From nscott@aconex.com Tue Oct 2 05:24:02 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 02 Oct 2007 05:24:09 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l92CNv8c031736 for ; Tue, 2 Oct 2007 05:24:02 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id AFE0E92C276 for ; Tue, 2 Oct 2007 22:23:57 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Tue, 2 Oct 2007 22:24:18 +1000 (EST) Message-ID: <51533.192.168.3.1.1191327858.squirrel@mail.aconex.com> Date: Tue, 2 Oct 2007 22:24:18 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1370 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 26 - dev/null |binary images/help-contents.png |binary images/help-contents.svg | 603 +++++++++++++++++++++++++++++++++++++++++++ images/tooliconview.svg | 419 ----------------------------- images/toollistview.svg | 412 ----------------------------- images/zoom-in.png |binary images/zoom-in.svg | 340 ++++++++++++++++++++++++ images/zoom-out.png |binary images/zoom-out.svg | 342 ++++++++++++++++++++++++ qa/settings-testcases | 23 + src/chart/GNUmakefile | 23 - src/chart/chart.cpp | 4 src/chart/kmchart.cpp | 143 +++++++++- src/chart/kmchart.h | 30 +- src/chart/kmchart.qrc | 5 src/chart/kmchart.ui | 213 ++++++++------- src/chart/main.cpp | 44 ++- src/chart/main.h | 12 src/chart/settingsdialog.cpp | 73 ++++- src/chart/settingsdialog.h | 25 + src/chart/settingsdialog.ui | 170 +++++++++++- src/chart/tab.cpp | 1 src/chart/tab.h | 4 src/chart/tabdialog.cpp | 12 25 files changed, 1907 insertions(+), 1017 deletions(-) commit 461db19a0fa6d3352bef7ba9c198fda1b492937a Author: Nathan Scott Date: Tue Oct 2 22:17:37 2007 +1000 Implement zooming in/out of the current Tab, by altering the visible points (which is already separated out from total sample history). Also, needed to (and did, yay!) find a way to revert the revert which made chart/logging intervals into integers instead of doubles as they really should be. Verified this works on MacOSX as well, which was where the original problem was (basically, using static functions has resolved this, instead of using static constants - still doen't make sense that g++ on Mac got confused by this). commit 9232ef2dbbf9ce4180b40648476779376100c0d1 Author: Nathan Scott Date: Tue Oct 2 20:54:11 2007 +1000 Move two features back from wishlist to the kmchart 1.0 list. These are the toolbox setting dialog (it was a slow AFL grand final...), and the ability to zoom in/out. Turns out neither is overly difficult. The ability to customize the toolbar is fairly handy (e.g. I like the toolbar on the right a fair bit, as it gives more vertical space - its not everyones cup of tea though), and zooming looks like it'll be easy since we have a visible/total samples split already. This change updates the README to reflect the above, and also implements Toolbar settings (both code and interactive QA). commit f7eb2885f41494f019b56a9391621d8d7535522e Author: Nathan Scott Date: Sat Sep 29 11:27:38 2007 +1000 User interface file updates for main kmchart window - rename Settings to Preferences for consistency across platforms, remove some unused icons, add a few new ones. From nscott@aconex.com Tue Oct 2 18:08:46 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 02 Oct 2007 18:08:52 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9318iFK012232 for ; Tue, 2 Oct 2007 18:08:45 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 31CCB92CC04 for ; Wed, 3 Oct 2007 11:05:15 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Wed, 03 Oct 2007 11:07:45 +1000 Message-Id: <1191373665.15908.228.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1371 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git qa/create-edit-chart-testcases | 1 src/chart/GNUmakefile | 2 src/chart/colorbutton.cpp | 46 ++++++++ src/chart/colorbutton.h | 43 +++++++ src/chart/kmchart.pro | 8 - src/chart/qcolorpicker.cpp | 8 - src/chart/settingsdialog.cpp | 224 ++++++----------------------------------- src/chart/settingsdialog.h | 82 +++++++++------ src/chart/settingsdialog.ui | 171 +++++++++++++++---------------- 9 files changed, 271 insertions(+), 314 deletions(-) commit 8b10d26f42e552132a86cd3d19747a17cc27f124 Author: Nathan Scott Date: Wed Oct 3 10:48:12 2007 +1000 Rework the color selection mechanism in the Settings dialog to use a model that will work on MacOSX as well, and which is similar to the qcolorpicker.h mechanism used during metric selection. commit 9b42221b8e673ae6e8f08722727e5bb09e12fad3 Author: Nathan Scott Date: Wed Oct 3 08:23:57 2007 +1000 drawFrame is documented as removed in QT4, so switch to more recent API. From markgw@sgi.com Wed Oct 3 21:13:30 2007 Received: with ECARTIS (v1.0.0; list pcp); Wed, 03 Oct 2007 21:13:35 -0700 (PDT) Received: from larry.melbourne.sgi.com (larry.melbourne.sgi.com [134.14.52.130]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with SMTP id l944DRpN008552 for ; Wed, 3 Oct 2007 21:13:29 -0700 Received: from [134.14.55.10] (dhcp10.melbourne.sgi.com [134.14.55.10]) by larry.melbourne.sgi.com (950413.SGI.8.6.12/950213.SGI.AUTOCF) via ESMTP id OAA22063; Thu, 4 Oct 2007 14:13:22 +1000 Message-ID: <4704685C.8040209@sgi.com> Date: Thu, 04 Oct 2007 14:13:16 +1000 From: Mark Goodwin Reply-To: markgw@sgi.com Organization: SGI Engineering User-Agent: Thunderbird 1.5.0.13 (Windows/20070809) MIME-Version: 1.0 To: nscott@aconex.com CC: pcp@oss.sgi.com Subject: Re: kmchart updates References: <45762.192.168.3.1.1190887138.squirrel@mail.aconex.com> <46FB8BB3.9040408@sgi.com> <1190935880.15908.155.camel@edge.yarra.acx> In-Reply-To: <1190935880.15908.155.camel@edge.yarra.acx> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-archive-position: 1372 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: markgw@sgi.com Precedence: bulk X-list: pcp I upgraded my FC7 to qt4-4.3.1-3 and kmchart builds fine now, thanks -- Mark Nathan Scott wrote: > On Thu, 2007-09-27 at 20:53 +1000, Mark Goodwin wrote: >> Hi Nathan, >> > > Hey Mark, > >> I've seen a lots of git commits for kmchart lately, so I thought I'd give >> it a try. > > Yeah, I've got a shopping list of known issues that I'm working through > (see README) to get to a kmchart 1.0 release, where I'll make packages > available (rpms and MacOSX packages planned). > >> First, cloned from your kmchart git tree and tried to build kmchart but >> failed. Seems I need to set QMAKE in my env to /usr/lib/qt-3.3/bin/qmake >> and add /usr/lib/qt-3.3/bin to my PATH. Then, following the instructions >> in Docs/INSTALL: > > No, I switched from QT3 recently, QT4 is required (they are completely > different beasts, with little in the way of compatibility between the > two APIs). > >> ./Makepkgs verbose >> ... >> I haven't spent much time on this, perhaps obviously :) I'm running FC7 >> in a VM on >> my laptop, with qt and qt-dev installed. Do I need a newer version of QT? > > Yep. Go for QT4.2 at least - I believe (from Kens laptop) that Fedora > is up to QT4.3 now (they will have both QT4 and QT3 packages, since the > two are so different). I switched to QT4 relatively recently, in order > to get the Intel Mac support, better looking widgets on Linux (plus a > host of other little benefits, like clear code from QtDesigner). > > I also ended up creating a local QWT library and QMC library (based on > PMC) due to the plethora of build issues I had on my Mac (MacOSX has > this unusual "Framework" concept, which is "more than a shared lib", > and since Qt knows how to build these things, I took the local-copy > route. This has the advantage now that the only build and runtime > dependency is QT4 (and PCP, of course). > > cheers. > From nscott@aconex.com Wed Oct 3 22:02:02 2007 Received: with ECARTIS (v1.0.0; list pcp); Wed, 03 Oct 2007 22:02:08 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9451xTD014255 for ; Wed, 3 Oct 2007 22:02:02 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 968C492D029 for ; Thu, 4 Oct 2007 15:01:57 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Thu, 4 Oct 2007 15:02:18 +1000 (EST) Message-ID: <40213.192.168.3.1.1191474138.squirrel@mail.aconex.com> Date: Thu, 4 Oct 2007 15:02:18 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1373 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/chart.cpp | 44 ++++++++++++++++++++++++++++++-------------- src/chart/chart.h | 3 +++ src/chart/kmchart.cpp | 16 ++++++++++++++++ src/chart/kmchart.h | 4 ++++ src/chart/main.cpp | 7 +------ src/chart/tab.cpp | 14 +++++++++----- 6 files changed, 63 insertions(+), 25 deletions(-) commit 4f812f6acc74491dc2b7845612f481719a974e48 Author: Nathan Scott Date: Thu Oct 4 14:57:39 2007 +1000 Bunch of work on correctly resizing the main window, resolving that really annoying problem where charts would overlap when initially created. We also shrink on delete now. Also moved the QWT setRawData call which updates the chart display into an overloaded replot routine, which helps with making changes to visible points take effect immediately. From nscott@aconex.com Thu Oct 4 01:10:15 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 04 Oct 2007 01:10:23 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l948ADW0012106 for ; Thu, 4 Oct 2007 01:10:15 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 3BF8792C48D for ; Thu, 4 Oct 2007 18:10:14 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Thu, 4 Oct 2007 18:10:35 +1000 (EST) Message-ID: <57787.192.168.3.1.1191485435.squirrel@mail.aconex.com> Date: Thu, 4 Oct 2007 18:10:35 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1374 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 1 qa/create-edit-chart-testcases | 3 - src/chart/chart.cpp | 97 +++++++++++++++++++---------------------- src/chart/chart.h | 8 +-- src/chart/chartdialog.cpp | 19 ++++---- src/chart/chartdialog.h | 1 src/chart/kmchart.cpp | 3 - src/chart/view.cpp | 2 8 files changed, 62 insertions(+), 72 deletions(-) commit b4b4370267f220808bde74f1a2205a348d44f298 Author: Nathan Scott Date: Thu Oct 4 18:08:21 2007 +1000 Fix the problem where new charts were always created as Area Plots. In the process resolve the issue where QPen was set independenly to QBrush for individual plots, which meant they could not be properly setup to seaparate colours. We now set black outlines on some plot styles (QPen width might be worth experimenting with further). From nscott@aconex.com Thu Oct 4 13:22:23 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 04 Oct 2007 13:22:29 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l94KMLRF001628 for ; Thu, 4 Oct 2007 13:22:23 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 7BAD592C39D for ; Fri, 5 Oct 2007 06:22:22 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Fri, 5 Oct 2007 06:22:43 +1000 (EST) Message-ID: <60666.192.168.3.1.1191529363.squirrel@mail.aconex.com> Date: Fri, 5 Oct 2007 06:22:43 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1375 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git qa/create-save-view-testcases | 2 -- src/chart/kmchart.cpp | 12 ++++++------ src/chart/openviewdialog.cpp | 2 +- src/chart/openviewdialog.ui | 8 ++++---- src/chart/saveviewdialog.cpp | 4 ++-- src/chart/source.cpp | 22 +++++++++++++++++++--- 6 files changed, 32 insertions(+), 18 deletions(-) commit 9bf32ae5518863935b1eec8816312e7d06b4bf74 Author: Nathan Scott Date: Fri Oct 5 06:20:27 2007 +1000 Fix a problem with zooming taking vsible points beyond sample history size. commit 43099ea68ca167421baf167cd6dd64c943fbc072 Author: Nathan Scott Date: Fri Oct 5 05:33:01 2007 +1000 Update QA test to note fixed case. commit 40785bd03c9c6ccd6ee2b5f9f427fcc7bc4ea805 Author: Nathan Scott Date: Fri Oct 5 05:18:59 2007 +1000 Fix user view toolbutton missing directory code (need full path mkdir). commit 07f145a7489be1192e4005a5b61ce8fa1fbee03b Author: Nathan Scott Date: Fri Oct 5 04:59:04 2007 +1000 Make host icon on openview dialogs pushbutton appropriately size for MacOSX. commit c3048db68ed828d261e126db1a9511fd2e8bfd05 Author: Nathan Scott Date: Fri Oct 5 04:54:33 2007 +1000 Ensure newly requested context is always setup as the current context. From nscott@aconex.com Thu Oct 4 22:46:15 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 04 Oct 2007 22:46:21 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l955kDxC024327 for ; Thu, 4 Oct 2007 22:46:15 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 2B2DA92C2B9 for ; Fri, 5 Oct 2007 15:46:13 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Fri, 05 Oct 2007 15:48:48 +1000 Message-Id: <1191563328.15908.263.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1376 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git qa/create-save-view-testcases | 4 src/chart/chart.cpp | 3 src/chart/chartdialog.cpp | 24 ++-- src/chart/main.cpp | 6 - src/chart/namespace.cpp | 11 + src/chart/openviewdialog.cpp | 38 +++--- src/chart/source.cpp | 246 +++++++++++++++++++++--------------------- src/chart/source.h | 46 ++----- src/chart/tab.cpp | 2 src/chart/view.cpp | 2 src/libqmc/qmc_source.cpp | 3 src/libqmc/qmc_source.h | 3 12 files changed, 198 insertions(+), 190 deletions(-) commit 9813d41bf1ba2e3e01768a3fc9962e761c696473 Author: Nathan Scott Date: Fri Oct 5 15:36:04 2007 +1000 Rework many details of the kmchart Source class, fixing code TODOs and also the remaining open-view-QA issue with source combo boxes. At some point this class should be merged with QmcSource/Group, I think, there seems to be some duplication of effort there and its obfuscating the code alot (e.g. Source keeps its own list of QmcContexts, and QMC has lists of contexts in QmcGroup, and back pointers in QmcSource). From nscott@aconex.com Sun Oct 7 15:44:23 2007 Received: with ECARTIS (v1.0.0; list pcp); Sun, 07 Oct 2007 15:44:29 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l97MiLXP029730 for ; Sun, 7 Oct 2007 15:44:22 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 647E492C36F for ; Mon, 8 Oct 2007 08:44:18 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Mon, 8 Oct 2007 08:44:40 +1000 (EST) Message-ID: <39567.192.168.3.1.1191797080.squirrel@mail.aconex.com> Date: Mon, 8 Oct 2007 08:44:40 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1377 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/source.cpp | 477 ------------------------------------------- src/chart/source.h | 101 --------- src/chart/GNUmakefile | 2 src/chart/chart.cpp | 16 - src/chart/chartdialog.cpp | 41 ++- src/chart/chartdialog.h | 7 src/chart/kmchart.cpp | 2 src/chart/kmchart.pro | 4 src/chart/main.cpp | 31 -- src/chart/main.h | 5 src/chart/namespace.cpp | 5 src/chart/openviewdialog.cpp | 118 +++++++++- src/chart/openviewdialog.h | 9 src/chart/openviewdialog.ui | 4 src/chart/source.cpp | 1 src/chart/source.h | 1 src/chart/tab.cpp | 6 src/chart/timecontrol.cpp | 6 src/chart/timecontrol.h | 2 src/chart/view.cpp | 16 - src/dumptext/kmdumptext.cpp | 19 - src/libqmc/qmc_group.cpp | 30 +- src/libqmc/qmc_group.h | 14 - src/libqmc/qmc_metric.cpp | 44 +-- src/libqmc/qmc_metric.h | 19 - 25 files changed, 252 insertions(+), 728 deletions(-) commit aa53ec27dc8295e8b9606e76fc5cec1d87a2fd9b Author: Nathan Scott Date: Mon Oct 8 08:40:32 2007 +1000 Change QMC to pass out the context from a group/metric as a real pointer rather than a c++ reference, as this is what we really need in kmchart. Rename which*() to context*() in the Group class, as it makes the code more readable and consistent. Fixes SIGBUS after New/Edit Chart dialogs have populated their tree views, as we were mismanaging our group/metric state via references rather than direct pointers (in particular group->context() was passing back a copy of the QmcContext rather than a pointer to it). commit b9c17e49a1f27b18013977a7d04ab71063c36387 Merge: 274ba58... 59dfaac... Author: Nathan Scott Date: Sun Oct 7 14:47:44 2007 +1000 Merge leaf:/source/git/kmchart commit 59dfaac271d67acc2ca353dd6fc29d4a00ec34b9 Author: Nathan Scott Date: Sun Oct 7 14:44:22 2007 +1000 This is a fairly major rework of the way we manage contexts in kmchart. It completely removes the need for source.{h,cpp} as we are now relying on all QmcContext data structure management being done within the metrics class. Turns out the global list of contexts, and current context pointers, that we maintained in the Source class in kmchart were duplicating pointers and lists that the metrics class was already maintaining. Output from diffstat on this change says it all: 18 files changed, 170 insertions(+), 345 deletions(-) So, this removes a bunch of code in kmchart, removes unneeded data structure indirection, and fixes a context management bug in the code that deals with selecting the new current context (the bug was evident when multiple hosts were added into the sourceComboBox, and then a chart was created with the second or third, or fourth - it would still use the initial host as the source of metrics). There was some code in source.cpp dealing with user interface updates (combo boxes, metric trees) - this has been moved to the source files dealing with all other aspects of those parts of the interface (where they really belonged anyway). There is one remaining issue with the new/edit chart dialog I still need to resolve due to this change, but lots is done and I need to do an initial checkpoint commit now so I can context switch temporarily. commit 65013865720e0814ca68093dbcdcefaa6475e9cc Author: Nathan Scott Date: Sun Oct 7 12:56:27 2007 +1000 Put kmchart config file in the default Qt location on all platforms, else (on Unix variants) they interfere with the User Views list as we get kmchart/Qt configs mixed up with kmchart Views in ~/.pcp/kmchart then. Also turn any additional arguments seen into whatever form of source (archive/host) has been requested so far on the command line (defaults to hosts). commit b7c4d19c29c8be4d8c37eaae648035513a972424 Author: Nathan Scott Date: Sun Oct 7 12:52:34 2007 +1000 Remove unused fetchGroup field from Source struct. commit da7b44400988dfcad8cd74f25b95fffef123e683 Author: Nathan Scott Date: Sun Oct 7 12:52:10 2007 +1000 Fix a typo in a debug statement. From nscott@aconex.com Sun Oct 7 19:17:25 2007 Received: with ECARTIS (v1.0.0; list pcp); Sun, 07 Oct 2007 19:17:31 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l982HNr1009371 for ; Sun, 7 Oct 2007 19:17:25 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 35AA392C4B2 for ; Mon, 8 Oct 2007 12:17:24 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Mon, 8 Oct 2007 12:17:45 +1000 (EST) Message-ID: <59668.192.168.3.1.1191809865.squirrel@mail.aconex.com> Date: Mon, 8 Oct 2007 12:17:45 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1378 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git qa/create-edit-chart-testcases | 15 ++++------ src/chart/chart.cpp | 13 +++++++-- src/chart/chart.h | 1 src/chart/chartdialog.cpp | 16 +++++++---- src/chart/namespace.cpp | 58 +++++++++++++++++++++++++++++++---------- src/chart/namespace.h | 4 ++ src/libqmc/qmc_source.cpp | 32 ++++++++++++++++++---- src/libqmc/qmc_source.h | 5 +++ 8 files changed, 107 insertions(+), 37 deletions(-) commit 0f86c19edfec69b5b5ea97b1e92cbe1fe8f199e2 Author: Nathan Scott Date: Mon Oct 8 12:15:01 2007 +1000 Resolve UI state issue in auto-scaling widgets enabled/disabled state. commit 29002c87365c952eea48df6f60b58ca5f1f29f5d Author: Nathan Scott Date: Mon Oct 8 11:48:34 2007 +1000 Fix a bug where metric tree names could be corrupted (some parts duplicated incorrectly, such that extra levels added to the tree). commit 5ad55c06acf8036a625ba9410d606094d2f638f1 Author: Nathan Scott Date: Mon Oct 8 11:28:00 2007 +1000 Fix bug in adding multiple instances to a chart, weren't comparing inst ID. commit 0796c07247fd32fec373273f57a5025842e50b55 Author: Nathan Scott Date: Mon Oct 8 10:22:38 2007 +1000 Resolve how to display archive hostname and host proxy name in the New/Edit Chart dialog trees - using tooltips, lots of room too, so we also provide archive start and end time, and timezone string. Update source class to provide archive start/end strings for this. From nscott@aconex.com Mon Oct 8 16:05:18 2007 Received: with ECARTIS (v1.0.0; list pcp); Mon, 08 Oct 2007 16:05:23 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l98N5Fmb017350 for ; Mon, 8 Oct 2007 16:05:18 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 1012C92CE3D for ; Tue, 9 Oct 2007 09:05:15 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Tue, 09 Oct 2007 09:07:59 +1000 Message-Id: <1191884879.15908.277.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1379 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 113 +++++++++++++++++++++++++++-------- images/back_on.png |binary images/back_on.svg | 97 ++++++++---------------------- qa/create-edit-chart-testcases | 6 - src/chart/aboutdialog.cpp | 5 + src/chart/aboutdialog.ui | 10 +-- src/chart/chart.cpp | 15 ++-- src/chart/chart.h | 2 src/chart/chartdialog.cpp | 17 ++++- src/chart/namespace.h | 1 src/chart/tab.cpp | 129 +++++++++++++++++++++-------------------- src/chart/tab.h | 2 src/libqmc/qmc_metric.h | 6 + src/time/aboutdialog.cpp | 5 + src/time/aboutdialog.ui | 15 ++-- 15 files changed, 232 insertions(+), 191 deletions(-) commit 170f387241ed223915995fbeb4ee714fe30229a5 Author: Nathan Scott Date: Tue Oct 9 08:56:23 2007 +1000 Auto-update the version string in the About dialogs. commit daa4c68d292bbd4cc949c764874f89c87cfa8040 Author: Nathan Scott Date: Tue Oct 9 07:55:07 2007 +1000 Fix too-dark shading of play-backward icon in kmtime. commit d0a91b0f5510be16922951a9236c93b6a6504d0a Author: Nathan Scott Date: Tue Oct 9 07:43:57 2007 +1000 Add a flag to Chart::update() to tell whether we have data or not (due to live mode VCR stop/start). Drop dead code from adjustLiveWorldView and add some diagnostics. Add code to detect unexpectedly large steps and adjustLiveWorldView in this case as well (extends the fuzzy time position match logic a bit, and also makes that code more generous in its definition of fuzziness). commit d28117ebd9d1c117be5108f2eb637eee97a17e14 Author: Nathan Scott Date: Mon Oct 8 15:22:25 2007 +1000 Fix a code TODO note - setCurrent(chart) needs no return value. commit b8cba004ffb812d64dcdfc2f8019d73b0309e40a Author: Nathan Scott Date: Mon Oct 8 13:52:05 2007 +1000 Check that a metric is of a (numeric) type that can be plotted before adding it the list of metrics that will be added to a chart. Tighten the real() check in the metrics class to also discount other unwanted types (other than just string) - like nosupport, aggregate, aggregate static, and unknown. From nscott@aconex.com Mon Oct 8 21:23:50 2007 Received: with ECARTIS (v1.0.0; list pcp); Mon, 08 Oct 2007 21:23:56 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l994NjTY011935 for ; Mon, 8 Oct 2007 21:23:49 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 61FF892C300; Tue, 9 Oct 2007 14:23:46 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Cc: Ken McDonell Content-Type: text/plain Organization: Aconex Date: Tue, 09 Oct 2007 14:26:31 +1000 Message-Id: <1191903991.15908.280.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1380 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/chart.cpp | 15 ++++++++++----- src/chart/namespace.cpp | 15 +++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) commit 9c1491a75ed2185d78c274cc7aee74f955f41e18 Author: Nathan Scott Date: Tue Oct 9 14:24:43 2007 +1000 Fix two regressions Ken found - firstly, the metric type validity check added yesterday was operating on uninitialised memory when dealing with instances - fix by inheriting not just the context pointer, but also the pmDesc of the parent (and memset it to zero for non-root names). Secondly, tree loop controls were incorrect again for instances, and would attempt to create internal tree nodes at times that they shouldn't have. From kimbrr@sgi.com Mon Oct 8 22:19:51 2007 Received: with ECARTIS (v1.0.0; list pcp); Mon, 08 Oct 2007 22:19:55 -0700 (PDT) Received: from larry.melbourne.sgi.com (larry.melbourne.sgi.com [134.14.52.130]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with SMTP id l995Jk2N019725 for ; Mon, 8 Oct 2007 22:19:49 -0700 Received: from snort.melbourne.sgi.com (snort.melbourne.sgi.com [134.14.54.149]) by larry.melbourne.sgi.com (950413.SGI.8.6.12/950213.SGI.AUTOCF) via ESMTP id PAA12371; Tue, 9 Oct 2007 15:19:46 +1000 Received: from snort.melbourne.sgi.com (localhost [127.0.0.1]) by snort.melbourne.sgi.com (SGI-8.12.5/8.12.5) with ESMTP id l995JjdD56663303; Tue, 9 Oct 2007 15:19:46 +1000 (AEST) Received: from localhost (kimbrr@localhost) by snort.melbourne.sgi.com (SGI-8.12.5/8.12.5/Submit) with ESMTP id l995JhKX56624046; Tue, 9 Oct 2007 15:19:44 +1000 (AEST) X-Authentication-Warning: snort.melbourne.sgi.com: kimbrr owned process doing -bs Date: Tue, 9 Oct 2007 15:19:43 +1000 From: Michael Newton X-X-Sender: kimbrr@snort.melbourne.sgi.com To: pcp@oss.sgi.com cc: nscott@aconex.com Subject: [patch] waitpid on dying agents at reconfig (qa/296) Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-archive-position: 1381 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: kimbrr@sgi.com Precedence: bulk X-list: pcp Nathan, can you review please? qa/296 fails with daemon PMDAs hanging round after a reconfigure (ie kill -HUP to pmcd). It appears that they need to be wait()ed upon. Prior to the addition of the condition || ap->ipcType == AGENT_DSO to HarvestAgents in agent.c this condition was masked by other cleanup. Previously, CleanupAgent did not waitpid() for AT_CONFIG. In addition, there is no reason to sleep every time round the waitpid() loop, and in many cases even once may be unnecessary =========================================================================== mgmt/pcp/src/pmcd/src/agent.c =========================================================================== --- a/mgmt/pcp/src/pmcd/src/agent.c 2007-10-09 15:17:17.000000000 +1000 +++ b/mgmt/pcp/src/pmcd/src/agent.c 2007-10-09 15:15:35.620705921 +1000 @@ -33,7 +33,7 @@ CleanupAgent(AgentInfo* aPtr, int why, int status) { extern int AgentDied; - int exit_status; + int exit_status = status; int reason = 0; if (aPtr->ipcType == AGENT_DSO) { @@ -68,50 +68,55 @@ __pmNotifyErr(LOG_INFO, "CleanupAgent ...\n"); fprintf(stderr, "Cleanup \"%s\" agent (dom %d):", aPtr->pmDomainLabel, aPtr->pmDomainId); - if (why == AT_CONFIG) { - fprintf(stderr, " unconfigured"); + if (why == AT_EXIT) { + /* waitpid has already been done */ + fprintf(stderr, " terminated"); + reason = (status << 8) | REASON_EXIT; } else { - if (why == AT_EXIT) { - fprintf(stderr, " terminated"); - exit_status = status; - reason = (status << 8) | REASON_EXIT; - } - else { + if (why == AT_CONFIG) { + fprintf(stderr, " unconfigured"); + } else { reason = REASON_PROTOCOL; fprintf(stderr, " protocol failure for fd=%d", status); exit_status = -1; - if (aPtr->status.isChild == 1) { - pid_t pid = -1; - pid_t done; - int wait_status; - if (aPtr->ipcType == AGENT_PIPE) - pid = aPtr->ipc.pipe.agentPid; - else if (aPtr->ipcType == AGENT_SOCKET) - pid = aPtr->ipc.socket.agentPid; - /* - * give PMDA a chance to notice the close() and exit - * before we try to wait() - */ - sleep(1); - for ( ; ; ) { + } + if (aPtr->status.isChild == 1) { + pid_t pid = -1; + pid_t done; + int wait_status; + int slept = 0; + + if (aPtr->ipcType == AGENT_PIPE) + pid = aPtr->ipc.pipe.agentPid; + else if (aPtr->ipcType == AGENT_SOCKET) + pid = aPtr->ipc.socket.agentPid; + for ( ; ; ) { #if defined(HAVE_WAIT3) - done = wait3(&wait_status, WNOHANG, NULL); + done = wait3(&wait_status, WNOHANG, NULL); #elif defined(HAVE_WAITPID) - done = waitpid((pid_t)-1, &wait_status, WNOHANG); + done = waitpid((pid_t)-1, &wait_status, WNOHANG); #else - break; + done = 0; #endif - if (done <= 0) - break; - else if (done == pid) - exit_status = wait_status; + if (done == pid) { + exit_status = wait_status; + break; + } + if (done > 0) { + continue; } + if (slept) { + break; + } + /* give PMDA a chance to notice the close() and exit */ + sleep(1); + slept = 1; } } - - if (exit_status != -1) { + } + if (exit_status != -1) { if (WIFEXITED(exit_status)) { fprintf(stderr, ", exit(%d)", WEXITSTATUS(exit_status)); reason = (WEXITSTATUS(exit_status) << 8) | reason; @@ -124,7 +129,6 @@ #endif reason = (WTERMSIG(exit_status) << 16) | reason; } - } } fputc('\n', stderr); aPtr->reason = reason; =========================================================================== mgmt/pcp/src/pmcd/src/config.c =========================================================================== --- a/mgmt/pcp/src/pmcd/src/config.c 2007-10-09 15:17:17.000000000 +1000 +++ b/mgmt/pcp/src/pmcd/src/config.c 2007-10-09 14:58:29.077617397 +1000 @@ -2382,11 +2382,6 @@ free(oldAgent); __pmAccFreeSavedHosts(); - /* Allow some time for the old agents to close down. This allows sockets - * to be closed at the agent end, etc. - */ - sleep(1); - /* Start the new agents */ ContactAgents(); for (i = 0; i < MAXDOMID + 2; i++) Dr.Michael("Kimba")Newton kimbrr@sgi.com From kimbrr@sgi.com Mon Oct 8 22:48:58 2007 Received: with ECARTIS (v1.0.0; list pcp); Mon, 08 Oct 2007 22:49:03 -0700 (PDT) Received: from larry.melbourne.sgi.com (larry.melbourne.sgi.com [134.14.52.130]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with SMTP id l995mtQm023613 for ; Mon, 8 Oct 2007 22:48:57 -0700 Received: from snort.melbourne.sgi.com (snort.melbourne.sgi.com [134.14.54.149]) by larry.melbourne.sgi.com (950413.SGI.8.6.12/950213.SGI.AUTOCF) via ESMTP id PAA13303; Tue, 9 Oct 2007 15:48:55 +1000 Received: from snort.melbourne.sgi.com (localhost [127.0.0.1]) by snort.melbourne.sgi.com (SGI-8.12.5/8.12.5) with ESMTP id l995msdD56764077; Tue, 9 Oct 2007 15:48:55 +1000 (AEST) Received: from localhost (kimbrr@localhost) by snort.melbourne.sgi.com (SGI-8.12.5/8.12.5/Submit) with ESMTP id l995mqdD56915666; Tue, 9 Oct 2007 15:48:53 +1000 (AEST) X-Authentication-Warning: snort.melbourne.sgi.com: kimbrr owned process doing -bs Date: Tue, 9 Oct 2007 15:48:52 +1000 From: Michael Newton X-X-Sender: kimbrr@snort.melbourne.sgi.com To: pcp@oss.sgi.com cc: nscott@aconex.com Subject: [patch] reinstate longer delay before resorting to KILLing pmcd Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-archive-position: 1382 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: kimbrr@sgi.com Precedence: bulk X-list: pcp Nathan Scott (nscott@aconex.com) reports a problem with a slightly modified version of 2.7.4-1, and speculates the same problem could possibly hit users running a large number of PMDAs on a loaded system. His problem is fixed by reinstating the longer (20s) delay in the init.d script. I don't have any issue with queuing this change, but I don't see getting it out in a release as a priority in the absence of evidence that it has occurred in the release as distributed. The symptom is that you see "forcing pmcd to terminate" on every /etc/init.d/pcp (re)start. Note that the restart does proceed unproblematically: the only issue is these scary-looking warnings. This is mostly a problem if you are running QA --- a/mgmt/pcp/src/pmcd/rc_pcp 2007-10-09 15:35:59.000000000 +1000 +++ b/mgmt/pcp/src/pmcd/rc_pcp 2007-10-09 15:34:08.816409829 +1000 @@ -461,7 +461,7 @@ # On failure, resort to SIGKILL. # $ECHO $PCP_ECHO_N "Waiting for PMCD to terminate ...""$PCP_ECHO_C" - delay=80 # tenths of a second + delay=200 # tenths of a second for SIG in TERM KILL do if [ "x$TOKILL" == "x" ] Dr.Michael("Kimba")Newton kimbrr@sgi.com From nscott@aconex.com Tue Oct 9 01:19:13 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 09 Oct 2007 01:19:19 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l998JAxb021412 for ; Tue, 9 Oct 2007 01:19:13 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 45D8892C7D1 for ; Tue, 9 Oct 2007 18:19:11 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Tue, 09 Oct 2007 18:21:56 +1000 Message-Id: <1191918116.15908.296.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1383 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/chart.cpp | 6 +++--- src/chart/chart.h | 2 +- src/chart/chartdialog.cpp | 6 +++--- src/chart/kmchart.h | 2 +- src/chart/namespace.cpp | 11 +---------- src/chart/namespace.h | 4 +--- 6 files changed, 10 insertions(+), 21 deletions(-) commit 4b417026005b59a3d5711181daface3358e636d5 Author: Nathan Scott Date: Tue Oct 9 18:19:46 2007 +1000 Fix a problem Ken discovered when changing attributes of a chart containing metrics with instances. Tree name matching was using instance ID, yet this was not always initialised. We now compare instance name instead of ID, as this is readily accessible in all cases. Remove the now unused instID from the NameSpace class. commit 12d4cf20a4fd17f86321e233c0e0dfc700d8a18f Author: Nathan Scott Date: Tue Oct 9 18:15:37 2007 +1000 Make default chart size slightly larger. From nscott@aconex.com Tue Oct 9 16:46:39 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 09 Oct 2007 16:46:46 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l99Nkb4F032732 for ; Tue, 9 Oct 2007 16:46:39 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id AD01A92C3B4 for ; Wed, 10 Oct 2007 09:46:37 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Wed, 10 Oct 2007 09:49:24 +1000 Message-Id: <1191973764.15908.298.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1384 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 3 +++ src/chart/chartdialog.cpp | 26 +++++++++++++++++++++++--- src/chart/chartdialog.h | 1 + src/chart/chartdialog.ui | 7 ++++++- src/chart/kmchart.cpp | 4 +++- src/chart/qcolorpicker.cpp | 28 ++++++++++++++++++++++++++++ src/chart/qcolorpicker.h | 19 +++++++++++++++++++ src/chart/settingsdialog.cpp | 1 + 8 files changed, 84 insertions(+), 5 deletions(-) commit bf4c685caab83b76bab620df83a8abdb8f3f320f Author: Nathan Scott Date: Wed Oct 10 09:39:50 2007 +1000 Plumb in the color value lineEdit on the New/Edit Chart dialog. commit c9b5b3918cb5a5f1315710af603ee248fef8c575 Author: Nathan Scott Date: Wed Oct 10 09:36:03 2007 +1000 Fix couple of issues related to restoring modified Toolbar settings. From nscott@aconex.com Wed Oct 10 20:00:08 2007 Received: with ECARTIS (v1.0.0; list pcp); Wed, 10 Oct 2007 20:00:15 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9B307dD012198 for ; Wed, 10 Oct 2007 20:00:08 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 796D592C310 for ; Thu, 11 Oct 2007 13:00:07 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Thu, 11 Oct 2007 13:00:29 +1000 (EST) Message-ID: <59373.192.168.3.1.1192071629.squirrel@mail.aconex.com> Date: Thu, 11 Oct 2007 13:00:29 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1385 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git qa/create-edit-chart-testcases | 187 ----------------------------- qa/create-save-view-testcases | 124 ------------------- README | 34 ++--- aclocal.m4 | 6 build/mac/GNUmakefile | 33 ++--- build/mac/build-installer | 8 - build/mac/installer-description | 2 build/mac/installer-resources/License.html | 8 - build/mac/installer-resources/ReadMe.html | 4 build/mac/installer-resources/Welcome.txt | 2 build/mac/installer-resources/postinstall | 5 build/mac/installer-resources/postupgrade | 2 build/rpm/kmchart.spec.in | 2 debian/control | 4 m4/package_globals.m4 | 6 qa/archives/chartqa1.0 |binary qa/archives/chartqa1.index |binary qa/archives/chartqa1.meta |binary qa/chart-control-testcases | 119 ++++++++++++++++++ qa/chart-create-edit-testcases | 187 +++++++++++++++++++++++++++++ qa/help-system-testcases | 19 ++ qa/tab-create-edit-testcases | 93 ++++++++++++++ qa/view-create-save-testcases | 124 +++++++++++++++++++ qa/views/ScaleManual | 8 + src/include/builddefs.in | 3 25 files changed, 616 insertions(+), 364 deletions(-) commit 10b7951eb2c9e512e1dd823d5fe00cbd97e9da38 Author: Nathan Scott Date: Thu Oct 11 12:37:49 2007 +1000 Interactive QA for edit/create Tab, and notes on checking the help system. commit 58701f8dbd784f71250b393588d24e64ec6a5dd1 Author: Nathan Scott Date: Thu Oct 11 11:22:23 2007 +1000 Improve the names of some of the QA tests. commit 01dbd48d93c8864cff40a7930d01810d95dfa95e Author: Nathan Scott Date: Thu Oct 11 11:17:42 2007 +1000 Update chart-control-testcases as done in README. commit e8c4026a4ff375d3aa841e4ddc5d7235fc8abad7 Author: Nathan Scott Date: Thu Oct 11 11:16:13 2007 +1000 Interactive QA for chart display functionality and time control. commit bb7aa897ccc7203a852be1994f6d1236f657bee9 Author: Nathan Scott Date: Thu Oct 11 11:10:07 2007 +1000 Update README with additional thoughts on various issues/features. commit a5ce7b4089c48a387620d996b399484455853b0c Author: Nathan Scott Date: Wed Oct 10 21:42:33 2007 +1000 More packaging tweaks, cleanup wording for installs, fix postinstall script. commit 8fdce997c74d4b5c83686338554ae25cfcedb6f3 Author: Nathan Scott Date: Wed Oct 10 21:14:26 2007 +1000 Packaging fixes for MacOSX, slight differences between pcp and kmchart builds. From nscott@aconex.com Thu Oct 11 02:15:54 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 11 Oct 2007 02:16:02 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9B9Fpjm017617 for ; Thu, 11 Oct 2007 02:15:54 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 6048A92C480 for ; Thu, 11 Oct 2007 19:15:53 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Thu, 11 Oct 2007 19:16:15 +1000 (EST) Message-ID: <40233.192.168.3.1.1192094175.squirrel@mail.aconex.com> Date: Thu, 11 Oct 2007 19:16:15 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1386 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 2 -- qa/chart-control-testcases | 1 - src/chart/GNUmakefile | 2 +- src/chart/chart.cpp | 26 ++++++++++++++++++++------ src/chart/chart.h | 4 +++- src/chart/chartdialog.cpp | 1 + src/chart/curve.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ src/chart/curve.h | 33 +++++++++++++++++++++++++++++++++ src/chart/kmchart.pro | 8 ++++---- 9 files changed, 103 insertions(+), 15 deletions(-) commit 6e372a031637b5bb9d480c76ac21383028c9290e Author: Nathan Scott Date: Thu Oct 11 15:42:04 2007 +1000 Correctly remove (and later possibly reinstate) plots from a chart. commit 79991ff3ba0d08a818d7392e7a3c665f3db8990f Author: Nathan Scott Date: Thu Oct 11 15:08:19 2007 +1000 Fix a long-standing problem where metrics with unavailable values were treated as having the value zero, which was completely wrong of course and resulted in very confusing graphs at times. Hooray! From nscott@aconex.com Thu Oct 11 12:41:17 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 11 Oct 2007 12:41:24 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9BJfDBg021996 for ; Thu, 11 Oct 2007 12:41:16 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id D5EC492C67E for ; Fri, 12 Oct 2007 05:41:14 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Fri, 12 Oct 2007 05:41:36 +1000 (EST) Message-ID: <55278.192.168.3.1.1192131696.squirrel@mail.aconex.com> Date: Fri, 12 Oct 2007 05:41:36 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1387 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/chart.cpp | 2 +- src/chart/chartdialog.cpp | 11 ----------- src/chart/chartdialog.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) commit c7073ed7cd810c46def31161099c2808a74d7452 Author: Nathan Scott Date: Fri Oct 12 05:35:23 2007 +1000 Fix the Available Metrics list annoying collapse-but-no-expand problem, which left large parts of the New/Edit Chart dialog effectively unusable when top level names were collapsed down. Not 100% clear as to why this fixes it, but calling expand() via the itemActivated signal is a QT3 hangover - removing it has resolved the problem, even though the item flags indicate no difference between the busted Available Metrics List and the working Chart Metrics List (which wasn't using this signal). commit f10302c899c39d25f7f937a2bfab01d7dec4640e Author: Nathan Scott Date: Fri Oct 12 05:30:10 2007 +1000 Fix incorrect calculation in legend label size when inserting ... suffix. From nscott@aconex.com Thu Oct 11 20:47:25 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 11 Oct 2007 20:47:33 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9C3lLYw004473 for ; Thu, 11 Oct 2007 20:47:25 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id C04E592C2A0; Fri, 12 Oct 2007 13:47:21 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Cc: Ken McDonell Content-Type: text/plain Organization: Aconex Date: Fri, 12 Oct 2007 13:50:13 +1000 Message-Id: <1192161014.15908.331.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1388 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 27 +-- qa/search-testcases | 80 ++++++++++ src/chart/GNUmakefile | 6 src/chart/chart.cpp | 4 src/chart/chartdialog.cpp | 20 +- src/chart/chartdialog.h | 5 src/chart/chartdialog.ui | 30 +++ src/chart/kmchart.cpp | 8 + src/chart/kmchart.h | 5 src/chart/kmchart.pro | 12 - src/chart/namespace.cpp | 31 ++-- src/chart/namespace.h | 10 - src/chart/recorddialog.cpp | 2 src/chart/saveviewdialog.cpp | 7 src/chart/saveviewdialog.h | 4 src/chart/saveviewdialog.ui | 226 +++++++++++++++++++----------- src/chart/searchdialog.cpp | 191 +++++++++++++++++++++++++ src/chart/searchdialog.h | 53 +++++++ src/chart/searchdialog.ui | 323 +++++++++++++++++++++++++++++++++++++++++++ src/chart/tab.cpp | 2 src/chart/view.cpp | 11 - 21 files changed, 908 insertions(+), 149 deletions(-) commit 3f9d7c4e1f65a32413c0981a88782779f0b193ca Author: Nathan Scott Date: Fri Oct 12 13:48:13 2007 +1000 User interface components of the "global" keyword (optional in saveview). commit a319af84b5e9538ecc262ffdcfb43691c7f7062f Author: Nathan Scott Date: Fri Oct 12 13:39:28 2007 +1000 Fix compiler warnings - unused variables from an earlier tmp workaround. commit a4b7f58deb45fef0370cd903a17d1d34b065110d Author: Ken McDonell Date: Fri Oct 12 13:37:19 2007 +1000 Add a metric namespace super-searching capability; allowing regex pattern matching on metric &| instance names, and propogation of search results back into the New/Edit Chart dialogs metric list. From nscott@aconex.com Sun Oct 14 18:51:47 2007 Received: with ECARTIS (v1.0.0; list pcp); Sun, 14 Oct 2007 18:51:57 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9F1pf0Q005844 for ; Sun, 14 Oct 2007 18:51:46 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 8575B92D27D for ; Mon, 15 Oct 2007 11:51:42 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Mon, 15 Oct 2007 11:52:04 +1000 (EST) Message-ID: <58154.192.168.3.1.1192413124.squirrel@mail.aconex.com> Date: Mon, 15 Oct 2007 11:52:04 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1389 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 11 +- qa/003 | 2 qa/003.out | 3 src/chart/chart.cpp | 36 ++++++--- src/chart/chart.h | 8 +- src/chart/chartdialog.cpp | 23 ++++- src/chart/chartdialog.h | 2 src/chart/chartdialog.ui | 5 + src/chart/kmchart.cpp | 5 - src/chart/kmchart.h | 1 src/chart/main.cpp | 96 ++++++++++++++++++++++--- src/chart/main.h | 17 +++- src/chart/namespace.cpp | 12 +-- src/chart/namespace.h | 7 + src/chart/openviewdialog.h | 1 src/chart/saveviewdialog.cpp | 19 +++- src/chart/saveviewdialog.h | 1 src/chart/saveviewdialog.ui | 5 - src/chart/searchdialog.cpp | 2 src/chart/settingsdialog.cpp | 28 +++++-- src/chart/settingsdialog.h | 8 +- src/chart/view.cpp | 165 +++++++++++++++++++++++++++++++++---------- 22 files changed, 344 insertions(+), 113 deletions(-) commit 19ff28df31d88b632e3087ba8b415c0cdcaae295 Author: Nathan Scott Date: Mon Oct 15 11:49:49 2007 +1000 Implement the global keyword from the pmchart config language. Update README and QA appropriately. Also fixed some full vs. absolute path issues with the View Save dialog. commit d76592e5f820461f5fe0c3f3b75b37387ee3d064 Author: Nathan Scott Date: Mon Oct 15 10:28:24 2007 +1000 Ensure globalSettings not marked as modified during startup, otherwise we will unintentionally force these to be written out later even if thats not needed (might result in creation of the .config file too, unnecessarily). commit c012f7bd540f23b99a3b73220f879789dd424ce1 Author: Nathan Scott Date: Mon Oct 15 09:53:59 2007 +1000 Add an init-to-zero to resolve a gcc4 compiler warning on MacOSX. commit 7eb04cf39ea54accfe86eb754889cba419e7b51f Author: Nathan Scott Date: Mon Oct 15 09:53:19 2007 +1000 Code refactoring to support different view-specific color schemes (to support pmchart "scheme" keyword). Also some more work on UI elements to be able to create/modify/delete schemes on-the-fly. commit 9efeeb28c726cba029f0396a9626495be7a3cbb2 Author: Nathan Scott Date: Mon Oct 15 09:36:02 2007 +1000 If absolute view path given, do not search for it on view PATH if not found. From nscott@aconex.com Mon Oct 15 02:29:21 2007 Received: with ECARTIS (v1.0.0; list pcp); Mon, 15 Oct 2007 02:29:32 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9F9THTK006113 for ; Mon, 15 Oct 2007 02:29:21 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id 11DDA92C38E for ; Mon, 15 Oct 2007 19:29:19 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Mon, 15 Oct 2007 19:29:41 +1000 (EST) Message-ID: <46460.192.168.3.1.1192440581.squirrel@mail.aconex.com> Date: Mon, 15 Oct 2007 19:29:41 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1390 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git build/GNUmakefile | 2 build/mac/installer-resources/background.jpg |binary build/mac/installer-resources/postinstall | 2 src/chart/settingsdialog.ui | 10 +- src/chart/view.cpp | 121 ++++++++++++++++++--------- 5 files changed, 94 insertions(+), 41 deletions(-) commit 6d63a36fc7c88694e10d78788b82e1751abcfa18 Author: Nathan Scott Date: Mon Oct 15 19:27:53 2007 +1000 Implement config language support for the "scheme" keyword, which allows individual charts/views to have alternate color rotation schemes (other than the default one). commit 45bda8ee7e0d1bd6f9b6a93843620f0a825cf065 Author: Nathan Scott Date: Mon Oct 15 17:23:16 2007 +1000 MacOSX installer updates and fixes. commit 01b43d3a41feb2683af8c7e0179638d6a812c9b8 Author: Nathan Scott Date: Mon Oct 15 12:51:13 2007 +1000 No reason the y-axis scaling should be limited to range of an integer. commit 754f7c86fd6dfd33954c574e5a07f08988929e84 Author: Nathan Scott Date: Mon Oct 15 12:50:39 2007 +1000 Update settings dialog to use push- instead of tool-buttons in 2 spots. From nscott@aconex.com Mon Oct 15 18:37:27 2007 Received: with ECARTIS (v1.0.0; list pcp); Mon, 15 Oct 2007 18:37:33 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9G1bP5v012760 for ; Mon, 15 Oct 2007 18:37:27 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 910C592C701 for ; Tue, 16 Oct 2007 11:37:27 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Tue, 16 Oct 2007 11:36:48 +1000 Message-Id: <1192498608.5414.7.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1391 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 4 images/document-close.png |binary images/document-close.svg | 377 +++++++++++++++++++++++++++++++++++++++++++ images/tab-close.png |binary images/tab-close.svg | 281 ++++++++++++++++++++++++++++++++ images/tab-edit.png |binary images/tab-edit.svg | 154 +++++++++++++++-- images/tab-new.png |binary images/tab-new.svg | 56 ++++-- src/chart/GNUmakefile | 7 src/chart/chartdialog.cpp | 23 ++ src/chart/chartdialog.h | 4 src/chart/chartdialog.ui | 36 ++-- src/chart/kmchart.cpp | 4 src/chart/kmchart.qrc | 6 src/chart/kmchart.ui | 6 src/chart/settingsdialog.cpp | 106 ++++++++++-- src/chart/settingsdialog.h | 8 src/chart/settingsdialog.ui | 122 +++++-------- src/chart/tab.cpp | 2 20 files changed, 1046 insertions(+), 150 deletions(-) commit f303c9da3a8b62f81ffca92b82f4c5e28f83e98c Author: Nathan Scott Date: Tue Oct 16 11:22:43 2007 +1000 Comment out new-tab-on-record-stop code for now, its unstable atm. commit 95d2efa4ed6e9fa4b74ef6bf66544edda6a03566 Author: Nathan Scott Date: Tue Oct 16 11:11:54 2007 +1000 Point commit of scheme UI interaction work, so I can do a merge. commit f3b5e221283c0e4049aefbb2099d84180bf435c8 Author: Nathan Scott Date: Tue Oct 16 10:39:22 2007 +1000 Usability tweak from the first Mac user (hehe) - make double click on the Available Metrics List equivalent to selecting a metric and pressing the Add Metric button (to add it into the chart). commit 578fa6a5287dfde78c59e9a0d9a722a2ce4b98f0 Author: Nathan Scott Date: Tue Oct 16 10:28:45 2007 +1000 Fix color scheme rotation when adding items one-by-one to a new chart. commit 24d92a285a60119d2ef8378928d23382daae0d02 Author: Nathan Scott Date: Tue Oct 16 09:37:29 2007 +1000 Add icons for close tab/chart actions (fixes toolbar layouts with these actions enabled in the toolbar). Also tweak the existing icons for edit/new tabs slightly. From nscott@aconex.com Tue Oct 16 00:35:08 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 00:35:14 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9G7Z5Qa008083 for ; Tue, 16 Oct 2007 00:35:07 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id C3BE692C43C for ; Tue, 16 Oct 2007 17:35:06 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Tue, 16 Oct 2007 17:34:28 +1000 Message-Id: <1192520068.5414.38.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1392 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 3 - qa/search-testcases | 19 +++++--- src/chart/chart.cpp | 5 ++ src/chart/chartdialog.cpp | 19 +++++++- src/chart/exportdialog.ui | 3 + src/chart/hostdialog.ui | 3 + src/chart/kmchart.cpp | 83 +++++++++++++++++++++++++++++++------- src/chart/namespace.cpp | 25 ++++------- src/chart/openviewdialog.ui | 3 + src/chart/recorddialog.ui | 3 + src/chart/saveviewdialog.ui | 3 + src/chart/searchdialog.ui | 95 +++++++++++++++++++++++++++++++++----------- src/chart/tab.cpp | 18 ++++++-- src/chart/tabdialog.ui | 3 + src/chart/view.cpp | 1 src/chart/views/Overview | 2 16 files changed, 219 insertions(+), 69 deletions(-) commit 0e40ae88e6fe03043cdc5286832be9784ef4cf94 Author: Nathan Scott Date: Tue Oct 16 17:11:14 2007 +1000 Fix parsing for schemes, extra eol check in there gave syntax errors on Linux. commit e8b5bd618a7476ef7f0767035aba5f7992d67cfc Merge: 4be4b37... b98664d... Author: Ken McDonell Date: Tue Oct 16 14:22:08 2007 +1000 Merge in goodies from Ken's tree. commit b98664d86f5a8fd28ed9cf34ccb300b683505f61 Merge: dec61ad... f303c9d... Author: Ken McDonell Date: Tue Oct 16 12:36:17 2007 +1000 Merge git://oss.sgi.com:8090/nathans/kmchart commit 4be4b37b10687e52f99dc4d74c70c8d11b97feef Merge: 40bdf5a... f303c9d... Author: Nathan Scott Date: Tue Oct 16 11:37:33 2007 +1000 Merge git://oss.sgi.com:8090/nathans/kmchart commit f303c9da3a8b62f81ffca92b82f4c5e28f83e98c Author: Nathan Scott Date: Tue Oct 16 11:22:43 2007 +1000 Comment out new-tab-on-record-stop code for now, its unstable atm. commit dec61ade1036850f86ff071d3ba730d967e6f5d2 Author: Ken McDonell Date: Tue Oct 16 08:07:49 2007 +1000 Add print support for time button, time axis and datestamp commit cdeb03ba92ddc88439960a3c4dadd5f41539d5ce Author: Ken McDonell Date: Tue Oct 16 05:13:13 2007 +1000 Initial support for File->Print and multiple charts commit 6eccd12a5a1c49ba17ece31d35fd8ca0de5f988f Author: Ken McDonell Date: Tue Oct 16 05:10:07 2007 +1000 Check for addPlot() failure, raise popup and avoid segv ... seen when using pmproxy and default is inaccessible, would also arise if pmcd not running locally commit 549e906e22ce47d50d3603aed513d9793babf6e8 Merge: 095bb06... 19ff28d... Author: Ken McDonell Date: Mon Oct 15 12:46:35 2007 +1000 Merge git://oss.sgi.com:8090/nathans/kmchart commit 095bb0602903522c0e53efa5b4b0d6ed8aa06034 Author: Ken McDonell Date: Mon Oct 15 12:46:08 2007 +1000 Make idle CPU time the same color as for the CPU view commit 40bdf5a32093e6baa1e0c12bd979a0943a9e1228 Author: Ken McDonell Date: Fri Oct 12 16:42:40 2007 +1000 Add a reminder note about occassionally leaking kmtime processes. commit 0a24d5deeb33accb301e06db02aa00b18b224d65 Author: Ken McDonell Date: Fri Oct 12 16:40:51 2007 +1000 Make several dialogs modal to ensure no odd interaction with parent occurs. commit c2d5a292298afe3dcfcc4b859acd0c412c8c16df Merge: 055bc04... e4d3320... Author: Ken McDonell Date: Fri Oct 12 16:32:07 2007 +1000 Merge git://oss.sgi.com:8090/nathans/kmchart commit 1c85c6365395ac9a4f672868fa2da02822c50d62 Author: Ken McDonell Date: Fri Oct 12 16:31:03 2007 +1000 Fix a memory leak on early-exit paths when setting up namespace lists. commit 055bc049e0686eda2dcff1611ee7e7741ce020af Author: Ken McDonell Date: Fri Oct 12 16:13:31 2007 +1000 make searchdialog modal, cleanup seteExpanded() use and small mem leak plug From o.tarnus@free.fr Tue Oct 16 13:55:42 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 13:55:50 -0700 (PDT) Received: from mailrelay005.isp.belgacom.be (mailrelay005.isp.belgacom.be [195.238.6.171]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9GKtdKU023026 for ; Tue, 16 Oct 2007 13:55:41 -0700 X-Belgacom-Dynamic: yes Received: from 244.215-243-81.adsl-dyn.isp.belgacom.be (HELO [192.168.230.20]) ([81.243.215.244]) by relay.skynet.be with ESMTP; 16 Oct 2007 22:44:49 +0200 Message-ID: <471522C1.9040009@free.fr> Date: Tue, 16 Oct 2007 22:44:49 +0200 From: Olivier Tarnus User-Agent: Thunderbird 2.0.0.6 (X11/20070806) MIME-Version: 1.0 To: nscott@aconex.com CC: pcp@oss.sgi.com Subject: Re: kmchart updates References: <1192520068.5414.38.camel@edge.yarra.acx> In-Reply-To: <1192520068.5414.38.camel@edge.yarra.acx> X-Enigmail-Version: 0.95.3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-archive-position: 1393 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: o.tarnus@free.fr Precedence: bulk X-list: pcp Hi Nathan, Seeing all the activity on kmchart in the recent times, I decided to try it. It built perfectly on gentoo linux x86_64 with qt-4.3.1, but i get errors at runtime and it seems that widget actions are not caught, see: -- snip -- tom@darkstar ~/dev/kmchart/src $ kmchart Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'fileNewChartAction') Object::connect: (receiver name: 'KmChart') Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'fileOpenViewAction') Object::connect: (receiver name: 'KmChart') Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'fileSaveViewAction') Object::connect: (receiver name: 'KmChart') Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'fileExportAction') Object::connect: (receiver name: 'KmChart') Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'filePrintAction') Object::connect: (receiver name: 'KmChart') Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'fileQuitAction') Object::connect: (receiver name: 'KmChart') Object::connect: No such signal QAction::activated() Object::connect: (sender name: 'helpTutorialAction') Object::connect: (receiver name: 'KmChart') ... and so on... --snap-- After that nothing works, ie: no action on the gui will produce any effect, even the quit menu item. Perhaps not the best place to talk about that, but i've not been able to find any website or list dedicated to kmchart. Thanks Olivier From nscott@aconex.com Tue Oct 16 16:25:41 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 16:25:46 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9GNPcTZ010188 for ; Tue, 16 Oct 2007 16:25:41 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id B010D92C2F5; Wed, 17 Oct 2007 09:25:40 +1000 (EST) Subject: Re: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: Olivier Tarnus Cc: pcp@oss.sgi.com In-Reply-To: <471522C1.9040009@free.fr> References: <1192520068.5414.38.camel@edge.yarra.acx> <471522C1.9040009@free.fr> Content-Type: text/plain Organization: Aconex Date: Wed, 17 Oct 2007 09:25:04 +1000 Message-Id: <1192577104.5414.45.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1394 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp On Tue, 2007-10-16 at 22:44 +0200, Olivier Tarnus wrote: > > Hi Nathan, > Hi there Olivier, > Seeing all the activity on kmchart in the recent times, I decided to > try it. > > It built perfectly on gentoo linux x86_64 with qt-4.3.1, but i get > errors at runtime and it seems that widget actions are not caught, > see: > -- snip -- > tom@darkstar ~/dev/kmchart/src $ kmchart > Object::connect: No such signal QAction::activated() > Object::connect: (sender name: 'fileNewChartAction') > Object::connect: (receiver name: 'KmChart') Ah, I see the problem - we're using the activated() signal, which is only supported in QT4 if QT3_SUPPORT is defined in the headers; from qaction.h... Q_SIGNALS: void changed(); void triggered(bool checked = false); void hovered(); void toggled(bool); #ifdef QT3_SUPPORT QT_MOC_COMPAT void activated(int = 0); #endif Looks like "triggered() is the prefered way to do this on QT4, I'll switch over to that. > After that nothing works, ie: no action on the gui will produce any > effect, even the quit menu item. Yeah, thats kinda what I'd expect if that signal wasn't hooked up. > Perhaps not the best place to talk about that, but i've not been able > to > find any website or list dedicated to kmchart. This is the right place. I'll commit that fix later this morning, and CC you when it goes in - thanks for reporting the problem. cheers. -- Nathan From o.tarnus@free.fr Tue Oct 16 16:45:01 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 16:45:10 -0700 (PDT) Received: from mailrelay002.isp.belgacom.be (mailrelay002.isp.belgacom.be [195.238.6.175]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9GNix1l012150 for ; Tue, 16 Oct 2007 16:45:01 -0700 X-Belgacom-Dynamic: yes Received: from 244.215-243-81.adsl-dyn.isp.belgacom.be (HELO [192.168.230.20]) ([81.243.215.244]) by relay.skynet.be with ESMTP; 17 Oct 2007 01:45:00 +0200 Message-ID: <47154CFB.2010809@free.fr> Date: Wed, 17 Oct 2007 01:44:59 +0200 From: Olivier Tarnus User-Agent: Thunderbird 2.0.0.6 (X11/20070806) MIME-Version: 1.0 To: nscott@aconex.com CC: pcp@oss.sgi.com Subject: Re: kmchart updates References: <1192520068.5414.38.camel@edge.yarra.acx> <471522C1.9040009@free.fr> <1192577104.5414.45.camel@edge.yarra.acx> In-Reply-To: <1192577104.5414.45.camel@edge.yarra.acx> X-Enigmail-Version: 0.95.3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-archive-position: 1395 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: o.tarnus@free.fr Precedence: bulk X-list: pcp Hey... Had some time to spend tonight :-) So i fixed calls to use triggered(), and also made some fix for InfoDialog::infoTabCurrentChanged(QWidget*) and KmChart::activeTabChanged(QWidget*) as they had also some problems because of the change of QTabWidget::currentChanged to int. Everything now runs fine... Happy to have fixed it myself ;-) Olivier Nathan Scott wrote: > On Tue, 2007-10-16 at 22:44 +0200, Olivier Tarnus wrote: > >> Hi Nathan, >> >> > > Hi there Olivier, > > >> Seeing all the activity on kmchart in the recent times, I decided to >> try it. >> >> It built perfectly on gentoo linux x86_64 with qt-4.3.1, but i get >> errors at runtime and it seems that widget actions are not caught, >> see: >> > > >> -- snip -- >> tom@darkstar ~/dev/kmchart/src $ kmchart >> Object::connect: No such signal QAction::activated() >> Object::connect: (sender name: 'fileNewChartAction') >> Object::connect: (receiver name: 'KmChart') >> > > Ah, I see the problem - we're using the activated() signal, which is > only supported in QT4 if QT3_SUPPORT is defined in the headers; from > qaction.h... > > Q_SIGNALS: > void changed(); > void triggered(bool checked = false); > void hovered(); > void toggled(bool); > #ifdef QT3_SUPPORT > QT_MOC_COMPAT void activated(int = 0); > #endif > > Looks like "triggered() is the prefered way to do this on QT4, I'll > switch over to that. > > >> After that nothing works, ie: no action on the gui will produce any >> effect, even the quit menu item. >> > > Yeah, thats kinda what I'd expect if that signal wasn't hooked up. > > >> Perhaps not the best place to talk about that, but i've not been able >> to >> find any website or list dedicated to kmchart. >> > > This is the right place. I'll commit that fix later this morning, and > CC you when it goes in - thanks for reporting the problem. > > cheers. > > -- > Nathan > > > From nscott@aconex.com Tue Oct 16 16:51:04 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 16:51:12 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9GNp3ob012491 for ; Tue, 16 Oct 2007 16:51:04 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 68ACA92C47D; Wed, 17 Oct 2007 09:51:05 +1000 (EST) Subject: Re: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: Olivier Tarnus Cc: pcp@oss.sgi.com In-Reply-To: <47154CFB.2010809@free.fr> References: <1192520068.5414.38.camel@edge.yarra.acx> <471522C1.9040009@free.fr> <1192577104.5414.45.camel@edge.yarra.acx> <47154CFB.2010809@free.fr> Content-Type: text/plain Organization: Aconex Date: Wed, 17 Oct 2007 09:50:28 +1000 Message-Id: <1192578628.5414.48.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1396 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp On Wed, 2007-10-17 at 01:44 +0200, Olivier Tarnus wrote: > > > > > Hey... > > Had some time to spend tonight :-) > > So i fixed calls to use triggered(), and also made some fix for > InfoDialog::infoTabCurrentChanged(QWidget*) and > KmChart::activeTabChanged(QWidget*) as they had also some problems > because of the change of QTabWidget::currentChanged to int. > > Everything now runs fine... Happy to have fixed it myself ;-) > Great! I've just merged the triggered() fix, could you send me a patch for everything else you needed to change? Thanks. cheers. -- Nathan From o.tarnus@free.fr Tue Oct 16 16:55:49 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 16:55:54 -0700 (PDT) Received: from mailrelay003.isp.belgacom.be (mailrelay003.isp.belgacom.be [195.238.6.53]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9GNtkEd012740 for ; Tue, 16 Oct 2007 16:55:48 -0700 X-Belgacom-Dynamic: yes Received: from 244.215-243-81.adsl-dyn.isp.belgacom.be (HELO [192.168.230.20]) ([81.243.215.244]) by relay.skynet.be with ESMTP; 17 Oct 2007 01:55:47 +0200 Message-ID: <47154F82.8000709@free.fr> Date: Wed, 17 Oct 2007 01:55:46 +0200 From: Olivier Tarnus User-Agent: Thunderbird 2.0.0.6 (X11/20070806) MIME-Version: 1.0 To: nscott@aconex.com CC: pcp@oss.sgi.com Subject: Re: kmchart updates References: <1192520068.5414.38.camel@edge.yarra.acx> <471522C1.9040009@free.fr> <1192577104.5414.45.camel@edge.yarra.acx> <47154CFB.2010809@free.fr> <1192578628.5414.48.camel@edge.yarra.acx> In-Reply-To: <1192578628.5414.48.camel@edge.yarra.acx> X-Enigmail-Version: 0.95.3 Content-Type: multipart/mixed; boundary="------------090503040303050502050103" X-archive-position: 1397 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: o.tarnus@free.fr Precedence: bulk X-list: pcp This is a multi-part message in MIME format. --------------090503040303050502050103 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Nathan Scott wrote: > On Wed, 2007-10-17 at 01:44 +0200, Olivier Tarnus wrote: > >> >> >> Hey... >> >> Had some time to spend tonight :-) >> >> So i fixed calls to use triggered(), and also made some fix for >> InfoDialog::infoTabCurrentChanged(QWidget*) and >> KmChart::activeTabChanged(QWidget*) as they had also some problems >> because of the change of QTabWidget::currentChanged to int. >> >> Everything now runs fine... Happy to have fixed it myself ;-) >> >> > > Great! I've just merged the triggered() fix, could you send > me a patch for everything else you needed to change? Thanks. > > cheers. > > -- > Nathan > > Sorry, forgot to attach the patch... here it is.. Olivier --------------090503040303050502050103 Content-Type: text/plain; name="kmchart-qt4-currentchanged.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="kmchart-qt4-currentchanged.diff" diff --git a/src/chart/infodialog.cpp b/src/chart/infodialog.cpp index bab455c..af01dd4 100644 --- a/src/chart/infodialog.cpp +++ b/src/chart/infodialog.cpp @@ -40,7 +40,7 @@ void InfoDialog::reset(QString source, QString metric, QString instance, my.instance = instance; infoTab->setCurrentWidget(pminfoTab); - infoTabCurrentChanged(pminfoTab); + infoTabCurrentChanged(0); } void InfoDialog::pminfo(void) @@ -130,15 +130,15 @@ void InfoDialog::pmvalStderr() pmvalTextEdit->append(s); } -void InfoDialog::infoTabCurrentChanged(QWidget *current) +void InfoDialog::infoTabCurrentChanged(int) { - if (current == pminfoTab) { + if (infoTab->currentWidget() == pminfoTab) { if (!my.pminfoStarted) { pminfo(); my.pminfoStarted = true; } } - else if (current == pmvalTab) { + else if (infoTab->currentWidget() == pmvalTab) { if (!my.pmvalStarted) { pmval(); my.pmvalStarted = true; diff --git a/src/chart/infodialog.h b/src/chart/infodialog.h index cc2d5c6..ab8a714 100644 --- a/src/chart/infodialog.h +++ b/src/chart/infodialog.h @@ -32,7 +32,7 @@ public slots: virtual void pminfoStderr(); virtual void pmvalStdout(); virtual void pmvalStderr(); - virtual void infoTabCurrentChanged(QWidget *); + virtual void infoTabCurrentChanged(int); virtual void quit(); protected slots: diff --git a/src/chart/infodialog.ui b/src/chart/infodialog.ui index 3552b0e..ce5ec77 100644 --- a/src/chart/infodialog.ui +++ b/src/chart/infodialog.ui @@ -174,9 +174,9 @@ infoTab - currentChanged(QWidget*) + currentChanged(int) InfoDialog - infoTabCurrentChanged(QWidget*) + infoTabCurrentChanged(int) diff --git a/src/chart/kmchart.cpp b/src/chart/kmchart.cpp index 337107e..4e2e50e 100644 --- a/src/chart/kmchart.cpp +++ b/src/chart/kmchart.cpp @@ -649,9 +649,8 @@ void KmChart::setActiveTab(int index, bool redisplay) chartTab->setCurrentIndex(index); } -void KmChart::activeTabChanged(QWidget *) +void KmChart::activeTabChanged(int index) { - int index = chartTab->currentIndex(); if (index < tabs.size()) setActiveTab(index, false); diff --git a/src/chart/kmchart.h b/src/chart/kmchart.h index 5f57ace..14daef0 100644 --- a/src/chart/kmchart.h +++ b/src/chart/kmchart.h @@ -112,7 +112,7 @@ public slots: virtual void acceptExport(); virtual void addTab(); virtual void closeTab(); - virtual void activeTabChanged(QWidget *); + virtual void activeTabChanged(int); virtual void editSettings(); virtual void acceptSettings(); virtual void recordStart(); diff --git a/src/chart/kmchart.ui b/src/chart/kmchart.ui index f3e2850..0c4ad45 100644 --- a/src/chart/kmchart.ui +++ b/src/chart/kmchart.ui @@ -638,7 +638,7 @@ fileNewChartAction - activated() + triggered() KmChart fileNewChart() @@ -654,7 +654,7 @@ fileOpenViewAction - activated() + triggered() KmChart fileOpenView() @@ -670,7 +670,7 @@ fileSaveViewAction - activated() + triggered() KmChart fileSaveView() @@ -686,7 +686,7 @@ fileExportAction - activated() + triggered() KmChart fileExport() @@ -702,7 +702,7 @@ filePrintAction - activated() + triggered() KmChart filePrint() @@ -718,7 +718,7 @@ fileQuitAction - activated() + triggered() KmChart fileQuit() @@ -734,7 +734,7 @@ helpTutorialAction - activated() + triggered() KmChart helpTutorial() @@ -750,7 +750,7 @@ helpAboutAction - activated() + triggered() KmChart helpAbout() @@ -766,7 +766,7 @@ helpSeeAlsoAction - activated() + triggered() KmChart helpSeeAlso() @@ -782,7 +782,7 @@ helpWhatsThisAction - activated() + triggered() KmChart whatsThis() @@ -798,7 +798,7 @@ timeControlAction - activated() + triggered() KmChart optionsTimeControl() @@ -814,7 +814,7 @@ toolbarAction - activated() + triggered() KmChart optionsToolbar() @@ -830,7 +830,7 @@ consoleAction - activated() + triggered() KmChart optionsConsole() @@ -846,7 +846,7 @@ newKmchartAction - activated() + triggered() KmChart optionsNewKmchart() @@ -862,7 +862,7 @@ closeTabAction - activated() + triggered() KmChart closeTab() @@ -878,7 +878,7 @@ editSettingsAction - activated() + triggered() KmChart editSettings() @@ -894,9 +894,9 @@ chartTab - currentChanged(QWidget*) + currentChanged(int) KmChart - activeTabChanged(QWidget*) + activeTabChanged(int) 20 @@ -926,7 +926,7 @@ editChartAction - activated() + triggered() KmChart editChart() @@ -942,7 +942,7 @@ closeChartAction - activated() + triggered() KmChart closeChart() @@ -958,7 +958,7 @@ editTabAction - activated() + triggered() KmChart editTab() @@ -974,7 +974,7 @@ closeTabAction - activated() + triggered() KmChart closeTab() @@ -990,7 +990,7 @@ addTabAction - activated() + triggered() KmChart addTab() @@ -1006,7 +1006,7 @@ helpManualAction - activated() + triggered() KmChart helpManual() @@ -1022,7 +1022,7 @@ recordStartAction - activated() + triggered() KmChart recordStart() @@ -1038,7 +1038,7 @@ recordQueryAction - activated() + triggered() KmChart recordQuery() @@ -1054,7 +1054,7 @@ recordStopAction - activated() + triggered() KmChart recordStop() @@ -1070,7 +1070,7 @@ recordDetachAction - activated() + triggered() KmChart recordDetach() @@ -1086,7 +1086,7 @@ zoomInAction - activated() + triggered() KmChart zoomIn() @@ -1102,7 +1102,7 @@ zoomOutAction - activated() + triggered() KmChart zoomOut() --------------090503040303050502050103-- From nscott@aconex.com Tue Oct 16 17:10:04 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 17:10:09 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9H0A27C013394 for ; Tue, 16 Oct 2007 17:10:03 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 9AF0792C306; Wed, 17 Oct 2007 10:10:04 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Cc: Olivier Tarnus Content-Type: text/plain Organization: Aconex Date: Wed, 17 Oct 2007 10:09:28 +1000 Message-Id: <1192579768.5414.51.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1398 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/chart.cpp | 12 ++++- src/chart/chart.h | 1 src/chart/chartdialog.cpp | 29 ++++++++++-- src/chart/chartdialog.h | 1 src/chart/colorbutton.h | 2 src/chart/infodialog.cpp | 8 +-- src/chart/infodialog.h | 2 src/chart/infodialog.ui | 4 - src/chart/kmchart.cpp | 16 ++++++ src/chart/kmchart.h | 8 ++- src/chart/kmchart.ui | 56 ++++++++++++------------ src/chart/main.cpp | 12 +++++ src/chart/main.h | 1 src/chart/openviewdialog.cpp | 2 src/chart/settingsdialog.cpp | 99 ++++++++++++++++++++++++++----------------- src/chart/settingsdialog.h | 18 ++++--- src/chart/settingsdialog.ui | 10 ---- src/chart/view.cpp | 22 +++++++++ src/chart/views/GNUmakefile | 2 src/chart/views/Schemes | 6 ++ 20 files changed, 206 insertions(+), 105 deletions(-) commit 3afd0b8b08809adfa56e59aea7b3cc4263c3b75e Author: Olivier Tarnus Date: Wed Oct 17 10:05:08 2007 +1000 More fixes related to building kmchart in QT4-only mode, as on Gentoo Linux, without the QT3-support code. commit c9863be23ad39fab6f3fad08456b28f797f3c396 Author: Nathan Scott Date: Wed Oct 17 09:55:42 2007 +1000 Fix compiler error on some gcc versions, due to early error case jump. commit d49140b9b7ba6de2dde9198a2cb5589ff90834db Author: Nathan Scott Date: Wed Oct 17 09:52:03 2007 +1000 QwtPlot has the ability to draw different style lines on the same chart. We now use this feature to draw instantaneous and discrete metrics as stepped lines (and leave counters as-is) for the Line Style of plot. commit 67b2aeb4b90770fc871352869c510cc35c991e79 Author: Nathan Scott Date: Wed Oct 17 09:48:46 2007 +1000 Switch to using triggered() signal for QActions, as the activated() signal is marked qt3-compat-only and some distributors of QT4 (e.g. Gentoo Linux) have switched this off. Thanks to Olivier Tarnus for reporting the problem. commit 4f3f9d15503e642e936424ead6c65e43d628273f Author: Nathan Scott Date: Wed Oct 17 09:38:32 2007 +1000 Setup the scheme combo box correctly on the settings dialog, and save the color schemes into views when they're used in a chart. commit e894e2e8e4cdcff039d63d6abcfe8dd8c8951885 Author: Nathan Scott Date: Wed Oct 17 09:35:31 2007 +1000 Update() color buttons after changing color, problem exposed by schemes code. commit d43d68957aea833b349b231b8e0245053354ae36 Author: Nathan Scott Date: Wed Oct 17 06:47:02 2007 +1000 Next round of color scheme related changes, interaction between settings/new/edit chart dialogs wrt schemes and populating the combo boxes with schemes. Also look for a default set of scheme specifications in a "Schemes" kmchart config on startup. From nscott@aconex.com Tue Oct 16 17:47:58 2007 Received: with ECARTIS (v1.0.0; list pcp); Tue, 16 Oct 2007 17:48:06 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9H0luem016038 for ; Tue, 16 Oct 2007 17:47:58 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id C263092C4D5; Wed, 17 Oct 2007 10:47:58 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Cc: Olivier Tarnus Content-Type: text/plain Organization: Aconex Date: Wed, 17 Oct 2007 10:47:21 +1000 Message-Id: <1192582041.5414.78.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1399 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git src/chart/kmchart.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 922e20dd8f3a1d225ca8937b45301ddc0d976939 Author: Olivier Tarnus Date: Wed Oct 17 10:38:13 2007 +1000 Missed a piece of Oliviers patch due to a merge overlap, this adds it back. From nscott@aconex.com Wed Oct 17 00:34:24 2007 Received: with ECARTIS (v1.0.0; list pcp); Wed, 17 Oct 2007 00:34:31 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9H7YLhr003343 for ; Wed, 17 Oct 2007 00:34:24 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 4E65592C2A0 for ; Wed, 17 Oct 2007 17:01:40 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Wed, 17 Oct 2007 17:01:04 +1000 Message-Id: <1192604464.5414.86.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1400 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 7 --- src/chart/GNUmakefile | 2 src/chart/chartdialog.cpp | 2 src/chart/colorscheme.cpp | 95 ++++++++++++++++++++++++++++++++++++++++++ src/chart/colorscheme.h | 57 +++++++++++++++++++++++++ src/chart/kmchart.cpp | 7 ++- src/chart/kmchart.pro | 12 ++--- src/chart/main.cpp | 31 +++++-------- src/chart/main.h | 8 --- src/chart/settingsdialog.cpp | 97 +++++++++++++++++++++++++++---------------- src/chart/settingsdialog.h | 5 +- src/chart/view.cpp | 77 +++++++++------------------------- src/chart/views/Schemes | 8 +-- 13 files changed, 272 insertions(+), 136 deletions(-) commit 9729afc44444c455afb2c73132899545436d1ab8 Author: Ken McDonell Date: Wed Oct 17 16:56:19 2007 +1000 Final set of changes for implementing full color Scheme support in the user interface and the configuration language. kmchart is now supporting the full set of functionality from pmchart's language. From nscott@aconex.com Thu Oct 18 01:00:36 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 18 Oct 2007 01:00:44 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9I80XP6013753 for ; Thu, 18 Oct 2007 01:00:36 -0700 Received: from mail.aconex.com (castle.yarra.acx [192.168.3.3]) by postoffice.aconex.com (Postfix) with ESMTP id D7EA592D1C0 for ; Thu, 18 Oct 2007 18:00:35 +1000 (EST) Received: from 192.168.3.1 (proxying for 211.28.181.43) (SquirrelMail authenticated user nscott) by mail.aconex.com with HTTP; Thu, 18 Oct 2007 18:00:58 +1000 (EST) Message-ID: <51069.192.168.3.1.1192694458.squirrel@mail.aconex.com> Date: Thu, 18 Oct 2007 18:00:58 +1000 (EST) Subject: kmchart updates From: nscott@aconex.com To: pcp@oss.sgi.com User-Agent: SquirrelMail/1.4.8-4.el4.centos MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-archive-position: 1401 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 27 build/mac/installer-info | 2 images/camera-video-close.png |binary images/camera-video-close.svg | 1208 ++++++++++++++++++++++++++++++++++++++++++ qa/tab-create-edit-testcases | 23 src/chart/GNUmakefile | 11 src/chart/chartdialog.cpp | 6 src/chart/exportdialog.cpp | 15 src/chart/kmchart.cpp | 181 +++--- src/chart/kmchart.h | 10 src/chart/kmchart.pro | 5 src/chart/kmchart.qrc | 1 src/chart/kmchart.ui | 32 - src/chart/main.cpp | 34 - src/chart/main.h | 3 src/chart/openviewdialog.cpp | 6 src/chart/recorddialog.cpp | 18 src/chart/saveviewdialog.cpp | 2 src/chart/tab.cpp | 28 src/chart/tab.h | 7 src/chart/tabdialog.cpp | 68 +- src/chart/tabdialog.h | 12 src/chart/tabdialog.ui | 559 ++++++++++--------- src/chart/tabwidget.cpp | 40 + src/chart/tabwidget.h | 46 + src/chart/timeaxis.cpp | 2 src/chart/view.cpp | 12 src/include/buildmacros | 2 28 files changed, 1829 insertions(+), 531 deletions(-) commit 82b0766da6441457a5fc77d50199ef3c8fd0f3ea Author: Nathan Scott Date: Thu Oct 18 17:57:48 2007 +1000 Resolve the issue where zooming in/out a bit mucked up the Edit Tab dialogs view of Visible vs Total samples. Also tuned the algorithm used to calculate number of points to zoom so that it zooms by less as you get closer to the minimum value. commit 0efd076060f922ba34017d02f4ed02f400afe349 Author: Nathan Scott Date: Thu Oct 18 17:29:40 2007 +1000 Fix spinbox/slider maximum range truncation issue. commit 1d5304f2f7b97835dec73c81ddbbd31205413ba9 Author: Nathan Scott Date: Thu Oct 18 15:40:01 2007 +1000 Add an icon for the stop recording action, mainly for the toolbars use. commit 8e5a05834c80b5fe2bc7284cc3f7b4bb480b71d3 Author: Nathan Scott Date: Thu Oct 18 15:22:41 2007 +1000 Fix several problems with Tabs - firstly, we only want the Tab labels showing across the top if there is more than one Tab active. In order to do this, we need access to the protected tabBar() routine, hence we need to subclass QTabWidget - see tabwidget.h. Move the global list of tabs here for consistency. Also fixes a problem to do with deleting tabs, which at the moment is tripping an assert due to a double-callback on closeTab(). Finally, rearrange some of the File Menu items to be more consistent with modern apps that use tabs (like most web browsers). commit 7320e13648532d85a8b0dcc74dbed0641a16eb23 Author: Nathan Scott Date: Thu Oct 18 14:30:34 2007 +1000 Add some missing build DIRT for Mac builds. commit 34cbe7ce7535aae70c7c6623bc75884de4d83aba Author: Nathan Scott Date: Thu Oct 18 14:25:41 2007 +1000 Resize a Mac installer string to <16bytes as docs suggest. commit 8428b2fb76e932286a363eea567b973cb7d33041 Author: Nathan Scott Date: Thu Oct 18 09:59:17 2007 +1000 Move known Tab issues into the main list, else they get forgotton. commit b95553bcfffd79a8ad1076dae9f9fb6233827d11 Author: Nathan Scott Date: Thu Oct 18 09:58:47 2007 +1000 Fix up layout oddities on the Tab dialog. From nscott@aconex.com Thu Oct 18 19:03:14 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 18 Oct 2007 19:03:22 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9J23AAQ009678 for ; Thu, 18 Oct 2007 19:03:14 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 9FFA892C3A0 for ; Fri, 19 Oct 2007 12:03:11 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Fri, 19 Oct 2007 12:02:39 +1000 Message-Id: <1192759359.24082.0.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1402 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git GNUmakefile | 5 README | 1 aclocal.m4 | 15 configure.in | 7 m4/GNUmakefile | 1 m4/package_paths.m4 | 14 man/html/GNUmakefile | 10 man/html/index.html | 35 + man/html/kmchart.adp | 25 - man/html/kmchart.adp.in | 25 + man/html/kmtime.adp | 25 - man/html/kmtime.adp.in | 25 + qa/001.out | 2 qa/002.out | 10 qa/003.out | 1 qa/004.out | 6 qa/006 | 64 ++ qa/006.out | 271 +++++++++++ qa/common.filter | 16 qa/common.test | 1 qa/group | 1 qa/qa-view-01 | 5 qa/qa-view-02 | 5 qa/qa-view-03 | 5 qa/qa-view-04 | 16 qa/qa-view-05 | 6 src/chart/GNUmakefile | 1 src/chart/chart.cpp | 154 +++--- src/chart/chart.h | 2 src/chart/chartdialog.cpp | 13 src/chart/chartdialog.ui | 1106 +++++++++++++++++++++++----------------------- src/chart/kmchart.cpp | 67 +- src/chart/kmchart.h | 1 src/chart/kmchart.pro | 2 src/chart/kmchart.qrc | 1 src/chart/kmchart.ui | 3 src/chart/main.cpp | 3 src/chart/tab.cpp | 2 src/chart/view.cpp | 19 src/include/builddefs.in | 2 src/include/version.h.in | 1 41 files changed, 1231 insertions(+), 743 deletions(-) commit b6ec3e7aba1c227fd509c5e9675dcefac0382f93 Author: Nathan Scott Date: Fri Oct 19 11:55:50 2007 +1000 Numerous changes to hook up the QT online help libs to kmchart. Also fixed the issue where you can have open dialogs, quit the main kmchart window, and still keep kmchart running with those top level dialogs. commit 1728d5650e1c5d8ee2821abf055bd9d0a8e82a57 Author: Nathan Scott Date: Fri Oct 19 11:29:07 2007 +1000 Final icon setup for the toolbar - add in an icon for SaveView action. commit 6cc4250c1f7c11fcd742c19352d7cadc49e392c8 Author: Nathan Scott Date: Fri Oct 19 11:03:01 2007 +1000 Set y-axis scale maxima to largest possible value. commit a9a8888406d0beec0794fb490c4b40291587e3ad Author: Nathan Scott Date: Fri Oct 19 10:53:21 2007 +1000 Revert "increase maximum and minimum range to go up to 1e+8 not 99.99" This reverts commit a1b1a55f018c932154141a52fe0dc2ba25b7eb41, which is incompatible with QT4.2. Will fix without all the other QT4.3 changes in following commit. commit 01e1b9436bcd5b9e864039501a8f1ef6799341b0 Author: Ken McDonell Date: Fri Oct 19 07:52:58 2007 +1000 Force Y axis re-labelling whenever the style is set or changes, and simplify the labelling of the Y axis in the utilization plot case commit b05b4385d0d94ab7ebc4d22c8f6b6a31343a903a Author: Ken McDonell Date: Thu Oct 18 20:54:26 2007 +1000 Fix typos in console post messages commit aac4435cec7be5952d3ed03de005565a5cf171fd Author: Ken McDonell Date: Thu Oct 18 20:53:33 2007 +1000 Update QA results for added diag Load View: /var/lib/pcp/config/kmchart/Schemes Extend 006 to check more units incompatibility cases. commit 88969579b655ddcdb18daf3661bd60ef357497d6 Merge: 97c4eb7... 82b0766... Author: Ken McDonell Date: Thu Oct 18 20:32:04 2007 +1000 Merge git://oss.sgi.com:8090/nathans/kmchart commit 97c4eb782b9197ecaefe8240e7761f781922642d Merge: 6c22b41... 1d5304f... Author: Ken McDonell Date: Thu Oct 18 17:55:08 2007 +1000 resolve conflicts from Nathan commit 6c22b416651c64cf4cd21971069a4d80936d18bb Author: Ken McDonell Date: Thu Oct 18 17:51:24 2007 +1000 Initial pmUnits compatibility checking for New Chart and loading views, also -CC support for QA testing of this stuff to extend view checking to include access to pmcd, calling addPlot() and checking semantics, without displaying anything commit 6c960d2252b023596b1d958259177e0ddbed7be1 Author: Ken McDonell Date: Thu Oct 18 17:48:50 2007 +1000 Some more QA infrastructure and view semantics checks commit a7234d5a42617edf018cc07395ae2b659d5615a4 Merge: a1b1a55... b5db77e... Author: Ken McDonell Date: Wed Oct 17 20:08:58 2007 +1000 Merge git://oss.sgi.com:8090/nathans/kmchart commit a1b1a55f018c932154141a52fe0dc2ba25b7eb41 Author: Ken McDonell Date: Wed Oct 17 20:08:32 2007 +1000 increase maximum and minimum range to go up to 1e+8 not 99.99 From nscott@aconex.com Thu Oct 18 23:40:54 2007 Received: with ECARTIS (v1.0.0; list pcp); Thu, 18 Oct 2007 23:41:00 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9J6erpY006034 for ; Thu, 18 Oct 2007 23:40:54 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 91C8692CAD1 for ; Fri, 19 Oct 2007 16:40:55 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Fri, 19 Oct 2007 16:40:24 +1000 Message-Id: <1192776024.24082.4.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1403 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 1 src/chart/kmchart.cpp | 9 ++---- src/chart/tab.cpp | 8 ++--- src/time/kmtime.pro | 2 - src/time/kmtimearch.cpp | 68 ++++++++++++++++++++--------------------------- src/time/kmtimearch.h | 9 +++--- src/time/kmtimearch.ui | 30 -------------------- src/time/kmtimelive.cpp | 69 ++++++++++++++++++++++-------------------------- src/time/kmtimelive.h | 9 +++--- src/time/kmtimelive.ui | 30 -------------------- src/time/timelord.cpp | 9 ++++++ src/time/timelord.h | 5 ++- 12 files changed, 94 insertions(+), 155 deletions(-) commit 22924eb8a3c6e320b0886b2bf3553ea25d4a35bb Author: Nathan Scott Date: Fri Oct 19 16:39:27 2007 +1000 Update TODO list in README, crossing off more fixed stuff. commit 612d06499be0d7824131518a6cfb213d8bd5af7b Author: Nathan Scott Date: Fri Oct 19 16:37:09 2007 +1000 Fix handling of timezone updates from kmtime. commit 84a9134101fe9ef25dcdd52ab8658e7ce65e8117 Author: Nathan Scott Date: Fri Oct 19 16:36:32 2007 +1000 Rework the close handling in kmtime to ensure Help app stopped correctly. commit 0a8938d815dfad73f30ec420aec76791818246fa Author: Nathan Scott Date: Fri Oct 19 15:09:06 2007 +1000 Dont call info dialog quit routine twice - reject() does this for us. commit 89f86ef2b2574d5d6f034fafb53df25265f74d5b Author: Nathan Scott Date: Fri Oct 19 15:07:26 2007 +1000 Hook up kmtime into online help system as well. From nscott@aconex.com Fri Oct 19 00:18:21 2007 Received: with ECARTIS (v1.0.0; list pcp); Fri, 19 Oct 2007 00:18:28 -0700 (PDT) Received: from postoffice.aconex.com (mail.app.aconex.com [203.89.192.138]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9J7IIZc013166 for ; Fri, 19 Oct 2007 00:18:21 -0700 Received: from edge.yarra.acx (unknown [203.89.192.141]) by postoffice.aconex.com (Postfix) with ESMTP id 2F19792C67B for ; Fri, 19 Oct 2007 17:18:21 +1000 (EST) Subject: kmchart updates From: Nathan Scott Reply-To: nscott@aconex.com To: pcp@oss.sgi.com Content-Type: text/plain Organization: Aconex Date: Fri, 19 Oct 2007 17:17:50 +1000 Message-Id: <1192778270.24082.6.camel@edge.yarra.acx> Mime-Version: 1.0 X-Mailer: Evolution 2.6.3 Content-Transfer-Encoding: 7bit X-archive-position: 1404 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: nscott@aconex.com Precedence: bulk X-list: pcp Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git README | 1 - src/time/timelord.cpp | 7 +++++++ src/time/timelord.h | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) commit af8c3f609442b93f2337fd451233daa897bb6451 Author: Nathan Scott Date: Fri Oct 19 17:17:03 2007 +1000 Resolve long-standing issue with occassionally-leaked kmtime processes. From o.tarnus@free.fr Sat Oct 20 16:04:09 2007 Received: with ECARTIS (v1.0.0; list pcp); Sat, 20 Oct 2007 16:04:15 -0700 (PDT) Received: from mailrelay009.isp.belgacom.be (mailrelay009.isp.belgacom.be [195.238.6.176]) by oss.sgi.com (8.12.11.20060308/8.12.10/SuSE Linux 0.7) with ESMTP id l9KN45hO012661 for ; Sat, 20 Oct 2007 16:04:07 -0700 X-Belgacom-Dynamic: yes Received: from 12.161-136-217.adsl-dyn.isp.belgacom.be (HELO [192.168.230.20]) ([217.136.161.12]) by relay.skynet.be with ESMTP; 21 Oct 2007 01:04:06 +0200 Message-ID: <471A8965.9020405@free.fr> Date: Sun, 21 Oct 2007 01:04:05 +0200 From: Olivier Tarnus User-Agent: Thunderbird 2.0.0.6 (X11/20070806) MIME-Version: 1.0 To: nscott@aconex.com CC: pcp@oss.sgi.com Subject: Re: kmchart updates References: <1192778270.24082.6.camel@edge.yarra.acx> In-Reply-To: <1192778270.24082.6.camel@edge.yarra.acx> X-Enigmail-Version: 0.95.3 Content-Type: multipart/mixed; boundary="------------070000070100020507000001" X-archive-position: 1405 X-ecartis-version: Ecartis v1.0.0 Sender: pcp-bounce@oss.sgi.com Errors-to: pcp-bounce@oss.sgi.com X-original-sender: o.tarnus@free.fr Precedence: bulk X-list: pcp This is a multi-part message in MIME format. --------------070000070100020507000001 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi Nathan, Here is a little patch that add an anti aliasing option per graph. The option is also saved in the view. See attached patch and saved view... I'm actually working on the layout of tabs, first by adding a column option that would let the user split the tab also vertically. Bye Olivier Nathan Scott wrote: > Changes committed to git://oss.sgi.com:8090/nathans/kmchart.git > > README | 1 - > src/time/timelord.cpp | 7 +++++++ > src/time/timelord.h | 4 +++- > 3 files changed, 10 insertions(+), 2 deletions(-) > > commit af8c3f609442b93f2337fd451233daa897bb6451 > Author: Nathan Scott > Date: Fri Oct 19 17:17:03 2007 +1000 > > Resolve long-standing issue with occassionally-leaked kmtime > processes. > > > > > --------------070000070100020507000001 Content-Type: text/plain; name="kmchart_antialiasing_option.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="kmchart_antialiasing_option.patch" diff --git a/src/chart/chart.cpp b/src/chart/chart.cpp index 1da39f5..5fc4178 100644 --- a/src/chart/chart.cpp +++ b/src/chart/chart.cpp @@ -45,6 +45,7 @@ Chart::Chart(Tab *chartTab, QWidget *parent) : QwtPlot(parent) canvas()->setPaintAttribute(QwtPlotCanvas::PaintPacked, true); enableAxis(xBottom, false); setLegendVisible(true); + legend()->contentsWidget()->setFont(globalFont); connect(this, SIGNAL(legendChecked(QwtPlotItem *, bool)), SLOT(showCurve(QwtPlotItem *, bool))); @@ -595,6 +596,12 @@ void Chart::setStroke(Plot *plot, Style style, QColor color) console->post("Chart::setStroke [style %d->%d]", my.style, style); plot->color = color; + if (my.antiAliasing) { + plot->curve->setRenderHint(QwtPlotItem::RenderAntialiased, true); + } + else { + plot->curve->setRenderHint(QwtPlotItem::RenderAntialiased, false); + } switch (style) { case BarStyle: @@ -656,7 +663,6 @@ void Chart::setStroke(Plot *plot, Style style, QColor color) plot->curve->setBrush(QBrush(Qt::NoBrush)); plot->curve->setStyle(isStepped(plot) ? QwtPlotCurve::Steps : QwtPlotCurve::Lines); - plot->curve->setRenderHint(QwtPlotItem::RenderAntialiased); if (my.style != LineStyle) { // Need to undo any munging of plotData[] @@ -843,6 +849,21 @@ void Chart::setLegendVisible(bool on) } } + +bool Chart::useAntiAliasing() +{ + // Legend is on or off for all plots, only need to test the first plot + return my.antiAliasing; +} + +void Chart::setAntiAliasing(bool on) +{ + console->post("Chart::setAntiAliasingOn(%d) antiAliasing()=%p", on, useAntiAliasing()); + my.antiAliasing=on; +} + + + QString Chart::name(int m) { return my.plots[m]->name; diff --git a/src/chart/chart.h b/src/chart/chart.h index dd619d9..7757fbf 100644 --- a/src/chart/chart.h +++ b/src/chart/chart.h @@ -75,6 +75,8 @@ public: void setYAxisTitle(char *); bool legendVisible(); void setLegendVisible(bool); + bool useAntiAliasing(); + void setAntiAliasing(bool); void update(bool, bool, bool); @@ -134,6 +136,7 @@ private: QString scheme; int sequence; bool autoScale; + bool antiAliasing; double yMin; double yMax; QwtPlotPicker *picker; diff --git a/src/chart/chartdialog.cpp b/src/chart/chartdialog.cpp index 46e6e9f..ac9fa88 100644 --- a/src/chart/chartdialog.cpp +++ b/src/chart/chartdialog.cpp @@ -98,6 +98,8 @@ void ChartDialog::reset(Chart *chart, int style, QString scheme) setupSchemeComboBox(); legendOn->setChecked(true); legendOff->setChecked(false); + antiAliasingOn->setChecked(true); + antiAliasingOff->setChecked(false); setupAvailableMetricsTree(my.archiveSource); my.yMin = yAxisMinimum->value(); my.yMax = yAxisMaximum->value(); @@ -378,6 +380,25 @@ void ChartDialog::legendOffClicked() legendOff->setChecked(true); } +bool ChartDialog::antiAliasing(void) +{ + return antiAliasingOn->isChecked(); +} + +void ChartDialog::antiAliasingOnClicked() +{ + antiAliasingOn->setChecked(true); + antiAliasingOff->setChecked(false); +} + +void ChartDialog::antiAliasingOffClicked() +{ + antiAliasingOn->setChecked(false); + antiAliasingOff->setChecked(true); +} + + + void ChartDialog::scheme(QString *scheme, int *sequence) { *scheme = my.scheme; @@ -390,6 +411,7 @@ void ChartDialog::setScheme(QString scheme, int sequence) my.sequence = sequence; } + void ChartDialog::scale(bool *autoScale, double *yMin, double *yMax) { *autoScale = autoScaleOn->isChecked(); diff --git a/src/chart/chartdialog.h b/src/chart/chartdialog.h index f05114a..97018cd 100644 --- a/src/chart/chartdialog.h +++ b/src/chart/chartdialog.h @@ -29,6 +29,7 @@ public: virtual Chart *chart(void); virtual QString title(void); virtual bool legend(void); + virtual bool antiAliasing(void); virtual void scale(bool *, double *, double *); virtual void setScale(bool, double, double); virtual void scheme(QString *, int *); @@ -63,6 +64,8 @@ public slots: virtual void sourceButtonClicked(); virtual void legendOnClicked(); virtual void legendOffClicked(); + virtual void antiAliasingOnClicked(); + virtual void antiAliasingOffClicked(); virtual void autoScaleOnClicked(); virtual void autoScaleOffClicked(); virtual void yAxisMinimumValueChanged(double); diff --git a/src/chart/chartdialog.ui b/src/chart/chartdialog.ui index 464ae1b..a540634 100644 --- a/src/chart/chartdialog.ui +++ b/src/chart/chartdialog.ui @@ -238,6 +238,130 @@ + + + + Antialiasing: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 21 + 20 + + + + + + + + + 0 + 0 + + + + On + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 16 + 20 + + + + + + + + + 0 + 0 + + + + Off + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + diff --git a/src/chart/kmchart.cpp b/src/chart/kmchart.cpp index fee9efc..6b3b5b1 100644 --- a/src/chart/kmchart.cpp +++ b/src/chart/kmchart.cpp @@ -461,6 +461,7 @@ void KmChart::acceptNewChart() if (newTitle.isEmpty() == false) cp->changeTitle(newTitle, true); cp->setLegendVisible(my.newchart->legend()); + cp->setAntiAliasing(my.newchart->antiAliasing()); if (my.newchart->setupChartPlotsShortcut(cp) == false) my.newchart->setupChartPlots(cp); my.newchart->scale(&yAutoScale, &yMin, &yMax); @@ -492,6 +493,8 @@ void KmChart::editChart() my.editchart->titleLineEdit->setText(cp->title()); my.editchart->legendOn->setChecked(cp->legendVisible()); my.editchart->legendOff->setChecked(!cp->legendVisible()); + my.editchart->antiAliasingOn->setChecked(cp->useAntiAliasing()); + my.editchart->antiAliasingOff->setChecked(!cp->useAntiAliasing()); cp->scale(&yAutoScale, &yMin, &yMax); my.editchart->setScale(yAutoScale, yMin, yMax); my.editchart->setScheme(cp->scheme(), cp->sequence()); @@ -510,6 +513,7 @@ void KmChart::acceptEditChart() if (editTitle.isEmpty() == false && editTitle != cp->title()) cp->changeTitle(editTitle, true); cp->setLegendVisible(my.editchart->legend()); + cp->setAntiAliasing(my.editchart->antiAliasing()); my.editchart->scale(&yAutoScale, &yMin, &yMax); cp->setScale(yAutoScale, yMin, yMax); my.editchart->setupChartPlots(cp); diff --git a/src/chart/view.cpp b/src/chart/view.cpp index f6189c8..f9b2ec3 100644 --- a/src/chart/view.cpp +++ b/src/chart/view.cpp @@ -423,6 +423,7 @@ new_chart: double ymin = 0; double ymax = 0; int legend = 1; + int antialias = 0;