Changeset 32

Timestamp:

04/03/09 13:07:12 (16 years ago)

Author:

ogrimm

Message:

Data transmission over socket contains now frequency and scale factor

File:

• tools/ddd/Functions.cpp (modified) (1 diff)

tools/ddd/Functions.cpp

@@ -211 +211 @@
     double *y = new double [NumberOfEntries];
 
-    while((NextNumber=strtok(NULL, " "))!=NULL && Count<NumberOfEntries) {      // All entries are separated by a whitespace
-      *(y+Count) = atof(NextNumber);
-      x[Count] = Count;
-      Count++;
-    }
+    // Convert all entries (separated by a whitespace) to numbers
+    while((NextNumber=strtok(NULL, " "))!=NULL && Count<NumberOfEntries)
+      *(y+Count++) = atof(NextNumber);
     if (Count==NumberOfEntries && NextNumber!=0)
       QMessageBox::warning(this, "ddd Message","Found too many numbers in data block, truncated.",QMessageBox::Ok);
-    Signal->setData(x, y, Count);       // Copies data, arrays can be deleted afterwards
-    Signal->show();
-    Zoomer->setZoomBase(Signal->boundingRect());
-
+    // Apply sampling frequency and scaling factor 
+    for(int i=2; i<Count; i++) {
+      x[i] = (i-2) / y[0];
+      y[i] = y[i] * y[1];
+    }
+    if(NumberOfEntries>2) {
+      Signal->setData(x+2, y+2, NumberOfEntries-2); // Copies data, arrays can be deleted afterwards
+      Signal->show();
+      Zoomer->setZoomBase(Signal->boundingRect());
+    }  
     delete[] x;   delete[] y;