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

[Joshua Netterfield]

SVN commit 1253869 by joshuanetterfield:

Bugfixes in pykst for creating data vectors and data matrices


 M  +1 -1      pyKst/pykst.py  
 M  +4 -2      src/images/kstScript.txt  


--- branches/work/kst/portto4/kst/pyKst/pykst.py #1253868:1253869
@@ -555,7 +555,7 @@
   The parameters of this function mirror the parameters within "Create>Matrix". """
   def __init__(self,client,filename,field,xstart,ystart,xnframe,ynframe,skip=False,boxcarFirst=False,xmin=0,ymin=0,xstep=1,ystep=1,name="") :
     Matrix.__init__(self,client)
-    self.handle=QtCore.QString(self.client.send("#newMatrix("+b2str(filename)+","+b2str(field)+","+","+b2str(xstart)+","+b2str(ystart)+","+b2str(xnframe)+","+b2str(ynframe)+","+b2str(skip)+","+b2str(boxcarFirst)+","+b2str(xmin)+","+b2str(ymin)+","+b2str(xstep)+","+b2str(ystep)+","+b2str(name)+")"))
+    self.handle=QtCore.QString(self.client.send("#newMatrix("+b2str(filename)+","+b2str(field)+","+b2str(xstart)+","+b2str(ystart)+","+b2str(xnframe)+","+b2str(ynframe)+","+b2str(skip)+","+b2str(boxcarFirst)+","+b2str(xmin)+","+b2str(ymin)+","+b2str(xstep)+","+b2str(ystep)+","+b2str(name)+")"))
     self.handle.remove(0,self.handle.indexOf("ing ")+4)
 
 class ExistingMatrix(Matrix) :
--- branches/work/kst/portto4/kst/src/images/kstScript.txt #1253868:1253869
@@ -59,13 +59,15 @@
 uncheckCountFromEnd()
 setStart($start)
 fi()
-if($start==-1)
+if($range==-1)
 checkCountFromEnd()
 fi()
-setRange($range)
 if($range==-1)
 checkReadToEnd()
 fi()
+if($range!=-1)
+setRange($range)
+fi()
 if($skip!=-1)
 if($skip!=)
 checkRead1SamplePer()