tempo-plotter Changeset - e8c51b2d8584 · protofusion repositories

Changeset - e8c51b2d8584

Parent rev.

Child rev.

[Not reviewed]

snapshots

0 3 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-30 02:47:43
hy@ozderya.net

added "View" menu actions to SnapshotView menu

3 files changed with 59 insertions and 1 deletions:

plot.cpp

plot.h

snapshotview.cpp

0 comments (0 inline, 0 general)

plot.cpp

➞

Show inline comments

@@ @@ -15,29 +15,63 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QRectF>
 #include <QKeySequence>
 #include "plot.h"
 #include "utils.h"
 Plot::Plot(QWidget* parent) :
     QwtPlot(parent),
     zoomer(this->canvas(), false),
     sZoomer(this, &zoomer)
     sZoomer(this, &zoomer),
     _showGridAction("Grid", this),
     _showMinorGridAction("Minor Grid", this),
     _unzoomAction("Unzoom", this),
     _darkBackgroundAction("Dark Background", this)
+{
     isAutoScaled = true;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.attach(this);
     rectItem.setRect(QRectF(0,0,100,1));
     // rectItem.attach(this);
     darkBackground(false);
     _showGridAction.setToolTip("Show Grid");
     _showMinorGridAction.setToolTip("Show Minor Grid");
     _unzoomAction.setToolTip("Unzoom the Plot");
     _darkBackgroundAction.setToolTip("Enable Dark Plot Background");
     _showGridAction.setShortcut(QKeySequence("G"));
     _showMinorGridAction.setShortcut(QKeySequence("M"));
     _showGridAction.setCheckable(true);
     _showMinorGridAction.setCheckable(true);
     _darkBackgroundAction.setCheckable(true);
     _showGridAction.setChecked(true);
     _showMinorGridAction.setChecked(false);
     _darkBackgroundAction.setChecked(false);
     connect(&_showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &Plot::showGrid);
     connect(&_showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             &_showMinorGridAction, &QAction::setEnabled);
     connect(&_showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &Plot::showMinorGrid);
     connect(&_unzoomAction, &QAction::triggered, this, &Plot::unzoom);
     connect(&_darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &Plot::darkBackground);
+}
 void Plot::setAxis(bool autoScaled, double yAxisMin, double yAxisMax)
+{
     this->isAutoScaled = autoScaled;
@@ @@ -48,12 +82,22 @@ void Plot::setAxis(bool autoScaled, doub @@
+    }
     zoomer.zoom(0);
     resetAxes();
+}
 QList<QAction*> Plot::menuActions()
+{
     QList<QAction*> actions;
     actions << &_showGridAction;
     actions << &_showMinorGridAction;
     actions << &_unzoomAction;
     actions << &_darkBackgroundAction;
     return actions;
+}
 void Plot::resetAxes()
+{
     if (isAutoScaled)
+    {
         setAxisAutoScale(QwtPlot::yLeft);
+    }

plot.h

➞

Show inline comments

@@ @@ -18,12 +18,14 @@ @@
 */
 #ifndef PLOT_H
 #define PLOT_H
 #include <QColor>
 #include <QList>
 #include <QAction>
 #include <qwt_plot.h>
 #include <qwt_plot_grid.h>
 #include <qwt_plot_shapeitem.h>
 #include "zoomer.h"
 #include "scalezoomer.h"
@@ @@ -32,22 +34,29 @@ class Plot : public QwtPlot @@
     Q_OBJECT
 public:
     Plot(QWidget* parent = 0);
     void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     QList<QAction*> menuActions();
     static QColor makeColor(unsigned int channelIndex);
 private:
     bool isAutoScaled;
     double yMin, yMax;
     Zoomer zoomer;
     ScaleZoomer sZoomer;
     QwtPlotGrid grid;
     QwtPlotShapeItem rectItem;
     QAction _showGridAction;
     QAction _showMinorGridAction;
     QAction _unzoomAction;
     QAction _darkBackgroundAction;
     void resetAxes();
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void unzoom();

snapshotview.cpp

➞

Show inline comments

@@ @@ -29,12 +29,17 @@ SnapShotView::SnapShotView(QWidget *pare @@
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapShotView::showRenameDialog);
     connect(ui->actionExport, &QAction::triggered,
             this, &SnapShotView::save);
     for (auto a : ui->plot->menuActions())
+    {
         ui->menuView->addAction(a);
+    }
+}
 SnapShotView::~SnapShotView()
+{
     for (auto curve : curves)
+    {

0 comments (0 inline, 0 general)