tempo-plotter Changeset - d678428ad457 · protofusion repositories

Changeset - d678428ad457

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-25 16:56:24
hy@ozderya.net

added "View" menu with Grid and Unzoom options

4 files changed with 78 insertions and 0 deletions:

mainwindow.cpp

mainwindow.ui

plot.cpp

plot.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -60,12 +60,26 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(ui->actionExportCsv, &QAction::triggered,
                      this, &MainWindow::onExportCsv);
     QObject::connect(ui->actionQuit, &QAction::triggered,
                      this, &MainWindow::close);
     QObject::connect(ui->actionGrid, &QAction::toggled, [this](bool show)
+                     {
                          ui->plot->showGrid(show);
                          ui->actionMinorGrid->setEnabled(show);
                      });
     ui->actionMinorGrid->setEnabled(ui->actionGrid->isChecked());
     QObject::connect(ui->actionMinorGrid, &QAction::toggled,
                      ui->plot, &Plot::showMinorGrid);
     QObject::connect(ui->actionUnzoom, &QAction::triggered,
                      ui->plot, &Plot::unzoom);
     // port control signals
     QObject::connect(&portControl, &PortControl::portToggled,
                      this, &MainWindow::onPortToggled);
     QObject::connect(&portControl, &PortControl::skipByteRequested,
                      this, &MainWindow::skipByte);
@@ @@ -135,12 +149,16 @@ MainWindow::MainWindow(QWidget *parent) @@
+    }
     // init auto scale
     ui->plot->setAxis(ui->cbAutoScale->isChecked(),
                       ui->spYmin->value(), ui->spYmax->value());
     // init grid
     ui->plot->showGrid(ui->actionGrid->isChecked());
     ui->plot->showMinorGrid(ui->actionMinorGrid->isChecked());
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else

mainwindow.ui

➞

Show inline comments

@@ @@ -466,13 +466,22 @@ @@
      <string>File</string>
     </property>
     <addaction name="actionExportCsv"/>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
      <string>View</string>
     </property>
     <addaction name="actionGrid"/>
     <addaction name="actionMinorGrid"/>
     <addaction name="actionUnzoom"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
@@ @@ -531,12 +540,39 @@ @@
     <string>Quit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
   <action name="actionGrid">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Grid</string>
    </property>
    <property name="toolTip">
     <string>Show/hide grid</string>
    </property>
   </action>
   <action name="actionUnzoom">
    <property name="text">
     <string>UnZoom</string>
    </property>
   </action>
   <action name="actionMinorGrid">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Minor Grid</string>
    </property>
    <property name="toolTip">
     <string>Show/hide minor grid</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>Plot</class>
    <extends>QFrame</extends>

plot.cpp

➞

Show inline comments

@@ @@ -62,6 +62,25 @@ void Plot::resetAxes() @@
 void Plot::unzoomed()
+{
     setAxisAutoScale(QwtPlot::xBottom);
     resetAxes();
+}
 void Plot::showGrid(bool show)
+{
     grid.enableX(show);
     grid.enableY(show);
     replot();
+}
 void Plot::showMinorGrid(bool show)
+{
     grid.enableXMin(show);
     grid.enableYMin(show);
     replot();
+}
 void Plot::unzoom()
+{
     zoomer.zoom(0);
+}

plot.h

➞

Show inline comments

@@ @@ -34,9 +34,14 @@ private: @@
     double yMin, yMax;
     Zoomer zoomer;
     QwtPlotGrid grid;
     void resetAxes();
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void unzoom();
 private slots:
     void unzoomed();
 };

0 comments (0 inline, 0 general)