Changeset - 015cdfbbb791
Parent rev.
Child rev.
[Not reviewed]
new-reader
0 4 0
Hasan Yavuz ÖZDERYA - 10 years ago 2016-05-23 15:08:51
hy@ozderya.net
removed skip byte button from the port control panel

it's now in binary stream reader settings
4 files changed with 2 insertions and 26 deletions:
src/mainwindow.cpp
3
src/portcontrol.cpp
9
src/portcontrol.h
2
src/portcontrol.ui
2
12
0 comments (0 inline, 0 general)
src/mainwindow.cpp
➞
Show inline comments
 
@@ -84,51 +84,48 @@ MainWindow::MainWindow(QWidget *parent)
 
    tbMenu->addAction(ui->plotToolBar->toggleViewAction());
 
    tbMenu->addAction(portControl.toolBar()->toggleViewAction());
 

			




	
	
	
		
 
    // init UI signals

			




	
	
	
		
 

			




	
	
	
		
 
    // menu signals

			




	
	
	
		
 
    QObject::connect(ui->actionHelpAbout, &QAction::triggered,

			




	
	
	
		
 
              &aboutDialog, &QWidget::show);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionReportBug, &QAction::triggered,

			




	
	
	
		
 
                     [](){QDesktopServices::openUrl(QUrl(BUG_REPORT_URL));});

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionExportCsv, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onExportCsv);

			




	
	
	
		
 

			




	
	
	
		
 
    ui->actionQuit->setShortcutContext(Qt::ApplicationShortcut);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionQuit, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::close);

			




	
	
	
		
 

			




	
	
	
		
 
    // port control signals

			




	
	
	
		
 
    QObject::connect(&portControl, &PortControl::portToggled,

			




	
	
	
		
 
                     this, &MainWindow::onPortToggled);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&portControl, &PortControl::skipByteRequested,

			




	
	
	
		
 
                     &dataFormatPanel, &DataFormatPanel::requestSkipByte);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,

			




	
	
	
		
 
            this, &MainWindow::onNumOfSamplesChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&plotControlPanel, &PlotControlPanel::scaleChanged,

			




	
	
	
		
 
            ui->plot, &Plot::setAxis);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),

			




	
	
	
		
 
                     this, SLOT(clearPlot()));

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,

			




	
	
	
		
 
                     ui->plot, &Plot::flashSnapshotOverlay);

			




	
	
	
		
 

			




	
	
	
		
 
    // init port signals

			




	
	
	
		
 
    QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),

			




	
	
	
		
 
                     this, SLOT(onPortError(QSerialPort::SerialPortError)));

			




	
	
	
		
 

			




	
	
	
		
 
    // init data format and reader

			




	
	
	
		
 
    QObject::connect(&dataFormatPanel, &DataFormatPanel::dataAdded,

			




	
	
	
		
 
                     ui->plot, &QwtPlot::replot);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionPause, &QAction::triggered,

			




	
	
	
		
 
                     &dataFormatPanel, &DataFormatPanel::pause);

			




	
	
	
		
 

			




	
	
	
		
 
    // init data arrays and plot

			




        

    


    
    

    

        

                

                    src/portcontrol.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -94,52 +94,48 @@ PortControl::PortControl(QSerialPort* po

			




	
	
	
		
 
    QObject::connect(&dataBitsButtons,

			




	
	
	
		
 
                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),

			




	
	
	
		
 
                     this, &PortControl::selectDataBits);

			




	
	
	
		
 

			




	
	
	
		
 
    // setup stop bits selection buttons

			




	
	
	
		
 
    stopBitsButtons.addButton(ui->rb1StopBit, (int) QSerialPort::OneStop);

			




	
	
	
		
 
    stopBitsButtons.addButton(ui->rb2StopBit, (int) QSerialPort::TwoStop);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&stopBitsButtons,

			




	
	
	
		
 
                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),

			




	
	
	
		
 
                     this, &PortControl::selectStopBits);

			




	
	
	
		
 

			




	
	
	
		
 
    // setup flow control selection buttons

			




	
	
	
		
 
    flowControlButtons.addButton(ui->rbNoFlowControl,

			




	
	
	
		
 
                                 (int) QSerialPort::NoFlowControl);

			




	
	
	
		
 
    flowControlButtons.addButton(ui->rbHardwareControl,

			




	
	
	
		
 
                                 (int) QSerialPort::HardwareControl);

			




	
	
	
		
 
    flowControlButtons.addButton(ui->rbSoftwareControl,

			




	
	
	
		
 
                                 (int) QSerialPort::SoftwareControl);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(&flowControlButtons,

			




	
	
	
		
 
                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),

			




	
	
	
		
 
                     this, &PortControl::selectFlowControl);

			




	
	
	
		
 

			




	
	
	
		
 
    // init skip byte button

			




	
	
	
		
 
    QObject::connect(ui->pbSkipByte, &QPushButton::clicked,

			




	
	
	
		
 
                     [this](){emit skipByteRequested();});

			




	
	
	
		
 

			




	
	
	
		
 
    loadPortList();

			




	
	
	
		
 
    loadBaudRateList();

			




	
	
	
		
 
    ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
PortControl::~PortControl()

			




	
	
	
		
 
{

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::loadPortList()

			




	
	
	
		
 
{

			




	
	
	
		
 
    QString currentSelection = ui->cbPortList->currentData(PortNameRole).toString();

			




	
	
	
		
 
    portList.loadPortList();

			




	
	
	
		
 
    int index = portList.indexOf(currentSelection);

			




	
	
	
		
 
    if (index >= 0)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        ui->cbPortList->setCurrentIndex(index);

			




	
	
	
		
 
        tbPortList.setCurrentIndex(index);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::loadBaudRateList()

			




	
	
	
		
 
{

			




	
	
		
 
@@ -251,48 +247,43 @@ void PortControl::togglePort()

			




	
	
	
		
 
            emit portToggled(true);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    openAction.setChecked(serialPort->isOpen());

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::selectPort(QString portName)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // portName may be coming from combobox

			




	
	
	
		
 
    portName = portName.split(" ")[0];

			




	
	
	
		
 
    // has selection actually changed

			




	
	
	
		
 
    if (portName != serialPort->portName())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // if another port is already open, close it by toggling

			




	
	
	
		
 
        if (serialPort->isOpen())

			




	
	
	
		
 
        {

			




	
	
	
		
 
            togglePort();

			




	
	
	
		
 

			




	
	
	
		
 
            // open new selection by toggling

			




	
	
	
		
 
            togglePort();

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::enableSkipByte(bool enabled)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->pbSkipByte->setDisabled(enabled);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
QToolBar* PortControl::toolBar()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return &portToolBar;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::openActionTriggered(bool checked)

			




	
	
	
		
 
{

			




	
	
	
		
 
    togglePort();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::onCbPortListActivated(int index)

			




	
	
	
		
 
{

			




	
	
	
		
 
    tbPortList.setCurrentIndex(index);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PortControl::onTbPortListActivated(int index)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->cbPortList->setCurrentIndex(index);

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/portcontrol.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,44 +43,42 @@ public:

			




	
	
	
		
 
    ~PortControl();

			




	
	
	
		
 

			




	
	
	
		
 
    QSerialPort* serialPort;

			




	
	
	
		
 

			




	
	
	
		
 
    QToolBar* toolBar();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::PortControl *ui;

			




	
	
	
		
 

			




	
	
	
		
 
    QButtonGroup parityButtons;

			




	
	
	
		
 
    QButtonGroup dataBitsButtons;

			




	
	
	
		
 
    QButtonGroup stopBitsButtons;

			




	
	
	
		
 
    QButtonGroup flowControlButtons;

			




	
	
	
		
 

			




	
	
	
		
 
    QToolBar portToolBar;

			




	
	
	
		
 
    QAction openAction;

			




	
	
	
		
 
    QComboBox tbPortList;

			




	
	
	
		
 
    PortList portList;

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    void loadPortList();

			




	
	
	
		
 
    void loadBaudRateList();

			




	
	
	
		
 
    void togglePort();

			




	
	
	
		
 
    void selectPort(QString portName);

			




	
	
	
		
 
    void enableSkipByte(bool enabled = true);

			




	
	
	
		
 

			




	
	
	
		
 
    void selectBaudRate(QString baudRate);

			




	
	
	
		
 
    void selectParity(int parity); // parity must be one of QSerialPort::Parity

			




	
	
	
		
 
    void selectDataBits(int dataBits); // bits must be one of QSerialPort::DataBits

			




	
	
	
		
 
    void selectStopBits(int stopBits); // stopBits must be one of QSerialPort::StopBits

			




	
	
	
		
 
    void selectFlowControl(int flowControl); // flowControl must be one of QSerialPort::FlowControl

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void openActionTriggered(bool checked);

			




	
	
	
		
 

			




	
	
	
		
 
    void onCbPortListActivated(int index);

			




	
	
	
		
 
    void onTbPortListActivated(int index);

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void skipByteRequested();

			




	
	
	
		
 
    void portToggled(bool open);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // PORTCONTROL_H

			




        

    


    
    

    

        

                

                    src/portcontrol.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
<ui version="4.0">

			




	
	
	
		
 
 <class>PortControl</class>

			




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

			




	
	
	
		
 
  <property name="geometry">

			




	
	
	
		
 
   <rect>

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>631</width>

			




	
	
	
		
 
    <height>213</height>

			




	
	
	
		
 
    <height>232</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>Form</string>

			




	
	
	
		
 
  </property>

			




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

			




	
	
	
		
 
   <item>

			




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

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <layout class="QGridLayout" name="gridLayout">

			




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

			




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

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Port:</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




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

			




	
	
	
		
 
        <widget class="QComboBox" name="cbPortList">

			




	
	
	
		
 
         <property name="sizePolicy">

			




	
	
	
		
 
          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">

			




	
	
	
		
 
           <horstretch>0</horstretch>

			




	
	
	
		
 
           <verstretch>0</verstretch>

			




	
	
	
		
 
          </sizepolicy>

			




	
	
		
 
@@ -264,69 +264,59 @@

			




	
	
	
		
 
    <spacer name="horizontalSpacer">

			




	
	
	
		
 
     <property name="orientation">

			




	
	
	
		
 
      <enum>Qt::Horizontal</enum>

			




	
	
	
		
 
     </property>

			




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

			




	
	
	
		
 
      <size>

			




	
	
	
		
 
       <width>10000</width>

			




	
	
	
		
 
       <height>20</height>

			




	
	
	
		
 
      </size>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </spacer>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
   <item>

			




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

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="QToolButton" name="pbOpenPort">

			




	
	
	
		
 
       <property name="sizePolicy">

			




	
	
	
		
 
        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

			




	
	
	
		
 
         <horstretch>0</horstretch>

			




	
	
	
		
 
         <verstretch>0</verstretch>

			




	
	
	
		
 
        </sizepolicy>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="minimumSize">

			




	
	
	
		
 
        <size>

			




	
	
	
		
 
         <width>0</width>

			




	
	
	
		
 
         <width>85</width>

			




	
	
	
		
 
         <height>50</height>

			




	
	
	
		
 
        </size>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Toggle port status</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Open</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="checkable">

			




	
	
	
		
 
        <bool>true</bool>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




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

			




	
	
	
		
 
       <property name="toolTip">

			




	
	
	
		
 
        <string>Skip reading 1 byte to correct the alignment</string>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="text">

			




	
	
	
		
 
        <string>Skip Byte</string>

			




	
	
	
		
 
       </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>40</height>

			




	
	
	
		
 
        </size>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </spacer>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
    </layout>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
  </layout>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections/>

			




	
	
	
		
 
</ui>

			




        

    



    


    



    



      

      





    
    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