PSI update

r1464 | ffr | 2007-02-12 12:20:21 +1100 (Mon, 12 Feb 2007) | 2 lines

scan.c

@@ -385,6 +385,7 @@ int AppendScanLine(pScanData self, char *line)
 }
 /*-------------------------------------------------------------------------*/
 extern char *stptok(const char *s, char *t, int len, char *brk);
+extern char *trim(char *txt);
 
 int StoreScanCounts(pScanData self, char *data)
 {
@@ -402,7 +403,7 @@ int StoreScanCounts(pScanData self, char *data)
   InitCountEntry(&sCount);
 
   /* parse the data */
-  pPtr = data;
+  pPtr = trim(data);
   pPtr = stptok(pPtr,pNumber,29," \t");
   if(pPtr != NULL)
   {
@@ -1584,7 +1585,7 @@ static int PrintTimes(pScanData self, SConnection *pCon,
 
   snprintf(pBueffel,59,"%s.scantimes = { ",name);
   DynStringCopy(data,pBueffel);
-  for(i = 0; i < self->iNP; i++)
+  for(i = 0; i < self->iCounts; i++)
   {
     DynarGet(self->pCounts,i,&pPtr);
     pData = (pCountEntry)pPtr;
@@ -2127,8 +2128,8 @@ static int DumpScan(pScanData self, SConnection *pCon)
         }
 /*------------ functions */
         else if(strcmp(argv[1],"function") == 0)
-	{
-	  return InterpretScanFunctions(self, pCon, argc, argv);
+	    {
+	        return InterpretScanFunctions(self, pCon, argc, argv);
         }
 /*---------- scan */
         else if(strcmp(argv[1],"run") == 0)
@@ -2414,6 +2415,20 @@ static int DumpScan(pScanData self, SConnection *pCon)
            }
 	   return AppendVarPos(pCon,self,i,(float)fStep);
         }
+        else if(strcmp(argv[1],"softpos") == 0){
+            if(argc > 2) {
+                if(!SCMatchRights(pCon,usMugger)){
+                    return 0;
+                }
+                self->posSoft = atoi(argv[2]);
+                SCSendOK(pCon);
+                return 1;
+            } else {
+                sprintf(pBueffel,"%s.softpos = %d", argv[0],self->posSoft);
+                SCWrite(pCon,pBueffel,eValue);
+                return 1; 
+            }
+        }       
 /*------- savecounter */
         else if(strcmp(argv[1],"savecounter") == 0)
 	{