tempo-plotter Changeset - 60f4eedd8b5e · protofusion repositories

Changeset - 60f4eedd8b5e

Parent rev.

Child rev.

[Not reviewed]

plot-manager

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-28 16:58:01
hy@ozderya.net

moved "Multi Plot" from plot control tab to view menu

6 files changed with 14 insertions and 27 deletions:

src/mainwindow.cpp

src/plotcontrolpanel.cpp

src/plotcontrolpanel.h

src/plotcontrolpanel.ui

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -116,15 +116,12 @@ MainWindow::MainWindow(QWidget *parent) @@
     connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,
             this, &MainWindow::onNumOfSamplesChanged);
     connect(&plotControlPanel, &PlotControlPanel::scaleChanged,
             plotMan, &PlotManager::setAxis);
     connect(&plotControlPanel, &PlotControlPanel::multiPlotChanged,
             plotMan, &PlotManager::setMulti);
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
                      plotMan, &PlotManager::flashSnapshotOverlay);

src/plotcontrolpanel.cpp

➞

Show inline comments

@@ @@ -57,15 +57,12 @@ PlotControlPanel::PlotControlPanel(QWidg @@
     connect(ui->spYmax, SIGNAL(valueChanged(double)),
             this, SLOT(onYScaleChanged()));
     connect(ui->spYmin, SIGNAL(valueChanged(double)),
             this, SLOT(onYScaleChanged()));
     connect(ui->cbMultiPlot, &QCheckBox::toggled,
             this, &PlotControlPanel::multiPlotChanged);
     // init scale range preset list
     for (int nbits = 8; nbits <= 24; nbits++) // signed binary formats
+    {
         int rmax = pow(2, nbits-1)-1;
         int rmin = -rmax-1;
         Range r = {double(rmin),  double(rmax)};
@@ @@ -150,11 +147,6 @@ void PlotControlPanel::onRangeSelected() @@
+}
 void PlotControlPanel::setChannelNamesModel(QAbstractItemModel * model)
+{
     ui->lvChannelNames->setModel(model);
+}
 bool PlotControlPanel::multiPlot()
+{
     return ui->cbMultiPlot->isChecked();
+}

src/plotcontrolpanel.h

➞

Show inline comments

@@ @@ -36,20 +36,18 @@ public: @@
     ~PlotControlPanel();
     unsigned numOfSamples();
     bool autoScale();
     double yMax();
     double yMin();
     bool multiPlot(); ///< returns true if multi plot is selected
     void setChannelNamesModel(QAbstractItemModel * model);
 signals:
     void numOfSamplesChanged(int value);
     void scaleChanged(bool autoScaled, double yMin = 0, double yMax = 1);
     void multiPlotChanged(bool enabled);
 private:
     Ui::PlotControlPanel *ui;
 private slots:
     void onAutoScaleChecked(bool checked);

src/plotcontrolpanel.ui

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
  <widget class="QWidget" name="PlotControlPanel">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>590</width>
-    <height>183</height>
+    <height>187</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
@@ @@ -144,31 +144,21 @@ @@
        </property>
        <property name="value">
         <double>0.000000000000000</double>
        </property>
       </widget>
      </item>
      <item row="4" column="1">
       <widget class="QComboBox" name="cbRangePresets"/>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Select Range Preset:</string>
        </property>
       </widget>
      </item>
      <item row="5" column="0">
       <widget class="QCheckBox" name="cbMultiPlot">
        <property name="toolTip">
         <string>Plot all channels separately</string>
        </property>
        <property name="text">
         <string>Multi Plot</string>
        </property>
       </widget>
      <item row="4" column="1">
       <widget class="QComboBox" name="cbRangePresets"/>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources/>

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -28,13 +28,14 @@ PlotManager::PlotManager(QWidget* plotAr @@
     QObject(parent),
     _plotArea(plotArea),
     showGridAction("Grid", this),
     showMinorGridAction("Minor Grid", this),
     unzoomAction("Unzoom", this),
     darkBackgroundAction("Dark Background", this),
     showLegendAction("Legend", this)
     showLegendAction("Legend", this),
     showMultiAction("Multi Plot", this)
+{
     _autoScaled = true;
     _yMin = 0;
     _yMax = 1;
     isDemoShown = false;
@@ @@ -47,25 +48,28 @@ PlotManager::PlotManager(QWidget* plotAr @@
     // initialize menu actions
     showGridAction.setToolTip("Show Grid");
     showMinorGridAction.setToolTip("Show Minor Grid");
     unzoomAction.setToolTip("Unzoom the Plot");
     darkBackgroundAction.setToolTip("Enable Dark Plot Background");
     showLegendAction.setToolTip("Display the Legend on Plot");
     showMultiAction.setToolTip("Display All Channels Separately");
     showGridAction.setShortcut(QKeySequence("G"));
     showMinorGridAction.setShortcut(QKeySequence("M"));
     showGridAction.setCheckable(true);
     showMinorGridAction.setCheckable(true);
     darkBackgroundAction.setCheckable(true);
     showLegendAction.setCheckable(true);
     showMultiAction.setCheckable(true);
     showGridAction.setChecked(false);
     showMinorGridAction.setChecked(false);
     darkBackgroundAction.setChecked(false);
     showLegendAction.setChecked(true);
     showMultiAction.setChecked(false);
     showMinorGridAction.setEnabled(false);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showGrid);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
@@ @@ -74,12 +78,16 @@ PlotManager::PlotManager(QWidget* plotAr @@
             this, &PlotManager::showMinorGrid);
     connect(&unzoomAction, &QAction::triggered, this, &PlotManager::unzoom);
     connect(&darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::darkBackground);
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
     connect(&showMultiAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::setMulti);
+}
 PlotManager::~PlotManager()
+{
     while (curves.size())
+    {
@@ @@ -276,12 +284,13 @@ QList<QAction*> PlotManager::menuActions @@
     QList<QAction*> actions;
     actions << &showGridAction;
     actions << &showMinorGridAction;
     actions << &unzoomAction;
     actions << &darkBackgroundAction;
     actions << &showLegendAction;
     actions << &showMultiAction;
     return actions;
+}
 void PlotManager::showGrid(bool show)
+{
     for (auto plot : plotWidgets)

src/plotmanager.h

➞

Show inline comments

@@ @@ -78,12 +78,13 @@ private: @@
     // menu actions
     QAction showGridAction;
     QAction showMinorGridAction;
     QAction unzoomAction;
     QAction darkBackgroundAction;
     QAction showLegendAction;
     QAction showMultiAction;
     void setupLayout(bool multiPlot);
     /// Inserts a new plot widget to the current layout.
     Plot* addPlotWidget();
     /// Returns the plot widget that given curve is attached to
     Plot* plotWidget(unsigned curveIndex);

0 comments (0 inline, 0 general)