Changeset - 797666010f26
Parent rev.
Child rev.
[Not reviewed]
channelmanager
0 8 2
Hasan Yavuz ÖZDERYA - 10 years ago 2016-03-24 17:43:38
hy@ozderya.net
implemented framebufferseries to isolate qwtplotcurve from framebuffer
10 files changed with 73 insertions and 24 deletions:
CMakeLists.txt
1
serialplot.pro
4
2
src/channelmanager.cpp
6
10
src/channelmanager.h
1
1
src/dataformatpanel.cpp
1
src/framebuffer.h
1
2
src/framebufferseries.cpp
22
src/framebufferseries.h
31
src/mainwindow.cpp
5
9
src/snapshotmanager.cpp
1
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -87,12 +87,13 @@ add_executable(${PROGRAM_NAME} WIN32
 
  src/commandwidget.cpp
 
  src/commandedit.cpp
 
  src/dataformatpanel.cpp
 
  src/tooltipfilter.cpp
 
  src/sneakylineedit.cpp
 
  src/channelmanager.cpp
 
  src/framebufferseries.cpp
 
  misc/windows_icon.rc
 
  ${UI_FILES}
 
  ${RES_FILES}
 
  )
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -50,13 +50,14 @@ SOURCES += \

			




	
	
	
		
 
    src/commandpanel.cpp \

			




	
	
	
		
 
    src/commandwidget.cpp \

			




	
	
	
		
 
    src/commandedit.cpp \

			




	
	
	
		
 
    src/dataformatpanel.cpp \

			




	
	
	
		
 
    src/tooltipfilter.cpp \

			




	
	
	
		
 
    src/sneakylineedit.cpp \

			




	
	
	
		
 
    src/channelmanager.cpp

			




	
	
	
		
 
    src/channelmanager.cpp \

			




	
	
	
		
 
    src/framebufferseries.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
	
		
 
    src/utils.h \

			




	
	
	
		
 
    src/portcontrol.h \

			




	
	
	
		
 
    src/floatswap.h \

			




	
	
		
 
@@ -74,13 +75,14 @@ HEADERS += \

			




	
	
	
		
 
    src/commandpanel.h \

			




	
	
	
		
 
    src/commandwidget.h \

			




	
	
	
		
 
    src/commandedit.h \

			




	
	
	
		
 
    src/dataformatpanel.h \

			




	
	
	
		
 
    src/tooltipfilter.h \

			




	
	
	
		
 
    src/sneakylineedit.h \

			




	
	
	
		
 
    src/channelmanager.h

			




	
	
	
		
 
    src/channelmanager.h \

			




	
	
	
		
 
    src/framebufferseries.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
	
		
 
    src/about_dialog.ui \

			




	
	
	
		
 
    src/portcontrol.ui \

			




	
	
	
		
 
    src/snapshotview.ui \

			




        

    


    
    

    

        

                

                    src/channelmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,28 +31,26 @@ ChannelManager::ChannelManager(unsigned 

			




	
	
	
		
 
    QStringList channelNamesList;

			




	
	
	
		
 

			




	
	
	
		
 
    for (unsigned int i = 0; i < numberOfChannels; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelBuffers.append(new FrameBuffer(numberOfSamples));

			




	
	
	
		
 
        channelNamesList << QString("Channel %1").arg(i+1);

			




	
	
	
		
 

			




	
	
	
		
 
        // curves.append(new QwtPlotCurve(QString("Channel %1").arg(i+1)));

			




	
	
	
		
 
        // curves[i]->setSamples(channelBuffers[i]);

			




	
	
	
		
 
        // curves[i]->setPen(Plot::makeColor(i));

			




	
	
	
		
 
        // curves[i]->attach(ui->plot);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    _channelNames.setStringList(channelNamesList);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&_channelNames, &QStringListModel::dataChanged,

			




	
	
	
		
 
            this, &ChannelManager::onChannelNameDataChange);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
ChannelManager::~ChannelManager()

			




	
	
	
		
 
{

			




	
	
	
		
 
    // TODO: remove all channelBuffers

			




	
	
	
		
 
    for (auto buffer : channelBuffers)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete buffer;

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
unsigned ChannelManager::numOfChannels()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return channelBuffers.size();

			




	
	
	
		
 
}

			




	
	
		
 
@@ -77,16 +75,13 @@ void ChannelManager::setNumOfChannels(un

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if(number < oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // remove channels

			




	
	
	
		
 
        for (unsigned int i = oldNum-1; i > number-1; i--)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            // also deletes owned FrameBuffer

			




	
	
	
		
 
            // delete curves.takeLast();

			




	
	
	
		
 
            // TODO: important, remove channelBuffer

			




	
	
	
		
 
            channelBuffers.removeLast();

			




	
	
	
		
 
            delete channelBuffers.takeLast();

			




	
	
	
		
 
            _channelNames.removeRow(i);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    emit numOfChannelsChanged(number);

			




	
	
	
		
 
}

			




	
	
		
 
@@ -130,12 +125,13 @@ void ChannelManager::addChannelName(QStr

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::onChannelNameDataChange(const QModelIndex & topLeft,

			




	
	
	
		
 
                                             const QModelIndex & bottomRight,

			




	
	
	
		
 
                                             const QVector<int> & roles)

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_UNUSED(roles);

			




	
	
	
		
 
    int start = topLeft.row();

			




	
	
	
		
 
    int end = bottomRight.row();

			




	
	
	
		
 

			




	
	
	
		
 
    // TODO: maybe check `roles` parameter, can't think of a reason for current use case

			




	
	
	
		
 
    for (int i = start; i <= end; i++)

			




	
	
	
		
 
    {

			




        

    


    
    

    

        

                

                    src/channelmanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -54,13 +54,13 @@ public slots:

			




	
	
	
		
 
private:

			




	
	
	
		
 
    unsigned _numOfChannels;

			




	
	
	
		
 
    unsigned _numOfSamples;

			




	
	
	
		
 
    QList<FrameBuffer*> channelBuffers;

			




	
	
	
		
 
    QStringListModel _channelNames;

			




	
	
	
		
 

			




	
	
	
		
 
    void addChannelName(QString name); /// appends a new channel name at the end of list

			




	
	
	
		
 
    void addChannelName(QString name); ///< appends a new channel name at the end of list

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void onChannelNameDataChange(const QModelIndex & topLeft,

			




	
	
	
		
 
                                 const QModelIndex & bottomRight,

			




	
	
	
		
 
                                 const QVector<int> & roles = QVector<int> ());

			




	
	
	
		
 
};

			




        

    


    
    

    

        

                

                    src/dataformatpanel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,12 +18,13 @@

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include "dataformatpanel.h"

			




	
	
	
		
 
#include "ui_dataformatpanel.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <QtEndian>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "floatswap.h"

			




	
	
	
		
 

			




	
	
	
		
 
DataFormatPanel::DataFormatPanel(QSerialPort* port,

			




	
	
	
		
 
                                 ChannelManager* channelMan,

			




        

    


    
    

    

        

                

                    src/framebuffer.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -17,17 +17,16 @@

			




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

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef FRAMEBUFFER_H

			




	
	
	
		
 
#define FRAMEBUFFER_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <qwt_series_data.h>

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 
#include <QRectF>

			




	
	
	
		
 

			




	
	
	
		
 
class FrameBuffer : public QwtSeriesData<QPointF>

			




	
	
	
		
 
class FrameBuffer

			




	
	
	
		
 
{

			




	
	
	
		
 
public:

			




	
	
	
		
 
    FrameBuffer(size_t size);

			




	
	
	
		
 
    ~FrameBuffer();

			




	
	
	
		
 

			




	
	
	
		
 
    void resize(size_t size);

			




        

    


    
    

    

        

                

                    src/framebufferseries.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebufferseries.h"

			




	
	
	
		
 

			




	
	
	
		
 
FrameBufferSeries::FrameBufferSeries(FrameBuffer* buffer)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _buffer = buffer;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
size_t FrameBufferSeries::size() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return _buffer->size();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QPointF FrameBufferSeries::sample(size_t i) const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return _buffer->sample(i);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QRectF FrameBufferSeries::boundingRect() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return _buffer->boundingRect();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/framebufferseries.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef FRAMEBUFFERSERIES_H

			




	
	
	
		
 
#define FRAMEBUFFERSERIES_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 
#include <QRectF>

			




	
	
	
		
 
#include <qwt_series_data.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * This class provides an interface for actual FrameBuffer

			




	
	
	
		
 
 * object. That way we can keep our data structures relatively

			




	
	
	
		
 
 * isolated from Qwt. Otherwise QwtPlotCurve owns FrameBuffer

			




	
	
	
		
 
 * structures.

			




	
	
	
		
 
 */

			




	
	
	
		
 
class FrameBufferSeries : public QwtSeriesData<QPointF>

			




	
	
	
		
 
{

			




	
	
	
		
 
public:

			




	
	
	
		
 
    FrameBufferSeries(FrameBuffer* buffer);

			




	
	
	
		
 

			




	
	
	
		
 
    // QwtSeriesData implementations

			




	
	
	
		
 
    size_t size() const;

			




	
	
	
		
 
    QPointF sample(size_t i) const;

			




	
	
	
		
 
    QRectF boundingRect() const;

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    FrameBuffer* _buffer;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // FRAMEBUFFERSERIES_H

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,17 +28,15 @@

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include <qwt_plot.h>

			




	
	
	
		
 
#include <limits.h>

			




	
	
	
		
 
#include <cmath>

			




	
	
	
		
 
#include <iostream>

			




	
	
	
		
 

			




	
	
	
		
 
// test code

			




	
	
	
		
 
#include <QListView>

			




	
	
	
		
 

			




	
	
	
		
 
#include <plot.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebufferseries.h"

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "version.h"

			




	
	
	
		
 

			




	
	
	
		
 
#if defined(Q_OS_WIN) && defined(QT_STATIC)

			




	
	
	
		
 
#include <QtPlugin>

			




	
	
	
		
 
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)

			




	
	
		
 
@@ -167,13 +165,14 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
    ui->lvChannelNames->setModel(channelMan.channelNames());

			




	
	
	
		
 

			




	
	
	
		
 
    // init curve list

			




	
	
	
		
 
    for (unsigned int i = 0; i < numOfChannels; i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        curves.append(new QwtPlotCurve(channelMan.channelName(i)));

			




	
	
	
		
 
        curves[i]->setSamples(channelMan.channelBuffer(i));

			




	
	
	
		
 
        curves[i]->setSamples(

			




	
	
	
		
 
            new FrameBufferSeries(channelMan.channelBuffer(i)));

			




	
	
	
		
 
        curves[i]->setPen(Plot::makeColor(i));

			




	
	
	
		
 
        curves[i]->attach(ui->plot);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // init auto scale

			




	
	
	
		
 
    ui->plot->setAxis(ui->cbAutoScale->isChecked(),

			




	
	
		
 
@@ -348,27 +347,24 @@ void MainWindow::onNumOfChannelsChanged(

			




	
	
	
		
 
    if (numOfChannels > oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // add new channels

			




	
	
	
		
 
        for (unsigned int i = oldNum; i < numOfChannels; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            QwtPlotCurve* curve = new QwtPlotCurve(channelMan.channelName(i));

			




	
	
	
		
 
            // TODO: create a wrapper around FrameBuffer that holds a

			




	
	
	
		
 
            // pointer to it and provides the QwtDataSeries interface,

			




	
	
	
		
 
            // that wrapper should be created for and owned by 'curve'

			




	
	
	
		
 
            curve->setSamples(channelMan.channelBuffer(i));

			




	
	
	
		
 
            curve->setSamples(

			




	
	
	
		
 
                new FrameBufferSeries(channelMan.channelBuffer(i)));

			




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

			




	
	
	
		
 
            curve->attach(ui->plot);

			




	
	
	
		
 
            curves.append(curve);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if(numOfChannels < oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // remove channels

			




	
	
	
		
 
        for (unsigned int i = 0; i < oldNum - numOfChannels; i++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            // also deletes owned FrameBuffer TODO: which souldn't happen

			




	
	
	
		
 
            delete curves.takeLast();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/snapshotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,12 +21,13 @@

			




	
	
	
		
 
#include <QMenuBar>

			




	
	
	
		
 
#include <QKeySequence>

			




	
	
	
		
 
#include <QFileDialog>

			




	
	
	
		
 
#include <QFile>

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
SnapshotManager::SnapshotManager(QMainWindow* mainWindow,

			




	
	
	
		
 
                                 ChannelManager* channelMan) :

			




	
	
	
		
 
    _menu("Snapshots"),

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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