Changeset - 5a4e6dd9042e
Parent rev.
Child rev.
[Not reviewed]
plot-manager
0 4 2
Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-21 16:43:07
hy@ozderya.net
plot manager implementation for multi plot display (not integrated yet)
6 files changed with 255 insertions and 2 deletions:
CMakeLists.txt
1
serialplot.pro
4
2
src/mainwindow.cpp
10
src/mainwindow.h
5
src/plotmanager.cpp
166
src/plotmanager.h
69
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -105,24 +105,25 @@ add_executable(${PROGRAM_NAME} WIN32
 
  src/channelmanager.cpp
 
  src/framebufferseries.cpp
 
  src/numberformatbox.cpp
 
  src/endiannessbox.cpp
 
  src/abstractreader.cpp
 
  src/binarystreamreader.cpp
 
  src/binarystreamreadersettings.cpp
 
  src/asciireader.cpp
 
  src/asciireadersettings.cpp
 
  src/demoreader.cpp
 
  src/framedreader.cpp
 
  src/framedreadersettings.cpp
 
  src/plotmanager.cpp
 
  misc/windows_icon.rc
 
  ${UI_FILES}
 
  ${RES_FILES}
 
  )
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




	
	
	
		
 
target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})

			




	
	
	
		
 
qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)

			




	
	
	
		
 

			




	
	
	
		
 
if (BUILD_QWT)

			




	
	
	
		
 
  add_dependencies(${PROGRAM_NAME} QWT)

			




	
	
	
		
 
endif (BUILD_QWT)

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -56,25 +56,26 @@ SOURCES += \

			




	
	
	
		
 
    src/channelmanager.cpp \

			




	
	
	
		
 
    src/framebufferseries.cpp \

			




	
	
	
		
 
    src/plotcontrolpanel.cpp \

			




	
	
	
		
 
    src/numberformatbox.cpp \

			




	
	
	
		
 
    src/endiannessbox.cpp \

			




	
	
	
		
 
    src/framedreadersettings.cpp \

			




	
	
	
		
 
    src/abstractreader.cpp \

			




	
	
	
		
 
    src/binarystreamreader.cpp \

			




	
	
	
		
 
    src/binarystreamreadersettings.cpp \

			




	
	
	
		
 
    src/asciireadersettings.cpp \

			




	
	
	
		
 
    src/asciireader.cpp \

			




	
	
	
		
 
    src/demoreader.cpp \

			




	
	
	
		
 
    src/framedreader.cpp

			




	
	
	
		
 
    src/framedreader.cpp \

			




	
	
	
		
 
    src/plotmanager.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
	
		
 
    src/utils.h \

			




	
	
	
		
 
    src/portcontrol.h \

			




	
	
	
		
 
    src/floatswap.h \

			




	
	
	
		
 
    src/plot.h \

			




	
	
	
		
 
    src/zoomer.h \

			




	
	
	
		
 
    src/hidabletabwidget.h \

			




	
	
	
		
 
    src/framebuffer.h \

			




	
	
	
		
 
    src/scalepicker.h \

			




	
	
	
		
 
    src/scalezoomer.h \

			




	
	
		
 
@@ -92,25 +93,26 @@ HEADERS += \

			




	
	
	
		
 
    src/channelmanager.h \

			




	
	
	
		
 
    src/framebufferseries.h \

			




	
	
	
		
 
    src/plotcontrolpanel.h \

			




	
	
	
		
 
    src/numberformatbox.h \

			




	
	
	
		
 
    src/endiannessbox.h \

			




	
	
	
		
 
    src/framedreadersettings.h \

			




	
	
	
		
 
    src/abstractreader.h \

			




	
	
	
		
 
    src/binarystreamreader.h \

			




	
	
	
		
 
    src/binarystreamreadersettings.h \

			




	
	
	
		
 
    src/asciireadersettings.h \

			




	
	
	
		
 
    src/asciireader.h \

			




	
	
	
		
 
    src/demoreader.h \

			




	
	
	
		
 
    src/framedreader.h

			




	
	
	
		
 
    src/framedreader.h \

			




	
	
	
		
 
    src/plotmanager.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
	
		
 
    src/about_dialog.ui \

			




	
	
	
		
 
    src/portcontrol.ui \

			




	
	
	
		
 
    src/snapshotview.ui \

			




	
	
	
		
 
    src/commandpanel.ui \

			




	
	
	
		
 
    src/commandwidget.ui \

			




	
	
	
		
 
    src/dataformatpanel.ui \

			




	
	
	
		
 
    src/plotcontrolpanel.ui \

			




	
	
	
		
 
    src/numberformatbox.ui \

			




	
	
	
		
 
    src/endiannessbox.ui \

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,25 +45,35 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow),

			




	
	
	
		
 
    aboutDialog(this),

			




	
	
	
		
 
    portControl(&serialPort),

			




	
	
	
		
 
    channelMan(1, 1, this),

			




	
	
	
		
 
    commandPanel(&serialPort),

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelMan),

			




	
	
	
		
 
    snapshotMan(this, &channelMan)

			




	
	
	
		
 
{

			




	
	
	
		
 

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 
    ui->plot->setParent(NULL);

			




	
	
	
		
 
    ui->plot->show();

			




	
	
	
		
 

			




	
	
	
		
 
    ((QVBoxLayout*) ui->centralWidget->layout())->insertWidget(0, &plotArea);

			




	
	
	
		
 
    plotMan = new PlotManager(&plotArea);

			




	
	
	
		
 

			




	
	
	
		
 
    // test code

			




	
	
	
		
 
    // plotArea.show();

			




	
	
	
		
 

			




	
	
	
		
 
    ui->tabWidget->insertTab(0, &portControl, "Port");

			




	
	
	
		
 
    ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");

			




	
	
	
		
 
    ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");

			




	
	
	
		
 
    ui->tabWidget->insertTab(3, &commandPanel, "Commands");

			




	
	
	
		
 
    ui->tabWidget->setCurrentIndex(0);

			




	
	
	
		
 
    addToolBar(portControl.toolBar());

			




	
	
	
		
 

			




	
	
	
		
 
    ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction());

			




	
	
	
		
 
    ui->menuBar->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());

			




	
	
	
		
 
    ui->menuBar->insertMenu(ui->menuHelp->menuAction(), commandPanel.menu());

			




	
	
	
		
 
    connect(commandPanel.newCommandAction(), &QAction::triggered, [this]()

			




	
	
	
		
 
            {

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,24 +33,25 @@

			




	
	
	
		
 
#include <QtGlobal>

			




	
	
	
		
 
#include <qwt_plot_curve.h>

			




	
	
	
		
 
#include <qwt_plot_textlabel.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "portcontrol.h"

			




	
	
	
		
 
#include "commandpanel.h"

			




	
	
	
		
 
#include "dataformatpanel.h"

			




	
	
	
		
 
#include "plotcontrolpanel.h"

			




	
	
	
		
 
#include "ui_about_dialog.h"

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class MainWindow : public QMainWindow

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit MainWindow(QWidget *parent = 0);

			




	
	
	
		
 
    ~MainWindow();

			




	
	
		
 
@@ -76,24 +77,28 @@ private:

			




	
	
	
		
 

			




	
	
	
		
 
    QLabel spsLabel;

			




	
	
	
		
 

			




	
	
	
		
 
    CommandPanel commandPanel;

			




	
	
	
		
 
    DataFormatPanel dataFormatPanel;

			




	
	
	
		
 
    PlotControlPanel plotControlPanel;

			




	
	
	
		
 

			




	
	
	
		
 
    SnapshotManager snapshotMan;

			




	
	
	
		
 

			




	
	
	
		
 
    QwtPlotTextLabel demoIndicator;

			




	
	
	
		
 
    bool isDemoRunning();

			




	
	
	
		
 

			




	
	
	
		
 
    // test widget

			




	
	
	
		
 
    QWidget plotArea;

			




	
	
	
		
 
    PlotManager* plotMan;

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void onPortToggled(bool open);

			




	
	
	
		
 
    void onPortError(QSerialPort::SerialPortError error);

			




	
	
	
		
 

			




	
	
	
		
 
    void onNumOfSamplesChanged(int value);

			




	
	
	
		
 
    void onNumOfChannelsChanged(unsigned value);

			




	
	
	
		
 
    void onChannelNameChanged(unsigned channel, QString name);

			




	
	
	
		
 

			




	
	
	
		
 
    void clearPlot();

			




	
	
	
		
 

			




	
	
	
		
 
    void onSpsChanged(unsigned sps);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/plotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2016 Hasan Yavuz Özderya

			




	
	
	
		
 

			




	
	
	
		
 
  This file is part of serialplot.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is free software: you can redistribute it and/or modify

			




	
	
	
		
 
  it under the terms of the GNU General Public License as published by

			




	
	
	
		
 
  the Free Software Foundation, either version 3 of the License, or

			




	
	
	
		
 
  (at your option) any later version.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is distributed in the hope that it will be useful,

			




	
	
	
		
 
  but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
  GNU General Public License for more details.

			




	
	
	
		
 

			




	
	
	
		
 
  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include "plot.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 

			




	
	
	
		
 
PlotManager::PlotManager(QWidget* plotArea, QObject *parent) :

			




	
	
	
		
 
    QObject(parent),

			




	
	
	
		
 
    _plotArea(plotArea)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // initalize layout and single widget

			




	
	
	
		
 
    isMulti = false;

			




	
	
	
		
 
    scrollArea = NULL;

			




	
	
	
		
 
    setupLayout(isMulti);

			




	
	
	
		
 
    addPlotWidget();

			




	
	
	
		
 

			




	
	
	
		
 
    // test code

			




	
	
	
		
 
    addCurve("test", new FrameBuffer(100));

			




	
	
	
		
 
    addCurve("test", new FrameBuffer(100));

			




	
	
	
		
 
    addCurve("test", new FrameBuffer(100));

			




	
	
	
		
 

			




	
	
	
		
 
    setMulti(true);

			




	
	
	
		
 
    setMulti(false);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
PlotManager::~PlotManager()

			




	
	
	
		
 
{

			




	
	
	
		
 
    while (curves.size())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete curves.takeLast();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // remove all widgets

			




	
	
	
		
 
    while (plotWidgets.size())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete plotWidgets.takeLast();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (scrollArea != NULL) delete scrollArea;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::setMulti(bool enabled)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (enabled == isMulti) return;

			




	
	
	
		
 

			




	
	
	
		
 
    isMulti = enabled;

			




	
	
	
		
 

			




	
	
	
		
 
    // detach all curves

			




	
	
	
		
 
    for (auto curve : curves)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        curve->detach();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // remove all widgets

			




	
	
	
		
 
    while (plotWidgets.size())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete plotWidgets.takeLast();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // setup new layout

			




	
	
	
		
 
    setupLayout(isMulti);

			




	
	
	
		
 

			




	
	
	
		
 
    if (isMulti)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // add new widgets and attach

			




	
	
	
		
 
        for (auto curve : curves)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            curve->attach(addPlotWidget());

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // add a single widget

			




	
	
	
		
 
        auto plot = addPlotWidget();

			




	
	
	
		
 

			




	
	
	
		
 
        // attach all curves

			




	
	
	
		
 
        for (auto curve : curves)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            curve->attach(plot);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotManager::setupLayout(bool multiPlot)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // delete previous layout if it exists

			




	
	
	
		
 
    if (_plotArea->layout() != 0)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete _plotArea->layout();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    if (multiPlot)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // setup a scroll area

			




	
	
	
		
 
        scrollArea = new QScrollArea();

			




	
	
	
		
 
        auto scrolledPlotArea = new QWidget(scrollArea);

			




	
	
	
		
 
        scrollArea->setWidget(scrolledPlotArea);

			




	
	
	
		
 
        scrollArea->setWidgetResizable(true);

			




	
	
	
		
 

			




	
	
	
		
 
        _plotArea->setLayout(new QVBoxLayout());

			




	
	
	
		
 
        _plotArea->layout()->addWidget(scrollArea);

			




	
	
	
		
 

			




	
	
	
		
 
        layout = new QVBoxLayout(scrolledPlotArea);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // delete scrollArea left from multi layout

			




	
	
	
		
 
        if (scrollArea != NULL) delete scrollArea;

			




	
	
	
		
 

			




	
	
	
		
 
        layout = new QVBoxLayout(_plotArea);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    layout->setSpacing(1);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
Plot* PlotManager::addPlotWidget()

			




	
	
	
		
 
{

			




	
	
	
		
 
    auto plot = new Plot();

			




	
	
	
		
 
    plotWidgets.append(plot);

			




	
	
	
		
 
    layout->addWidget(plot);

			




	
	
	
		
 
    return plot;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
{

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    curve->attach(plot);

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/plotmanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2016 Hasan Yavuz Özderya

			




	
	
	
		
 

			




	
	
	
		
 
  This file is part of serialplot.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is free software: you can redistribute it and/or modify

			




	
	
	
		
 
  it under the terms of the GNU General Public License as published by

			




	
	
	
		
 
  the Free Software Foundation, either version 3 of the License, or

			




	
	
	
		
 
  (at your option) any later version.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is distributed in the hope that it will be useful,

			




	
	
	
		
 
  but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
  GNU General Public License for more details.

			




	
	
	
		
 

			




	
	
	
		
 
  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef PLOTMANAGER_H

			




	
	
	
		
 
#define PLOTMANAGER_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QObject>

			




	
	
	
		
 
#include <QWidget>

			




	
	
	
		
 
#include <QScrollArea>

			




	
	
	
		
 
#include <QVBoxLayout>

			




	
	
	
		
 
#include <QList>

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    /// Set the displayed title for a curve

			




	
	
	
		
 
    void setTitle(unsigned index, QString title);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Removes curves from the end

			




	
	
	
		
 
    void removeCurves(unsigned number);

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    /// Enable/Disable multiple plot display

			




	
	
	
		
 
    void setMulti(bool enabled);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    bool isMulti;

			




	
	
	
		
 
    QWidget* _plotArea;

			




	
	
	
		
 
    QVBoxLayout* layout; ///< layout of the `plotArea`

			




	
	
	
		
 
    QScrollArea* scrollArea;

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    QList<Plot*> plotWidgets;

			




	
	
	
		
 

			




	
	
	
		
 
    void setupLayout(bool multiPlot);

			




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

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // PLOTMANAGER_H

			




        

    



    


    



    



      

      





    
    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