tempo-plotter Changeset - a3678ca6cfab · protofusion repositories

Changeset - a3678ca6cfab

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-26 11:22:44
hy@ozderya.net

added dark background, default background is not white (was gray)

4 files changed with 39 insertions and 1 deletions:

mainwindow.cpp

mainwindow.ui

plot.cpp

plot.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -67,24 +67,29 @@ MainWindow::MainWindow(QWidget *parent) @@
+                     {
                          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);
     QObject::connect(ui->actionDarkBackground, &QAction::toggled,
                      ui->plot, &Plot::darkBackground);
     ui->plot->darkBackground(ui->actionDarkBackground->isChecked());
     // port control signals
     QObject::connect(&portControl, &PortControl::portToggled,
                      this, &MainWindow::onPortToggled);
     QObject::connect(&portControl, &PortControl::skipByteRequested,
                      this, &MainWindow::skipByte);
     QObject::connect(ui->spNumOfSamples, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfSamplesChanged);
     QObject::connect(ui->cbAutoScale, &QCheckBox::toggled,
                      this, &MainWindow::onAutoScaleChecked);

mainwindow.ui

➞

Show inline comments

@@ @@ -467,24 +467,25 @@ @@
     </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"/>
     <addaction name="actionDarkBackground"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuView"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
@@ @@ -561,24 +562,35 @@ @@
   </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>
   <action name="actionDarkBackground">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Dark Background</string>
    </property>
    <property name="toolTip">
     <string>Toggle Dark Background</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>Plot</class>
    <extends>QFrame</extends>
    <header>plot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

plot.cpp

➞

Show inline comments

@@ @@ -19,26 +19,27 @@ @@
 #include "plot.h"
 Plot::Plot(QWidget* parent) :
     QwtPlot(parent),
     zoomer(this->canvas(), false)
+{
     isAutoScaled = false;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.setPen(Qt::lightGray);
     grid.attach(this);
     darkBackground(false);
+}
 void Plot::setAxis(bool autoScaled, double yAxisMin, double yAxisMax)
+{
     this->isAutoScaled = autoScaled;
     if (!autoScaled)
+    {
         yMin = yAxisMin;
         yMax = yAxisMax;
+    }
@@ @@ -75,12 +76,31 @@ void Plot::showGrid(bool show) @@
 void Plot::showMinorGrid(bool show)
+{
     grid.enableXMin(show);
     grid.enableYMin(show);
     replot();
+}
 void Plot::unzoom()
+{
     zoomer.zoom(0);
+}
 void Plot::darkBackground(bool enabled)
+{
     if (enabled)
+    {
         setCanvasBackground(QBrush(Qt::black));
         grid.setPen(Qt::darkGray);
         zoomer.setRubberBandPen(QPen(Qt::white));
         zoomer.setTrackerPen(QPen(Qt::white));
+    }
     else
+    {
         setCanvasBackground(QBrush(Qt::white));
         grid.setPen(Qt::lightGray);
         zoomer.setRubberBandPen(QPen(Qt::black));
         zoomer.setTrackerPen(QPen(Qt::black));
+    }
     replot();
+}

plot.h

➞

Show inline comments

@@ @@ -32,16 +32,17 @@ public: @@
 private:
     bool isAutoScaled;
     double yMin, yMax;
     Zoomer zoomer;
     QwtPlotGrid grid;
     void resetAxes();
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
 private slots:
     void unzoomed();
 };

0 comments (0 inline, 0 general)