Work in progress.

signalcurve.cpp

@@ -341,8 +341,8 @@ void SignalCurve::drawWidget(QPainter *painter, int curve_w, int curve_h)
 
 /////////////////////////////////// draw the curve ///////////////////////////////////////////
 
-  if(bufsize < 2)  return;
+  if(bufsize > 32)
-
+  {
     painter->setClipping(true);
     painter->setClipRegion(QRegion(0, 0, curve_w, curve_h), Qt::ReplaceClip);
 
@@ -385,6 +385,7 @@ void SignalCurve::drawWidget(QPainter *painter, int curve_w, int curve_h)
     }
 
     painter->setClipping(false);
+  }
 
 /////////////////////////////////// draw the trigger arrows ///////////////////////////////////////////
 

timer_handlers.cpp

@@ -311,6 +311,8 @@ void UI_Mainwindow::scrn_timer_handler()
 
 //struct waveform_preamble wfp;
 
+  if(devparms.triggerstatus != 1)  // Don't download waveform data when triggerstatus is "wait"
+  {
     for(i=0; i<MAX_CHNS; i++)
     {
       if(!devparms.chandisplay[i])  // Download data only when channel is switched on
@@ -383,9 +385,9 @@ void UI_Mainwindow::scrn_timer_handler()
         goto OUT_ERROR;
       }
 
-    if(n < 16)
+      if(n < 32)
       {
-      return;
+        n = 0;
       }
 
       for(j=0; j<n; j++)
@@ -393,6 +395,7 @@ void UI_Mainwindow::scrn_timer_handler()
         devparms.wavebuf[i][j] = (int)(((unsigned char *)device->buf)[j]) - 127;
       }
     }
+  }
 
   devparms.wavebufsz = n;