Changeset 259 in flair-src for trunk

Timestamp:

Jul 25, 2018, 5:27:17 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

add history to us sensor plot

Location:

trunk/tools/FlairGCS/src

Files:

• UsSensorPlot.cpp (modified) (15 diffs)
• UsSensorPlot.h (modified) (3 diffs)

trunk/tools/FlairGCS/src/UsSensorPlot.cpp

@@ -14 +14 @@
 #include <qwt_legend.h>
 #include <qwt_plot_panner.h>
-#include <qwt_plot_rescaler.h>
 #include <qwt_plot_marker.h>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QInputDialog>
+#include <QVBoxLayout>
+#include <QScrollBar>
 #include <qendian.h>
 #include <qwt_symbol.h>
@@ -25 +26 @@
                        QString y_name, float ymin, float ymax, uint32_t nbSamples,QString datasType,bool enabled, int period)
     : DataRemote(plot_name, "UsSensorPlot", parent, enabled, period) {
+  visible_widget = new QWidget();
+
+  parent->addWidget(visible_widget, row, col);
+  QVBoxLayout* layout = new QVBoxLayout(visible_widget);
+      
   plot = new QwtPlot(NULL);
   plot->setEnabled(enabled);
-
-  parent->addWidget(plot, row, col);
-  visible_widget = plot;
   
   this->nbSamples=nbSamples;
@@ -44 +47 @@
 #endif
 
+  //scroll bar
+  scrollbar=new QScrollBar(Qt::Horizontal);
+  scrollbar->setSingleStep(1);
+  scrollbar->setRange(0,0);
+  scrolling=true;
+  connect(scrollbar,SIGNAL(valueChanged(int)),this,SLOT(scrollBarMoved(int)));
+  layout->addWidget(scrollbar);
+  layout->addWidget(plot);
+
   alignScales();
 
   // Assign a title
   plot->setTitle(plot_name);
-
+  
   // Axis
   plot->setAxisTitle(QwtPlot::xBottom, "samples");
   setXAxisScale(0, nbSamples-1);
-
+  
   plot->setAxisTitle(QwtPlot::yLeft, y_name);
   setYAxisScale(ymin, ymax);
-
-  //QwtPlotRescaler *rescaler = new QwtPlotRescaler(plot->canvas());
-  //rescaler->setRescalePolicy(QwtPlotRescaler::Fixed); 
-  /*
- rescaler->setReferenceAxis(QwtPlot::xBottom);
- rescaler->setAspectRatio(QwtPlot::yLeft, 1.0);*/
 
   // grid
@@ -77 +83 @@
   
   dx = (double *)malloc(nbSamples* sizeof(double));
-  dy = (double *)malloc(nbSamples* sizeof(double));
   for (int i = 0; i < nbSamples; i++) dx[i] = i;
   
@@ -86 +91 @@
 
   datas->setVisible(true);
-
-  // Attach (don't copy) data
-  datas->setRawSamples(dx,dy, nbSamples);
 
   if (datasType == "float") {
@@ -104 +106 @@
   QwtSymbol* s1=new QwtSymbol( QwtSymbol::Diamond, Qt::blue, Qt::NoPen, QSize( 10, 10 ) );
   firstPeakStart->setSymbol(s1);
-  //m->setLabel("toto" );
   firstPeakStart->attach( plot );
   
@@ -125 +126 @@
 UsSensorPlot::~UsSensorPlot() {
   free(dx);
-  free(dy);
+  for(int i=0;i<measures.count();i++) {
+    free(measures.at(i).dy);
+  }
 }
 
@@ -185 +188 @@
   if (IsEnabled() == false || RefreshRate_ms() != period)
     return;
+   
+  measure_t measure;
+  measure.dy = (double *)malloc(nbSamples* sizeof(double));
 
   if (datasType == "float") {
     float *data=(float*)*buf;
     for (int i = 0; i < nbSamples; i++) {
-      dy[i]=data[i];
+      measure.dy[i]=data[i];
     }
     *buf += nbSamples*sizeof(float);
@@ -195 +201 @@
     int8_t *data=(int8_t*)*buf;
     for (int i = 0; i < nbSamples; i++) {
-      dy[i]=data[i];
+      measure.dy[i]=data[i];
     }
     *buf += nbSamples*sizeof(int8_t);
@@ -201 +207 @@
     uint8_t *data=(uint8_t*)*buf;
     for (int i = 0; i < nbSamples; i++) {
-      dy[i]=data[i];
+      measure.dy[i]=data[i];
     }
     *buf += nbSamples*sizeof(uint8_t);
@@ -207 +213 @@
     int16_t *data=(int16_t*)*buf;
     for (int i = 0; i < nbSamples; i++) {
-      dy[i]=data[i];
+      measure.dy[i]=data[i];
     }
     *buf += nbSamples*sizeof(int16_t);
@@ -213 +219 @@
     uint16_t *data=(uint16_t*)*buf;
     for (int i = 0; i < nbSamples; i++) {
-      dy[i]=data[i];
+      measure.dy[i]=data[i];
     }
     *buf += nbSamples*sizeof(uint16_t);
@@ -222 +228 @@
   *buf += 4*sizeof(uint16_t);
   
-  firstPeakStart->setValue( QPointF( data[0], dy[data[0]] ) );
-  firstPeakEnd->setValue( QPointF( data[1], dy[data[1]] ) );
-  secondPeakStart->setValue( QPointF( data[2], dy[data[2]] ) );
-  secondPeakEnd->setValue( QPointF( data[3], dy[data[3]] ) );
+  measure.firstPeakStartIndex=data[0];
+  measure.firstPeakEndIndex=data[1];
+  measure.secondPeakStartIndex=data[2];
+  measure.secondPeakEndIndex=data[3];
+  measures.append(measure);
+
+  scrollbar->setRange(0,measures.count()-1);
+  if(scrolling) {
+    scrollbar->blockSignals(true);//block valuechanged signal 
+    scrollbar->setValue(measures.count()-1);
+    scrollbar->blockSignals(false);
+    
+    plotMeasure(measures.count()-1);
+  }
+}
+
+void UsSensorPlot::plotMeasure(int index) {
+  firstPeakStart->setValue( QPointF(measures.at(index).firstPeakStartIndex,measures.at(index).dy[measures.at(index).firstPeakStartIndex] ) );
+  firstPeakEnd->setValue( QPointF(measures.at(index).firstPeakEndIndex,measures.at(index).dy[measures.at(index).firstPeakEndIndex] ) );
+  secondPeakStart->setValue( QPointF(measures.at(index).secondPeakStartIndex,measures.at(index).dy[measures.at(index).secondPeakStartIndex] ) );
+  secondPeakEnd->setValue( QPointF(measures.at(index).secondPeakEndIndex,measures.at(index).dy[measures.at(index).secondPeakEndIndex] ) );
+  
+  // Attach (don't copy) data
+  datas->setRawSamples(dx,measures.at(index).dy, nbSamples);
   
   plot->replot();
 }
-
-
 // context menu
 void UsSensorPlot::mousePressEvent(QMouseEvent *event) {
@@ -241 +265 @@
     a = menu->addAction("reset zoom");
     menu->addSeparator();
-
 
     appendmenu(menu);
@@ -254 +277 @@
   }
 }
+
+void UsSensorPlot::scrollBarMoved(int value) {
+  if(value==scrollbar->maximum()) {
+    scrolling=true;
+  } else {
+    scrolling=false;
+  }
+  plotMeasure(value);
+}

trunk/tools/FlairGCS/src/UsSensorPlot.h

@@ -16 +16 @@
 class QMouseEvent;
 class QwtPlotMarker;
+class QScrollBar;
 
 class UsSensorPlot : public DataRemote {
@@ -33 +34 @@
   void alignScales(void);
   float xmin_orig, xmax_orig, ymin_orig, ymax_orig;
+  QScrollBar* scrollbar;
 
   QwtPlotCurve *datas;
   QwtPlotMarker *firstPeakStart,*firstPeakEnd,*secondPeakStart,*secondPeakEnd;
   QString datasType;
-  bool datas_first_update;
   double *dx;
-  double *dy;
+  
+  struct measure_t {
+    double *dy;
+    uint16_t firstPeakStartIndex;
+    uint16_t firstPeakEndIndex;
+    uint16_t secondPeakStartIndex;
+    uint16_t secondPeakEndIndex;
+  };
+  QList<measure_t> measures;
+        
+  
   uint32_t nbSamples;
+  bool scrolling;
 
   bool eventFilter(QObject *, QEvent *);
@@ -46 +58 @@
   void setXAxisScale(float xmin, float xmax);
   void BufEvent(char **buf, int *buf_size, uint16_t period, bool big_endian);
+  void plotMeasure(int index);
+  
+ private slots:
+    void scrollBarMoved(int value);
 };