Changeset - 7c5d07725a0a
Parent rev.
Child rev.
[Not reviewed]
stream
0 6 3
Hasan Yavuz ÖZDERYA - 7 years ago 2018-05-27 22:26:12
hy@ozderya.net
added demoreader its own settings widget
9 files changed with 192 insertions and 25 deletions:
CMakeLists.txt
2
serialplot.pro
6
3
src/dataformatpanel.cpp
5
9
src/dataformatpanel.h
1
src/demoreader.cpp
15
7
src/demoreader.h
5
6
src/demoreadersettings.cpp
51
src/demoreadersettings.h
48
src/demoreadersettings.ui
59
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -85,6 +85,7 @@ qt5_wrap_ui(UI_FILES
 
  src/binarystreamreadersettings.ui
 
  src/asciireadersettings.ui
 
  src/framedreadersettings.ui
 
  src/demoreadersettings.ui
 
  src/updatecheckdialog.ui
 
  )
 

			




	
	
		
 
@@ -134,6 +135,7 @@ add_executable(${PROGRAM_NAME} WIN32

			




	
	
	
		
 
  src/asciireader.cpp

			




	
	
	
		
 
  src/asciireadersettings.cpp

			




	
	
	
		
 
  src/demoreader.cpp

			




	
	
	
		
 
  src/demoreadersettings.cpp

			




	
	
	
		
 
  src/framedreader.cpp

			




	
	
	
		
 
  src/framedreadersettings.cpp

			




	
	
	
		
 
  src/plotmanager.cpp

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -70,7 +70,8 @@ SOURCES += \

			




	
	
	
		
 
    src/numberformat.cpp \

			




	
	
	
		
 
    src/recordpanel.cpp \

			




	
	
	
		
 
    src/updatechecker.cpp \

			




	
	
	
		
 
    src/updatecheckdialog.cpp

			




	
	
	
		
 
    src/updatecheckdialog.cpp \

			




	
	
	
		
 
    src/demoreadersettings.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
		
 
@@ -112,7 +113,8 @@ HEADERS += \

			




	
	
	
		
 
    src/numberformat.h \

			




	
	
	
		
 
    src/recordpanel.h \

			




	
	
	
		
 
    src/updatechecker.h \

			




	
	
	
		
 
    src/updatecheckdialog.h

			




	
	
	
		
 
    src/updatecheckdialog.h \

			




	
	
	
		
 
    src/demoreadersettings.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
		
 
@@ -129,7 +131,8 @@ FORMS += \

			




	
	
	
		
 
    src/binarystreamreadersettings.ui \

			




	
	
	
		
 
    src/asciireadersettings.ui \

			




	
	
	
		
 
    src/recordpanel.ui \

			




	
	
	
		
 
    src/updatecheckdialog.ui

			




	
	
	
		
 
    src/updatecheckdialog.ui \

			




	
	
	
		
 
    src/demoreadersettings.ui

			




	
	
	
		
 

			




	
	
	
		
 
INCLUDEPATH += qmake/ src/

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/dataformatpanel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -39,6 +39,7 @@ DataFormatPanel::DataFormatPanel(QSerial

			




	
	
	
		
 
    serialPort = port;

			




	
	
	
		
 
    paused = false;

			




	
	
	
		
 
    demoEnabled = false;

			




	
	
	
		
 
    readerBeforeDemo = nullptr;

			




	
	
	
		
 

			




	
	
	
		
 
    // initalize default reader

			




	
	
	
		
 
    currentReader = &bsReader;

			




	
	
		
 
@@ -63,10 +64,6 @@ DataFormatPanel::DataFormatPanel(QSerial

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked) selectReader(&framedReader);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    // re-purpose numofchannels settings from actual reader settings to demo reader

			




	
	
	
		
 
    connect(this, &DataFormatPanel::numOfChannelsChanged,

			




	
	
	
		
 
            &demoReader, &DemoReader::setNumOfChannels);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
DataFormatPanel::~DataFormatPanel()

			




	
	
		
 
@@ -95,14 +92,13 @@ void DataFormatPanel::enableDemo(bool en

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (enabled)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        demoReader.enable();

			




	
	
	
		
 
        emit sourceChanged(&demoReader);

			




	
	
	
		
 
        readerBeforeDemo = currentReader;

			




	
	
	
		
 
        selectReader(&demoReader);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        demoReader.enable(false);

			




	
	
	
		
 
        disconnect(&demoReader, 0, this, 0);

			




	
	
	
		
 
        emit sourceChanged(currentReader);

			




	
	
	
		
 
        Q_ASSERT(readerBeforeDemo != nullptr);

			




	
	
	
		
 
        selectReader(readerBeforeDemo);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    demoEnabled = enabled;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/dataformatpanel.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -81,6 +81,7 @@ private:

			




	
	
	
		
 

			




	
	
	
		
 
    bool demoEnabled;

			




	
	
	
		
 
    DemoReader demoReader;

			




	
	
	
		
 
    AbstractReader* readerBeforeDemo;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // DATAFORMATPANEL_H

			




        

    


    
    

    

        

                

                    src/demoreader.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,16 +29,19 @@ DemoReader::DemoReader(QIODevice* device

			




	
	
	
		
 
    AbstractReader(device, parent)

			




	
	
	
		
 
{

			




	
	
	
		
 
    paused = false;

			




	
	
	
		
 
    _numChannels = 1;

			




	
	
	
		
 
    _numChannels = _settingsWidget.numChannels();

			




	
	
	
		
 
    connect(&_settingsWidget, &DemoReaderSettings::numChannelsChanged,

			




	
	
	
		
 
            this, &DemoReader::onNumChannelsChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    count = 0;

			




	
	
	
		
 
    timer.setInterval(100);

			




	
	
	
		
 
    QObject::connect(&timer, &QTimer::timeout,

			




	
	
	
		
 
                     this, &DemoReader::demoTimerTimeout);

			




	
	
	
		
 
    connect(&timer, &QTimer::timeout,

			




	
	
	
		
 
            this, &DemoReader::demoTimerTimeout);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QWidget* DemoReader::settingsWidget()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return NULL;

			




	
	
	
		
 
    return &_settingsWidget;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DemoReader::enable(bool enabled)

			




	
	
		
 
@@ -59,10 +62,9 @@ unsigned DemoReader::numChannels() const

			




	
	
	
		
 
    return _numChannels;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DemoReader::setNumOfChannels(unsigned value)

			




	
	
	
		
 
void DemoReader::setNumChannels(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _numChannels = value;

			




	
	
	
		
 
    updateNumChannels();

			




	
	
	
		
 
    _settingsWidget.setNumChannels(value);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DemoReader::pause(bool enabled)

			




	
	
		
 
@@ -87,3 +89,9 @@ void DemoReader::demoTimerTimeout()

			




	
	
	
		
 
        feedOut(samples);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DemoReader::onNumChannelsChanged(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _numChannels = value;

			




	
	
	
		
 
    updateNumChannels();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/demoreader.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,6 +23,7 @@

			




	
	
	
		
 
#include <QTimer>

			




	
	
	
		
 

			




	
	
	
		
 
#include "abstractreader.h"

			




	
	
	
		
 
#include "demoreadersettings.h"

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * This is a special case of reader implementation and should be used

			




	
	
		
 
@@ -40,20 +41,17 @@ class DemoReader : public AbstractReader

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit DemoReader(QIODevice* device, QObject* parent = 0);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Demo reader is an exception so this function returns NULL

			




	
	
	
		
 
    QWidget* settingsWidget();

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned numChannels() const;

			




	
	
	
		
 

			




	
	
	
		
 
    void enable(bool enabled = true);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    void pause(bool);

			




	
	
	
		
 

			




	
	
	
		
 
    /// Sets the number of channels, this doesn't trigger a `numOfChannelsChanged` signal.

			




	
	
	
		
 
    void setNumOfChannels(unsigned value);

			




	
	
	
		
 
    void setNumChannels(unsigned value);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    DemoReaderSettings _settingsWidget;

			




	
	
	
		
 

			




	
	
	
		
 
    bool paused;

			




	
	
	
		
 
    unsigned _numChannels;

			




	
	
	
		
 
    QTimer timer;

			




	
	
		
 
@@ -61,6 +59,7 @@ private:

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void demoTimerTimeout();

			




	
	
	
		
 
    void onNumChannelsChanged(unsigned value);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // DEMOREADER_H

			




        

    


    
    

    

        

                

                    src/demoreadersettings.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2018 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 "demoreadersettings.h"

			




	
	
	
		
 
#include "ui_demoreadersettings.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 

			




	
	
	
		
 
DemoReaderSettings::DemoReaderSettings(QWidget *parent) :

			




	
	
	
		
 
    QWidget(parent),

			




	
	
	
		
 
    ui(new Ui::DemoReaderSettings)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->spNumChannels, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),

			




	
	
	
		
 
            [this](int value)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                emit numChannelsChanged(value);

			




	
	
	
		
 
            });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
DemoReaderSettings::~DemoReaderSettings()

			




	
	
	
		
 
{

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
unsigned DemoReaderSettings::numChannels() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return ui->spNumChannels->value();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DemoReaderSettings::setNumChannels(unsigned value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->spNumChannels->setValue(value);

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/demoreadersettings.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2018 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 DEMOREADERSETTINGS_H

			




	
	
	
		
 
#define DEMOREADERSETTINGS_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QWidget>

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class DemoReaderSettings;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class DemoReaderSettings : public QWidget

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit DemoReaderSettings(QWidget *parent = 0);

			




	
	
	
		
 
    ~DemoReaderSettings();

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned numChannels() const;

			




	
	
	
		
 
    /// Doesn't signal `numChannelsChanged`.

			




	
	
	
		
 
    void setNumChannels(unsigned value);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::DemoReaderSettings *ui;

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void numChannelsChanged(unsigned);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // DEMOREADERSETTINGS_H

			




        

    


    
    

    

        

                

                    src/demoreadersettings.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
<?xml version="1.0" encoding="UTF-8"?>

			




	
	
	
		
 
<ui version="4.0">

			




	
	
	
		
 
 <class>DemoReaderSettings</class>

			




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

			




	
	
	
		
 
  <property name="geometry">

			




	
	
	
		
 
   <rect>

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>444</width>

			




	
	
	
		
 
    <height>141</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>Form</string>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <layout class="QFormLayout" name="formLayout">

			




	
	
	
		
 
   <property name="fieldGrowthPolicy">

			




	
	
	
		
 
    <enum>QFormLayout::ExpandingFieldsGrow</enum>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <item row="0" column="0">

			




	
	
	
		
 
    <widget class="QLabel" name="label_4">

			




	
	
	
		
 
     <property name="text">

			




	
	
	
		
 
      <string>Number Of Channels:</string>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </widget>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
   <item row="0" column="1">

			




	
	
	
		
 
    <widget class="QSpinBox" name="spNumChannels">

			




	
	
	
		
 
     <property name="minimumSize">

			




	
	
	
		
 
      <size>

			




	
	
	
		
 
       <width>60</width>

			




	
	
	
		
 
       <height>0</height>

			




	
	
	
		
 
      </size>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="toolTip">

			




	
	
	
		
 
      <string>Select number of channels or set to 0 for Auto (determined from incoming data)</string>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="specialValueText">

			




	
	
	
		
 
      <string/>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="keyboardTracking">

			




	
	
	
		
 
      <bool>false</bool>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="minimum">

			




	
	
	
		
 
      <number>1</number>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="maximum">

			




	
	
	
		
 
      <number>32</number>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="value">

			




	
	
	
		
 
      <number>5</number>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </widget>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
  </layout>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections/>

			




	
	
	
		
 
</ui>

			




        

    



    


    



    



      

      





    
    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