프로젝트

일반

사용자정보

개정판 a873b8aa

IDa873b8aa02113d7ea569b1444dd85977443a278e
상위 78ffe44b
하위 e534f39d

김연진이(가) 5년 이상 전에 추가함

issue #1049 : 옵션 창 및 기능 : DrawingsUnits 변경 기능

Change-Id: Ibe1a084188aa1e19ee13d07fa2a878c6f16f497e

차이점 보기:

HYTOS/HYTOS/AppDocData.py
3042 3042
            param = (drawing[0][0], drawing[0][1], drawing[0][2])
3043 3043
            cursor.execute(sql, param)
3044 3044

  
3045
            sql = "select Table_Name, Column_Name, Units_UID from DrawingsUnits where drawings_UID = '00000000-0000-0000-0000-000000000000'"
3045
            sql = "select Units, Units_UID from DrawingsUnits where drawings_UID = '00000000-0000-0000-0000-000000000000'"
3046 3046
            cursor.execute(sql)
3047 3047
            rows = cursor.fetchall()
3048 3048
            for row in rows:
......
3050 3050
                            (
3051 3051
                                UID
3052 3052
                                , Drawings_UID
3053
                                , Table_Name
3054
                                , Column_Name
3053
                                , Units
3055 3054
                                , Units_UID
3056 3055
                             )
3057 3056
                             values 
......
3060 3059
                                , ?
3061 3060
                                , ?
3062 3061
                                , ?
3063
                                , ?
3064 3062
                             )"""
3065
                param = (str(uuid.uuid4()), drawing[0][0], row[0], row[1], row[2])
3063
                param = (str(uuid.uuid4()), drawing[0][0], row[0], row[1])
3066 3064
                cursor.execute(sql, param)
3067 3065

  
3068 3066
            conn.commit()
......
3175 3173

  
3176 3174
        return ComponentList
3177 3175

  
3176

  
3177
    def getDrawingsUnitsByDrawingUID(self, uid):
3178
        unitsList = []
3179

  
3180
        try:
3181
            dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), AppDocData.DATABASE)
3182

  
3183
            conn = sqlite3.connect(dbPath)
3184
            cursor = conn.cursor()
3185
            #sql = 'select UID from Components where Drawings_UID = ? order by x desc'
3186

  
3187
            sql = """select du.Units
3188
                          , u.Value
3189
                       from DrawingsUnits du 
3190
                       left join units u 
3191
                         on du.Units_UID = u.uid
3192
                      where du.drawings_uid = ?"""
3193
            try:
3194
                param = (uid, )
3195
                cursor.execute(sql, param)
3196
                rows = cursor.fetchall()
3197
                for row in rows:
3198
                    unitsList.append((row[0], row[1])) 
3199
            except Exception as ex:
3200
                from App import App
3201

  
3202
                message = 'error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno)
3203
                App.mainWnd().addMessage.emit(MessageType.Error, message)
3204
        finally:
3205
            conn.close()
3206

  
3207
        return unitsList
3208

  
3209

  
3178 3210
    '''
3179 3211
        @brief      Return Components By DrawingUID
3180 3212
        @author     yeonjin
......
3234 3266

  
3235 3267
        return symbolTypeList
3236 3268

  
3269
    def getUnits(self):
3270
        unitsList = []
3271

  
3272
        try:
3273
            dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), AppDocData.DATABASE)
3274

  
3275
            conn = sqlite3.connect(dbPath)
3276
            cursor = conn.cursor()
3277
            sql = 'Select UID, Key, Value From Units'
3278
            try:
3279
                cursor.execute(sql)
3280
                rows = cursor.fetchall()
3281
                for row in rows:
3282
                    unitsList.append((row[0], row[1], row[2])) # UID, Key, Value
3283
            except Exception as ex:
3284
                from App import App
3285

  
3286
                message = 'error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno)
3287
                App.mainWnd().addMessage.emit(MessageType.Error, message)
3288
        finally:
3289
            conn.close()
3290

  
3291
        return unitsList
3292

  
3293

  
3237 3294
    def getUnitsByDrawingName(self, drawingName):
3238 3295
        unitsList = []
3239 3296

  
......
3271 3328

  
3272 3329
        return unitsList
3273 3330

  
3331
    def getHMBDisplayNameAndUnitsExpression(self):
3332
        res = []
3333

  
3334
        try:
3335
            dbPath = os.path.join(self.getCurrentProject().getDbFilePath(), AppDocData.DATABASE)
3336

  
3337
            conn = sqlite3.connect(dbPath)
3338
            cursor = conn.cursor()
3339
            sql = """SELECT dn.DISPLAY_NAME
3340
                          , hu.Units_Expression
3341
                       FROM DisplayNames dn
3342
                       left join HMBUnits hu
3343
                         on dn.COLUMN_NAME = Hu.Column_Name
3344
                      where dn.Table_Name = 'HMB'
3345
                      order by dn.[Order]"""    
3346
            try:
3347
                cursor.execute(sql)  
3348
                rows = cursor.fetchall()
3349
                for row in rows:
3350
                    res.append((row[0], row[1])) 
3351
            except Exception as ex:
3352
                from App import App
3353

  
3354
                message = 'error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno)
3355
                App.mainWnd().addMessage.emit(MessageType.Error, message)
3356
        finally:
3357
            conn.close()
3358

  
3359
        return res
3360

  
3361

  
3362

  
3274 3363
    def getColumnDisplayNames(self, uid, table):
3275 3364
        columnDisplayNameList = []
3276 3365

  
......
3280 3369
            conn = sqlite3.connect(dbPath)
3281 3370
            cursor = conn.cursor()
3282 3371
            sql = """SELECT dn.DISPLAY_NAME
3283
                          , u.UNIT
3372
                          , u.Value
3284 3373
                       FROM DisplayNames dn
3285 3374
                       left join drawingsUnits du
3286 3375
                         on dn.TABLE_NAME = du.Table_Name and dn.COLUMN_NAME = du.Column_Name
HYTOS/HYTOS/ConfigurationDialog.py
20 20

  
21 21
        self.ui = Configuration_UI.Ui_ConfigurationDialog()
22 22
        self.ui.setupUi(self)
23
        self.ui.comboBox_Pressure.currentIndexChanged.connect(self.onPpressurechanged) 
23 24

  
24
    def accept(self):
25

  
26
        self.initialize()
27
        
28
    def onPpressurechanged(self, index):
29

  
30
        unit = self.ui.comboBox_Pressure.itemText(index)
31
        if unit == 'kg/cm2':
32
            self.ui.lineEdit_CurrentBarometricPressure.setText('1.033')
33
        elif unit == 'bar':
34
            self.ui.lineEdit_CurrentBarometricPressure.setText('1.01325')
35
        elif unit == 'psi':
36
            self.ui.lineEdit_CurrentBarometricPressure.setText('14.7')
37
        elif unit == 'mmHg':
38
            self.ui.lineEdit_CurrentBarometricPressure.setText('760')
39
        elif unit == 'kPa':
40
            self.ui.lineEdit_CurrentBarometricPressure.setText('101.325')
41
        elif unit == 'MPa':
42
            self.ui.lineEdit_CurrentBarometricPressure.setText('0.101325')
43

  
44
        self.ui.label_PressureUnit.setText(unit)
45
        
46

  
47

  
48

  
49
        
50
        
51
        uid = self.ui.comboBox_Pressure.itemData(index)
52
        
53

  
54
    def initialize(self):       
55
        self.ui.comboBox_Flowrate_Mass.clear()
56
        self.ui.comboBox_Flowrate_Volume.clear()
57
        self.ui.comboBox_Density.clear()
58
        self.ui.comboBox_Viscosity.clear()
59
        self.ui.comboBox_Temperature.clear()
60
        self.ui.comboBox_Power.clear()
61
        self.ui.comboBox_Pressure.clear()
62
        self.ui.comboBox_Velocity.clear()
63
        self.ui.comboBox_Pipe_Diameter.clear()
64
        self.ui.comboBox_Length.clear()
65
        self.ui.comboBox_Roughness.clear()
66

  
67
        unitsList = AppDocData.instance().getUnits()
68
        for units in unitsList:
69
            uid = units[0]
70
            key = units[1]
71
            val = units[2]
72

  
73
            if key == 'Flowrate_Mass':
74
                self.ui.comboBox_Flowrate_Mass.addItem(val, uid)
75
            elif key == 'Flowrate_Volume':
76
                self.ui.comboBox_Flowrate_Volume.addItem(val, uid)
77
            elif key == 'Density':
78
                self.ui.comboBox_Density.addItem(val, uid)
79
            elif key == 'Viscosity':
80
                self.ui.comboBox_Viscosity.addItem(val, uid)
81
            elif key == 'Temperature':
82
                self.ui.comboBox_Temperature.addItem(val, uid)
83
            elif key == 'Power':
84
                self.ui.comboBox_Power.addItem(val, uid)
85
            elif key == 'Pressure':
86
                self.ui.comboBox_Pressure.addItem(val, uid)
87
            elif key == 'Velocity':
88
                self.ui.comboBox_Velocity.addItem(val, uid)
89
            elif key == 'Pipe_Diameter':
90
                self.ui.comboBox_Pipe_Diameter.addItem(val, uid)
91
            elif key == 'Length':
92
                self.ui.comboBox_Length.addItem(val, uid)
93
            elif key == 'Roughness':
94
                self.ui.comboBox_Roughness.addItem(val, uid)
95

  
96

  
97
    def accept(self):   
98
        # To Do List...
99
        # 1. Update Unit attributes in Drawing
100
        # 2. Update DrawingsUnits Table
101
        # 3. Update HMB List
25 102
        
26 103
        QDialog.accept(self)
27 104

  
HYTOS/HYTOS/Configuration_UI.py
13 13
class Ui_ConfigurationDialog(object):
14 14
    def setupUi(self, ConfigurationDialog):
15 15
        ConfigurationDialog.setObjectName("ConfigurationDialog")
16
        ConfigurationDialog.resize(531, 474)
16
        ConfigurationDialog.resize(537, 423)
17 17
        font = QtGui.QFont()
18 18
        font.setFamily("맑은 고딕")
19 19
        ConfigurationDialog.setFont(font)
......
106 106
        self.lineEdit_2.setObjectName("lineEdit_2")
107 107
        self.horizontalLayout_4.addWidget(self.lineEdit_2)
108 108
        self.gridLayout_7.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
109
        self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
110
        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
111
        self.label_9 = QtWidgets.QLabel(self.groupBox_2)
112
        self.label_9.setMinimumSize(QtCore.QSize(80, 0))
113
        font = QtGui.QFont()
114
        font.setFamily("맑은 고딕")
115
        font.setBold(False)
116
        font.setWeight(50)
117
        self.label_9.setFont(font)
118
        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
119
        self.label_9.setObjectName("label_9")
120
        self.horizontalLayout_9.addWidget(self.label_9)
121
        self.lineEdit_8 = QtWidgets.QLineEdit(self.groupBox_2)
122
        font = QtGui.QFont()
123
        font.setFamily("맑은 고딕")
124
        font.setBold(False)
125
        font.setWeight(50)
126
        self.lineEdit_8.setFont(font)
127
        self.lineEdit_8.setObjectName("lineEdit_8")
128
        self.horizontalLayout_9.addWidget(self.lineEdit_8)
129
        self.gridLayout_7.addLayout(self.horizontalLayout_9, 5, 0, 1, 1)
109 130
        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
110 131
        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
111 132
        self.label_2 = QtWidgets.QLabel(self.groupBox_2)
......
148 169
        self.lineEdit.setObjectName("lineEdit")
149 170
        self.horizontalLayout_5.addWidget(self.lineEdit)
150 171
        self.gridLayout_7.addLayout(self.horizontalLayout_5, 0, 0, 1, 1)
151
        self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
152
        self.horizontalLayout_9.setObjectName("horizontalLayout_9")
153
        self.label_9 = QtWidgets.QLabel(self.groupBox_2)
154
        self.label_9.setMinimumSize(QtCore.QSize(80, 0))
155
        font = QtGui.QFont()
156
        font.setFamily("맑은 고딕")
157
        font.setBold(False)
158
        font.setWeight(50)
159
        self.label_9.setFont(font)
160
        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
161
        self.label_9.setObjectName("label_9")
162
        self.horizontalLayout_9.addWidget(self.label_9)
163
        self.lineEdit_8 = QtWidgets.QLineEdit(self.groupBox_2)
164
        font = QtGui.QFont()
165
        font.setFamily("맑은 고딕")
166
        font.setBold(False)
167
        font.setWeight(50)
168
        self.lineEdit_8.setFont(font)
169
        self.lineEdit_8.setObjectName("lineEdit_8")
170
        self.horizontalLayout_9.addWidget(self.lineEdit_8)
171
        self.gridLayout_7.addLayout(self.horizontalLayout_9, 5, 0, 1, 1)
172
        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
173
        self.gridLayout_7.addItem(spacerItem, 6, 0, 1, 1)
172 174
        self.gridLayout_5.addWidget(self.groupBox_2, 0, 0, 1, 1)
173 175
        self.groupBox = QtWidgets.QGroupBox(self.Infomation)
174 176
        font = QtGui.QFont()
......
250 252
        self.lineEdit_6.setObjectName("lineEdit_6")
251 253
        self.horizontalLayout.addWidget(self.lineEdit_6)
252 254
        self.gridLayout_6.addLayout(self.horizontalLayout, 2, 0, 1, 1)
253
        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
254
        self.gridLayout_6.addItem(spacerItem, 3, 0, 1, 1)
255
        spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
256
        self.gridLayout_6.addItem(spacerItem1, 3, 0, 1, 1)
255 257
        self.gridLayout_5.addWidget(self.groupBox, 0, 1, 1, 1)
256 258
        self.verticalLayout.addLayout(self.gridLayout_5)
257 259
        self.gridLayout_2.addLayout(self.verticalLayout, 1, 0, 1, 1)
......
285 287
        self.gridLayout = QtWidgets.QGridLayout(self.Unit)
286 288
        self.gridLayout.setObjectName("gridLayout")
287 289
        self.groupBoxText_2 = QtWidgets.QGroupBox(self.Unit)
288
        self.groupBoxText_2.setTitle("")
290
        self.groupBoxText_2.setMinimumSize(QtCore.QSize(0, 0))
291
        self.groupBoxText_2.setMaximumSize(QtCore.QSize(16777215, 240))
292
        font = QtGui.QFont()
293
        font.setBold(True)
294
        font.setWeight(75)
295
        self.groupBoxText_2.setFont(font)
289 296
        self.groupBoxText_2.setObjectName("groupBoxText_2")
290 297
        self.gridLayout_4 = QtWidgets.QGridLayout(self.groupBoxText_2)
291 298
        self.gridLayout_4.setObjectName("gridLayout_4")
292
        self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
293
        self.horizontalLayout_10.setObjectName("horizontalLayout_10")
294 299
        self.gridLayout_10 = QtWidgets.QGridLayout()
295 300
        self.gridLayout_10.setObjectName("gridLayout_10")
296
        self.listWidget_Symbol = QtWidgets.QListWidget(self.groupBoxText_2)
297
        self.listWidget_Symbol.setFlow(QtWidgets.QListView.TopToBottom)
298
        self.listWidget_Symbol.setViewMode(QtWidgets.QListView.IconMode)
299
        self.listWidget_Symbol.setObjectName("listWidget_Symbol")
300
        self.gridLayout_10.addWidget(self.listWidget_Symbol, 0, 1, 1, 1)
301
        self.horizontalLayout_10.addLayout(self.gridLayout_10)
302
        self.gridLayout_4.addLayout(self.horizontalLayout_10, 0, 0, 1, 1)
301
        self.horizontalLayout_17 = QtWidgets.QHBoxLayout()
302
        self.horizontalLayout_17.setObjectName("horizontalLayout_17")
303
        self.label_18 = QtWidgets.QLabel(self.groupBoxText_2)
304
        font = QtGui.QFont()
305
        font.setBold(False)
306
        font.setWeight(50)
307
        self.label_18.setFont(font)
308
        self.label_18.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
309
        self.label_18.setObjectName("label_18")
310
        self.horizontalLayout_17.addWidget(self.label_18)
311
        self.comboBox_Pressure = QtWidgets.QComboBox(self.groupBoxText_2)
312
        font = QtGui.QFont()
313
        font.setBold(False)
314
        font.setWeight(50)
315
        self.comboBox_Pressure.setFont(font)
316
        self.comboBox_Pressure.setObjectName("comboBox_Pressure")
317
        self.horizontalLayout_17.addWidget(self.comboBox_Pressure)
318
        self.gridLayout_10.addLayout(self.horizontalLayout_17, 0, 0, 1, 1)
319
        self.horizontalLayout_21 = QtWidgets.QHBoxLayout()
320
        self.horizontalLayout_21.setObjectName("horizontalLayout_21")
321
        self.label_22 = QtWidgets.QLabel(self.groupBoxText_2)
322
        font = QtGui.QFont()
323
        font.setBold(False)
324
        font.setWeight(50)
325
        self.label_22.setFont(font)
326
        self.label_22.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
327
        self.label_22.setObjectName("label_22")
328
        self.horizontalLayout_21.addWidget(self.label_22)
329
        self.comboBox_Pipe_Diameter = QtWidgets.QComboBox(self.groupBoxText_2)
330
        font = QtGui.QFont()
331
        font.setBold(False)
332
        font.setWeight(50)
333
        self.comboBox_Pipe_Diameter.setFont(font)
334
        self.comboBox_Pipe_Diameter.setObjectName("comboBox_Pipe_Diameter")
335
        self.horizontalLayout_21.addWidget(self.comboBox_Pipe_Diameter)
336
        self.gridLayout_10.addLayout(self.horizontalLayout_21, 2, 0, 1, 1)
337
        self.horizontalLayout_18 = QtWidgets.QHBoxLayout()
338
        self.horizontalLayout_18.setObjectName("horizontalLayout_18")
339
        self.label_19 = QtWidgets.QLabel(self.groupBoxText_2)
340
        font = QtGui.QFont()
341
        font.setBold(False)
342
        font.setWeight(50)
343
        self.label_19.setFont(font)
344
        self.label_19.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
345
        self.label_19.setObjectName("label_19")
346
        self.horizontalLayout_18.addWidget(self.label_19)
347
        self.comboBox_Roughness = QtWidgets.QComboBox(self.groupBoxText_2)
348
        font = QtGui.QFont()
349
        font.setBold(False)
350
        font.setWeight(50)
351
        self.comboBox_Roughness.setFont(font)
352
        self.comboBox_Roughness.setObjectName("comboBox_Roughness")
353
        self.horizontalLayout_18.addWidget(self.comboBox_Roughness)
354
        self.gridLayout_10.addLayout(self.horizontalLayout_18, 4, 0, 1, 1)
355
        self.horizontalLayout_20 = QtWidgets.QHBoxLayout()
356
        self.horizontalLayout_20.setObjectName("horizontalLayout_20")
357
        self.label_21 = QtWidgets.QLabel(self.groupBoxText_2)
358
        font = QtGui.QFont()
359
        font.setBold(False)
360
        font.setWeight(50)
361
        self.label_21.setFont(font)
362
        self.label_21.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
363
        self.label_21.setObjectName("label_21")
364
        self.horizontalLayout_20.addWidget(self.label_21)
365
        self.comboBox_Velocity = QtWidgets.QComboBox(self.groupBoxText_2)
366
        font = QtGui.QFont()
367
        font.setBold(False)
368
        font.setWeight(50)
369
        self.comboBox_Velocity.setFont(font)
370
        self.comboBox_Velocity.setObjectName("comboBox_Velocity")
371
        self.horizontalLayout_20.addWidget(self.comboBox_Velocity)
372
        self.gridLayout_10.addLayout(self.horizontalLayout_20, 1, 0, 1, 1)
373
        self.horizontalLayout_19 = QtWidgets.QHBoxLayout()
374
        self.horizontalLayout_19.setObjectName("horizontalLayout_19")
375
        self.label_20 = QtWidgets.QLabel(self.groupBoxText_2)
376
        font = QtGui.QFont()
377
        font.setBold(False)
378
        font.setWeight(50)
379
        self.label_20.setFont(font)
380
        self.label_20.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
381
        self.label_20.setObjectName("label_20")
382
        self.horizontalLayout_19.addWidget(self.label_20)
383
        self.comboBox_Length = QtWidgets.QComboBox(self.groupBoxText_2)
384
        font = QtGui.QFont()
385
        font.setBold(False)
386
        font.setWeight(50)
387
        self.comboBox_Length.setFont(font)
388
        self.comboBox_Length.setObjectName("comboBox_Length")
389
        self.horizontalLayout_19.addWidget(self.comboBox_Length)
390
        self.gridLayout_10.addLayout(self.horizontalLayout_19, 3, 0, 1, 1)
391
        spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
392
        self.gridLayout_10.addItem(spacerItem2, 5, 0, 1, 1)
393
        self.gridLayout_4.addLayout(self.gridLayout_10, 2, 1, 1, 1)
394
        self.horizontalLayout_16 = QtWidgets.QHBoxLayout()
395
        self.horizontalLayout_16.setObjectName("horizontalLayout_16")
396
        self.label_16 = QtWidgets.QLabel(self.groupBoxText_2)
397
        font = QtGui.QFont()
398
        font.setBold(False)
399
        font.setWeight(50)
400
        self.label_16.setFont(font)
401
        self.label_16.setObjectName("label_16")
402
        self.horizontalLayout_16.addWidget(self.label_16)
403
        self.lineEdit_CurrentBarometricPressure = QtWidgets.QLineEdit(self.groupBoxText_2)
404
        self.lineEdit_CurrentBarometricPressure.setMinimumSize(QtCore.QSize(130, 0))
405
        self.lineEdit_CurrentBarometricPressure.setMaximumSize(QtCore.QSize(130, 16777215))
406
        font = QtGui.QFont()
407
        font.setBold(False)
408
        font.setWeight(50)
409
        self.lineEdit_CurrentBarometricPressure.setFont(font)
410
        self.lineEdit_CurrentBarometricPressure.setAlignment(QtCore.Qt.AlignCenter)
411
        self.lineEdit_CurrentBarometricPressure.setObjectName("lineEdit_CurrentBarometricPressure")
412
        self.horizontalLayout_16.addWidget(self.lineEdit_CurrentBarometricPressure)
413
        self.label_PressureUnit = QtWidgets.QLabel(self.groupBoxText_2)
414
        font = QtGui.QFont()
415
        font.setBold(False)
416
        font.setWeight(50)
417
        self.label_PressureUnit.setFont(font)
418
        self.label_PressureUnit.setText("")
419
        self.label_PressureUnit.setObjectName("label_PressureUnit")
420
        self.horizontalLayout_16.addWidget(self.label_PressureUnit)
421
        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
422
        self.horizontalLayout_16.addItem(spacerItem3)
423
        self.gridLayout_4.addLayout(self.horizontalLayout_16, 0, 0, 1, 2)
424
        self.gridLayout_11 = QtWidgets.QGridLayout()
425
        self.gridLayout_11.setObjectName("gridLayout_11")
426
        self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
427
        self.horizontalLayout_13.setObjectName("horizontalLayout_13")
428
        self.label_14 = QtWidgets.QLabel(self.groupBoxText_2)
429
        font = QtGui.QFont()
430
        font.setBold(False)
431
        font.setWeight(50)
432
        self.label_14.setFont(font)
433
        self.label_14.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
434
        self.label_14.setObjectName("label_14")
435
        self.horizontalLayout_13.addWidget(self.label_14)
436
        self.comboBox_Density = QtWidgets.QComboBox(self.groupBoxText_2)
437
        font = QtGui.QFont()
438
        font.setBold(False)
439
        font.setWeight(50)
440
        self.comboBox_Density.setFont(font)
441
        self.comboBox_Density.setObjectName("comboBox_Density")
442
        self.horizontalLayout_13.addWidget(self.comboBox_Density)
443
        self.gridLayout_11.addLayout(self.horizontalLayout_13, 3, 0, 1, 1)
444
        spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
445
        self.gridLayout_11.addItem(spacerItem4, 7, 0, 1, 1)
446
        self.horizontalLayout_22 = QtWidgets.QHBoxLayout()
447
        self.horizontalLayout_22.setObjectName("horizontalLayout_22")
448
        self.label_23 = QtWidgets.QLabel(self.groupBoxText_2)
449
        font = QtGui.QFont()
450
        font.setBold(False)
451
        font.setWeight(50)
452
        self.label_23.setFont(font)
453
        self.label_23.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
454
        self.label_23.setObjectName("label_23")
455
        self.horizontalLayout_22.addWidget(self.label_23)
456
        self.comboBox_Temperature = QtWidgets.QComboBox(self.groupBoxText_2)
457
        font = QtGui.QFont()
458
        font.setBold(False)
459
        font.setWeight(50)
460
        self.comboBox_Temperature.setFont(font)
461
        self.comboBox_Temperature.setObjectName("comboBox_Temperature")
462
        self.horizontalLayout_22.addWidget(self.comboBox_Temperature)
463
        self.gridLayout_11.addLayout(self.horizontalLayout_22, 5, 0, 1, 1)
464
        self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
465
        self.horizontalLayout_12.setObjectName("horizontalLayout_12")
466
        self.label_15 = QtWidgets.QLabel(self.groupBoxText_2)
467
        font = QtGui.QFont()
468
        font.setBold(False)
469
        font.setWeight(50)
470
        self.label_15.setFont(font)
471
        self.label_15.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
472
        self.label_15.setObjectName("label_15")
473
        self.horizontalLayout_12.addWidget(self.label_15)
474
        self.comboBox_Viscosity = QtWidgets.QComboBox(self.groupBoxText_2)
475
        font = QtGui.QFont()
476
        font.setBold(False)
477
        font.setWeight(50)
478
        self.comboBox_Viscosity.setFont(font)
479
        self.comboBox_Viscosity.setObjectName("comboBox_Viscosity")
480
        self.horizontalLayout_12.addWidget(self.comboBox_Viscosity)
481
        self.gridLayout_11.addLayout(self.horizontalLayout_12, 4, 0, 1, 1)
482
        self.horizontalLayout_15 = QtWidgets.QHBoxLayout()
483
        self.horizontalLayout_15.setObjectName("horizontalLayout_15")
484
        self.label_12 = QtWidgets.QLabel(self.groupBoxText_2)
485
        font = QtGui.QFont()
486
        font.setBold(False)
487
        font.setWeight(50)
488
        self.label_12.setFont(font)
489
        self.label_12.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
490
        self.label_12.setObjectName("label_12")
491
        self.horizontalLayout_15.addWidget(self.label_12)
492
        self.comboBox_Flowrate_Mass = QtWidgets.QComboBox(self.groupBoxText_2)
493
        font = QtGui.QFont()
494
        font.setBold(False)
495
        font.setWeight(50)
496
        self.comboBox_Flowrate_Mass.setFont(font)
497
        self.comboBox_Flowrate_Mass.setObjectName("comboBox_Flowrate_Mass")
498
        self.horizontalLayout_15.addWidget(self.comboBox_Flowrate_Mass)
499
        self.gridLayout_11.addLayout(self.horizontalLayout_15, 1, 0, 1, 1)
500
        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
501
        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
502
        self.label_11 = QtWidgets.QLabel(self.groupBoxText_2)
503
        font = QtGui.QFont()
504
        font.setBold(False)
505
        font.setWeight(50)
506
        self.label_11.setFont(font)
507
        self.label_11.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
508
        self.label_11.setObjectName("label_11")
509
        self.horizontalLayout_11.addWidget(self.label_11)
510
        self.comboBox_Power = QtWidgets.QComboBox(self.groupBoxText_2)
511
        font = QtGui.QFont()
512
        font.setBold(False)
513
        font.setWeight(50)
514
        self.comboBox_Power.setFont(font)
515
        self.comboBox_Power.setObjectName("comboBox_Power")
516
        self.horizontalLayout_11.addWidget(self.comboBox_Power)
517
        self.gridLayout_11.addLayout(self.horizontalLayout_11, 6, 0, 1, 1)
518
        self.horizontalLayout_14 = QtWidgets.QHBoxLayout()
519
        self.horizontalLayout_14.setObjectName("horizontalLayout_14")
520
        self.label_13 = QtWidgets.QLabel(self.groupBoxText_2)
521
        font = QtGui.QFont()
522
        font.setBold(False)
523
        font.setWeight(50)
524
        self.label_13.setFont(font)
525
        self.label_13.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
526
        self.label_13.setObjectName("label_13")
527
        self.horizontalLayout_14.addWidget(self.label_13)
528
        self.comboBox_Flowrate_Volume = QtWidgets.QComboBox(self.groupBoxText_2)
529
        font = QtGui.QFont()
530
        font.setBold(False)
531
        font.setWeight(50)
532
        self.comboBox_Flowrate_Volume.setFont(font)
533
        self.comboBox_Flowrate_Volume.setObjectName("comboBox_Flowrate_Volume")
534
        self.horizontalLayout_14.addWidget(self.comboBox_Flowrate_Volume)
535
        self.gridLayout_11.addLayout(self.horizontalLayout_14, 2, 0, 1, 1)
536
        self.gridLayout_4.addLayout(self.gridLayout_11, 2, 0, 1, 1)
537
        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
538
        self.gridLayout_4.addItem(spacerItem5, 1, 0, 1, 1)
303 539
        self.gridLayout.addWidget(self.groupBoxText_2, 0, 0, 1, 1)
540
        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
541
        self.gridLayout.addItem(spacerItem6, 1, 0, 1, 1)
304 542
        self.tabWidget.addTab(self.Unit, "")
305 543
        self.formLayout.setWidget(0, QtWidgets.QFormLayout.SpanningRole, self.tabWidget)
306 544
        self.buttonBox = QtWidgets.QDialogButtonBox(ConfigurationDialog)
......
314 552
        self.buttonBox.accepted.connect(ConfigurationDialog.accept)
315 553
        self.buttonBox.rejected.connect(ConfigurationDialog.reject)
316 554
        QtCore.QMetaObject.connectSlotsByName(ConfigurationDialog)
555
        ConfigurationDialog.setTabOrder(self.tabWidget, self.lineEdit)
556
        ConfigurationDialog.setTabOrder(self.lineEdit, self.lineEdit_2)
557
        ConfigurationDialog.setTabOrder(self.lineEdit_2, self.lineEdit_3)
558
        ConfigurationDialog.setTabOrder(self.lineEdit_3, self.lineEdit_4)
559
        ConfigurationDialog.setTabOrder(self.lineEdit_4, self.lineEdit_7)
560
        ConfigurationDialog.setTabOrder(self.lineEdit_7, self.lineEdit_8)
561
        ConfigurationDialog.setTabOrder(self.lineEdit_8, self.radioButton)
562
        ConfigurationDialog.setTabOrder(self.radioButton, self.radioButton_2)
563
        ConfigurationDialog.setTabOrder(self.radioButton_2, self.lineEdit_5)
564
        ConfigurationDialog.setTabOrder(self.lineEdit_5, self.lineEdit_6)
565
        ConfigurationDialog.setTabOrder(self.lineEdit_6, self.tableWidget)
566
        ConfigurationDialog.setTabOrder(self.tableWidget, self.lineEdit_CurrentBarometricPressure)
567
        ConfigurationDialog.setTabOrder(self.lineEdit_CurrentBarometricPressure, self.comboBox_Flowrate_Mass)
568
        ConfigurationDialog.setTabOrder(self.comboBox_Flowrate_Mass, self.comboBox_Flowrate_Volume)
569
        ConfigurationDialog.setTabOrder(self.comboBox_Flowrate_Volume, self.comboBox_Density)
570
        ConfigurationDialog.setTabOrder(self.comboBox_Density, self.comboBox_Viscosity)
571
        ConfigurationDialog.setTabOrder(self.comboBox_Viscosity, self.comboBox_Temperature)
572
        ConfigurationDialog.setTabOrder(self.comboBox_Temperature, self.comboBox_Power)
573
        ConfigurationDialog.setTabOrder(self.comboBox_Power, self.comboBox_Pressure)
574
        ConfigurationDialog.setTabOrder(self.comboBox_Pressure, self.comboBox_Velocity)
575
        ConfigurationDialog.setTabOrder(self.comboBox_Velocity, self.comboBox_Pipe_Diameter)
576
        ConfigurationDialog.setTabOrder(self.comboBox_Pipe_Diameter, self.comboBox_Length)
577
        ConfigurationDialog.setTabOrder(self.comboBox_Length, self.comboBox_Roughness)
317 578

  
318 579
    def retranslateUi(self, ConfigurationDialog):
319 580
        _translate = QtCore.QCoreApplication.translate
......
322 583
        self.label_8.setText(_translate("ConfigurationDialog", "Approved By :"))
323 584
        self.label.setText(_translate("ConfigurationDialog", "Checked By :"))
324 585
        self.label_3.setText(_translate("ConfigurationDialog", "Date :"))
586
        self.label_9.setText(_translate("ConfigurationDialog", "Rev. Status :"))
325 587
        self.label_2.setText(_translate("ConfigurationDialog", "Description :"))
326 588
        self.label_4.setText(_translate("ConfigurationDialog", "Made By :"))
327
        self.label_9.setText(_translate("ConfigurationDialog", "Rev. Status :"))
328 589
        self.groupBox.setTitle(_translate("ConfigurationDialog", "Job Information"))
329 590
        self.label_5.setText(_translate("ConfigurationDialog", "Job No :"))
330 591
        self.label_6.setText(_translate("ConfigurationDialog", "Type :"))
......
333 594
        self.label_7.setText(_translate("ConfigurationDialog", "Job Name :"))
334 595
        self.groupBox_3.setTitle(_translate("ConfigurationDialog", "Sheet History"))
335 596
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.Infomation), _translate("ConfigurationDialog", "Information"))
597
        self.groupBoxText_2.setTitle(_translate("ConfigurationDialog", "Unit Conversion"))
598
        self.label_18.setText(_translate("ConfigurationDialog", "Pressure :"))
599
        self.label_22.setText(_translate("ConfigurationDialog", "Pipe Diameter :"))
600
        self.label_19.setText(_translate("ConfigurationDialog", "Roughness :"))
601
        self.label_21.setText(_translate("ConfigurationDialog", "Velocity :"))
602
        self.label_20.setText(_translate("ConfigurationDialog", "Length :"))
603
        self.label_16.setText(_translate("ConfigurationDialog", "Current Barometric Pressure :"))
604
        self.label_14.setText(_translate("ConfigurationDialog", "Density :"))
605
        self.label_23.setText(_translate("ConfigurationDialog", "Temperature :"))
606
        self.label_15.setText(_translate("ConfigurationDialog", "Viscosity :"))
607
        self.label_12.setText(_translate("ConfigurationDialog", "Flowrate (Mass) :"))
608
        self.label_11.setText(_translate("ConfigurationDialog", "Power :"))
609
        self.label_13.setText(_translate("ConfigurationDialog", "Flowrate (Volume) :"))
336 610
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.Unit), _translate("ConfigurationDialog", "Unit"))
337 611
import Resource_rc
HYTOS/HYTOS/Drawing.py
13 13
        app_doc_data = AppDocData.instance()
14 14

  
15 15
        self.name = name
16
        self._attrs = [['Drawing No', ''], ['Rev No', ''], ['Unit', '']] # attributes
16
        self._attrs = [['Drawing No', ''], ['Rev No', ''], ['Units', '']] # attributes
17 17

  
18 18
        ''' set drawing uid '''
19 19
        drawings = app_doc_data.getDrawings()
......
24 24
        self.allItems = []
25 25
        self._hmbTable = None
26 26
       
27
        self.setUnits(self.UID)
28

  
27 29
    def clearItemList(self):
28 30
        self.allItems.clear()
29 31
        
32
    def setUnits(self, uid):
33
        value = {}
34

  
35
        unitsList = AppDocData.instance().getDrawingsUnitsByDrawingUID(uid)
36
        for units in unitsList:            
37
            value[units[0]] = units[1]
38

  
39
        if len(value) > 0:
40
            self.setAttr('Units', value)        
30 41
    '''
31 42
        @brief  getter of attrs
32 43
        @author humkyung
HYTOS/HYTOS/MainWindow.py
303 303
        self.treeWidgetDrawingList.hideColumn(2)
304 304

  
305 305
    def initTableWidgetHMB(self):        
306
        docData = AppDocData.instance() 
307

  
308
        columnInfos = docData.getHMBDisplayNameAndUnitsExpression()
309
        count = len(columnInfos)
310
        self.tableWidgetHMB.setRowCount(count)
311
        self.tableWidgetHMB.setColumnCount(2)
312
        self.tableWidgetHMB.hideRow(0)
313
        self.tableWidgetHMB.hideRow(1)
314

  
315
        rowIndex = 0
316
        for columnInfo in columnInfos:      
317
            displayName = columnInfo[0]
318
            unitsExpres = columnInfo[1]
319

  
320
            name = QTableWidgetItem(displayName)
321
            name.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter)
322
            name.setBackground(QColor(230, 230, 230))                                     
323
            self.tableWidgetHMB.setItem(rowIndex, 0, name)
324
               
325
            if docData.activeDrawing:                
326
                if unitsExpres:
327
                    units = self.convertToUnits(unitsExpres)
328
                else:
329
                    units = None    
330
            else:
331
                units = None
332

  
333
            unit = QTableWidgetItem(units)
334
            unit.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
335
            unit.setBackground(QColor(230, 230, 230))
336
            self.tableWidgetHMB.setItem(rowIndex, 1, unit)
337

  
338
            rowIndex += 1
339

  
340
        self.tableWidgetHMB.setEditTriggers(QAbstractItemView.NoEditTriggers)
341
        self.tableWidgetHMB.resizeColumnsToContents()
342
        self.tableWidgetHMB.resizeRowsToContents()        
343

  
344
        self.tableWidgetHMB.horizontalHeader().setVisible(False)
345
        self.tableWidgetHMB.verticalHeader().setVisible(False)
346

  
347

  
348
        return
349

  
350

  
351

  
306 352
        docData = AppDocData.instance()    
307 353
        if docData.activeDrawing is None:
354
            
308 355
            drawingUid = '00000000-0000-0000-0000-000000000000'
309 356
        else:
310 357
            drawingUid = docData.activeDrawing.UID
......
337 384
        self.tableWidgetHMB.horizontalHeader().setVisible(False)
338 385
        self.tableWidgetHMB.verticalHeader().setVisible(False)
339 386
        
387

  
388

  
389
    '''
390
        @brief      Convert UnitsExpression To Units Value
391
        @author     yeonjin
392
        @date       19.08.29
393
    '''
394
    def convertToUnits(self, unitsExpression):
395
        value = unitsExpression
396

  
397
        for attr in AppDocData.instance().activeDrawing.attrs:
398
            if attr[0] == 'Units':
399
                key = unitsExpression.replace("{","").replace("}","")                
400
                if key in attr[1]:
401
                    value = attr[1][key]
402
                    break
403
                
404
        return value
405

  
406

  
340 407
    '''
341 408
        @brief      Clear TreeWidget and Set Current PID
342 409
        @author     Jeongwoo
HYTOS/HYTOS/Scripts/CreateTables.sql
65 65
CREATE TABLE IF NOT EXISTS DrawingsUnits (
66 66
    UID          TEXT NOT NULL,
67 67
    Drawings_UID TEXT NOT NULL,
68
    Table_Name   TEXT NOT NULL,
69
    Column_Name  TEXT NOT NULL,
70
    Units_UID    TEXT,
68
    Units        TEXT NOT NULL,
69
    Units_UID    TEXT NOT NULL,
71 70
    CONSTRAINT PK_DrawingsUnits PRIMARY KEY (
72 71
        UID
73 72
    ),
......
407 406

  
408 407
CREATE TABLE IF NOT EXISTS Units (
409 408
    UID         TEXT NOT NULL,
410
    TABLE_NAME  TEXT NOT NULL,
411
    COLUMN_NAME TEXT NOT NULL,
412
    UNIT        TEXT NOT NULL,
409
    [Key]       TEXT NOT NULL,
410
    Value       TEXT NOT NULL,
413 411
    CONSTRAINT PK_Units PRIMARY KEY (
414 412
        UID
415 413
    ),
416 414
    CONSTRAINT UQ_Units UNIQUE (
417
        TABLE_NAME,
418
        COLUMN_NAME,
419
        UNIT
415
        [Key],
416
        Value
420 417
    )
421 418
);
422 419

  
423

  
420
CREATE TABLE IF NOT EXISTS HMBUnits (
421
    UID                 TEXT NOT NULL,
422
    COLUMN_NAME         TEXT NOT NULL,
423
    Units_Expression    TEXT,
424
    CONSTRAINT PK_HMBUnits PRIMARY KEY (
425
        UID
426
    ),
427
    CONSTRAINT UQ_HMBUnits UNIQUE (
428
        COLUMN_NAME
429
    )
430
);
HYTOS/HYTOS/UI/Configuration.ui
6 6
   <rect>
7 7
    <x>0</x>
8 8
    <y>0</y>
9
    <width>531</width>
10
    <height>474</height>
9
    <width>537</width>
10
    <height>423</height>
11 11
   </rect>
12 12
  </property>
13 13
  <property name="font">
......
166 166
                  </item>
167 167
                 </layout>
168 168
                </item>
169
                <item row="2" column="0">
170
                 <layout class="QHBoxLayout" name="horizontalLayout_3">
169
                <item row="5" column="0">
170
                 <layout class="QHBoxLayout" name="horizontalLayout_9">
171 171
                  <item>
172
                   <widget class="QLabel" name="label_2">
172
                   <widget class="QLabel" name="label_9">
173 173
                    <property name="minimumSize">
174 174
                     <size>
175 175
                      <width>80</width>
......
184 184
                     </font>
185 185
                    </property>
186 186
                    <property name="text">
187
                     <string>Description :</string>
187
                     <string>Rev. Status :</string>
188 188
                    </property>
189 189
                    <property name="alignment">
190 190
                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
192 192
                   </widget>
193 193
                  </item>
194 194
                  <item>
195
                   <widget class="QLineEdit" name="lineEdit_3">
195
                   <widget class="QLineEdit" name="lineEdit_8">
196 196
                    <property name="font">
197 197
                     <font>
198 198
                      <family>맑은 고딕</family>
......
204 204
                  </item>
205 205
                 </layout>
206 206
                </item>
207
                <item row="0" column="0">
208
                 <layout class="QHBoxLayout" name="horizontalLayout_5">
207
                <item row="2" column="0">
208
                 <layout class="QHBoxLayout" name="horizontalLayout_3">
209 209
                  <item>
210
                   <widget class="QLabel" name="label_4">
210
                   <widget class="QLabel" name="label_2">
211 211
                    <property name="minimumSize">
212 212
                     <size>
213 213
                      <width>80</width>
......
222 222
                     </font>
223 223
                    </property>
224 224
                    <property name="text">
225
                     <string>Made By :</string>
225
                     <string>Description :</string>
226 226
                    </property>
227 227
                    <property name="alignment">
228 228
                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
230 230
                   </widget>
231 231
                  </item>
232 232
                  <item>
233
                   <widget class="QLineEdit" name="lineEdit">
233
                   <widget class="QLineEdit" name="lineEdit_3">
234 234
                    <property name="font">
235 235
                     <font>
236 236
                      <family>맑은 고딕</family>
......
242 242
                  </item>
243 243
                 </layout>
244 244
                </item>
245
                <item row="5" column="0">
246
                 <layout class="QHBoxLayout" name="horizontalLayout_9">
245
                <item row="0" column="0">
246
                 <layout class="QHBoxLayout" name="horizontalLayout_5">
247 247
                  <item>
248
                   <widget class="QLabel" name="label_9">
248
                   <widget class="QLabel" name="label_4">
249 249
                    <property name="minimumSize">
250 250
                     <size>
251 251
                      <width>80</width>
......
260 260
                     </font>
261 261
                    </property>
262 262
                    <property name="text">
263
                     <string>Rev. Status :</string>
263
                     <string>Made By :</string>
264 264
                    </property>
265 265
                    <property name="alignment">
266 266
                     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
268 268
                   </widget>
269 269
                  </item>
270 270
                  <item>
271
                   <widget class="QLineEdit" name="lineEdit_8">
271
                   <widget class="QLineEdit" name="lineEdit">
272 272
                    <property name="font">
273 273
                     <font>
274 274
                      <family>맑은 고딕</family>
......
280 280
                  </item>
281 281
                 </layout>
282 282
                </item>
283
                <item row="6" column="0">
284
                 <spacer name="verticalSpacer">
285
                  <property name="orientation">
286
                   <enum>Qt::Vertical</enum>
287
                  </property>
288
                  <property name="sizeHint" stdset="0">
289
                   <size>
290
                    <width>20</width>
291
                    <height>40</height>
292
                   </size>
293
                  </property>
294
                 </spacer>
295
                </item>
283 296
               </layout>
284 297
              </widget>
285 298
             </item>
......
489 502
      <layout class="QGridLayout" name="gridLayout">
490 503
       <item row="0" column="0">
491 504
        <widget class="QGroupBox" name="groupBoxText_2">
505
         <property name="minimumSize">
506
          <size>
507
           <width>0</width>
508
           <height>0</height>
509
          </size>
510
         </property>
511
         <property name="maximumSize">
512
          <size>
513
           <width>16777215</width>
514
           <height>240</height>
515
          </size>
516
         </property>
517
         <property name="font">
518
          <font>
519
           <weight>75</weight>
520
           <bold>true</bold>
521
          </font>
522
         </property>
492 523
         <property name="title">
493
          <string/>
524
          <string>Unit Conversion</string>
494 525
         </property>
495 526
         <layout class="QGridLayout" name="gridLayout_4">
496
          <item row="0" column="0">
497
           <layout class="QHBoxLayout" name="horizontalLayout_10">
527
          <item row="2" column="1">
528
           <layout class="QGridLayout" name="gridLayout_10">
529
            <item row="0" column="0">
530
             <layout class="QHBoxLayout" name="horizontalLayout_17">
531
              <item>
532
               <widget class="QLabel" name="label_18">
533
                <property name="font">
534
                 <font>
535
                  <weight>50</weight>
536
                  <bold>false</bold>
537
                 </font>
538
                </property>
539
                <property name="text">
540
                 <string>Pressure :</string>
541
                </property>
542
                <property name="alignment">
543
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
544
                </property>
545
               </widget>
546
              </item>
547
              <item>
548
               <widget class="QComboBox" name="comboBox_Pressure">
549
                <property name="font">
550
                 <font>
551
                  <weight>50</weight>
552
                  <bold>false</bold>
553
                 </font>
554
                </property>
555
               </widget>
556
              </item>
557
             </layout>
558
            </item>
559
            <item row="2" column="0">
560
             <layout class="QHBoxLayout" name="horizontalLayout_21">
561
              <item>
562
               <widget class="QLabel" name="label_22">
563
                <property name="font">
564
                 <font>
565
                  <weight>50</weight>
566
                  <bold>false</bold>
567
                 </font>
568
                </property>
569
                <property name="text">
570
                 <string>Pipe Diameter :</string>
571
                </property>
572
                <property name="alignment">
573
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
574
                </property>
575
               </widget>
576
              </item>
577
              <item>
578
               <widget class="QComboBox" name="comboBox_Pipe_Diameter">
579
                <property name="font">
580
                 <font>
581
                  <weight>50</weight>
582
                  <bold>false</bold>
583
                 </font>
584
                </property>
585
               </widget>
586
              </item>
587
             </layout>
588
            </item>
589
            <item row="4" column="0">
590
             <layout class="QHBoxLayout" name="horizontalLayout_18">
591
              <item>
592
               <widget class="QLabel" name="label_19">
593
                <property name="font">
594
                 <font>
595
                  <weight>50</weight>
596
                  <bold>false</bold>
597
                 </font>
598
                </property>
599
                <property name="text">
600
                 <string>Roughness :</string>
601
                </property>
602
                <property name="alignment">
603
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
604
                </property>
605
               </widget>
606
              </item>
607
              <item>
608
               <widget class="QComboBox" name="comboBox_Roughness">
609
                <property name="font">
610
                 <font>
611
                  <weight>50</weight>
612
                  <bold>false</bold>
613
                 </font>
614
                </property>
615
               </widget>
616
              </item>
617
             </layout>
618
            </item>
619
            <item row="1" column="0">
620
             <layout class="QHBoxLayout" name="horizontalLayout_20">
621
              <item>
622
               <widget class="QLabel" name="label_21">
623
                <property name="font">
624
                 <font>
625
                  <weight>50</weight>
626
                  <bold>false</bold>
627
                 </font>
628
                </property>
629
                <property name="text">
630
                 <string>Velocity :</string>
631
                </property>
632
                <property name="alignment">
633
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
634
                </property>
635
               </widget>
636
              </item>
637
              <item>
638
               <widget class="QComboBox" name="comboBox_Velocity">
639
                <property name="font">
640
                 <font>
641
                  <weight>50</weight>
642
                  <bold>false</bold>
643
                 </font>
644
                </property>
645
               </widget>
646
              </item>
647
             </layout>
648
            </item>
649
            <item row="3" column="0">
650
             <layout class="QHBoxLayout" name="horizontalLayout_19">
651
              <item>
652
               <widget class="QLabel" name="label_20">
653
                <property name="font">
654
                 <font>
655
                  <weight>50</weight>
656
                  <bold>false</bold>
657
                 </font>
658
                </property>
659
                <property name="text">
660
                 <string>Length :</string>
661
                </property>
662
                <property name="alignment">
663
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
664
                </property>
665
               </widget>
666
              </item>
667
              <item>
668
               <widget class="QComboBox" name="comboBox_Length">
669
                <property name="font">
670
                 <font>
671
                  <weight>50</weight>
672
                  <bold>false</bold>
673
                 </font>
674
                </property>
675
               </widget>
676
              </item>
677
             </layout>
678
            </item>
679
            <item row="5" column="0">
680
             <spacer name="verticalSpacer_4">
681
              <property name="orientation">
682
               <enum>Qt::Vertical</enum>
683
              </property>
684
              <property name="sizeHint" stdset="0">
685
               <size>
686
                <width>20</width>
687
                <height>40</height>
688
               </size>
689
              </property>
690
             </spacer>
691
            </item>
692
           </layout>
693
          </item>
694
          <item row="0" column="0" colspan="2">
695
           <layout class="QHBoxLayout" name="horizontalLayout_16">
498 696
            <item>
499
             <layout class="QGridLayout" name="gridLayout_10">
500
              <item row="0" column="1">
501
               <widget class="QListWidget" name="listWidget_Symbol">
502
                <property name="flow">
503
                 <enum>QListView::TopToBottom</enum>
697
             <widget class="QLabel" name="label_16">
698
              <property name="font">
699
               <font>
700
                <weight>50</weight>
701
                <bold>false</bold>
702
               </font>
703
              </property>
704
              <property name="text">
705
               <string>Current Barometric Pressure :</string>
706
              </property>
707
             </widget>
708
            </item>
709
            <item>
710
             <widget class="QLineEdit" name="lineEdit_CurrentBarometricPressure">
711
              <property name="minimumSize">
712
               <size>
713
                <width>130</width>
714
                <height>0</height>
715
               </size>
716
              </property>
717
              <property name="maximumSize">
718
               <size>
719
                <width>130</width>
720
                <height>16777215</height>
721
               </size>
722
              </property>
723
              <property name="font">
724
               <font>
725
                <weight>50</weight>
726
                <bold>false</bold>
727
               </font>
728
              </property>
729
              <property name="alignment">
730
               <set>Qt::AlignCenter</set>
731
              </property>
732
             </widget>
733
            </item>
734
            <item>
735
             <widget class="QLabel" name="label_PressureUnit">
736
              <property name="font">
737
               <font>
738
                <weight>50</weight>
739
                <bold>false</bold>
740
               </font>
741
              </property>
742
              <property name="text">
743
               <string/>
744
              </property>
745
             </widget>
746
            </item>
747
            <item>
748
             <spacer name="horizontalSpacer">
749
              <property name="orientation">
750
               <enum>Qt::Horizontal</enum>
751
              </property>
752
              <property name="sizeHint" stdset="0">
753
               <size>
754
                <width>40</width>
755
                <height>20</height>
756
               </size>
757
              </property>
758
             </spacer>
759
            </item>
760
           </layout>
761
          </item>
762
          <item row="2" column="0">
763
           <layout class="QGridLayout" name="gridLayout_11">
764
            <item row="3" column="0">
765
             <layout class="QHBoxLayout" name="horizontalLayout_13">
766
              <item>
767
               <widget class="QLabel" name="label_14">
768
                <property name="font">
769
                 <font>
770
                  <weight>50</weight>
771
                  <bold>false</bold>
772
                 </font>
773
                </property>
774
                <property name="text">
775
                 <string>Density :</string>
504 776
                </property>
505
                <property name="viewMode">
506
                 <enum>QListView::IconMode</enum>
777
                <property name="alignment">
778
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
779
                </property>
780
               </widget>
781
              </item>
782
              <item>
783
               <widget class="QComboBox" name="comboBox_Density">
784
                <property name="font">
785
                 <font>
786
                  <weight>50</weight>
787
                  <bold>false</bold>
788
                 </font>
789
                </property>
790
               </widget>
791
              </item>
792
             </layout>
793
            </item>
794
            <item row="7" column="0">
795
             <spacer name="verticalSpacer_5">
796
              <property name="orientation">
797
               <enum>Qt::Vertical</enum>
798
              </property>
799
              <property name="sizeHint" stdset="0">
800
               <size>
801
                <width>20</width>
802
                <height>40</height>
803
               </size>
804
              </property>
805
             </spacer>
806
            </item>
807
            <item row="5" column="0">
808
             <layout class="QHBoxLayout" name="horizontalLayout_22">
809
              <item>
810
               <widget class="QLabel" name="label_23">
811
                <property name="font">
812
                 <font>
813
                  <weight>50</weight>
814
                  <bold>false</bold>
815
                 </font>
816
                </property>
817
                <property name="text">
818
                 <string>Temperature :</string>
819
                </property>
820
                <property name="alignment">
821
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
822
                </property>
823
               </widget>
824
              </item>
825
              <item>
826
               <widget class="QComboBox" name="comboBox_Temperature">
827
                <property name="font">
828
                 <font>
829
                  <weight>50</weight>
830
                  <bold>false</bold>
831
                 </font>
832
                </property>
833
               </widget>
834
              </item>
835
             </layout>
836
            </item>
837
            <item row="4" column="0">
838
             <layout class="QHBoxLayout" name="horizontalLayout_12">
839
              <item>
840
               <widget class="QLabel" name="label_15">
841
                <property name="font">
842
                 <font>
843
                  <weight>50</weight>
844
                  <bold>false</bold>
845
                 </font>
846
                </property>
847
                <property name="text">
848
                 <string>Viscosity :</string>
849
                </property>
850
                <property name="alignment">
851
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
852
                </property>
853
               </widget>
854
              </item>
855
              <item>
856
               <widget class="QComboBox" name="comboBox_Viscosity">
857
                <property name="font">
858
                 <font>
859
                  <weight>50</weight>
860
                  <bold>false</bold>
861
                 </font>
862
                </property>
863
               </widget>
864
              </item>
865
             </layout>
866
            </item>
867
            <item row="1" column="0">
868
             <layout class="QHBoxLayout" name="horizontalLayout_15">
869
              <item>
870
               <widget class="QLabel" name="label_12">
871
                <property name="font">
872
                 <font>
873
                  <weight>50</weight>
874
                  <bold>false</bold>
875
                 </font>
876
                </property>
877
                <property name="text">
878
                 <string>Flowrate (Mass) :</string>
879
                </property>
880
                <property name="alignment">
881
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
882
                </property>
883
               </widget>
884
              </item>
885
              <item>
886
               <widget class="QComboBox" name="comboBox_Flowrate_Mass">
887
                <property name="font">
888
                 <font>
889
                  <weight>50</weight>
890
                  <bold>false</bold>
891
                 </font>
892
                </property>
893
               </widget>
894
              </item>
895
             </layout>
896
            </item>
897
            <item row="6" column="0">
898
             <layout class="QHBoxLayout" name="horizontalLayout_11">
899
              <item>
900
               <widget class="QLabel" name="label_11">
901
                <property name="font">
902
                 <font>
903
                  <weight>50</weight>
904
                  <bold>false</bold>
905
                 </font>
906
                </property>
907
                <property name="text">
908
                 <string>Power :</string>
909
                </property>
910
                <property name="alignment">
911
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
912
                </property>
913
               </widget>
914
              </item>
915
              <item>
916
               <widget class="QComboBox" name="comboBox_Power">
917
                <property name="font">
918
                 <font>
919
                  <weight>50</weight>
920
                  <bold>false</bold>
921
                 </font>
922
                </property>
923
               </widget>
924
              </item>
925
             </layout>
926
            </item>
927
            <item row="2" column="0">
928
             <layout class="QHBoxLayout" name="horizontalLayout_14">
929
              <item>
930
               <widget class="QLabel" name="label_13">
931
                <property name="font">
932
                 <font>
933
                  <weight>50</weight>
934
                  <bold>false</bold>
935
                 </font>
936
                </property>
937
                <property name="text">
938
                 <string>Flowrate (Volume) :</string>
939
                </property>
940
                <property name="alignment">
941
                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
942
                </property>
943
               </widget>
944
              </item>
945
              <item>
946
               <widget class="QComboBox" name="comboBox_Flowrate_Volume">
947
                <property name="font">
948
                 <font>
949
                  <weight>50</weight>
950
                  <bold>false</bold>
951
                 </font>
507 952
                </property>
508 953
               </widget>
509 954
              </item>
......
511 956
            </item>
512 957
           </layout>
513 958
          </item>
959
          <item row="1" column="0">
960
           <spacer name="verticalSpacer_6">
961
            <property name="orientation">
962
             <enum>Qt::Vertical</enum>
963
            </property>
964
            <property name="sizeHint" stdset="0">
965
             <size>
966
              <width>20</width>
967
              <height>40</height>
968
             </size>
969
            </property>
970
           </spacer>
971
          </item>
514 972
         </layout>
515 973
        </widget>
516 974
       </item>
975
       <item row="1" column="0">
976
        <spacer name="verticalSpacer_3">
977
         <property name="orientation">
978
          <enum>Qt::Vertical</enum>
979
         </property>
980
         <property name="sizeHint" stdset="0">
981
          <size>
982
           <width>20</width>
983
           <height>40</height>
984
          </size>
985
         </property>
986
        </spacer>
987
       </item>
517 988
      </layout>
518 989
     </widget>
519 990
    </widget>
......
530 1001
   </item>
531 1002
  </layout>
532 1003
 </widget>
1004
 <tabstops>
1005
  <tabstop>tabWidget</tabstop>
1006
  <tabstop>lineEdit</tabstop>
1007
  <tabstop>lineEdit_2</tabstop>
1008
  <tabstop>lineEdit_3</tabstop>
1009
  <tabstop>lineEdit_4</tabstop>
1010
  <tabstop>lineEdit_7</tabstop>
1011
  <tabstop>lineEdit_8</tabstop>
1012
  <tabstop>radioButton</tabstop>
1013
  <tabstop>radioButton_2</tabstop>
1014
  <tabstop>lineEdit_5</tabstop>
1015
  <tabstop>lineEdit_6</tabstop>
1016
  <tabstop>tableWidget</tabstop>
1017
  <tabstop>lineEdit_CurrentBarometricPressure</tabstop>
1018
  <tabstop>comboBox_Flowrate_Mass</tabstop>
1019
  <tabstop>comboBox_Flowrate_Volume</tabstop>
1020
  <tabstop>comboBox_Density</tabstop>
1021
  <tabstop>comboBox_Viscosity</tabstop>
1022
  <tabstop>comboBox_Temperature</tabstop>
1023
  <tabstop>comboBox_Power</tabstop>
1024
  <tabstop>comboBox_Pressure</tabstop>
1025
  <tabstop>comboBox_Velocity</tabstop>
1026
  <tabstop>comboBox_Pipe_Diameter</tabstop>
1027
  <tabstop>comboBox_Length</tabstop>
1028
  <tabstop>comboBox_Roughness</tabstop>
1029
 </tabstops>
533 1030
 <resources>
534 1031
  <include location="../res/Resource.qrc"/>
535 1032
 </resources>
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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