Changeset - 37727123d513
Parent rev.
Child rev.
[Not reviewed]
plot-manager
0 5 0
Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-28 16:43:56
hy@ozderya.net
updated snapshot view to use plot manager
5 files changed with 41 insertions and 37 deletions:
src/plotmanager.cpp
22
9
src/plotmanager.h
6
6
src/snapshotview.cpp
9
11
src/snapshotview.h
2
1
src/snapshotview.ui
2
10
0 comments (0 inline, 0 general)
src/plotmanager.cpp
➞
Show inline comments
 
@@ -178,44 +178,57 @@ Plot* PlotManager::addPlotWidget()
 
    plot->darkBackground(darkBackgroundAction.isChecked());
 
    plot->showGrid(showGridAction.isChecked());
 
    plot->showMinorGrid(showMinorGridAction.isChecked());
 
    plot->showLegend(showLegendAction.isChecked());
 
    plot->showDemoIndicator(isDemoShown);
 
    plot->setAxis(_autoScaled, _yMin, _yMax);
 

			




	
	
	
		
 
    return plot;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::addCurve(QString title, FrameBuffer* buffer)

			




	
	
	
		
 
{

			




	
	
	
		
 
    auto curve = new QwtPlotCurve(title);

			




	
	
	
		
 
    curve->setSamples(new FrameBufferSeries(buffer));

			




	
	
	
		
 
    _addCurve(curve);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::addCurve(QString title, QVector<QPointF> data)

			




	
	
	
		
 
{

			




	
	
	
		
 
    auto curve = new QwtPlotCurve(title);

			




	
	
	
		
 
    curve->setSamples(data);

			




	
	
	
		
 
    _addCurve(curve);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::_addCurve(QwtPlotCurve* curve)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // store and init the curve

			




	
	
	
		
 
    curves.append(curve);

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned index = curves.size()-1;

			




	
	
	
		
 
    curve->setPen(Plot::makeColor(index));

			




	
	
	
		
 

			




	
	
	
		
 
    // create the plot for the curve if we are on multi display

			




	
	
	
		
 
    Plot* plot;

			




	
	
	
		
 

			




	
	
	
		
 
    if (isMulti)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // create a new plot widget

			




	
	
	
		
 
        plot = addPlotWidget();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        plot = plotWidgets[0];

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // create the curve

			




	
	
	
		
 
    QwtPlotCurve* curve = new QwtPlotCurve(title);

			




	
	
	
		
 
    curves.append(curve);

			




	
	
	
		
 

			




	
	
	
		
 
    curve->setSamples(new FrameBufferSeries(buffer));

			




	
	
	
		
 
    unsigned index = curves.size()-1;

			




	
	
	
		
 
    curve->setPen(Plot::makeColor(index));

			




	
	
	
		
 

			




	
	
	
		
 
    // show the curve

			




	
	
	
		
 
    curve->attach(plot);

			




	
	
	
		
 
    plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::removeCurves(unsigned number)

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (unsigned i = 0; i < number; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        if (!curves.isEmpty())

			




	
	
	
		
 
        {

			




	
	
	
		
 
            delete curves.takeLast();

			




	
	
	
		
 
            if (isMulti) // delete corresponding widget as well

			




        

    


    
    

    

        

                

                    src/plotmanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,38 +28,35 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include <qwt_plot_curve.h>

			




	
	
	
		
 
#include "plot.h"

			




	
	
	
		
 
#include "framebufferseries.h"

			




	
	
	
		
 

			




	
	
	
		
 
class PlotManager : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit PlotManager(QWidget* plotArea, QObject *parent = 0);

			




	
	
	
		
 
    ~PlotManager();

			




	
	
	
		
 

			




	
	
	
		
 
    /// Add a new curve with title and buffer. A color is

			




	
	
	
		
 
    /// automatically chosen for curve.

			




	
	
	
		
 
    void addCurve(QString title, FrameBuffer* buffer);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Alternative of `addCurve` for static curve data (snapshots).

			




	
	
	
		
 
    void addCurve(QString title, QVector<QPointF> data);

			




	
	
	
		
 
    /// Set the displayed title for a curve

			




	
	
	
		
 
    void setTitle(unsigned index, QString title);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Removes curves from the end

			




	
	
	
		
 
    void removeCurves(unsigned number);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Returns current number of curves known by plot manager

			




	
	
	
		
 
    unsigned numOfCurves();

			




	
	
	
		
 

			




	
	
	
		
 
    /// Returns the list of actions to be inserted into the `View` menu

			




	
	
	
		
 
    QList<QAction*> menuActions();

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    /// Enable/Disable multiple plot display

			




	
	
	
		
 
    void setMulti(bool enabled);

			




	
	
	
		
 
    /// Update all plot widgets

			




	
	
	
		
 
    void replot();

			




	
	
	
		
 
    /// Enable display of a "DEMO" label on each plot

			




	
	
	
		
 
    void showDemoIndicator(bool show = true);

			




	
	
	
		
 
    /// Set the Y axis

			




	
	
	
		
 
    void setAxis(bool autoScaled, double yMin = 0, double yMax = 1);

			




	
	
		
 
@@ -77,25 +74,28 @@ private:

			




	
	
	
		
 
    bool _autoScaled;

			




	
	
	
		
 
    double _yMin;

			




	
	
	
		
 
    double _yMax;

			




	
	
	
		
 

			




	
	
	
		
 
    // menu actions

			




	
	
	
		
 
    QAction showGridAction;

			




	
	
	
		
 
    QAction showMinorGridAction;

			




	
	
	
		
 
    QAction unzoomAction;

			




	
	
	
		
 
    QAction darkBackgroundAction;

			




	
	
	
		
 
    QAction showLegendAction;

			




	
	
	
		
 

			




	
	
	
		
 
    void setupLayout(bool multiPlot);

			




	
	
	
		
 
    Plot* addPlotWidget(); ///< inserts a new plot widget to the current layout

			




	
	
	
		
 
    /// 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);

			




	
	
	
		
 
    /// Common part of overloaded `addCurve` functions

			




	
	
	
		
 
    void _addCurve(QwtPlotCurve* curve);

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void showGrid(bool show = true);

			




	
	
	
		
 
    void showMinorGrid(bool show = true);

			




	
	
	
		
 
    void showLegend(bool show = true);

			




	
	
	
		
 
    void unzoom();

			




	
	
	
		
 
    void darkBackground(bool enabled = true);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // PLOTMANAGER_H

			




        

    


    
    

    

        

                

                    src/snapshotview.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,51 +19,49 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "snapshotview.h"

			




	
	
	
		
 
#include "ui_snapshotview.h"

			




	
	
	
		
 

			




	
	
	
		
 
SnapshotView::SnapshotView(QWidget *parent, Snapshot* snapshot) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::SnapshotView),

			




	
	
	
		
 
    renameDialog(this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _snapshot = snapshot;

			




	
	
	
		
 

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea);

			




	
	
	
		
 

			




	
	
	
		
 
    ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());

			




	
	
	
		
 
    this->setWindowTitle(snapshot->name());

			




	
	
	
		
 

			




	
	
	
		
 
    // initialize curves

			




	
	
	
		
 
    unsigned numOfChannels = snapshot->data.size();

			




	
	
	
		
 

			




	
	
	
		
 
    for (unsigned ci = 0; ci < numOfChannels; ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QwtPlotCurve* curve = new QwtPlotCurve(snapshot->channelName(ci));

			




	
	
	
		
 
        curves.append(curve);

			




	
	
	
		
 
        curve->setSamples(snapshot->data[ci]);

			




	
	
	
		
 
        curve->setPen(Plot::makeColor(ci));

			




	
	
	
		
 
        curve->attach(ui->plot);

			




	
	
	
		
 
        plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    renameDialog.setWindowTitle("Rename Snapshot");

			




	
	
	
		
 
    renameDialog.setLabelText("Enter new name:");

			




	
	
	
		
 
    connect(ui->actionRename, &QAction::triggered,

			




	
	
	
		
 
            this, &SnapshotView::showRenameDialog);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->actionExport, &QAction::triggered,

			




	
	
	
		
 
            this, &SnapshotView::save);

			




	
	
	
		
 

			




	
	
	
		
 
    // TODO: fix snapshot menu

			




	
	
	
		
 
    // for (auto a : ui->plot->menuActions())

			




	
	
	
		
 
    // {

			




	
	
	
		
 
    //     ui->menuView->addAction(a);

			




	
	
	
		
 
    // }

			




	
	
	
		
 
    for (auto a : plotMan->menuActions())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        ui->menuView->addAction(a);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
SnapshotView::~SnapshotView()

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (auto curve : curves)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete curve;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void SnapshotView::closeEvent(QCloseEvent *event)

			




        

    


    
    

    

        

                

                    src/snapshotview.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,45 +20,46 @@

			




	
	
	
		
 
#ifndef SNAPSHOTVIEW_H

			




	
	
	
		
 
#define SNAPSHOTVIEW_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QMainWindow>

			




	
	
	
		
 
#include <QInputDialog>

			




	
	
	
		
 
#include <QFileDialog>

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 
#include <QPen>

			




	
	
	
		
 
#include <QCloseEvent>

			




	
	
	
		
 
#include <qwt_plot_curve.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "plot.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "snapshot.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class SnapshotView;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class SnapshotView : public QMainWindow

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit SnapshotView(QWidget *parent, Snapshot* snapshot);

			




	
	
	
		
 
    ~SnapshotView();

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void closed();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::SnapshotView *ui;

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    Snapshot* _snapshot;

			




	
	
	
		
 
    QInputDialog renameDialog;

			




	
	
	
		
 
    PlotManager* plotMan;

			




	
	
	
		
 

			




	
	
	
		
 
    void closeEvent(QCloseEvent *event);

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void showRenameDialog();

			




	
	
	
		
 
    void renameSnapshot(QString name);

			




	
	
	
		
 
    void save();

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // SNAPSHOTVIEW_H

			




        

    


    
    

    

        

                

                    src/snapshotview.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,35 +7,35 @@

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>544</width>

			




	
	
	
		
 
    <height>449</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>MainWindow</string>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <widget class="QWidget" name="centralwidget">

			




	
	
	
		
 
   <layout class="QVBoxLayout" name="verticalLayout">

			




	
	
	
		
 
    <item>

			




	
	
	
		
 
     <widget class="Plot" name="plot" native="true"/>

			




	
	
	
		
 
     <widget class="QWidget" name="plotArea" native="true"/>

			




	
	
	
		
 
    </item>

			




	
	
	
		
 
   </layout>

			




	
	
	
		
 
  </widget>

			




	
	
	
		
 
  <widget class="QMenuBar" name="menubar">

			




	
	
	
		
 
   <property name="geometry">

			




	
	
	
		
 
    <rect>

			




	
	
	
		
 
     <x>0</x>

			




	
	
	
		
 
     <y>0</y>

			




	
	
	
		
 
     <width>544</width>

			




	
	
	
		
 
     <height>27</height>

			




	
	
	
		
 
     <height>20</height>

			




	
	
	
		
 
    </rect>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <widget class="QMenu" name="menuSnapshot">

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>Snapshot</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionRename"/>

			




	
	
	
		
 
    <addaction name="actionExport"/>

			




	
	
	
		
 
    <addaction name="actionClose"/>

			




	
	
	
		
 
   </widget>

			




	
	
	
		
 
   <widget class="QMenu" name="menuView">

			




	
	
	
		
 
    <property name="title">

			




	
	
		
 
@@ -64,32 +64,24 @@

			




	
	
	
		
 
  <action name="actionClose">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Close</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Close Window</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="shortcut">

			




	
	
	
		
 
    <string>Ctrl+W</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <customwidgets>

			




	
	
	
		
 
  <customwidget>

			




	
	
	
		
 
   <class>Plot</class>

			




	
	
	
		
 
   <extends>QWidget</extends>

			




	
	
	
		
 
   <header>plot.h</header>

			




	
	
	
		
 
   <container>1</container>

			




	
	
	
		
 
  </customwidget>

			




	
	
	
		
 
 </customwidgets>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections>

			




	
	
	
		
 
  <connection>

			




	
	
	
		
 
   <sender>actionClose</sender>

			




	
	
	
		
 
   <signal>triggered()</signal>

			




	
	
	
		
 
   <receiver>SnapshotView</receiver>

			




	
	
	
		
 
   <slot>close()</slot>

			




	
	
	
		
 
   <hints>

			




	
	
	
		
 
    <hint type="sourcelabel">

			




	
	
	
		
 
     <x>-1</x>

			




	
	
	
		
 
     <y>-1</y>

			




	
	
	
		
 
    </hint>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-13856
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support