Changeset - 8d241dce8310
Parent rev.
Child rev.
[Not reviewed]
new-textview
0 4 3
Hasan Yavuz ÖZDERYA - 7 years ago 2019-01-12 15:06:14
hy@ozderya.net
added text view widget
7 files changed with 220 insertions and 6 deletions:
CMakeLists.txt
2
serialplot.pro
6
3
src/datatextview.cpp
72
src/datatextview.h
33
src/datatextview.ui
99
src/mainwindow.cpp
5
2
src/mainwindow.h
3
1
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -64,12 +64,13 @@ qt5_wrap_ui(UI_FILES
 
  src/endiannessbox.ui
 
  src/binarystreamreadersettings.ui
 
  src/asciireadersettings.ui
 
  src/framedreadersettings.ui
 
  src/demoreadersettings.ui
 
  src/updatecheckdialog.ui
 
  src/datatextview.ui
 
  )
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
  qt5_add_resources(RES_FILES misc/icons.qrc misc/winicons.qrc)

			




	
	
	
		
 
else (WIN32)

			




	
	
	
		
 
  qt5_add_resources(RES_FILES misc/icons.qrc)

			




	
	
		
 
@@ -131,12 +132,13 @@ add_executable(${PROGRAM_NAME} WIN32

			




	
	
	
		
 
  src/updatecheckdialog.cpp

			




	
	
	
		
 
  src/samplepack.cpp

			




	
	
	
		
 
  src/source.cpp

			




	
	
	
		
 
  src/sink.cpp

			




	
	
	
		
 
  src/samplecounter.cpp

			




	
	
	
		
 
  src/ledwidget.cpp

			




	
	
	
		
 
  src/datatextview.cpp

			




	
	
	
		
 
  misc/windows_icon.rc

			




	
	
	
		
 
  ${UI_FILES}

			




	
	
	
		
 
  ${RES_FILES}

			




	
	
	
		
 
  )

			




	
	
	
		
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
    src/framedreader.cpp \

			




	
	
	
		
 
    src/plotmanager.cpp \

			




	
	
	
		
 
    src/numberformat.cpp \

			




	
	
	
		
 
    src/recordpanel.cpp \

			




	
	
	
		
 
    src/updatechecker.cpp \

			




	
	
	
		
 
    src/updatecheckdialog.cpp \

			




	
	
	
		
 
    src/demoreadersettings.cpp

			




	
	
	
		
 
    src/demoreadersettings.cpp \

			




	
	
	
		
 
    src/datatextview.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
	
		
 
    src/utils.h \

			




	
	
	
		
 
    src/portcontrol.h \

			




	
	
	
		
 
    src/floatswap.h \

			




	
	
		
 
@@ -111,13 +112,14 @@ HEADERS += \

			




	
	
	
		
 
    src/plotmanager.h \

			




	
	
	
		
 
    src/setting_defines.h \

			




	
	
	
		
 
    src/numberformat.h \

			




	
	
	
		
 
    src/recordpanel.h \

			




	
	
	
		
 
    src/updatechecker.h \

			




	
	
	
		
 
    src/updatecheckdialog.h \

			




	
	
	
		
 
    src/demoreadersettings.h

			




	
	
	
		
 
    src/demoreadersettings.h \

			




	
	
	
		
 
    src/datatextview.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
	
		
 
    src/about_dialog.ui \

			




	
	
	
		
 
    src/portcontrol.ui \

			




	
	
	
		
 
    src/snapshotview.ui \

			




	
	
		
 
@@ -129,13 +131,14 @@ FORMS += \

			




	
	
	
		
 
    src/endiannessbox.ui \

			




	
	
	
		
 
    src/framedreadersettings.ui \

			




	
	
	
		
 
    src/binarystreamreadersettings.ui \

			




	
	
	
		
 
    src/asciireadersettings.ui \

			




	
	
	
		
 
    src/recordpanel.ui \

			




	
	
	
		
 
    src/updatecheckdialog.ui \

			




	
	
	
		
 
    src/demoreadersettings.ui

			




	
	
	
		
 
    src/demoreadersettings.ui \

			




	
	
	
		
 
    src/datatextview.ui

			




	
	
	
		
 

			




	
	
	
		
 
INCLUDEPATH += qmake/ src/

			




	
	
	
		
 

			




	
	
	
		
 
CONFIG += c++11

			




	
	
	
		
 

			




	
	
	
		
 
RESOURCES += misc/icons.qrc

			




        

    


    
    

    

        

                

                    src/datatextview.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
#include "datatextview.h"

			




	
	
	
		
 
#include "ui_datatextview.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "utils.h"

			




	
	
	
		
 

			




	
	
	
		
 
class DataTextViewSink : public Sink

			




	
	
	
		
 
{

			




	
	
	
		
 
public:

			




	
	
	
		
 
    DataTextViewSink(DataTextView* textView)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        _textView = textView;

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
    virtual void feedIn(const SamplePack& data) override

			




	
	
	
		
 
    {

			




	
	
	
		
 
        _textView->addData(data);

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    DataTextView* _textView;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
DataTextView::DataTextView(Stream* stream, QWidget *parent) :

			




	
	
	
		
 
    QWidget(parent),

			




	
	
	
		
 
    ui(new Ui::DataTextView)

			




	
	
	
		
 
{

			




	
	
	
		
 
    _stream = stream;

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 
    sink = new DataTextViewSink(this);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->cbEnable, &QCheckBox::toggled, [this](bool checked)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                if (checked)

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    _stream->connectFollower(sink);

			




	
	
	
		
 
                }

			




	
	
	
		
 
                else

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    _stream->disconnectFollower(sink);

			




	
	
	
		
 
                }

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    ui->textView->setMaximumBlockCount(ui->spNumLines->value());

			




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

			




	
	
	
		
 
            [this](int value)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                ui->textView->setMaximumBlockCount(value);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    connect(ui->pbClear, &QPushButton::clicked, ui->textView, &QPlainTextEdit::clear);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
DataTextView::~DataTextView()

			




	
	
	
		
 
{

			




	
	
	
		
 
    delete sink;

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void DataTextView::addData(const SamplePack& data)

			




	
	
	
		
 
{

			




	
	
	
		
 
    for (unsigned int i = 0; i < data.numSamples(); i++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QString str;

			




	
	
	
		
 
        for (unsigned ci = 0; ci < data.numChannels(); ci++)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            str += QString::number(data.data(ci)[i], 'f', ui->spDecimals->value());

			




	
	
	
		
 
            if (ci != data.numChannels()-1) str += " ";

			




	
	
	
		
 
        }

			




	
	
	
		
 
        ui->textView->appendPlainText(str);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/datatextview.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
#ifndef DATATEXTVIEW_H

			




	
	
	
		
 
#define DATATEXTVIEW_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QWidget>

			




	
	
	
		
 

			




	
	
	
		
 
#include "stream.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class DataTextView;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class DataTextViewSink;

			




	
	
	
		
 

			




	
	
	
		
 
class DataTextView : public QWidget

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit DataTextView(Stream* stream, QWidget *parent = 0);

			




	
	
	
		
 
    ~DataTextView();

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
    void addData(const SamplePack& data);

			




	
	
	
		
 

			




	
	
	
		
 
    friend DataTextViewSink;

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::DataTextView *ui;

			




	
	
	
		
 
    DataTextViewSink* sink;

			




	
	
	
		
 
    Stream* _stream;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // DATATEXTVIEW_H

			




        

    


    
    

    

        

                

                    src/datatextview.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




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

			




	
	
	
		
 
<ui version="4.0">

			




	
	
	
		
 
 <class>DataTextView</class>

			




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

			




	
	
	
		
 
  <property name="geometry">

			




	
	
	
		
 
   <rect>

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>451</width>

			




	
	
	
		
 
    <height>212</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>Form</string>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <layout class="QHBoxLayout" name="horizontalLayout">

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <layout class="QVBoxLayout" name="verticalLayout">

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QCheckBox" name="cbEnable">

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Enable display of plotted data as text.</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Enable</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




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

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Num. Lines:</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




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

			




	
	
	
		
 
       <property name="minimum">

			




	
	
	
		
 
        <number>1</number>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="maximum">

			




	
	
	
		
 
        <number>10000</number>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="value">

			




	
	
	
		
 
        <number>1000</number>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




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

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Decimals:</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




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

			




	
	
	
		
 
       <property name="maximum">

			




	
	
	
		
 
        <number>9</number>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="value">

			




	
	
	
		
 
        <number>6</number>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <spacer name="verticalSpacer">

			




	
	
	
		
 
       <property name="orientation">

			




	
	
	
		
 
        <enum>Qt::Vertical</enum>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="sizeHint" stdset="0">

			




	
	
	
		
 
        <size>

			




	
	
	
		
 
         <width>20</width>

			




	
	
	
		
 
         <height>1</height>

			




	
	
	
		
 
        </size>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </spacer>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QPushButton" name="pbClear">

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Clear</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
    </layout>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <widget class="QPlainTextEdit" name="textView">

			




	
	
	
		
 
     <property name="readOnly">

			




	
	
	
		
 
      <bool>true</bool>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </widget>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
  </layout>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections/>

			




	
	
	
		
 
</ui>

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2018 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2019 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

			




	
	
		
 
@@ -52,36 +52,39 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi

			




	
	
	
		
 
const QMap<int, QString> panelSettingMap({

			




	
	
	
		
 
        {0, "Port"},

			




	
	
	
		
 
        {1, "DataFormat"},

			




	
	
	
		
 
        {2, "Plot"},

			




	
	
	
		
 
        {3, "Commands"},

			




	
	
	
		
 
        {4, "Record"},

			




	
	
	
		
 
        {5, "Log"}

			




	
	
	
		
 
        {5, "TextView"},

			




	
	
	
		
 
        {6, "Log"}

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow),

			




	
	
	
		
 
    aboutDialog(this),

			




	
	
	
		
 
    portControl(&serialPort),

			




	
	
	
		
 
    secondaryPlot(NULL),

			




	
	
	
		
 
    snapshotMan(this, &stream),

			




	
	
	
		
 
    commandPanel(&serialPort),

			




	
	
	
		
 
    dataFormatPanel(&serialPort),

			




	
	
	
		
 
    recordPanel(&stream),

			




	
	
	
		
 
    textView(&stream),

			




	
	
	
		
 
    updateCheckDialog(this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea, &plotMenu, &stream);

			




	
	
	
		
 

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    ui->tabWidget->insertTab(4, &recordPanel, "Record");

			




	
	
	
		
 
    ui->tabWidget->insertTab(5, &textView, "Text View");

			




	
	
	
		
 
    ui->tabWidget->setCurrentIndex(0);

			




	
	
	
		
 
    auto tbPortControl = portControl.toolBar();

			




	
	
	
		
 
    addToolBar(tbPortControl);

			




	
	
	
		
 
    addToolBar(recordPanel.toolbar());

			




	
	
	
		
 

			




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

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2018 Hasan Yavuz Özderya

			




	
	
	
		
 
  Copyright © 2019 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

			




	
	
		
 
@@ -43,12 +43,13 @@

			




	
	
	
		
 
#include "stream.h"

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "plotmenu.h"

			




	
	
	
		
 
#include "updatecheckdialog.h"

			




	
	
	
		
 
#include "samplecounter.h"

			




	
	
	
		
 
#include "datatextview.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class MainWindow : public QMainWindow

			




	
	
		
 
@@ -86,12 +87,13 @@ private:

			




	
	
	
		
 
    QLabel spsLabel;

			




	
	
	
		
 
    CommandPanel commandPanel;

			




	
	
	
		
 
    DataFormatPanel dataFormatPanel;

			




	
	
	
		
 
    RecordPanel recordPanel;

			




	
	
	
		
 
    PlotControlPanel plotControlPanel;

			




	
	
	
		
 
    PlotMenu plotMenu;

			




	
	
	
		
 
    DataTextView textView;

			




	
	
	
		
 
    UpdateCheckDialog updateCheckDialog;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Returns true if demo is running

			




	
	
	
		
 
    bool isDemoRunning();

			




	
	
	
		
 
    /// Display a secondary plot in the splitter, removing and

			




	
	
	
		
 
    /// deleting previous one if it exists

			




        

    



    


    



    



      

      





    
    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