프로젝트

일반

사용자정보

개정판 d6bb98b7

IDd6bb98b72a5ea5ef03f9a021a90e19b756b741af
상위 41eac0d2
하위 271ea777

함의성이(가) 약 2년 전에 추가함

add connection port setting

Change-Id: I9a3572c4ab80813345684fbfb96cbc5a2168920f

차이점 보기:

DTI_PID/DTI_PID/ConfigurationDialog.py
595 595
            # app config for individual user
596 596
            configs = docData.getAppConfigs('app', 'port')
597 597
            self.ui.spinBoxListeningPort.setValue(int(configs[0].value) if configs else 2549)
598
            configs = docData.getAppConfigs('app', 'conn port')
599
            self.ui.spinBoxConnectionPort.setValue(int(configs[0].value) if configs else 3030)
598 600

  
599 601
            # connect signals and slots
600 602
            self.ui.pushButtonCopyProperty.clicked.connect(self.copyLineProperty)
......
1351 1353
            # app config
1352 1354
            app_configs = []
1353 1355
            app_configs.append(Config('app', 'port', self.ui.spinBoxListeningPort.value()))
1356
            app_configs.append(Config('app', 'conn port', self.ui.spinBoxConnectionPort.value()))
1354 1357

  
1355 1358
            _desc = self.project.desc.split(self.lineNoDelimiter)
1356 1359
            if len(_desc) == 2:                
DTI_PID/DTI_PID/Configuration_UI.py
2 2

  
3 3
# Form implementation generated from reading ui file './UI/Configuration.ui'
4 4
#
5
# Created by: PyQt5 UI code generator 5.11.3
5
# Created by: PyQt5 UI code generator 5.15.4
6 6
#
7
# WARNING! All changes made in this file will be lost!
7
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8
# run again.  Do not edit this file unless you know what you are doing.
9

  
8 10

  
9 11
from PyQt5 import QtCore, QtGui, QtWidgets
10 12

  
13

  
11 14
class Ui_ConfigurationDialog(object):
12 15
    def setupUi(self, ConfigurationDialog):
13 16
        ConfigurationDialog.setObjectName("ConfigurationDialog")
......
760 763
        self.label_31.setMinimumSize(QtCore.QSize(200, 0))
761 764
        self.label_31.setObjectName("label_31")
762 765
        self.gridLayout_31.addWidget(self.label_31, 4, 0, 1, 1)
763
        self.label_30 = QtWidgets.QLabel(self.groupBox_11)
764
        self.label_30.setObjectName("label_30")
765
        self.gridLayout_31.addWidget(self.label_30, 1, 0, 1, 1)
766
        self.pushButtonClearAccessInfo = QtWidgets.QPushButton(self.groupBox_11)
767
        self.pushButtonClearAccessInfo.setObjectName("pushButtonClearAccessInfo")
768
        self.gridLayout_31.addWidget(self.pushButtonClearAccessInfo, 4, 1, 1, 1)
769 766
        self.horizontalLayout_14 = QtWidgets.QHBoxLayout()
770 767
        self.horizontalLayout_14.setObjectName("horizontalLayout_14")
771 768
        self.radioButtonLineListYes = QtWidgets.QRadioButton(self.groupBox_11)
......
779 776
        self.buttonGroup_11.addButton(self.radioButtonLineListNo)
780 777
        self.horizontalLayout_14.addWidget(self.radioButtonLineListNo)
781 778
        self.gridLayout_31.addLayout(self.horizontalLayout_14, 3, 1, 1, 1)
779
        self.pushButtonClearAccessInfo = QtWidgets.QPushButton(self.groupBox_11)
780
        self.pushButtonClearAccessInfo.setObjectName("pushButtonClearAccessInfo")
781
        self.gridLayout_31.addWidget(self.pushButtonClearAccessInfo, 4, 1, 1, 1)
782 782
        self.spinBoxSaveAlarm = QtWidgets.QSpinBox(self.groupBox_11)
783 783
        self.spinBoxSaveAlarm.setMaximum(100)
784 784
        self.spinBoxSaveAlarm.setSingleStep(10)
785 785
        self.spinBoxSaveAlarm.setObjectName("spinBoxSaveAlarm")
786 786
        self.gridLayout_31.addWidget(self.spinBoxSaveAlarm, 0, 1, 1, 1)
787
        self.label_34 = QtWidgets.QLabel(self.groupBox_11)
788
        self.label_34.setObjectName("label_34")
789
        self.gridLayout_31.addWidget(self.label_34, 2, 0, 1, 1)
790
        self.spinBoxListeningPort = QtWidgets.QSpinBox(self.groupBox_11)
791
        self.spinBoxListeningPort.setMaximum(9999)
792
        self.spinBoxListeningPort.setProperty("value", 2549)
793
        self.spinBoxListeningPort.setObjectName("spinBoxListeningPort")
794
        self.gridLayout_31.addWidget(self.spinBoxListeningPort, 5, 1, 1, 1)
795
        self.label_61 = QtWidgets.QLabel(self.groupBox_11)
796
        self.label_61.setObjectName("label_61")
797
        self.gridLayout_31.addWidget(self.label_61, 5, 0, 1, 1)
798
        self.label_30 = QtWidgets.QLabel(self.groupBox_11)
799
        self.label_30.setObjectName("label_30")
800
        self.gridLayout_31.addWidget(self.label_30, 1, 0, 1, 1)
787 801
        self.label_49 = QtWidgets.QLabel(self.groupBox_11)
788 802
        self.label_49.setObjectName("label_49")
789 803
        self.gridLayout_31.addWidget(self.label_49, 0, 0, 1, 1)
790
        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
791
        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
792
        self.radioButtonSaveUnknownYes = QtWidgets.QRadioButton(self.groupBox_11)
793
        self.radioButtonSaveUnknownYes.setAutoExclusive(True)
794
        self.radioButtonSaveUnknownYes.setObjectName("radioButtonSaveUnknownYes")
795
        self.buttonGroup_2 = QtWidgets.QButtonGroup(ConfigurationDialog)
796
        self.buttonGroup_2.setObjectName("buttonGroup_2")
797
        self.buttonGroup_2.addButton(self.radioButtonSaveUnknownYes)
798
        self.horizontalLayout_4.addWidget(self.radioButtonSaveUnknownYes)
799
        self.radioButtonSaveUnknownNo = QtWidgets.QRadioButton(self.groupBox_11)
800
        self.radioButtonSaveUnknownNo.setAutoExclusive(True)
801
        self.radioButtonSaveUnknownNo.setObjectName("radioButtonSaveUnknownNo")
802
        self.buttonGroup_2.addButton(self.radioButtonSaveUnknownNo)
803
        self.horizontalLayout_4.addWidget(self.radioButtonSaveUnknownNo)
804
        self.gridLayout_31.addLayout(self.horizontalLayout_4, 2, 1, 1, 1)
805 804
        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
806 805
        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
807 806
        self.radioButtonLoadXmlOnly = QtWidgets.QRadioButton(self.groupBox_11)
......
821 820
        self.buttonGroup.addButton(self.radioButtonLoadXmlNo)
822 821
        self.horizontalLayout_3.addWidget(self.radioButtonLoadXmlNo)
823 822
        self.gridLayout_31.addLayout(self.horizontalLayout_3, 1, 1, 1, 1)
824
        self.label_34 = QtWidgets.QLabel(self.groupBox_11)
825
        self.label_34.setObjectName("label_34")
826
        self.gridLayout_31.addWidget(self.label_34, 2, 0, 1, 1)
827
        self.label_61 = QtWidgets.QLabel(self.groupBox_11)
828
        self.label_61.setObjectName("label_61")
829
        self.gridLayout_31.addWidget(self.label_61, 5, 0, 1, 1)
830
        self.spinBoxListeningPort = QtWidgets.QSpinBox(self.groupBox_11)
831
        self.spinBoxListeningPort.setMaximum(9999)
832
        self.spinBoxListeningPort.setProperty("value", 2549)
833
        self.spinBoxListeningPort.setObjectName("spinBoxListeningPort")
834
        self.gridLayout_31.addWidget(self.spinBoxListeningPort, 5, 1, 1, 1)
823
        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
824
        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
825
        self.radioButtonSaveUnknownYes = QtWidgets.QRadioButton(self.groupBox_11)
826
        self.radioButtonSaveUnknownYes.setAutoExclusive(True)
827
        self.radioButtonSaveUnknownYes.setObjectName("radioButtonSaveUnknownYes")
828
        self.buttonGroup_2 = QtWidgets.QButtonGroup(ConfigurationDialog)
829
        self.buttonGroup_2.setObjectName("buttonGroup_2")
830
        self.buttonGroup_2.addButton(self.radioButtonSaveUnknownYes)
831
        self.horizontalLayout_4.addWidget(self.radioButtonSaveUnknownYes)
832
        self.radioButtonSaveUnknownNo = QtWidgets.QRadioButton(self.groupBox_11)
833
        self.radioButtonSaveUnknownNo.setAutoExclusive(True)
834
        self.radioButtonSaveUnknownNo.setObjectName("radioButtonSaveUnknownNo")
835
        self.buttonGroup_2.addButton(self.radioButtonSaveUnknownNo)
836
        self.horizontalLayout_4.addWidget(self.radioButtonSaveUnknownNo)
837
        self.gridLayout_31.addLayout(self.horizontalLayout_4, 2, 1, 1, 1)
838
        self.label_62 = QtWidgets.QLabel(self.groupBox_11)
839
        self.label_62.setObjectName("label_62")
840
        self.gridLayout_31.addWidget(self.label_62, 6, 0, 1, 1)
841
        self.spinBoxConnectionPort = QtWidgets.QSpinBox(self.groupBox_11)
842
        self.spinBoxConnectionPort.setMaximum(9999)
843
        self.spinBoxConnectionPort.setProperty("value", 3030)
844
        self.spinBoxConnectionPort.setObjectName("spinBoxConnectionPort")
845
        self.gridLayout_31.addWidget(self.spinBoxConnectionPort, 6, 1, 1, 1)
835 846
        self.gridLayout_23.addLayout(self.gridLayout_31, 0, 0, 1, 1)
836 847
        self.gridLayout_21.addWidget(self.groupBox_11, 0, 0, 1, 1)
837 848
        self.groupBox_12 = QtWidgets.QGroupBox(self.tabETC)
......
1158 1169
        self.groupBox_11.setTitle(_translate("ConfigurationDialog", "Program Data"))
1159 1170
        self.label_58.setText(_translate("ConfigurationDialog", "Line List by Using Stream No : "))
1160 1171
        self.label_31.setText(_translate("ConfigurationDialog", "Clear Drawing Access Information : "))
1161
        self.label_30.setText(_translate("ConfigurationDialog", "Load Data From : "))
1162
        self.pushButtonClearAccessInfo.setText(_translate("ConfigurationDialog", "Clear"))
1163 1172
        self.radioButtonLineListYes.setText(_translate("ConfigurationDialog", "Yes"))
1164 1173
        self.radioButtonLineListNo.setText(_translate("ConfigurationDialog", "No"))
1174
        self.pushButtonClearAccessInfo.setText(_translate("ConfigurationDialog", "Clear"))
1175
        self.label_34.setText(_translate("ConfigurationDialog", "Save Unknown Item to XML Only : "))
1176
        self.label_61.setText(_translate("ConfigurationDialog", "Listening Port(2549) : "))
1177
        self.label_30.setText(_translate("ConfigurationDialog", "Load Data From : "))
1165 1178
        self.label_49.setText(_translate("ConfigurationDialog", "Save Alarm(min) : "))
1166
        self.radioButtonSaveUnknownYes.setText(_translate("ConfigurationDialog", "Yes"))
1167
        self.radioButtonSaveUnknownNo.setText(_translate("ConfigurationDialog", "No"))
1168 1179
        self.radioButtonLoadXmlOnly.setText(_translate("ConfigurationDialog", "XML Only"))
1169 1180
        self.radioButtonLoadXmlYes.setText(_translate("ConfigurationDialog", "XML Frist"))
1170 1181
        self.radioButtonLoadXmlNo.setText(_translate("ConfigurationDialog", "Database Only"))
1171
        self.label_34.setText(_translate("ConfigurationDialog", "Save Unknown Item to XML Only : "))
1172
        self.label_61.setText(_translate("ConfigurationDialog", "Listening Port(2549) : "))
1182
        self.radioButtonSaveUnknownYes.setText(_translate("ConfigurationDialog", "Yes"))
1183
        self.radioButtonSaveUnknownNo.setText(_translate("ConfigurationDialog", "No"))
1184
        self.label_62.setText(_translate("ConfigurationDialog", "Connection Port(3030)"))
1173 1185
        self.groupBox_12.setTitle(_translate("ConfigurationDialog", "Visual"))
1174 1186
        self.label_36.setText(_translate("ConfigurationDialog", "Background Text Transparency : "))
1175 1187
        self.radioButtonBackTextYes.setText(_translate("ConfigurationDialog", "Yes"))
......
1196 1208
        self.radioButtonOpModeFF.setText(_translate("ConfigurationDialog", "Fire Fighting"))
1197 1209
        self.radioButtonOpModeInst.setText(_translate("ConfigurationDialog", "Instrument"))
1198 1210
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabETC), _translate("ConfigurationDialog", "ETC"))
1199

  
1200 1211
import MainWindow_rc
1201 1212

  
1213

  
1202 1214
if __name__ == "__main__":
1203 1215
    import sys
1204 1216
    app = QtWidgets.QApplication(sys.argv)
......
1207 1219
    ui.setupUi(ConfigurationDialog)
1208 1220
    ConfigurationDialog.show()
1209 1221
    sys.exit(app.exec_())
1210

  
DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py
1181 1181
        from TcpServer import TcpSocket
1182 1182

  
1183 1183
        app_doc_data = AppDocData.instance()
1184
        configs = app_doc_data.getAppConfigs('app', 'port call')
1184
        configs = app_doc_data.getAppConfigs('app', 'conn port')
1185 1185
        port = 3030
1186 1186
        if configs and 1 == len(configs):
1187 1187
            port = int(configs[0].value)
DTI_PID/DTI_PID/UI/Configuration.ui
1574 1574
                </property>
1575 1575
               </widget>
1576 1576
              </item>
1577
              <item row="1" column="0">
1578
               <widget class="QLabel" name="label_30">
1579
                <property name="text">
1580
                 <string>Load Data From : </string>
1581
                </property>
1582
               </widget>
1583
              </item>
1584
              <item row="4" column="1">
1585
               <widget class="QPushButton" name="pushButtonClearAccessInfo">
1586
                <property name="text">
1587
                 <string>Clear</string>
1588
                </property>
1589
               </widget>
1590
              </item>
1591 1577
              <item row="3" column="1">
1592 1578
               <layout class="QHBoxLayout" name="horizontalLayout_14">
1593 1579
                <item>
......
1612 1598
                </item>
1613 1599
               </layout>
1614 1600
              </item>
1601
              <item row="4" column="1">
1602
               <widget class="QPushButton" name="pushButtonClearAccessInfo">
1603
                <property name="text">
1604
                 <string>Clear</string>
1605
                </property>
1606
               </widget>
1607
              </item>
1615 1608
              <item row="0" column="1">
1616 1609
               <widget class="QSpinBox" name="spinBoxSaveAlarm">
1617 1610
                <property name="maximum">
......
1622 1615
                </property>
1623 1616
               </widget>
1624 1617
              </item>
1618
              <item row="2" column="0">
1619
               <widget class="QLabel" name="label_34">
1620
                <property name="text">
1621
                 <string>Save Unknown Item to XML Only : </string>
1622
                </property>
1623
               </widget>
1624
              </item>
1625
              <item row="5" column="1">
1626
               <widget class="QSpinBox" name="spinBoxListeningPort">
1627
                <property name="maximum">
1628
                 <number>9999</number>
1629
                </property>
1630
                <property name="value">
1631
                 <number>2549</number>
1632
                </property>
1633
               </widget>
1634
              </item>
1635
              <item row="5" column="0">
1636
               <widget class="QLabel" name="label_61">
1637
                <property name="text">
1638
                 <string>Listening Port(2549) : </string>
1639
                </property>
1640
               </widget>
1641
              </item>
1642
              <item row="1" column="0">
1643
               <widget class="QLabel" name="label_30">
1644
                <property name="text">
1645
                 <string>Load Data From : </string>
1646
                </property>
1647
               </widget>
1648
              </item>
1625 1649
              <item row="0" column="0">
1626 1650
               <widget class="QLabel" name="label_49">
1627 1651
                <property name="text">
......
1629 1653
                </property>
1630 1654
               </widget>
1631 1655
              </item>
1632
              <item row="2" column="1">
1633
               <layout class="QHBoxLayout" name="horizontalLayout_4">
1656
              <item row="1" column="1">
1657
               <layout class="QHBoxLayout" name="horizontalLayout_3">
1634 1658
                <item>
1635
                 <widget class="QRadioButton" name="radioButtonSaveUnknownYes">
1659
                 <widget class="QRadioButton" name="radioButtonLoadXmlOnly">
1636 1660
                  <property name="text">
1637
                   <string>Yes</string>
1638
                  </property>
1639
                  <property name="autoExclusive">
1640
                   <bool>true</bool>
1661
                   <string>XML Only</string>
1641 1662
                  </property>
1642 1663
                  <attribute name="buttonGroup">
1643
                   <string notr="true">buttonGroup_2</string>
1664
                   <string notr="true">buttonGroup</string>
1644 1665
                  </attribute>
1645 1666
                 </widget>
1646 1667
                </item>
1647 1668
                <item>
1648
                 <widget class="QRadioButton" name="radioButtonSaveUnknownNo">
1669
                 <widget class="QRadioButton" name="radioButtonLoadXmlYes">
1649 1670
                  <property name="text">
1650
                   <string>No</string>
1671
                   <string>XML Frist</string>
1651 1672
                  </property>
1652 1673
                  <property name="autoExclusive">
1653 1674
                   <bool>true</bool>
1654 1675
                  </property>
1655 1676
                  <attribute name="buttonGroup">
1656
                   <string notr="true">buttonGroup_2</string>
1677
                   <string notr="true">buttonGroup</string>
1657 1678
                  </attribute>
1658 1679
                 </widget>
1659 1680
                </item>
1660
               </layout>
1661
              </item>
1662
              <item row="1" column="1">
1663
               <layout class="QHBoxLayout" name="horizontalLayout_3">
1664 1681
                <item>
1665
                 <widget class="QRadioButton" name="radioButtonLoadXmlOnly">
1682
                 <widget class="QRadioButton" name="radioButtonLoadXmlNo">
1666 1683
                  <property name="text">
1667
                   <string>XML Only</string>
1684
                   <string>Database Only</string>
1685
                  </property>
1686
                  <property name="autoExclusive">
1687
                   <bool>true</bool>
1668 1688
                  </property>
1669 1689
                  <attribute name="buttonGroup">
1670 1690
                   <string notr="true">buttonGroup</string>
1671 1691
                  </attribute>
1672 1692
                 </widget>
1673 1693
                </item>
1694
               </layout>
1695
              </item>
1696
              <item row="2" column="1">
1697
               <layout class="QHBoxLayout" name="horizontalLayout_4">
1674 1698
                <item>
1675
                 <widget class="QRadioButton" name="radioButtonLoadXmlYes">
1699
                 <widget class="QRadioButton" name="radioButtonSaveUnknownYes">
1676 1700
                  <property name="text">
1677
                   <string>XML Frist</string>
1701
                   <string>Yes</string>
1678 1702
                  </property>
1679 1703
                  <property name="autoExclusive">
1680 1704
                   <bool>true</bool>
1681 1705
                  </property>
1682 1706
                  <attribute name="buttonGroup">
1683
                   <string notr="true">buttonGroup</string>
1707
                   <string notr="true">buttonGroup_2</string>
1684 1708
                  </attribute>
1685 1709
                 </widget>
1686 1710
                </item>
1687 1711
                <item>
1688
                 <widget class="QRadioButton" name="radioButtonLoadXmlNo">
1712
                 <widget class="QRadioButton" name="radioButtonSaveUnknownNo">
1689 1713
                  <property name="text">
1690
                   <string>Database Only</string>
1714
                   <string>No</string>
1691 1715
                  </property>
1692 1716
                  <property name="autoExclusive">
1693 1717
                   <bool>true</bool>
1694 1718
                  </property>
1695 1719
                  <attribute name="buttonGroup">
1696
                   <string notr="true">buttonGroup</string>
1720
                   <string notr="true">buttonGroup_2</string>
1697 1721
                  </attribute>
1698 1722
                 </widget>
1699 1723
                </item>
1700 1724
               </layout>
1701 1725
              </item>
1702
              <item row="2" column="0">
1703
               <widget class="QLabel" name="label_34">
1704
                <property name="text">
1705
                 <string>Save Unknown Item to XML Only : </string>
1706
                </property>
1707
               </widget>
1708
              </item>
1709
              <item row="5" column="0">
1710
               <widget class="QLabel" name="label_61">
1726
              <item row="6" column="0">
1727
               <widget class="QLabel" name="label_62">
1711 1728
                <property name="text">
1712
                 <string>Listening Port(2549) : </string>
1729
                 <string>Connection Port(3030)</string>
1713 1730
                </property>
1714 1731
               </widget>
1715 1732
              </item>
1716
              <item row="5" column="1">
1717
               <widget class="QSpinBox" name="spinBoxListeningPort">
1733
              <item row="6" column="1">
1734
               <widget class="QSpinBox" name="spinBoxConnectionPort">
1718 1735
                <property name="maximum">
1719 1736
                 <number>9999</number>
1720 1737
                </property>
1721 1738
                <property name="value">
1722
                 <number>2549</number>
1739
                 <number>3030</number>
1723 1740
                </property>
1724 1741
               </widget>
1725 1742
              </item>
......
2168 2185
  </connection>
2169 2186
 </connections>
2170 2187
 <buttongroups>
2188
  <buttongroup name="buttonGroup_14"/>
2189
  <buttongroup name="buttonGroup_9"/>
2190
  <buttongroup name="buttonGroup_4"/>
2171 2191
  <buttongroup name="buttonGroup_13"/>
2172
  <buttongroup name="buttonGroup_6"/>
2173
  <buttongroup name="buttonGroup_12"/>
2174 2192
  <buttongroup name="buttonGroup_11"/>
2193
  <buttongroup name="buttonGroup"/>
2194
  <buttongroup name="buttonGroup_12"/>
2175 2195
  <buttongroup name="buttonGroup_7"/>
2176
  <buttongroup name="buttonGroup_4"/>
2177
  <buttongroup name="buttonGroup_9"/>
2178 2196
  <buttongroup name="buttonGroup_8"/>
2179 2197
  <buttongroup name="buttonGroup_3"/>
2180
  <buttongroup name="buttonGroup_10"/>
2181 2198
  <buttongroup name="buttonGroup_2"/>
2182
  <buttongroup name="buttonGroup"/>
2183 2199
  <buttongroup name="buttonGroup_5"/>
2184
  <buttongroup name="buttonGroup_14"/>
2200
  <buttongroup name="buttonGroup_6"/>
2201
  <buttongroup name="buttonGroup_10"/>
2185 2202
 </buttongroups>
2186 2203
</ui>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)