Commit: master - QSerialPortTerminal4KOZOS (git)

QSerialPortTerminalにKOZOS用XMODEM送信機能追加

Commit MetaInfo

• Revision: ff29a4733bdb1be644aab51fa6a955ad46ddbd12 (tree)
• Zeit: 2012-05-19 00:07:23
• Autor: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

ADD: Select OtherPort

Ändern Zusammenfassung

• modified: src/QSerialPortTerminal/ui/QSerialPortTerminal.cpp
• modified: src/QSerialPortTerminal/ui/QSerialPortTerminal.h
• modified: src/QSerialPortTerminal/ui/QSerialPortTerminal.ui

Diff

--- a/src/QSerialPortTerminal/ui/QSerialPortTerminal.cpp
+++ b/src/QSerialPortTerminal/ui/QSerialPortTerminal.cpp
@@ -28,15 +28,20 @@ QSerialPortTerminal::QSerialPortTerminal( QWidget* parent )
     comboBoxPortName->addItem("COM6", QVariant::fromValue(QString("COM6")));
     comboBoxPortName->addItem("COM7", QVariant::fromValue(QString("COM7")));
     comboBoxPortName->addItem("COM8", QVariant::fromValue(QString("COM8")));
+    comboBoxPortName->addItem("Other", QVariant::fromValue(QString("Other")));
     comboBoxPortName->setCurrentIndex(0); //COM1
+    lineEditOtherPort->setText("COM");
 #endif
 
 #ifdef _TTY_POSIX_
     comboBoxPortName->addItem("ttyS0", QVariant::fromValue(QString("/dev/ttyS0")));
     comboBoxPortName->addItem("ttyS1", QVariant::fromValue(QString("/dev/ttyS1")));
     comboBoxPortName->addItem("ttyUSB0", QVariant::fromValue(QString("/dev/ttyUSB0")));
+    comboBoxPortName->addItem("Other", QVariant::fromValue(QString("Other")));
     comboBoxPortName->setCurrentIndex(0); //ttyS0
+    lineEditOtherPort->setText("/dev/");
 #endif
+    lineEditOtherPort->setEnabled(false);
 
     comboBoxBaudRate->addItem("110", QVariant::fromValue(BAUD110));
     comboBoxBaudRate->addItem("300", QVariant::fromValue(BAUD300));
@@ -78,6 +83,7 @@ QSerialPortTerminal::QSerialPortTerminal( QWidget* parent )
     connect(pushButtonSend, SIGNAL(clicked()), this, SLOT(slot_sendPort()));
     connect(pushButtonSendFile, SIGNAL(clicked()), this, SLOT(slot_sendPortToFile()));
     connect(pushButtonClear, SIGNAL(clicked()), this, SLOT(slot_clear()));
+    connect(comboBoxPortName, SIGNAL(currentIndexChanged(int)), this, SLOT(slot_chgPort(int)));
 
     /*Codecs list*/
     QMap<QString, QTextCodec *> codecMap;
@@ -144,6 +150,20 @@ void QSerialPortTerminal::updatetextEditReceive()
 
 void QSerialPortTerminal::slot_openPort()
 {
+    //Settings parameters
+    QVariant temp;
+
+    if (comboBoxPortName->currentIndex()+1 == comboBoxPortName->count()) { // select Other?
+        if (lineEditOtherPort->text().isEmpty()) {
+            QMessageBox::warning(this, tr("QSerialPortTerminal"), tr("Other Port name is empty."));
+            return;
+        }
+        serialPort->setPort(lineEditOtherPort->text()); //Port
+    } else {
+        temp = comboBoxPortName->itemData(comboBoxPortName->currentIndex());
+        serialPort->setPort(temp.value<QString>()); //Port
+    }
+
     groupBoxSettings->setEnabled(false);
     pushButtonOpen->setEnabled(false);
     pushButtonClose->setEnabled(true);
@@ -153,12 +173,6 @@ void QSerialPortTerminal::slot_openPort()
     if (serialPort->isOpen())
         serialPort->close();
 
-    //Settings parameters
-    QVariant temp;
-
-    temp = comboBoxPortName->itemData(comboBoxPortName->currentIndex());
-    serialPort->setPort(temp.value<QString>()); //Port
-
     temp = comboBoxBaudRate->itemData(comboBoxBaudRate->currentIndex());
     serialPort->setBaudRate(temp.value<BaudRateType>()); //BaudRate
 
@@ -237,6 +251,14 @@ void QSerialPortTerminal::slot_clear()
 {
     textEditReceive->clear();
 }
+void QSerialPortTerminal::slot_chgPort(int index)
+{
+    if (index+1 == comboBoxPortName->count()) { // Other?
+        lineEditOtherPort->setEnabled(true);
+    } else {
+        lineEditOtherPort->setEnabled(false);
+    }
+}
 
 void QSerialPortTerminal::slot_sendPortToFile()
 {

--- a/src/QSerialPortTerminal/ui/QSerialPortTerminal.h
+++ b/src/QSerialPortTerminal/ui/QSerialPortTerminal.h
@@ -31,6 +31,7 @@ private slots:
     void slot_closePort();
     void slot_sendPort();
     void slot_clear();
+    void slot_chgPort(int);
     void slot_sendPortToFile();
     void slot_stopSendPortToFile();
 

--- a/src/QSerialPortTerminal/ui/QSerialPortTerminal.ui
+++ b/src/QSerialPortTerminal/ui/QSerialPortTerminal.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>613</width>
-    <height>352</height>
+    <width>670</width>
+    <height>407</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -39,7 +39,7 @@
          <item row="0" column="1">
           <widget class="QComboBox" name="comboBoxPortName"/>
          </item>
-         <item row="1" column="0">
+         <item row="2" column="0">
           <widget class="QLabel" name="labelBaudRate">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -52,10 +52,10 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
+         <item row="2" column="1">
           <widget class="QComboBox" name="comboBoxBaudRate"/>
          </item>
-         <item row="2" column="0">
+         <item row="3" column="0">
           <widget class="QLabel" name="labelData">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -68,10 +68,10 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="3" column="1">
           <widget class="QComboBox" name="comboBoxDataBits"/>
          </item>
-         <item row="3" column="0">
+         <item row="4" column="0">
           <widget class="QLabel" name="labelParity">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -84,10 +84,10 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
+         <item row="4" column="1">
           <widget class="QComboBox" name="comboBoxParity"/>
          </item>
-         <item row="4" column="0">
+         <item row="5" column="0">
           <widget class="QLabel" name="labelStop">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -100,10 +100,10 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
+         <item row="5" column="1">
           <widget class="QComboBox" name="comboBoxStopBits"/>
          </item>
-         <item row="5" column="0">
+         <item row="6" column="0">
           <widget class="QLabel" name="labelFlowControl">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -116,9 +116,38 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="1">
+         <item row="6" column="1">
           <widget class="QComboBox" name="comboBoxFlowControl"/>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="labelOtherPort">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string> Other : </string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="lineEditOtherPort">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>/dev/</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
@@ -225,6 +254,11 @@
        </item>
        <item>
         <widget class="QTextEdit" name="textEditReceive">
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
          <property name="readOnly">
           <bool>true</bool>
          </property>