[Kst] branches/work/kst/portto4/kst

[Barth Netterfield]

SVN commit 1305976 by netterfield:

Some minor scripting fixes.

Fix -h (histograms) from command line.


 M  +2 -1      AUTHORS  
 M  +2 -2      pyKst/demo/vectors.py  
 M  +1 -2      src/libkstapp/commandlineparser.cpp  
 M  +11 -15    src/libkstapp/kstScript.txt  


--- branches/work/kst/portto4/kst/AUTHORS #1305975:1305976
@@ -13,5 +13,6 @@
 Sumus Technology Limited
 Peter Kümmel <syntheticpp at gmx.net>
 Zongyi Zang
+Joshua Netterfield <joshua at nettek.ca>
 
-# File must be saved as UTF8!
\ No newline at end of file
+# File must be saved as UTF8!
--- branches/work/kst/portto4/kst/pyKst/demo/vectors.py #1305975:1305976
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.7
 import pykst as kst
 from datetime import datetime
 from numpy import *
@@ -7,7 +7,7 @@
 
 client=kst.Client()
 dt=datetime.now()
-vec=kst.GeneratedVector(client,0,1000,100000,"Alfred")
+vec=kst.GeneratedVector(client,0,1000,100000,"Generated Vector")
 print("Took "+str((datetime.now()-dt))+" to generate an 100000-sample vector.")
 dt=datetime.now()
 pyar=vec.getNumPyArray()
--- branches/work/kst/portto4/kst/src/libkstapp/commandlineparser.cpp #1305975:1305976
@@ -199,7 +199,6 @@
 
 bool CommandLineParser::_setStringArg(QString &arg, QString Message) {
   bool ok = true;
-
   if (_arguments.count()> 0) {
     arg = _arguments.takeFirst();
   } else {
@@ -522,7 +521,7 @@
       QString field;
       *ok = _setStringArg(field,i18n("Usage: -h <fieldname>\n"));
 
-      if (!*ok) {
+      if (*ok) {
         for ( int i_file=0; i_file<_fileNames.size(); i_file++ ) {
           QString file = _fileNames.at ( i_file );
           QFileInfo info ( file );
--- branches/work/kst/portto4/kst/src/libkstapp/kstScript.txt #1305975:1305976
@@ -273,14 +273,10 @@
 if($autolayout==true)
 checkAutomaticLayout()
 fi()
-if($customgridcolumns==true)
-fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
-if($customgridcolumns==true)
-fi()
 if($protectexistinglayout==true)
 checkProtectExistingLayout()
 fi()
@@ -364,7 +360,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -437,7 +433,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -495,7 +491,7 @@
 if($autolayout==true)
 checkAutomaticLayout()
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -544,7 +540,7 @@
 if($autolayout==true)
 checkAutomaticLayout()
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -611,7 +607,7 @@
 if($autolayout==true)
 checkAutomaticLayout()
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -721,7 +717,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -794,7 +790,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -1098,7 +1094,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -1171,7 +1167,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()
@@ -1244,7 +1240,7 @@
 fi()
 if($customgridcolumns==true)
 fi()
-if($customgridcolumns!=)
+if($customgridcolumns!=false)
 checkCustomGrid()
 setColumns($customgridcolumns)
 fi()