Changeset - 015cdfbbb791
[Not reviewed]
new-reader
0 4 0
Hasan Yavuz Ă–ZDERYA - 9 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:
0 comments (0 inline, 0 general)
src/mainwindow.cpp
Show inline comments
 
@@ -105,9 +105,6 @@ MainWindow::MainWindow(QWidget *parent) 
 
    QObject::connect(&portControl, &PortControl::portToggled,
 
                     this, &MainWindow::onPortToggled);
 

	
 
    QObject::connect(&portControl, &PortControl::skipByteRequested,
 
                     &dataFormatPanel, &DataFormatPanel::requestSkipByte);
 

	
 
    connect(&plotControlPanel, &PlotControlPanel::numOfSamplesChanged,
 
            this, &MainWindow::onNumOfSamplesChanged);
 

	
src/portcontrol.cpp
Show inline comments
 
@@ -115,10 +115,6 @@ PortControl::PortControl(QSerialPort* po
 
                     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"));
 
@@ -272,11 +268,6 @@ void PortControl::selectPort(QString por
 
    }
 
}
 

	
 
void PortControl::enableSkipByte(bool enabled)
 
{
 
    ui->pbSkipByte->setDisabled(enabled);
 
}
 

	
 
QToolBar* PortControl::toolBar()
 
{
 
    return &portToolBar;
src/portcontrol.h
Show inline comments
 
@@ -64,7 +64,6 @@ public slots:
 
    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
 
@@ -79,7 +78,6 @@ private slots:
 
    void onTbPortListActivated(int index);
 

	
 
signals:
 
    void skipByteRequested();
 
    void portToggled(bool open);
 
};
 

	
src/portcontrol.ui
Show inline comments
 
@@ -7,7 +7,7 @@
 
    <x>0</x>
 
    <y>0</y>
 
    <width>631</width>
 
    <height>213</height>
 
    <height>232</height>
 
   </rect>
 
  </property>
 
  <property name="windowTitle">
 
@@ -285,7 +285,7 @@
 
       </property>
 
       <property name="minimumSize">
 
        <size>
 
         <width>0</width>
 
         <width>85</width>
 
         <height>50</height>
 
        </size>
 
       </property>
 
@@ -301,16 +301,6 @@
 
      </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>
0 comments (0 inline, 0 general)