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
 
@@ -69,48 +69,49 @@ else (WIN32)
 
endif (WIN32)
 

			




	
	
	
		
 
add_executable(${PROGRAM_NAME} WIN32

			




	
	
	
		
 
  src/main.cpp

			




	
	
	
		
 
  src/mainwindow.cpp

			




	
	
	
		
 
  src/portcontrol.cpp

			




	
	
	
		
 
  src/plot.cpp

			




	
	
	
		
 
  src/zoomer.cpp

			




	
	
	
		
 
  src/hidabletabwidget.cpp

			




	
	
	
		
 
  src/framebuffer.cpp

			




	
	
	
		
 
  src/scalepicker.cpp

			




	
	
	
		
 
  src/scalezoomer.cpp

			




	
	
	
		
 
  src/portlist.cpp

			




	
	
	
		
 
  src/snapshot.cpp

			




	
	
	
		
 
  src/snapshotview.cpp

			




	
	
	
		
 
  src/snapshotmanager.cpp

			




	
	
	
		
 
  src/plotsnapshotoverlay.cpp

			




	
	
	
		
 
  src/commandpanel.cpp

			




	
	
	
		
 
  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.

			




	
	
	
		
 
target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})

			




	
	
	
		
 
qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)

			




	
	
	
		
 

			




	
	
	
		
 
# set compiler flags

			




	
	
	
		
 
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")

			




	
	
	
		
 

			




	
	
	
		
 
# Enable C++11 support, fail if not supported

			




	
	
	
		
 
include(CheckCXXCompilerFlag)

			




	
	
	
		
 
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)

			




	
	
	
		
 
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)

			




	
	
	
		
 
if(COMPILER_SUPPORTS_CXX11)

			




	
	
	
		
 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

			




	
	
	
		
 
elseif(COMPILER_SUPPORTS_CXX0X)

			




	
	
	
		
 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

			




	
	
	
		
 
else()

			




	
	
	
		
 
  message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -32,68 +32,70 @@ TEMPLATE = app

			




	
	
	
		
 

			




	
	
	
		
 
CONFIG += qwt

			




	
	
	
		
 

			




	
	
	
		
 
SOURCES += \

			




	
	
	
		
 
    src/main.cpp\

			




	
	
	
		
 
    src/mainwindow.cpp \

			




	
	
	
		
 
    src/portcontrol.cpp \

			




	
	
	
		
 
    src/plot.cpp \

			




	
	
	
		
 
    src/zoomer.cpp \

			




	
	
	
		
 
    src/hidabletabwidget.cpp \

			




	
	
	
		
 
    src/framebuffer.cpp \

			




	
	
	
		
 
    src/scalepicker.cpp \

			




	
	
	
		
 
    src/scalezoomer.cpp \

			




	
	
	
		
 
    src/portlist.cpp \

			




	
	
	
		
 
    src/snapshotview.cpp \

			




	
	
	
		
 
    src/snapshotmanager.cpp \

			




	
	
	
		
 
    src/snapshot.cpp \

			




	
	
	
		
 
    src/plotsnapshotoverlay.cpp \

			




	
	
	
		
 
    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 \

			




	
	
	
		
 
    src/plot.h \

			




	
	
	
		
 
    src/zoomer.h \

			




	
	
	
		
 
    src/hidabletabwidget.h \

			




	
	
	
		
 
    src/framebuffer.h \

			




	
	
	
		
 
    src/scalepicker.h \

			




	
	
	
		
 
    src/scalezoomer.h \

			




	
	
	
		
 
    src/portlist.h \

			




	
	
	
		
 
    src/snapshotview.h \

			




	
	
	
		
 
    src/snapshotmanager.h \

			




	
	
	
		
 
    src/snapshot.h \

			




	
	
	
		
 
    src/plotsnapshotoverlay.h \

			




	
	
	
		
 
    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/commandpanel.ui \

			




	
	
	
		
 
    src/commandwidget.ui \

			




	
	
	
		
 
    src/dataformatpanel.ui

			




	
	
	
		
 

			




	
	
	
		
 
INCLUDEPATH += qmake/ src/

			




	
	
	
		
 

			




	
	
	
		
 
CONFIG += c++11

			




	
	
	
		
 

			




	
	
	
		
 
RESOURCES += misc/icons.qrc

			




	
	
	
		
 

			




	
	
	
		
 
win32 {

			




	
	
	
		
 
    RESOURCES += misc/winicons.qrc

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/channelmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,98 +13,93 @@

			




	
	
	
		
 
  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

			




	
	
	
		
 
    for (auto buffer : channelBuffers)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        delete buffer;

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -112,38 +107,39 @@ QStringListModel* ChannelManager::channe

			




	
	
	
		
 
{

			




	
	
	
		
 
    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)

			




	
	
	
		
 
{

			




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

			




	
	
	
		
 
    {

			




	
	
	
		
 
        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
                    
                

        

        

            



	
	
		
 
@@ -36,33 +36,33 @@ public:

			




	
	
	
		
 

			




	
	
	
		
 
    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

			




	
	
	
		
 
    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
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 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 "dataformatpanel.h"

			




	
	
	
		
 
#include "ui_dataformatpanel.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <QtEndian>

			




	
	
	
		
 
#include <QtDebug>

			




	
	
	
		
 

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 
#include "floatswap.h"

			




	
	
	
		
 

			




	
	
	
		
 
DataFormatPanel::DataFormatPanel(QSerialPort* port,

			




	
	
	
		
 
                                 ChannelManager* channelMan,

			




	
	
	
		
 
                                 QWidget *parent) :

			




	
	
	
		
 
    QWidget(parent),

			




	
	
	
		
 
    ui(new Ui::DataFormatPanel)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    serialPort = port;

			




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

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbInt8,   NumberFormat_int8);

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbInt16,  NumberFormat_int16);

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbInt32,  NumberFormat_int32);

			




	
	
	
		
 
    numberFormatButtons.addButton(ui->rbFloat,  NumberFormat_float);

			




        

    


    
    

    

        

                

                    src/framebuffer.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2015 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 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);

			




	
	
	
		
 
    void addSamples(double* samples, size_t size);

			




	
	
	
		
 
    void clear(); // fill 0

			




	
	
	
		
 

			




	
	
	
		
 
    // QwtSeriesData implementations

			




	
	
	
		
 
    size_t size() const;

			




	
	
	
		
 
    QPointF sample(size_t i) const;

			




	
	
	
		
 
    QRectF boundingRect() const;

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    size_t _size; // size of `data`

			




	
	
	
		
 
    double* data;

			




	
	
	
		
 
    size_t headIndex; // indicates the actual `0` index of the ring buffer

			




	
	
	
		
 

			




	
	
	
		
 
    QRectF _boundingRect;

			




	
	
	
		
 

			




	
	
	
		
 
    double _sample(size_t i) const;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    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
                    
                

        

        

            



	
	
		
 
@@ -10,53 +10,51 @@

			




	
	
	
		
 

			




	
	
	
		
 
  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 "mainwindow.h"

			




	
	
	
		
 
#include "ui_mainwindow.h"

			




	
	
	
		
 
#include <QByteArray>

			




	
	
	
		
 
#include <QApplication>

			




	
	
	
		
 
#include <QFileDialog>

			




	
	
	
		
 
#include <QFile>

			




	
	
	
		
 
#include <QTextStream>

			




	
	
	
		
 
#include <QMenu>

			




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

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
struct Range

			




	
	
	
		
 
{

			




	
	
	
		
 
    double rmin;

			




	
	
	
		
 
    double rmax;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
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, &channelMan),

			




	
	
		
 
@@ -149,49 +147,50 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
                     &dataFormatPanel, &DataFormatPanel::pause);

			




	
	
	
		
 

			




	
	
	
		
 
    // init data arrays and plot

			




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

			




	
	
	
		
 
    unsigned numOfChannels = dataFormatPanel.numOfChannels();

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                      ui->spYmin->value(), ui->spYmax->value());

			




	
	
	
		
 

			




	
	
	
		
 
    // init scale range preset list

			




	
	
	
		
 
    for (int nbits = 8; nbits <= 24; nbits++) // signed binary formats

			




	
	
	
		
 
    {

			




	
	
	
		
 
        int rmax = pow(2, nbits-1)-1;

			




	
	
	
		
 
        int rmin = -rmax-1;

			




	
	
	
		
 
        Range r = {double(rmin),  double(rmax)};

			




	
	
	
		
 
        ui->cbRangePresets->addItem(

			




	
	
	
		
 
            QString().sprintf("Signed %d bits %d to +%d", nbits, rmin, rmax),

			




	
	
	
		
 
            QVariant::fromValue(r));

			




	
	
	
		
 
    }

			




	
	
	
		
 
    for (int nbits = 8; nbits <= 24; nbits++) // unsigned binary formats

			




	
	
	
		
 
    {

			




	
	
	
		
 
        int rmax = pow(2, nbits)-1;

			




	
	
	
		
 
        ui->cbRangePresets->addItem(

			




	
	
	
		
 
            QString().sprintf("Unsigned %d bits %d to +%d", nbits, 0, rmax),

			




	
	
	
		
 
            QVariant::fromValue(Range{0, double(rmax)}));

			




	
	
		
 
@@ -330,63 +329,60 @@ void MainWindow::clearPlot()

			




	
	
	
		
 
    {

			




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

			




	
	
	
		
 
    }

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onNumOfSamplesChanged(int value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    numOfSamples = value;

			




	
	
	
		
 
    channelMan.setNumOfSamples(value);

			




	
	
	
		
 
    ui->plot->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onNumOfChannelsChanged(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    unsigned int oldNum = curves.size();

			




	
	
	
		
 
    unsigned numOfChannels = value;

			




	
	
	
		
 

			




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

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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 ((int) channel < curves.size()) // check if channel exists in curve list

			




	
	
	
		
 
    {

			




	
	
	
		
 
        curves[channel]->setTitle(name);

			




	
	
	
		
 
        ui->plot->replot();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onAutoScaleChecked(bool checked)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (checked)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        ui->plot->setAxis(true);

			




        

    


    
    

    

        

                

                    src/snapshotmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,48 +3,49 @@

			




	
	
	
		
 

			




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

			




	
	
	
		
 
#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"),

			




	
	
	
		
 
    _takeSnapshotAction("Take Snapshot", this),

			




	
	
	
		
 
    loadSnapshotAction("Load Snapshots", this),

			




	
	
	
		
 
    clearAction("Clear Snapshots", this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _mainWindow = mainWindow;

			




	
	
	
		
 
    _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)),

			




	
	
	
		
 
            this, SLOT(takeSnapshot()));

			




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

			




	
	
	
		
 
            this, SLOT(clearSnapshots()));

			




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

			




	
	
	
		
 
            this, SLOT(loadSnapshots()));

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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