프로젝트

일반

사용자정보

개정판 b6603e12

IDb6603e123e983ecec2280dc730e0bf74c523e8d5
상위 a587998a
하위 775be547, 6e095179

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

ff ui on going

Change-Id: Idea4d369593d02698c9ae25b177e9cb218c0ae5c

차이점 보기:

DTI_PID/DTI_PID/ConfigurationDialog.py
563 563
            configs = docData.getConfigs('Project', 'Operation')
564 564
            if configs:
565 565
                size = int(configs[0].value)
566
                self.ui.radioButtonOpModeGenenal.setChecked(True if size == 1 else False)
566
                self.ui.radioButtonOpModeGeneral.setChecked(True if size == 1 else False)
567 567
                self.ui.radioButtonOpModeInst.setChecked(True if size == -1 else False)
568 568
            else:
569
                self.ui.radioButtonOpModeGenenal.setChecked(True)
569
                self.ui.radioButtonOpModeGeneral.setChecked(True)
570 570
                self.ui.radioButtonOpModeInst.setChecked(False)
571 571

  
572 572
            # app config for individual user
......
1323 1323
            # ai mode
1324 1324
            configs.append(Config('Engine', 'AI', '1' if self.ui.radioButtonAI1.isChecked() else ('2' if self.ui.radioButtonAI2.isChecked() else '3')))
1325 1325
            configs.append(Config('Engine', 'OCR', '1' if self.ui.radioButtonOCRLocal.isChecked() else '-1'))
1326
            configs.append(Config('Project', 'Operation', '1' if self.ui.radioButtonOpModeGenenal.isChecked() else '-1'))
1326
            configs.append(Config('Project', 'Operation', '1' if self.ui.radioButtonOpModeGeneral.isChecked() else '-1'))
1327 1327
            
1328 1328
            # app config
1329 1329
            app_configs = []
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.9.2
5
# Created by: PyQt5 UI code generator 5.11.3
6 6
#
7 7
# WARNING! All changes made in this file will be lost!
8 8

  
......
962 962
        self.gridLayout_36.addItem(spacerItem10, 0, 2, 1, 1)
963 963
        self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
964 964
        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
965
        self.radioButtonOpModeGenenal = QtWidgets.QRadioButton(self.groupBox_14)
966
        self.radioButtonOpModeGenenal.setObjectName("radioButtonOpModeGenenal")
967
        self.horizontalLayout_12.addWidget(self.radioButtonOpModeGenenal)
965
        self.radioButtonOpModeGeneral = QtWidgets.QRadioButton(self.groupBox_14)
966
        self.radioButtonOpModeGeneral.setObjectName("radioButtonOpModeGeneral")
967
        self.horizontalLayout_12.addWidget(self.radioButtonOpModeGeneral)
968 968
        self.radioButtonOpModeInst = QtWidgets.QRadioButton(self.groupBox_14)
969 969
        self.radioButtonOpModeInst.setObjectName("radioButtonOpModeInst")
970 970
        self.horizontalLayout_12.addWidget(self.radioButtonOpModeInst)
......
1184 1184
        self.radioButtonAI3.setText(_translate("ConfigurationDialog", "Faster RCNN"))
1185 1185
        self.groupBox_14.setTitle(_translate("ConfigurationDialog", "Project"))
1186 1186
        self.label_55.setText(_translate("ConfigurationDialog", "Operation Mode : "))
1187
        self.radioButtonOpModeGenenal.setText(_translate("ConfigurationDialog", "Genenal"))
1187
        self.radioButtonOpModeGeneral.setText(_translate("ConfigurationDialog", "General"))
1188 1188
        self.radioButtonOpModeInst.setText(_translate("ConfigurationDialog", "Instrument"))
1189 1189
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabETC), _translate("ConfigurationDialog", "ETC"))
1190 1190

  
DTI_PID/DTI_PID/Project_UI.py
1 1
# -*- coding: utf-8 -*-
2 2

  
3
# Form implementation generated from reading ui file '.\UI\Project.ui'
3
# Form implementation generated from reading ui file './UI/Project.ui'
4 4
#
5
# Created by: PyQt5 UI code generator 5.15.4
5
# Created by: PyQt5 UI code generator 5.11.3
6 6
#
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

  
7
# WARNING! All changes made in this file will be lost!
10 8

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

  
13

  
14 11
class Ui_ProjectDialog(object):
15 12
    def setupUi(self, ProjectDialog):
16 13
        ProjectDialog.setObjectName("ProjectDialog")
17
        ProjectDialog.resize(679, 300)
14
        ProjectDialog.resize(679, 336)
18 15
        ProjectDialog.setMinimumSize(QtCore.QSize(0, 300))
19
        ProjectDialog.setMaximumSize(QtCore.QSize(16777215, 300))
16
        ProjectDialog.setMaximumSize(QtCore.QSize(16777215, 350))
20 17
        font = QtGui.QFont()
21 18
        font.setFamily("맑은 고딕")
22 19
        font.setBold(True)
......
82 79
        self.gridLayout.addWidget(self.groupBoxDBType, 1, 0, 1, 1)
83 80
        self.gridLayout_4 = QtWidgets.QGridLayout()
84 81
        self.gridLayout_4.setObjectName("gridLayout_4")
82
        self.toolButtonDelete = QtWidgets.QToolButton(ProjectDialog)
83
        self.toolButtonDelete.setText("")
84
        icon2 = QtGui.QIcon()
85
        icon2.addPixmap(QtGui.QPixmap(":/newPrefix/Remove.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
86
        self.toolButtonDelete.setIcon(icon2)
87
        self.toolButtonDelete.setObjectName("toolButtonDelete")
88
        self.gridLayout_4.addWidget(self.toolButtonDelete, 0, 3, 1, 1)
85 89
        self.comboBoxProjectUnit = QtWidgets.QComboBox(ProjectDialog)
86 90
        self.comboBoxProjectUnit.setEnabled(False)
87 91
        self.comboBoxProjectUnit.setObjectName("comboBoxProjectUnit")
......
112 116
        font.setWeight(75)
113 117
        self.toolButton.setFont(font)
114 118
        self.toolButton.setText("")
115
        icon2 = QtGui.QIcon()
116
        icon2.addPixmap(QtGui.QPixmap(":/newPrefix/Add.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
117
        self.toolButton.setIcon(icon2)
119
        icon3 = QtGui.QIcon()
120
        icon3.addPixmap(QtGui.QPixmap(":/newPrefix/Add.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
121
        self.toolButton.setIcon(icon3)
118 122
        self.toolButton.setObjectName("toolButton")
119 123
        self.gridLayout_4.addWidget(self.toolButton, 0, 2, 1, 1)
120 124
        self.label_2 = QtWidgets.QLabel(ProjectDialog)
......
125 129
        self.label_2.setFont(font)
126 130
        self.label_2.setObjectName("label_2")
127 131
        self.gridLayout_4.addWidget(self.label_2, 1, 0, 1, 1)
128
        self.toolButtonDelete = QtWidgets.QToolButton(ProjectDialog)
129
        self.toolButtonDelete.setText("")
130
        icon3 = QtGui.QIcon()
131
        icon3.addPixmap(QtGui.QPixmap(":/newPrefix/Remove.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
132
        self.toolButtonDelete.setIcon(icon3)
133
        self.toolButtonDelete.setObjectName("toolButtonDelete")
134
        self.gridLayout_4.addWidget(self.toolButtonDelete, 0, 3, 1, 1)
135 132
        self.lineEditProjectDesc = QtWidgets.QLineEdit(ProjectDialog)
136 133
        self.lineEditProjectDesc.setObjectName("lineEditProjectDesc")
137 134
        self.gridLayout_4.addWidget(self.lineEditProjectDesc, 1, 1, 1, 1)
......
143 140
        self.label_3.setFont(font)
144 141
        self.label_3.setObjectName("label_3")
145 142
        self.gridLayout_4.addWidget(self.label_3, 2, 0, 1, 1)
143
        self.label_5 = QtWidgets.QLabel(ProjectDialog)
144
        font = QtGui.QFont()
145
        font.setPointSize(10)
146
        font.setBold(False)
147
        font.setWeight(50)
148
        self.label_5.setFont(font)
149
        self.label_5.setObjectName("label_5")
150
        self.gridLayout_4.addWidget(self.label_5, 3, 0, 1, 1)
151
        self.horizontalLayout = QtWidgets.QHBoxLayout()
152
        self.horizontalLayout.setObjectName("horizontalLayout")
153
        self.radioButtonGeneral = QtWidgets.QRadioButton(ProjectDialog)
154
        self.radioButtonGeneral.setObjectName("radioButtonGeneral")
155
        self.horizontalLayout.addWidget(self.radioButtonGeneral)
156
        self.radioButtonFireFighting = QtWidgets.QRadioButton(ProjectDialog)
157
        self.radioButtonFireFighting.setObjectName("radioButtonFireFighting")
158
        self.horizontalLayout.addWidget(self.radioButtonFireFighting)
159
        self.radioButtonInstrument = QtWidgets.QRadioButton(ProjectDialog)
160
        self.radioButtonInstrument.setObjectName("radioButtonInstrument")
161
        self.horizontalLayout.addWidget(self.radioButtonInstrument)
162
        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
163
        self.horizontalLayout.addItem(spacerItem)
164
        self.gridLayout_4.addLayout(self.horizontalLayout, 3, 1, 1, 1)
146 165
        self.gridLayout.addLayout(self.gridLayout_4, 0, 0, 1, 1)
147 166
        self.gridLayout_5 = QtWidgets.QGridLayout()
148 167
        self.gridLayout_5.setObjectName("gridLayout_5")
......
162 181
        ProjectDialog.setTabOrder(self.toolButton, self.toolButtonDelete)
163 182
        ProjectDialog.setTabOrder(self.toolButtonDelete, self.lineEditProjectDesc)
164 183
        ProjectDialog.setTabOrder(self.lineEditProjectDesc, self.comboBoxProjectUnit)
165
        ProjectDialog.setTabOrder(self.comboBoxProjectUnit, self.radioButtonSQLite)
184
        ProjectDialog.setTabOrder(self.comboBoxProjectUnit, self.radioButtonGeneral)
185
        ProjectDialog.setTabOrder(self.radioButtonGeneral, self.radioButtonFireFighting)
186
        ProjectDialog.setTabOrder(self.radioButtonFireFighting, self.radioButtonInstrument)
187
        ProjectDialog.setTabOrder(self.radioButtonInstrument, self.radioButtonSQLite)
166 188
        ProjectDialog.setTabOrder(self.radioButtonSQLite, self.radioButtonMSSQL)
167 189
        ProjectDialog.setTabOrder(self.radioButtonMSSQL, self.lineEditServer)
168 190
        ProjectDialog.setTabOrder(self.lineEditServer, self.lineEditUser)
169 191
        ProjectDialog.setTabOrder(self.lineEditUser, self.lineEditPassword)
170 192
        ProjectDialog.setTabOrder(self.lineEditPassword, self.pushButtonTestConnection)
193
        ProjectDialog.setTabOrder(self.pushButtonTestConnection, self.lineEditUpdateURL)
171 194

  
172 195
    def retranslateUi(self, ProjectDialog):
173 196
        _translate = QtCore.QCoreApplication.translate
174 197
        ProjectDialog.setWindowTitle(_translate("ProjectDialog", "Project"))
175 198
        self.groupBoxDBType.setTitle(_translate("ProjectDialog", "Database Type"))
176 199
        self.radioButtonSQLite.setText(_translate("ProjectDialog", "SQLite"))
177
        self.labelServer.setText(_translate("ProjectDialog", "Server"))
178
        self.labelUser.setText(_translate("ProjectDialog", "User"))
179
        self.labelPassword.setText(_translate("ProjectDialog", "Password"))
200
        self.labelServer.setText(_translate("ProjectDialog", "Server : "))
201
        self.labelUser.setText(_translate("ProjectDialog", "User : "))
202
        self.labelPassword.setText(_translate("ProjectDialog", "Password : "))
180 203
        self.pushButtonTestConnection.setText(_translate("ProjectDialog", "Test Connection"))
181 204
        self.radioButtonMSSQL.setText(_translate("ProjectDialog", "MSSQL"))
182
        self.label.setText(_translate("ProjectDialog", "Project Name"))
183
        self.label_2.setText(_translate("ProjectDialog", "Project Desc"))
184
        self.label_3.setText(_translate("ProjectDialog", "Project Unit"))
205
        self.label.setText(_translate("ProjectDialog", "Project Name : "))
206
        self.label_2.setText(_translate("ProjectDialog", "Project Desc : "))
207
        self.label_3.setText(_translate("ProjectDialog", "Project Unit : "))
208
        self.label_5.setText(_translate("ProjectDialog", "Project Mode : "))
209
        self.radioButtonGeneral.setText(_translate("ProjectDialog", "General"))
210
        self.radioButtonFireFighting.setText(_translate("ProjectDialog", "Fire Fighting"))
211
        self.radioButtonInstrument.setText(_translate("ProjectDialog", "Instrument"))
185 212
        self.label_4.setText(_translate("ProjectDialog", "Update URL : "))
213

  
186 214
import MainWindow_rc
215

  
216
if __name__ == "__main__":
217
    import sys
218
    app = QtWidgets.QApplication(sys.argv)
219
    ProjectDialog = QtWidgets.QDialog()
220
    ui = Ui_ProjectDialog()
221
    ui.setupUi(ProjectDialog)
222
    ProjectDialog.show()
223
    sys.exit(app.exec_())
224

  
DTI_PID/DTI_PID/UI/Configuration.ui
2008 2008
              <item row="0" column="1">
2009 2009
               <layout class="QHBoxLayout" name="horizontalLayout_12">
2010 2010
                <item>
2011
                 <widget class="QRadioButton" name="radioButtonOpModeGenenal">
2011
                 <widget class="QRadioButton" name="radioButtonOpModeGeneral">
2012 2012
                  <property name="text">
2013
                   <string>Genenal</string>
2013
                   <string>General</string>
2014 2014
                  </property>
2015 2015
                 </widget>
2016 2016
                </item>
......
2152 2152
  </connection>
2153 2153
 </connections>
2154 2154
 <buttongroups>
2155
  <buttongroup name="buttonGroup"/>
2156
  <buttongroup name="buttonGroup_9"/>
2157 2155
  <buttongroup name="buttonGroup_13"/>
2156
  <buttongroup name="buttonGroup_6"/>
2158 2157
  <buttongroup name="buttonGroup_12"/>
2159
  <buttongroup name="buttonGroup_8"/>
2160
  <buttongroup name="buttonGroup_10"/>
2161 2158
  <buttongroup name="buttonGroup_11"/>
2162 2159
  <buttongroup name="buttonGroup_7"/>
2163
  <buttongroup name="buttonGroup_3"/>
2164
  <buttongroup name="buttonGroup_6"/>
2165 2160
  <buttongroup name="buttonGroup_4"/>
2166
  <buttongroup name="buttonGroup_5"/>
2161
  <buttongroup name="buttonGroup_9"/>
2162
  <buttongroup name="buttonGroup_8"/>
2163
  <buttongroup name="buttonGroup_3"/>
2164
  <buttongroup name="buttonGroup_10"/>
2167 2165
  <buttongroup name="buttonGroup_2"/>
2166
  <buttongroup name="buttonGroup"/>
2167
  <buttongroup name="buttonGroup_5"/>
2168 2168
 </buttongroups>
2169 2169
</ui>
DTI_PID/DTI_PID/UI/Project.ui
7 7
    <x>0</x>
8 8
    <y>0</y>
9 9
    <width>679</width>
10
    <height>300</height>
10
    <height>336</height>
11 11
   </rect>
12 12
  </property>
13 13
  <property name="minimumSize">
......
19 19
  <property name="maximumSize">
20 20
   <size>
21 21
    <width>16777215</width>
22
    <height>300</height>
22
    <height>350</height>
23 23
   </size>
24 24
  </property>
25 25
  <property name="font">
......
96 96
        <item row="1" column="1">
97 97
         <widget class="QLabel" name="labelServer">
98 98
          <property name="text">
99
           <string>Server</string>
99
           <string>Server : </string>
100 100
          </property>
101 101
         </widget>
102 102
        </item>
103 103
        <item row="2" column="1">
104 104
         <widget class="QLabel" name="labelUser">
105 105
          <property name="text">
106
           <string>User</string>
106
           <string>User : </string>
107 107
          </property>
108 108
         </widget>
109 109
        </item>
110 110
        <item row="3" column="1">
111 111
         <widget class="QLabel" name="labelPassword">
112 112
          <property name="text">
113
           <string>Password</string>
113
           <string>Password : </string>
114 114
          </property>
115 115
         </widget>
116 116
        </item>
......
142 142
   </item>
143 143
   <item row="0" column="0">
144 144
    <layout class="QGridLayout" name="gridLayout_4">
145
     <item row="0" column="3">
146
      <widget class="QToolButton" name="toolButtonDelete">
147
       <property name="text">
148
        <string/>
149
       </property>
150
       <property name="icon">
151
        <iconset resource="../res/MainWindow.qrc">
152
         <normaloff>:/newPrefix/Remove.svg</normaloff>:/newPrefix/Remove.svg</iconset>
153
       </property>
154
      </widget>
155
     </item>
145 156
     <item row="2" column="1">
146 157
      <widget class="QComboBox" name="comboBoxProjectUnit">
147 158
       <property name="enabled">
......
172 183
        </font>
173 184
       </property>
174 185
       <property name="text">
175
        <string>Project Name</string>
186
        <string>Project Name : </string>
176 187
       </property>
177 188
      </widget>
178 189
     </item>
......
205 216
        </font>
206 217
       </property>
207 218
       <property name="text">
208
        <string>Project Desc</string>
209
       </property>
210
      </widget>
211
     </item>
212
     <item row="0" column="3">
213
      <widget class="QToolButton" name="toolButtonDelete">
214
       <property name="text">
215
        <string/>
216
       </property>
217
       <property name="icon">
218
        <iconset resource="../res/MainWindow.qrc">
219
         <normaloff>:/newPrefix/Remove.svg</normaloff>:/newPrefix/Remove.svg</iconset>
219
        <string>Project Desc : </string>
220 220
       </property>
221 221
      </widget>
222 222
     </item>
......
233 233
        </font>
234 234
       </property>
235 235
       <property name="text">
236
        <string>Project Unit</string>
236
        <string>Project Unit : </string>
237
       </property>
238
      </widget>
239
     </item>
240
     <item row="3" column="0">
241
      <widget class="QLabel" name="label_5">
242
       <property name="font">
243
        <font>
244
         <pointsize>10</pointsize>
245
         <weight>50</weight>
246
         <bold>false</bold>
247
        </font>
248
       </property>
249
       <property name="text">
250
        <string>Project Mode : </string>
237 251
       </property>
238 252
      </widget>
239 253
     </item>
254
     <item row="3" column="1">
255
      <layout class="QHBoxLayout" name="horizontalLayout">
256
       <item>
257
        <widget class="QRadioButton" name="radioButtonGeneral">
258
         <property name="text">
259
          <string>General</string>
260
         </property>
261
        </widget>
262
       </item>
263
       <item>
264
        <widget class="QRadioButton" name="radioButtonFireFighting">
265
         <property name="text">
266
          <string>Fire Fighting</string>
267
         </property>
268
        </widget>
269
       </item>
270
       <item>
271
        <widget class="QRadioButton" name="radioButtonInstrument">
272
         <property name="text">
273
          <string>Instrument</string>
274
         </property>
275
        </widget>
276
       </item>
277
       <item>
278
        <spacer name="horizontalSpacer">
279
         <property name="orientation">
280
          <enum>Qt::Horizontal</enum>
281
         </property>
282
         <property name="sizeHint" stdset="0">
283
          <size>
284
           <width>40</width>
285
           <height>20</height>
286
          </size>
287
         </property>
288
        </spacer>
289
       </item>
290
      </layout>
291
     </item>
240 292
    </layout>
241 293
   </item>
242 294
   <item row="2" column="0">
......
261 313
  <tabstop>toolButtonDelete</tabstop>
262 314
  <tabstop>lineEditProjectDesc</tabstop>
263 315
  <tabstop>comboBoxProjectUnit</tabstop>
316
  <tabstop>radioButtonGeneral</tabstop>
317
  <tabstop>radioButtonFireFighting</tabstop>
318
  <tabstop>radioButtonInstrument</tabstop>
264 319
  <tabstop>radioButtonSQLite</tabstop>
265 320
  <tabstop>radioButtonMSSQL</tabstop>
266 321
  <tabstop>lineEditServer</tabstop>
267 322
  <tabstop>lineEditUser</tabstop>
268 323
  <tabstop>lineEditPassword</tabstop>
269 324
  <tabstop>pushButtonTestConnection</tabstop>
325
  <tabstop>lineEditUpdateURL</tabstop>
270 326
 </tabstops>
271 327
 <resources>
272 328
  <include location="../res/MainWindow.qrc"/>

내보내기 Unified diff

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