Changeset - 1a05d0ad46b0
Parent rev.
Child rev.
[Not reviewed]
channelmanager
0 8 2
Hasan Yavuz ÖZDERYA - 10 years ago 2016-03-21 18:28:28
hy@ozderya.net
integrated preliminary implementation of channelmanager

channel name list is a loose widget, code is still a mess
10 files changed with 293 insertions and 43 deletions:
CMakeLists.txt
1
serialplot.pro
4
2
src/channelmanager.cpp
148
src/channelmanager.h
68
src/dataformatpanel.cpp
3
3
src/dataformatpanel.h
3
2
src/mainwindow.cpp
54
28
src/mainwindow.h
4
1
src/snapshotmanager.cpp
5
5
src/snapshotmanager.h
3
2
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -86,12 +86,13 @@ add_executable(${PROGRAM_NAME} WIN32
 
  src/commandpanel.cpp
 
  src/commandwidget.cpp
 
  src/commandedit.cpp
 
  src/dataformatpanel.cpp
 
  src/tooltipfilter.cpp
 
  src/sneakylineedit.cpp
 
  src/channelmanager.cpp
 
  misc/windows_icon.rc
 
  ${UI_FILES}
 
  ${RES_FILES}
 
  )
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
    src/plotsnapshotoverlay.cpp \

			




	
	
	
		
 
    src/commandpanel.cpp \

			




	
	
	
		
 
    src/commandwidget.cpp \

			




	
	
	
		
 
    src/commandedit.cpp \

			




	
	
	
		
 
    src/dataformatpanel.cpp \

			




	
	
	
		
 
    src/tooltipfilter.cpp \

			




	
	
	
		
 
    src/sneakylineedit.cpp

			




	
	
	
		
 
    src/sneakylineedit.cpp \

			




	
	
	
		
 
    src/channelmanager.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
	
		
 
    src/utils.h \

			




	
	
	
		
 
    src/portcontrol.h \

			




	
	
	
		
 
    src/floatswap.h \

			




	
	
		
 
@@ -72,13 +73,14 @@ HEADERS += \

			




	
	
	
		
 
    src/plotsnapshotoverlay.h \

			




	
	
	
		
 
    src/commandpanel.h \

			




	
	
	
		
 
    src/commandwidget.h \

			




	
	
	
		
 
    src/commandedit.h \

			




	
	
	
		
 
    src/dataformatpanel.h \

			




	
	
	
		
 
    src/tooltipfilter.h \

			




	
	
	
		
 
    src/sneakylineedit.h

			




	
	
	
		
 
    src/sneakylineedit.h \

			




	
	
	
		
 
    src/channelmanager.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
	
		
 
    src/about_dialog.ui \

			




	
	
	
		
 
    src/portcontrol.ui \

			




	
	
	
		
 
    src/snapshotview.ui \

			




        

    


    
    

    

        

                

                    src/channelmanager.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 "channelmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <QStringList>

			




	
	
	
		
 
#include <QModelIndex>

			




	
	
	
		
 

			




	
	
	
		
 
ChannelManager::ChannelManager(unsigned numberOfChannels, unsigned numberOfSamples, QObject *parent) :

			




	
	
	
		
 
    QObject(parent)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _numOfChannels = numberOfChannels;

			




	
	
	
		
 
    _numOfSamples = numberOfSamples;

			




	
	
	
		
 

			




	
	
	
		
 
    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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
unsigned ChannelManager::numOfChannels()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return channelBuffers.size();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
unsigned ChannelManager::numOfSamples()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return _numOfSamples;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::setNumOfChannels(unsigned number)

			




	
	
	
		
 
{

			




	
	
	
		
 
    unsigned int oldNum = channelBuffers.size();

			




	
	
	
		
 

			




	
	
	
		
 
    if (number > oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // add new channels

			




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

			




	
	
	
		
 
        {

			




	
	
	
		
 
            channelBuffers.append(new FrameBuffer(_numOfSamples));

			




	
	
	
		
 
            addChannelName(QString("Channel %1").arg(oldNum+i+1));

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else if(number < oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // remove channels

			




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

			




	
	
	
		
 
        {

			




	
	
	
		
 
            // also deletes owned FrameBuffer

			




	
	
	
		
 
            // delete curves.takeLast();

			




	
	
	
		
 
            // TODO: important, remove channelBuffer

			




	
	
	
		
 
            channelBuffers.removeLast();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    emit numOfChannelsChanged(number);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::setNumOfSamples(unsigned number)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _numOfSamples = number;

			




	
	
	
		
 

			




	
	
	
		
 
    for (int ci = 0; ci < channelBuffers.size(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelBuffers[ci]->resize(_numOfSamples);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    emit numOfSamplesChanged(number);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
FrameBuffer* ChannelManager::channelBuffer(unsigned channel)

			




	
	
	
		
 
{

			




	
	
	
		
 
    return channelBuffers[channel];

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QStringListModel* ChannelManager::channelNames()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return &_channelNames;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QString ChannelManager::channelName(unsigned channel)

			




	
	
	
		
 
{

			




	
	
	
		
 
    return _channelNames.data(_channelNames.index(channel, 0), Qt::DisplayRole).toString();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::setChannelName(unsigned channel, QString name)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _channelNames.setData(_channelNames.index(channel, 0), QVariant(name), Qt::DisplayRole);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::addChannelName(QString name)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _channelNames.insertRow(_channelNames.rowCount());

			




	
	
	
		
 
    setChannelName(_channelNames.rowCount()-1, name);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::onChannelNameDataChange(const QModelIndex & topLeft,

			




	
	
	
		
 
                                             const QModelIndex & bottomRight,

			




	
	
	
		
 
                                             const QVector<int> & 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++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        emit channelNameChanged(i, channelName(i));

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelManager::addChannelData(unsigned channel, double* data, unsigned size)

			




	
	
	
		
 
{

			




	
	
	
		
 
    channelBuffer(channel)->addSamples(data, size);

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/channelmanager.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 CHANNELMANAGER_H

			




	
	
	
		
 
#define CHANNELMANAGER_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QObject>

			




	
	
	
		
 
#include <QStringListModel>

			




	
	
	
		
 
#include <QModelIndex>

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 

			




	
	
	
		
 
class ChannelManager : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit ChannelManager(unsigned numberOfChannels, unsigned numberOfSamples, QObject *parent = 0);

			




	
	
	
		
 
    ~ChannelManager();

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned numOfChannels();

			




	
	
	
		
 
    unsigned numOfSamples();

			




	
	
	
		
 
    FrameBuffer* channelBuffer(unsigned channel);

			




	
	
	
		
 
    QStringListModel* channelNames();

			




	
	
	
		
 
    QString channelName(unsigned channel);

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void numOfChannelsChanged(unsigned value);

			




	
	
	
		
 
    void numOfSamplesChanged(unsigned value);

			




	
	
	
		
 
    void channelNameChanged(unsigned channel, QString name);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    void setNumOfChannels(unsigned number);

			




	
	
	
		
 
    void setNumOfSamples(unsigned number);

			




	
	
	
		
 
    void setChannelName(unsigned channel, QString name);

			




	
	
	
		
 
    void addChannelData(unsigned channel, double* data, unsigned size);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    unsigned _numOfChannels;

			




	
	
	
		
 
    unsigned _numOfSamples;

			




	
	
	
		
 
    QList<FrameBuffer*> channelBuffers;

			




	
	
	
		
 
    QStringListModel _channelNames;

			




	
	
	
		
 

			




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

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // CHANNELMANAGER_H

			




        

    


    
    

    

        

                

                    src/dataformatpanel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,21 +23,21 @@

			




	
	
	
		
 
#include <QtEndian>

			




	
	
	
		
 

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "floatswap.h"

			




	
	
	
		
 

			




	
	
	
		
 
DataFormatPanel::DataFormatPanel(QSerialPort* port,

			




	
	
	
		
 
                                 QList<FrameBuffer*>* channelBuffers,

			




	
	
	
		
 
                                 ChannelManager* channelMan,

			




	
	
	
		
 
                                 QWidget *parent) :

			




	
	
	
		
 
    QWidget(parent),

			




	
	
	
		
 
    ui(new Ui::DataFormatPanel)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    serialPort = port;

			




	
	
	
		
 
    _channelBuffers = channelBuffers;

			




	
	
	
		
 
    _channelMan = channelMan;

			




	
	
	
		
 
    paused = false;

			




	
	
	
		
 

			




	
	
	
		
 
    // setup number format buttons

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbUint8,  NumberFormat_uint8);

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbUint16, NumberFormat_uint16);

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbUint32, NumberFormat_uint32);

			




	
	
		
 
@@ -316,9 +316,9 @@ template<typename T> double DataFormatPa

			




	
	
	
		
 
    return double(data);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DataFormatPanel::addChannelData(unsigned int channel,

			




	
	
	
		
 
                                     double* data, unsigned size)

			




	
	
	
		
 
{

			




	
	
	
		
 
    (*_channelBuffers)[channel]->addSamples(data, size);

			




	
	
	
		
 
    _channelMan->addChannelData(channel, data, size);

			




	
	
	
		
 
    sampleCount += size;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/dataformatpanel.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
#include <QTimer>

			




	
	
	
		
 
#include <QSerialPort>

			




	
	
	
		
 
#include <QList>

			




	
	
	
		
 
#include <QtGlobal>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class DataFormatPanel;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class DataFormatPanel : public QWidget

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit DataFormatPanel(QSerialPort* port,

			




	
	
	
		
 
                             QList<FrameBuffer*>* channelBuffers,

			




	
	
	
		
 
                             ChannelManager* channelMan,

			




	
	
	
		
 
                             QWidget *parent = 0);

			




	
	
	
		
 
    ~DataFormatPanel();

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned numOfChannels();

			




	
	
	
		
 
    unsigned samplesPerSecond();

			




	
	
	
		
 
    bool skipByteEnabled(void); // true for binary formats

			




	
	
		
 
@@ -74,13 +75,13 @@ private:

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    Ui::DataFormatPanel *ui;

			




	
	
	
		
 
    QButtonGroup numberFormatButtons;

			




	
	
	
		
 

			




	
	
	
		
 
    QSerialPort* serialPort;

			




	
	
	
		
 
    QList<FrameBuffer*>* _channelBuffers;

			




	
	
	
		
 
    ChannelManager* _channelMan;

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned int _numOfChannels;

			




	
	
	
		
 
    NumberFormat numberFormat;

			




	
	
	
		
 
    unsigned int sampleSize; // number of bytes in the selected number format

			




	
	
	
		
 
    bool skipByteRequested;

			




	
	
	
		
 
    bool paused;

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,12 +28,15 @@

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 
#include <qwt_plot.h>

			




	
	
	
		
 
#include <limits.h>

			




	
	
	
		
 
#include <cmath>

			




	
	
	
		
 
#include <iostream>

			




	
	
	
		
 

			




	
	
	
		
 
// test code

			




	
	
	
		
 
#include <QListView>

			




	
	
	
		
 

			




	
	
	
		
 
#include <plot.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "version.h"

			




	
	
	
		
 

			




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

			




	
	
		
 
@@ -51,15 +54,16 @@ Q_DECLARE_METATYPE(Range);

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow),

			




	
	
	
		
 
    aboutDialog(this),

			




	
	
	
		
 
    portControl(&serialPort),

			




	
	
	
		
 
    channelMan(1, 1, this),

			




	
	
	
		
 
    commandPanel(&serialPort),

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelBuffers),

			




	
	
	
		
 
    snapshotMan(this, &channelBuffers)

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelMan),

			




	
	
	
		
 
    snapshotMan(this, &channelMan)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




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

			




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

			




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

			




	
	
	
		
 
    ui->tabWidget->setCurrentIndex(0);

			




	
	
		
 
@@ -145,23 +149,34 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
                     &dataFormatPanel, &DataFormatPanel::pause);

			




	
	
	
		
 

			




	
	
	
		
 
    // init data arrays and plot

			




	
	
	
		
 
    numOfSamples = ui->spNumOfSamples->value();

			




	
	
	
		
 
    unsigned numOfChannels = dataFormatPanel.numOfChannels();

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&dataFormatPanel,

			




	
	
	
		
 
                     &DataFormatPanel::numOfChannelsChanged,

			




	
	
	
		
 
                     this,

			




	
	
	
		
 
                     &MainWindow::onNumOfChannelsChanged);

			




	
	
	
		
 
    channelMan.setNumOfSamples(ui->spNumOfSamples->value());

			




	
	
	
		
 
    channelMan.setNumOfChannels(dataFormatPanel.numOfChannels());

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&dataFormatPanel, &DataFormatPanel::numOfChannelsChanged,

			




	
	
	
		
 
            &channelMan, &ChannelManager::setNumOfChannels);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&channelMan, &ChannelManager::numOfChannelsChanged,

			




	
	
	
		
 
            this, &MainWindow::onNumOfChannelsChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&channelMan, &ChannelManager::channelNameChanged,

			




	
	
	
		
 
            this, &MainWindow::onChannelNameChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    // TODO: move this into the plot tab

			




	
	
	
		
 
    QListView* channelNamesView = new QListView();

			




	
	
	
		
 
    channelNamesView->setModel(channelMan.channelNames());

			




	
	
	
		
 
    channelNamesView->show();

			




	
	
	
		
 

			




	
	
	
		
 
    // init channel data and curve list

			




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

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelBuffers.append(new FrameBuffer(numOfSamples));

			




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

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // init auto scale

			




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

			




	
	
		
 
@@ -311,58 +326,69 @@ required privileges or device is already

			




	
	
	
		
 
            break;

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::clearPlot()

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (int ci = 0; ci < channelBuffers.size(); ci++)

			




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

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelBuffers[ci]->clear();

			




	
	
	
		
 
        channelMan.channelBuffer(ci)->clear();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onNumOfSamplesChanged(int value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    numOfSamples = value;

			




	
	
	
		
 

			




	
	
	
		
 
    for (int ci = 0; ci < channelBuffers.size(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        channelBuffers[ci]->resize(numOfSamples);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    channelMan.setNumOfSamples(value);

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onNumOfChannelsChanged(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    unsigned int oldNum = channelBuffers.size();

			




	
	
	
		
 
    unsigned int oldNum = curves.size();

			




	
	
	
		
 
    unsigned numOfChannels = value;

			




	
	
	
		
 

			




	
	
	
		
 
    if (numOfChannels > oldNum)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // add new channels

			




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

			




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

			




	
	
	
		
 
        {

			




	
	
	
		
 
            channelBuffers.append(new FrameBuffer(numOfSamples));

			




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

			




	
	
	
		
 
            curves.last()->setSamples(channelBuffers.last());

			




	
	
	
		
 
            curves.last()->setPen(Plot::makeColor(curves.length()-1));

			




	
	
	
		
 
            curves.last()->attach(ui->plot);

			




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

			




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

			




	
	
	
		
 
            delete curves.takeLast();

			




	
	
	
		
 
            channelBuffers.removeLast();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onChannelNameChanged(unsigned channel, QString name)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // This slot is triggered also when a new channel is added, in

			




	
	
	
		
 
    // this case curve list doesn't contain said channel. No worries,

			




	
	
	
		
 
    // since `onNumOfChannelsChanged` slot will update curve list.

			




	
	
	
		
 
    if (channel < curves.size()) // check if channel exists in curve list

			




	
	
	
		
 
    {

			




	
	
	
		
 
        curves[channel]->setTitle(name);

			




	
	
	
		
 
        ui->plot->replot();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onAutoScaleChecked(bool checked)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (checked)

			




	
	
	
		
 
    {

			




	
	
		
 
@@ -446,25 +472,25 @@ void MainWindow::onExportCsv()

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QFile file(fileName);

			




	
	
	
		
 
        if (file.open(QIODevice::WriteOnly | QIODevice::Text))

			




	
	
	
		
 
        {

			




	
	
	
		
 
            QTextStream fileStream(&file);

			




	
	
	
		
 

			




	
	
	
		
 
            unsigned numOfChannels = channelBuffers.size();

			




	
	
	
		
 
            unsigned numOfChannels = channelMan.numOfChannels();

			




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

			




	
	
	
		
 
            {

			




	
	
	
		
 
                fileStream << "Channel " << ci;

			




	
	
	
		
 
                if (ci != numOfChannels-1) fileStream << ",";

			




	
	
	
		
 
            }

			




	
	
	
		
 
            fileStream << '\n';

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            {

			




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

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    fileStream << channelBuffers[ci]->sample(i).y();

			




	
	
	
		
 
                    fileStream << channelMan.channelBuffer(ci)->sample(i).y();

			




	
	
	
		
 
                    if (ci != numOfChannels-1) fileStream << ",";

			




	
	
	
		
 
                }

			




	
	
	
		
 
                fileStream << '\n';

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,12 +36,13 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "portcontrol.h"

			




	
	
	
		
 
#include "commandpanel.h"

			




	
	
	
		
 
#include "dataformatpanel.h"

			




	
	
	
		
 
#include "ui_about_dialog.h"

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -66,13 +67,14 @@ private:

			




	
	
	
		
 
    PortControl portControl;

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned int numOfSamples;

			




	
	
	
		
 

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    // Note: FrameBuffer s are owned by their respective QwtPlotCurve s.

			




	
	
	
		
 
    QList<FrameBuffer*> channelBuffers;

			




	
	
	
		
 
    // QList<FrameBuffer*> channelBuffers;

			




	
	
	
		
 
    ChannelManager channelMan;

			




	
	
	
		
 

			




	
	
	
		
 
    QLabel spsLabel;

			




	
	
	
		
 

			




	
	
	
		
 
    CommandPanel commandPanel;

			




	
	
	
		
 
    DataFormatPanel dataFormatPanel;

			




	
	
	
		
 

			




	
	
		
 
@@ -87,12 +89,13 @@ private slots:

			




	
	
	
		
 

			




	
	
	
		
 
    void onNumOfSamplesChanged(int value);

			




	
	
	
		
 
    void onAutoScaleChecked(bool checked);

			




	
	
	
		
 
    void onYScaleChanged();

			




	
	
	
		
 
    void onRangeSelected();

			




	
	
	
		
 
    void onNumOfChannelsChanged(unsigned value);

			




	
	
	
		
 
    void onChannelNameChanged(unsigned channel, QString name);

			




	
	
	
		
 

			




	
	
	
		
 
    void clearPlot();

			




	
	
	
		
 

			




	
	
	
		
 
    void onSpsChanged(unsigned sps);

			




	
	
	
		
 

			




	
	
	
		
 
    void enableDemo(bool enabled);

			




        

    


    
    

    

        

                

                    src/snapshotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -25,20 +25,20 @@

			




	
	
	
		
 
#include <QVector>

			




	
	
	
		
 
#include <QPointF>

			




	
	
	
		
 

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 

			




	
	
	
		
 
SnapshotManager::SnapshotManager(QMainWindow* mainWindow,

			




	
	
	
		
 
                                 QList<FrameBuffer*>* channelBuffers) :

			




	
	
	
		
 
                                 ChannelManager* channelMan) :

			




	
	
	
		
 
    _menu("Snapshots"),

			




	
	
	
		
 
    _takeSnapshotAction("Take Snapshot", this),

			




	
	
	
		
 
    loadSnapshotAction("Load Snapshots", this),

			




	
	
	
		
 
    clearAction("Clear Snapshots", this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _mainWindow = mainWindow;

			




	
	
	
		
 
    _channelBuffers = channelBuffers;

			




	
	
	
		
 
    _channelMan = channelMan;

			




	
	
	
		
 

			




	
	
	
		
 
    _takeSnapshotAction.setToolTip("Take a snapshot of current plot");

			




	
	
	
		
 
    _takeSnapshotAction.setShortcut(QKeySequence("F5"));

			




	
	
	
		
 
    loadSnapshotAction.setToolTip("Load snapshots from CSV files");

			




	
	
	
		
 
    clearAction.setToolTip("Delete all snapshots");

			




	
	
	
		
 
    connect(&_takeSnapshotAction, SIGNAL(triggered(bool)),

			




	
	
		
 
@@ -61,21 +61,21 @@ SnapshotManager::~SnapshotManager()

			




	
	
	
		
 

			




	
	
	
		
 
void SnapshotManager::takeSnapshot()

			




	
	
	
		
 
{

			




	
	
	
		
 
    QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");

			




	
	
	
		
 
    auto snapshot = new Snapshot(_mainWindow, name);

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned numOfChannels = _channelBuffers->size();

			




	
	
	
		
 
    unsigned numOfSamples = _channelBuffers->at(0)->size();

			




	
	
	
		
 
    unsigned numOfChannels = _channelMan->numOfChannels();

			




	
	
	
		
 
    unsigned numOfSamples = _channelMan->numOfSamples();

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    {

			




	
	
	
		
 
        snapshot->data.append(QVector<QPointF>(numOfSamples));

			




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

			




	
	
	
		
 
        {

			




	
	
	
		
 
            snapshot->data[ci][i] = _channelBuffers->at(ci)->sample(i);

			




	
	
	
		
 
            snapshot->data[ci][i] = _channelMan->channelBuffer(ci)->sample(i);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    addSnapshot(snapshot);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/snapshotmanager.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,28 +22,29 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include <QObject>

			




	
	
	
		
 
#include <QAction>

			




	
	
	
		
 
#include <QMenu>

			




	
	
	
		
 

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 
#include "snapshot.h"

			




	
	
	
		
 

			




	
	
	
		
 
class SnapshotManager : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    SnapshotManager(QMainWindow* mainWindow, QList<FrameBuffer*>* channelBuffers);

			




	
	
	
		
 
    SnapshotManager(QMainWindow* mainWindow, ChannelManager* channelMan);

			




	
	
	
		
 
    ~SnapshotManager();

			




	
	
	
		
 

			




	
	
	
		
 
    QMenu* menu();

			




	
	
	
		
 
    QAction* takeSnapshotAction();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    QMainWindow* _mainWindow;

			




	
	
	
		
 
    QList<FrameBuffer*>* _channelBuffers;

			




	
	
	
		
 
    ChannelManager* _channelMan;

			




	
	
	
		
 

			




	
	
	
		
 
    QList<Snapshot*> snapshots;

			




	
	
	
		
 

			




	
	
	
		
 
    QMenu _menu;

			




	
	
	
		
 
    QAction _takeSnapshotAction;

			




	
	
	
		
 
    QAction loadSnapshotAction;

			




        

    



    


    



    



      

      





    
    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