프로젝트

일반

사용자정보

개정판 63d5ec82

ID63d5ec823a9a5f93f78c81df4f37b1b00bcba7f7
상위 fc0411f4
하위 d9478fca, 999b0445

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

SymbolEditor 수정
1. 신규 심벌 등록시에만 Data + png, svg 파일 저장
2. 기존 심벌 등록시에는 Data만 저장

Change-Id: I80a3773251dca8856344bea63c369370f3ddcf4d

차이점 보기:

HYTOS/HYTOS/SymbolEditorDialog.py
43 43
            self.ui.setupUi(self)
44 44
            
45 45
            self.ui.tableWidgetConnList.setColumnCount(3)
46
            self.ui.tableWidgetConnList.horizontalHeader().setStretchLastSection(True)
46 47
            self.ui.tableWidgetConnList.setHorizontalHeaderLabels([self.tr('위치'), self.tr('방향'), self.tr('심볼')])
47 48
            self.ui.tableWidgetConnList.horizontalHeaderItem(0).setSizeHint(QSize(25, 25))
48 49
            self.ui.tableWidgetConnList.itemPressed.connect(self.onConnPtPressed)
49 50

  
51
            self.ui.label.setVisible(False)
52
            self.ui.label_2.setVisible(False)
53
            self.ui.comboBoxNormalColor.setVisible(False)
54
            self.ui.comboBoxHoverColor.setVisible(False)
55

  
50 56
            self.setupImageViewer()
51 57
            self.setupTools()
52 58
            self.initForms()
......
56 62
            self.offsetY = 0
57 63
            self.newSym = None
58 64

  
65
            
66

  
59 67
            #self.setWindowTitle(self.tr('심볼 편집기'))
60 68
            if self.selectedSymbol is not None:
61 69
                self.ui.openImageFileButton.setEnabled(False)                
......
168 176
                self.ui.comboBoxNormalColor.addItem(config.key, config.value)
169 177
                self.ui.comboBoxHoverColor.addItem(config.key, config.value)
170 178

  
171
            nomalIndex = self.ui.comboBoxNormalColor.findText('Blue', Qt.MatchExactly)
172
            if nomalIndex is not -1:
173
                self.ui.comboBoxNormalColor.setCurrentIndex(nomalIndex)
174
            hoberIndex = self.ui.comboBoxNormalColor.findText('Red', Qt.MatchExactly)
175
            if hoberIndex is not -1:
176
                self.ui.comboBoxHoverColor.setCurrentIndex(hoberIndex)
179
            normalIndex = self.ui.comboBoxNormalColor.findText('Blue', Qt.MatchExactly)
180
            if normalIndex is not -1:
181
                self.ui.comboBoxNormalColor.setCurrentIndex(normalIndex)
182
            hoverIndex = self.ui.comboBoxNormalColor.findText('Red', Qt.MatchExactly)
183
            if hoverIndex is not -1:
184
                self.ui.comboBoxHoverColor.setCurrentIndex(hoverIndex)
177 185

  
178 186
    '''
179 187
        @brief      Init Symbol Type ComboBox Items
......
248 256

  
249 257
                        row = row + 1
250 258

  
251
                        self.ui.tableWidgetConnList.resizeColumnsToContents()          
259
                        #self.ui.tableWidgetConnList.resizeColumnsToContents()          
252 260
        except Exception as ex:
253 261
            from App import App
254 262

  
......
390 398
                Validation Check → Make Symbol Data → Insert Symbol Data into DB → Save png and svg files
391 399
        @history    2018.05.03  Jeongwoo    Change parameters on method 'deleteImageAndSvg'
392 400
                                            Change self.dbHelper to AppDocData
401
                    2019.07.11 yenjin       
393 402
    '''
394 403
    def accept(self):
395 404
        isValid, exceptionMsg = self.isValidSymbolInfo()
......
402 411
            if isSuccess:
403 412
                try:
404 413
                    image = self.ui.imageView.image()
405
                    #imageFlip = self.ui.imageView.image().mirrored(horizontal = True, vertical = False)
406 414
                    if image is not None:
407
                        if self.selectedSymbol is not None:
408
                            self.deleteImageAndSvg(self.selectedSymbol.getImageFileFullPath(), self.selectedSymbol.getSvgFileFullPath())
409
                        imageLocation = os.path.join(self.project.getImageFilePath(), fileType)
410
                        if not os.path.exists(imageLocation):
411
                            os.makedirs(imageLocation) 
415
                        # 신규 심벌 생성인 경우에만 PNG 파일과 SVG 파일을 생성
416
                        if self.selectedSymbol is None:
417
                            imageLocation = os.path.join(self.project.getImageFilePath(), fileType)
418
                            if not os.path.exists(imageLocation):
419
                                os.makedirs(imageLocation)                             
420
                            image.save(imagePath, 'PNG')
412 421
                            
413
                        image.save(imagePath, 'PNG')
414
                        #if self.ui.makeFlipCheckBox.isChecked():
415
                        #    imageFlip.save(imagePath + '_Flip', 'PNG')
416

  
417
                        svgLocation = os.path.join(self.project.getSvgFilePath(), fileType)
418
                        if not os.path.exists(svgLocation):
419
                            os.makedirs(svgLocation)
420

  
421
                        normal_color = self.ui.comboBoxNormalColor.itemData(self.ui.comboBoxNormalColor.currentIndex())
422
                        hover_color = self.ui.comboBoxHoverColor.itemData(self.ui.comboBoxHoverColor.currentIndex())
423
                        potrace.convertImageToSvg(imagePath, os.path.join(svgLocation, fileName + ".svg"), normalColor=normal_color, hoverColor=hover_color)
424
                        #if self.ui.makeFlipCheckBox.isChecked():
425
                        #    potrace.convertImageToSvg(imagePath + '_Flip', os.path.join(svgLocation + "/" + fileName + "_Flip.svg"), normalColor=normal_color, hoverColor=hover_color)
422
                            svgLocation = os.path.join(self.project.getSvgFilePath(), fileType)
423
                            if not os.path.exists(svgLocation):
424
                                os.makedirs(svgLocation)
425

  
426
                            normal_color = self.ui.comboBoxNormalColor.itemData(self.ui.comboBoxNormalColor.currentIndex())
427
                            hover_color = self.ui.comboBoxHoverColor.itemData(self.ui.comboBoxHoverColor.currentIndex())
428

  
429
                            potrace.convertImageToSvg(imagePath, os.path.join(svgLocation, fileName + ".svg"), normalColor=normal_color, hoverColor=hover_color)
430
                    
426 431
                        self.isAccepted = True
427 432
                                              
428 433
                        QDialog.accept(self)
......
511 516
        if os.path.isfile(self.path): 
512 517
            self.ui.imageFileLineEdit.setText(os.path.basename(self.path))
513 518
            self.ui.nameLineEdit.setText(os.path.splitext(self.ui.imageFileLineEdit.text())[0])
519
            self.ui.imageView.showGuideline(None, True)
514 520
    '''
515 521
        @brief  Hand Tool Button Clicked
516 522
    '''
HYTOS/HYTOS/SymbolEditor_UI.py
11 11
class Ui_Dialog(object):
12 12
    def setupUi(self, Dialog):
13 13
        Dialog.setObjectName("Dialog")
14
        Dialog.resize(1280, 720)
15
        Dialog.setMinimumSize(QtCore.QSize(1280, 720))
14
        Dialog.resize(862, 410)
15
        Dialog.setMinimumSize(QtCore.QSize(0, 0))
16 16
        Dialog.setMaximumSize(QtCore.QSize(16777215, 16777215))
17 17
        font = QtGui.QFont()
18 18
        font.setFamily("맑은 고딕")
......
247 247
        self.areaEraserButton.setObjectName("areaEraserButton")
248 248
        self.gridLayout_5.addWidget(self.areaEraserButton, 0, 7, 1, 1)
249 249
        self.horizontalLayout.addLayout(self.gridLayout_5)
250
        self.gridLayout_6 = QtWidgets.QGridLayout()
251
        self.gridLayout_6.setObjectName("gridLayout_6")
252
        self.label = QtWidgets.QLabel(self.toolWidget)
253
        self.label.setMaximumSize(QtCore.QSize(100, 16777215))
254
        self.label.setObjectName("label")
255
        self.gridLayout_6.addWidget(self.label, 0, 0, 1, 1)
256
        self.comboBoxNormalColor = QtWidgets.QComboBox(self.toolWidget)
257
        self.comboBoxNormalColor.setMaximumSize(QtCore.QSize(100, 16777215))
258
        self.comboBoxNormalColor.setObjectName("comboBoxNormalColor")
259
        self.gridLayout_6.addWidget(self.comboBoxNormalColor, 0, 1, 1, 1)
260
        self.label_2 = QtWidgets.QLabel(self.toolWidget)
261
        self.label_2.setMaximumSize(QtCore.QSize(100, 16777215))
262
        self.label_2.setObjectName("label_2")
263
        self.gridLayout_6.addWidget(self.label_2, 1, 0, 1, 1)
264
        self.comboBoxHoverColor = QtWidgets.QComboBox(self.toolWidget)
265
        self.comboBoxHoverColor.setMaximumSize(QtCore.QSize(100, 16777215))
266
        self.comboBoxHoverColor.setObjectName("comboBoxHoverColor")
267
        self.gridLayout_6.addWidget(self.comboBoxHoverColor, 1, 1, 1, 1)
268
        self.horizontalLayout.addLayout(self.gridLayout_6)
269 250
        self.verticalLayout_2.addWidget(self.toolWidget)
270 251
        self.imageViewContainer = QtWidgets.QWidget(self.widget_3)
271 252
        self.imageViewContainer.setObjectName("imageViewContainer")
......
292 273
        self.scrollArea.setWidgetResizable(True)
293 274
        self.scrollArea.setObjectName("scrollArea")
294 275
        self.scrollAreaWidgetContents = QtWidgets.QWidget()
295
        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 478, 651))
276
        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 478, 341))
296 277
        self.scrollAreaWidgetContents.setMinimumSize(QtCore.QSize(378, 0))
297 278
        self.scrollAreaWidgetContents.setMaximumSize(QtCore.QSize(16777215, 16777215))
298 279
        self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
299 280
        self.gridLayout_4 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents)
300 281
        self.gridLayout_4.setObjectName("gridLayout_4")
301
        self.formLayout = QtWidgets.QFormLayout()
302
        self.formLayout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
303
        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
304
        self.formLayout.setLabelAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
305
        self.formLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
306
        self.formLayout.setContentsMargins(6, 6, 6, 6)
307
        self.formLayout.setObjectName("formLayout")
282
        self.gridLayout_7 = QtWidgets.QGridLayout()
283
        self.gridLayout_7.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
284
        self.gridLayout_7.setContentsMargins(6, 6, 6, 6)
285
        self.gridLayout_7.setObjectName("gridLayout_7")
308 286
        self.imgFileNameLabel = QtWidgets.QLabel(self.scrollAreaWidgetContents)
309 287
        font = QtGui.QFont()
310 288
        font.setBold(True)
311 289
        font.setWeight(75)
312 290
        self.imgFileNameLabel.setFont(font)
313 291
        self.imgFileNameLabel.setObjectName("imgFileNameLabel")
314
        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.imgFileNameLabel)
292
        self.gridLayout_7.addWidget(self.imgFileNameLabel, 0, 0, 1, 1)
315 293
        self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
316 294
        self.horizontalLayout_3.setObjectName("horizontalLayout_3")
317 295
        self.imageFileLineEdit = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
......
323 301
        self.openImageFileButton.setMaximumSize(QtCore.QSize(40, 16777215))
324 302
        self.openImageFileButton.setObjectName("openImageFileButton")
325 303
        self.horizontalLayout_3.addWidget(self.openImageFileButton)
326
        self.formLayout.setLayout(0, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_3)
304
        self.gridLayout_7.addLayout(self.horizontalLayout_3, 0, 1, 1, 1)
327 305
        self.nameLabel = QtWidgets.QLabel(self.scrollAreaWidgetContents)
328 306
        font = QtGui.QFont()
329 307
        font.setBold(True)
330 308
        font.setWeight(75)
331 309
        self.nameLabel.setFont(font)
332 310
        self.nameLabel.setObjectName("nameLabel")
333
        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.nameLabel)
311
        self.gridLayout_7.addWidget(self.nameLabel, 1, 0, 1, 1)
334 312
        self.nameLineEdit = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
335 313
        self.nameLineEdit.setObjectName("nameLineEdit")
336
        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.nameLineEdit)
314
        self.gridLayout_7.addWidget(self.nameLineEdit, 1, 1, 1, 1)
337 315
        self.typeLabel = QtWidgets.QLabel(self.scrollAreaWidgetContents)
338 316
        font = QtGui.QFont()
339 317
        font.setBold(True)
340 318
        font.setWeight(75)
341 319
        self.typeLabel.setFont(font)
342 320
        self.typeLabel.setObjectName("typeLabel")
343
        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.typeLabel)
321
        self.gridLayout_7.addWidget(self.typeLabel, 2, 0, 1, 1)
344 322
        self.typeComboBox = QtWidgets.QComboBox(self.scrollAreaWidgetContents)
345 323
        self.typeComboBox.setObjectName("typeComboBox")
346
        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.typeComboBox)
324
        self.gridLayout_7.addWidget(self.typeComboBox, 2, 1, 1, 1)
347 325
        self.originalPointLabel = QtWidgets.QLabel(self.scrollAreaWidgetContents)
348 326
        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
349 327
        sizePolicy.setHorizontalStretch(0)
......
356 334
        self.originalPointLabel.setFont(font)
357 335
        self.originalPointLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
358 336
        self.originalPointLabel.setObjectName("originalPointLabel")
359
        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.originalPointLabel)
337
        self.gridLayout_7.addWidget(self.originalPointLabel, 3, 0, 1, 1)
360 338
        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
361 339
        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
362 340
        self.originalPointLineEdit = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
......
367 345
        self.addOriginalPointButton.setMaximumSize(QtCore.QSize(40, 16777215))
368 346
        self.addOriginalPointButton.setObjectName("addOriginalPointButton")
369 347
        self.horizontalLayout_4.addWidget(self.addOriginalPointButton)
370
        self.formLayout.setLayout(5, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_4)
348
        self.gridLayout_7.addLayout(self.horizontalLayout_4, 3, 1, 1, 1)
371 349
        self.connectionPointLabel = QtWidgets.QLabel(self.scrollAreaWidgetContents)
372 350
        font = QtGui.QFont()
373 351
        font.setBold(True)
......
375 353
        self.connectionPointLabel.setFont(font)
376 354
        self.connectionPointLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
377 355
        self.connectionPointLabel.setObjectName("connectionPointLabel")
378
        self.formLayout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.connectionPointLabel)
356
        self.gridLayout_7.addWidget(self.connectionPointLabel, 4, 0, 1, 1)
379 357
        self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
380 358
        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
381 359
        self.connectionPointLineEdit = QtWidgets.QLineEdit(self.scrollAreaWidgetContents)
......
392 370
        self.pushButtonDelConnPt.setMaximumSize(QtCore.QSize(40, 16777215))
393 371
        self.pushButtonDelConnPt.setObjectName("pushButtonDelConnPt")
394 372
        self.horizontalLayout_6.addWidget(self.pushButtonDelConnPt)
395
        self.formLayout.setLayout(9, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout_6)
373
        self.gridLayout_7.addLayout(self.horizontalLayout_6, 4, 1, 1, 1)
396 374
        self.tableWidgetConnList = QtWidgets.QTableWidget(self.scrollAreaWidgetContents)
397 375
        self.tableWidgetConnList.setObjectName("tableWidgetConnList")
398 376
        self.tableWidgetConnList.setColumnCount(0)
399 377
        self.tableWidgetConnList.setRowCount(0)
400 378
        self.tableWidgetConnList.verticalHeader().setVisible(False)
401
        self.formLayout.setWidget(10, QtWidgets.QFormLayout.FieldRole, self.tableWidgetConnList)
402
        self.gridLayout_4.addLayout(self.formLayout, 0, 0, 1, 1)
379
        self.gridLayout_7.addWidget(self.tableWidgetConnList, 5, 1, 1, 1)
380
        self.gridLayout_6 = QtWidgets.QGridLayout()
381
        self.gridLayout_6.setObjectName("gridLayout_6")
382
        self.label = QtWidgets.QLabel(self.scrollAreaWidgetContents)
383
        self.label.setMaximumSize(QtCore.QSize(100, 16777215))
384
        self.label.setObjectName("label")
385
        self.gridLayout_6.addWidget(self.label, 0, 0, 1, 1)
386
        self.comboBoxNormalColor = QtWidgets.QComboBox(self.scrollAreaWidgetContents)
387
        self.comboBoxNormalColor.setMaximumSize(QtCore.QSize(100, 16777215))
388
        self.comboBoxNormalColor.setObjectName("comboBoxNormalColor")
389
        self.gridLayout_6.addWidget(self.comboBoxNormalColor, 0, 1, 1, 1)
390
        self.label_2 = QtWidgets.QLabel(self.scrollAreaWidgetContents)
391
        self.label_2.setMaximumSize(QtCore.QSize(100, 16777215))
392
        self.label_2.setObjectName("label_2")
393
        self.gridLayout_6.addWidget(self.label_2, 1, 0, 1, 1)
394
        self.comboBoxHoverColor = QtWidgets.QComboBox(self.scrollAreaWidgetContents)
395
        self.comboBoxHoverColor.setMaximumSize(QtCore.QSize(100, 16777215))
396
        self.comboBoxHoverColor.setObjectName("comboBoxHoverColor")
397
        self.gridLayout_6.addWidget(self.comboBoxHoverColor, 1, 1, 1, 1)
398
        self.gridLayout_7.addLayout(self.gridLayout_6, 5, 0, 1, 1)
399
        self.gridLayout_4.addLayout(self.gridLayout_7, 0, 0, 1, 1)
403 400
        self.scrollArea.setWidget(self.scrollAreaWidgetContents)
404 401
        self.verticalLayout.addWidget(self.scrollArea)
405 402
        self.buttonBox = QtWidgets.QDialogButtonBox(self.widget)
......
420 417
        self.handButton.setText(_translate("Dialog", "Hand"))
421 418
        self.zoomButton.setText(_translate("Dialog", "Zoom"))
422 419
        self.initZoomButton.setText(_translate("Dialog", "Init Zoom"))
423
        self.label.setText(_translate("Dialog", "Normal Color :"))
424
        self.label_2.setText(_translate("Dialog", "Highlight Color :"))
425 420
        self.imgFileNameLabel.setText(_translate("Dialog", "Image File Name"))
426 421
        self.openImageFileButton.setText(_translate("Dialog", "Open"))
427 422
        self.nameLabel.setText(_translate("Dialog", "Symbol Name"))
......
431 426
        self.connectionPointLabel.setText(_translate("Dialog", "Connection Point"))
432 427
        self.addConnectionPointButton.setText(_translate("Dialog", "Add"))
433 428
        self.pushButtonDelConnPt.setText(_translate("Dialog", "Del"))
429
        self.label.setText(_translate("Dialog", "Normal :"))
430
        self.label_2.setText(_translate("Dialog", "Highlight :"))
434 431

  
435 432
import MainWindow_rc
HYTOS/HYTOS/UI/SymbolEditor.ui
6 6
   <rect>
7 7
    <x>0</x>
8 8
    <y>0</y>
9
    <width>1280</width>
10
    <height>720</height>
9
    <width>862</width>
10
    <height>410</height>
11 11
   </rect>
12 12
  </property>
13 13
  <property name="minimumSize">
14 14
   <size>
15
    <width>1280</width>
16
    <height>720</height>
15
    <width>0</width>
16
    <height>0</height>
17 17
   </size>
18 18
  </property>
19 19
  <property name="maximumSize">
......
546 546
              </item>
547 547
             </layout>
548 548
            </item>
549
            <item>
550
             <layout class="QGridLayout" name="gridLayout_6">
551
              <item row="0" column="0">
552
               <widget class="QLabel" name="label">
553
                <property name="maximumSize">
554
                 <size>
555
                  <width>100</width>
556
                  <height>16777215</height>
557
                 </size>
558
                </property>
559
                <property name="text">
560
                 <string>Normal Color :</string>
561
                </property>
562
               </widget>
563
              </item>
564
              <item row="0" column="1">
565
               <widget class="QComboBox" name="comboBoxNormalColor">
566
                <property name="maximumSize">
567
                 <size>
568
                  <width>100</width>
569
                  <height>16777215</height>
570
                 </size>
571
                </property>
572
               </widget>
573
              </item>
574
              <item row="1" column="0">
575
               <widget class="QLabel" name="label_2">
576
                <property name="maximumSize">
577
                 <size>
578
                  <width>100</width>
579
                  <height>16777215</height>
580
                 </size>
581
                </property>
582
                <property name="text">
583
                 <string>Highlight Color :</string>
584
                </property>
585
               </widget>
586
              </item>
587
              <item row="1" column="1">
588
               <widget class="QComboBox" name="comboBoxHoverColor">
589
                <property name="maximumSize">
590
                 <size>
591
                  <width>100</width>
592
                  <height>16777215</height>
593
                 </size>
594
                </property>
595
               </widget>
596
              </item>
597
             </layout>
598
            </item>
599 549
           </layout>
600 550
          </widget>
601 551
         </item>
......
654 604
              <x>0</x>
655 605
              <y>0</y>
656 606
              <width>478</width>
657
              <height>651</height>
607
              <height>341</height>
658 608
             </rect>
659 609
            </property>
660 610
            <property name="minimumSize">
......
671 621
            </property>
672 622
            <layout class="QGridLayout" name="gridLayout_4">
673 623
             <item row="0" column="0">
674
              <layout class="QFormLayout" name="formLayout">
624
              <layout class="QGridLayout" name="gridLayout_7">
675 625
               <property name="sizeConstraint">
676 626
                <enum>QLayout::SetDefaultConstraint</enum>
677 627
               </property>
678
               <property name="fieldGrowthPolicy">
679
                <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
680
               </property>
681
               <property name="labelAlignment">
682
                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
683
               </property>
684
               <property name="formAlignment">
685
                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
686
               </property>
687 628
               <property name="leftMargin">
688 629
                <number>6</number>
689 630
               </property>
......
755 696
               <item row="1" column="1">
756 697
                <widget class="QLineEdit" name="nameLineEdit"/>
757 698
               </item>
758
               <item row="3" column="0">
699
               <item row="2" column="0">
759 700
                <widget class="QLabel" name="typeLabel">
760 701
                 <property name="font">
761 702
                  <font>
......
768 709
                 </property>
769 710
                </widget>
770 711
               </item>
771
               <item row="3" column="1">
712
               <item row="2" column="1">
772 713
                <widget class="QComboBox" name="typeComboBox"/>
773 714
               </item>
774
               <item row="5" column="0">
715
               <item row="3" column="0">
775 716
                <widget class="QLabel" name="originalPointLabel">
776 717
                 <property name="sizePolicy">
777 718
                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
......
793 734
                 </property>
794 735
                </widget>
795 736
               </item>
796
               <item row="5" column="1">
737
               <item row="3" column="1">
797 738
                <layout class="QHBoxLayout" name="horizontalLayout_4">
798 739
                 <item>
799 740
                  <widget class="QLineEdit" name="originalPointLineEdit">
......
817 758
                 </item>
818 759
                </layout>
819 760
               </item>
820
               <item row="9" column="0">
761
               <item row="4" column="0">
821 762
                <widget class="QLabel" name="connectionPointLabel">
822 763
                 <property name="font">
823 764
                  <font>
......
833 774
                 </property>
834 775
                </widget>
835 776
               </item>
836
               <item row="9" column="1">
777
               <item row="4" column="1">
837 778
                <layout class="QHBoxLayout" name="horizontalLayout_6">
838 779
                 <item>
839 780
                  <widget class="QLineEdit" name="connectionPointLineEdit">
......
882 823
                 </item>
883 824
                </layout>
884 825
               </item>
885
               <item row="10" column="1">
826
               <item row="5" column="1">
886 827
                <widget class="QTableWidget" name="tableWidgetConnList">
887 828
                 <attribute name="verticalHeaderVisible">
888 829
                  <bool>false</bool>
889 830
                 </attribute>
890 831
                </widget>
891 832
               </item>
833
               <item row="5" column="0">
834
                <layout class="QGridLayout" name="gridLayout_6">
835
                 <item row="0" column="0">
836
                  <widget class="QLabel" name="label">
837
                   <property name="maximumSize">
838
                    <size>
839
                     <width>100</width>
840
                     <height>16777215</height>
841
                    </size>
842
                   </property>
843
                   <property name="text">
844
                    <string>Normal :</string>
845
                   </property>
846
                  </widget>
847
                 </item>
848
                 <item row="0" column="1">
849
                  <widget class="QComboBox" name="comboBoxNormalColor">
850
                   <property name="maximumSize">
851
                    <size>
852
                     <width>100</width>
853
                     <height>16777215</height>
854
                    </size>
855
                   </property>
856
                  </widget>
857
                 </item>
858
                 <item row="1" column="0">
859
                  <widget class="QLabel" name="label_2">
860
                   <property name="maximumSize">
861
                    <size>
862
                     <width>100</width>
863
                     <height>16777215</height>
864
                    </size>
865
                   </property>
866
                   <property name="text">
867
                    <string>Highlight :</string>
868
                   </property>
869
                  </widget>
870
                 </item>
871
                 <item row="1" column="1">
872
                  <widget class="QComboBox" name="comboBoxHoverColor">
873
                   <property name="maximumSize">
874
                    <size>
875
                     <width>100</width>
876
                     <height>16777215</height>
877
                    </size>
878
                   </property>
879
                  </widget>
880
                 </item>
881
                </layout>
882
               </item>
892 883
              </layout>
893 884
             </item>
894 885
            </layout>

내보내기 Unified diff

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