프로젝트

일반

사용자정보

개정판 7b3d1572

ID7b3d1572932ac21dad1b5d78fb16ed6085890cee
상위 79d21218
하위 2c7b34fc

함의성이(가) 10달 전에 추가함

line no newline test and db save fix

Change-Id: Iface48db86b84baeeedaad3df05a5226d3f5a69d

차이점 보기:

DTI_PID/DTI_PID/Configs.py
30 30 
                if int(configs[0].value) == 1:
31 31 
                    allowSpace = True
32 32 

  		




  
  33
  
    
            configs = appDocData.getConfigs('Line No', 'Newline')


  		




  
  34
  
    
            newline = False


  		




  
  35
  
    
            if configs:


  		




  
  36
  
    
                if int(configs[0].value) == 1:


  		




  
  37
  
    
                    newline = True


  		




  
  38
  
    

  		




  33
  39
  
    
            configs = list(csv.reader([self.value], delimiter=LineNoConfig.DELIMITER,


  		




  34
  40
  
    
                                      escapechar=LineNoConfig.ESCAPE_CHAR))[0]


  		




  35
  41
  
    

  		




  ......




  38
  44
  
    

  		




  39
  45
  
    
            res = []


  		




  40
  46
  
    
            if not allowSpace:


  		




  41
  
  
    
                _text = text.replace(' ', '').replace('\n', '')


  		




  42
  
  
    
            else:


  		




  43
  
  
    
                _text = text.replace('\n', '')


  		




  44
  
  
    
            index = []


  		




  45
  
  
    

  		




  
  47
  
    
                _text = text.replace(' ', '')


  		




  
  48
  
    
            


  		




  46
  49
  
    
            # code for new line in line no


  		




  47
  
  
    
            #_text = text.replace(' ', '')


  		




  48
  
  
    
            #index = sorted(list(set([_text.find('\n', i) for i in range(len(_text)) if _text.find('\n', i) != -1])), reverse=True)


  		




  49
  
  
    
            #if index:


  		




  50
  
  
    
            #    _text = _text.replace('\n', '')


  		




  
  50
  
    
            index = []


  		




  
  51
  
    
            if newline:


  		




  
  52
  
    
                index = sorted(list(set([_text.find('\n', i) for i in range(len(_text)) if _text.find('\n', i) != -1])), reverse=True)


  		




  
  53
  
    
            _text = _text.replace('\n', '')


  		




  51
  54
  
    
                


  		




  52
  55
  
    
            for propertyName in configs:


  		




  53
  56
  
    
                lineProp = appDocData.getLinePropertiesByUID(propertyName)


  		












  

    
      DTI_PID/DTI_PID/ConfigurationDialog.py
    
  





  300
  300
  
    
                self.ui.radioButtonAllowLineNoSpaceYes.setChecked(False)


  		




  301
  301
  
    
                self.ui.radioButtonAllowLineNoSpaceNo.setChecked(True)


  		




  302
  302
  
    

  		




  
  303
  
    
            configs = docData.getConfigs('Line No', 'Newline')


  		




  
  304
  
    
            if configs:


  		




  
  305
  
    
                size = int(configs[0].value)


  		




  
  306
  
    
                self.ui.radioButtonLineNoNewlineYes.setChecked(True if size == 1 else False)


  		




  
  307
  
    
                self.ui.radioButtonLineNoNewlineNo.setChecked(True if size == -1 else False)


  		




  
  308
  
    
            else:


  		




  
  309
  
    
                self.ui.radioButtonLineNoNewlineYes.setChecked(False)


  		




  
  310
  
    
                self.ui.radioButtonLineNoNewlineNo.setChecked(True)


  		




  
  311
  
    

  		




  303
  312
  
    
            self.load_line_properties()


  		




  304
  313
  
    

  		




  305
  314
  
    
            # line no setting (line no, size unit, delimiter)


  		




  ......




  1352
  1361
  
    
            configs.append(Config('Symbol', 'OPC', '1' if self.ui.radioButtonOPCModeYes.isChecked() else '-1'))


  		




  1353
  1362
  
    
            configs.append(Config('Symbol', 'EQ binding', '1' if self.ui.radioButtonEQBindingOn.isChecked() else '-1'))


  		




  1354
  1363
  
    
            configs.append(Config('Line No', 'Space', '1' if self.ui.radioButtonAllowLineNoSpaceYes.isChecked() else '-1'))


  		




  
  1364
  
    
            configs.append(Config('Line No', 'Newline', '1' if self.ui.radioButtonLineNoNewlineYes.isChecked() else '-1'))


  		




  1355
  1365
  
    
            configs.append(Config('Note No Tag Rule', 'Note No Expression', self.ui.lineEditNoteNoExpression.text()))


  		




  1356
  1366
  
    
            configs.append(Config('Note No Tag Rule', 'Note No Symbol Name', self.ui.lineEditNoteNoSymbolName.text()))


  		




  1357
  1367
  
    
            configs.append(Config('OPC Tag Rule', 'From Prefix', self.ui.lineEditOPCFromPrefix.text()))


  		












  

    
      DTI_PID/DTI_PID/Configuration_UI.py
    
  





  387
  387
  
    
        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  388
  388
  
    
        self.horizontalLayout_18.addItem(spacerItem)


  		




  389
  389
  
    
        self.gridLayout_28.addLayout(self.horizontalLayout_18, 0, 1, 1, 1)


  		




  390
  
  
    
        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  391
  
  
    
        self.gridLayout_28.addItem(spacerItem1, 1, 1, 1, 1)


  		




  
  390
  
    
        self.pushButtonCopyProperty = QtWidgets.QPushButton(self.groupBoxLineNo)


  		




  
  391
  
    
        self.pushButtonCopyProperty.setText("")


  		




  
  392
  
    
        icon1 = QtGui.QIcon()


  		




  
  393
  
    
        icon1.addPixmap(QtGui.QPixmap(":/newPrefix/Copy.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  
  394
  
    
        self.pushButtonCopyProperty.setIcon(icon1)


  		




  
  395
  
    
        self.pushButtonCopyProperty.setObjectName("pushButtonCopyProperty")


  		




  
  396
  
    
        self.gridLayout_28.addWidget(self.pushButtonCopyProperty, 2, 2, 1, 1)


  		




  
  397
  
    
        self.pushButtonAddProperty = QtWidgets.QToolButton(self.groupBoxLineNo)


  		




  
  398
  
    
        self.pushButtonAddProperty.setText("")


  		




  
  399
  
    
        icon2 = QtGui.QIcon()


  		




  
  400
  
    
        icon2.addPixmap(QtGui.QPixmap(":/newPrefix/Add.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  
  401
  
    
        self.pushButtonAddProperty.setIcon(icon2)


  		




  
  402
  
    
        self.pushButtonAddProperty.setObjectName("pushButtonAddProperty")


  		




  
  403
  
    
        self.gridLayout_28.addWidget(self.pushButtonAddProperty, 2, 3, 1, 1)


  		




  392
  404
  
    
        self.tableViewLineNo = QtWidgets.QTableView(self.groupBoxLineNo)


  		




  393
  405
  
    
        self.tableViewLineNo.setObjectName("tableViewLineNo")


  		




  394
  
  
    
        self.gridLayout_28.addWidget(self.tableViewLineNo, 2, 0, 1, 5)


  		




  
  406
  
    
        self.gridLayout_28.addWidget(self.tableViewLineNo, 3, 0, 1, 5)


  		




  395
  407
  
    
        self.pushButtonDeleteProperty = QtWidgets.QToolButton(self.groupBoxLineNo)


  		




  396
  408
  
    
        self.pushButtonDeleteProperty.setText("")


  		




  397
  
  
    
        icon1 = QtGui.QIcon()


  		




  398
  
  
    
        icon1.addPixmap(QtGui.QPixmap(":/newPrefix/Remove.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  399
  
  
    
        self.pushButtonDeleteProperty.setIcon(icon1)


  		




  
  409
  
    
        icon3 = QtGui.QIcon()


  		




  
  410
  
    
        icon3.addPixmap(QtGui.QPixmap(":/newPrefix/Remove.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  
  411
  
    
        self.pushButtonDeleteProperty.setIcon(icon3)


  		




  400
  412
  
    
        self.pushButtonDeleteProperty.setObjectName("pushButtonDeleteProperty")


  		




  401
  
  
    
        self.gridLayout_28.addWidget(self.pushButtonDeleteProperty, 1, 4, 1, 1)


  		




  
  413
  
    
        self.gridLayout_28.addWidget(self.pushButtonDeleteProperty, 2, 4, 1, 1)


  		




  
  414
  
    
        self.label_65 = QtWidgets.QLabel(self.groupBoxLineNo)


  		




  
  415
  
    
        self.label_65.setObjectName("label_65")


  		




  
  416
  
    
        self.gridLayout_28.addWidget(self.label_65, 0, 0, 1, 1)


  		




  402
  417
  
    
        self.pushButtonLineNoAttribute = QtWidgets.QPushButton(self.groupBoxLineNo)


  		




  403
  418
  
    
        self.pushButtonLineNoAttribute.setMinimumSize(QtCore.QSize(50, 24))


  		




  404
  419
  
    
        self.pushButtonLineNoAttribute.setMaximumSize(QtCore.QSize(16777215, 24))


  		




  405
  420
  
    
        self.pushButtonLineNoAttribute.setObjectName("pushButtonLineNoAttribute")


  		




  406
  
  
    
        self.gridLayout_28.addWidget(self.pushButtonLineNoAttribute, 1, 0, 1, 1)


  		




  407
  
  
    
        self.label_65 = QtWidgets.QLabel(self.groupBoxLineNo)


  		




  408
  
  
    
        self.label_65.setObjectName("label_65")


  		




  409
  
  
    
        self.gridLayout_28.addWidget(self.label_65, 0, 0, 1, 1)


  		




  410
  
  
    
        self.pushButtonAddProperty = QtWidgets.QToolButton(self.groupBoxLineNo)


  		




  411
  
  
    
        self.pushButtonAddProperty.setText("")


  		




  412
  
  
    
        icon2 = QtGui.QIcon()


  		




  413
  
  
    
        icon2.addPixmap(QtGui.QPixmap(":/newPrefix/Add.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  414
  
  
    
        self.pushButtonAddProperty.setIcon(icon2)


  		




  415
  
  
    
        self.pushButtonAddProperty.setObjectName("pushButtonAddProperty")


  		




  416
  
  
    
        self.gridLayout_28.addWidget(self.pushButtonAddProperty, 1, 3, 1, 1)


  		




  417
  
  
    
        self.pushButtonCopyProperty = QtWidgets.QPushButton(self.groupBoxLineNo)


  		




  418
  
  
    
        self.pushButtonCopyProperty.setText("")


  		




  419
  
  
    
        icon3 = QtGui.QIcon()


  		




  420
  
  
    
        icon3.addPixmap(QtGui.QPixmap(":/newPrefix/Copy.svg"), QtGui.QIcon.Normal, QtGui.QIcon.Off)


  		




  421
  
  
    
        self.pushButtonCopyProperty.setIcon(icon3)


  		




  422
  
  
    
        self.pushButtonCopyProperty.setObjectName("pushButtonCopyProperty")


  		




  423
  
  
    
        self.gridLayout_28.addWidget(self.pushButtonCopyProperty, 1, 2, 1, 1)


  		




  
  421
  
    
        self.gridLayout_28.addWidget(self.pushButtonLineNoAttribute, 2, 0, 1, 1)


  		




  
  422
  
    
        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  423
  
    
        self.gridLayout_28.addItem(spacerItem1, 2, 1, 1, 1)


  		




  
  424
  
    
        self.label_79 = QtWidgets.QLabel(self.groupBoxLineNo)


  		




  
  425
  
    
        self.label_79.setObjectName("label_79")


  		




  
  426
  
    
        self.gridLayout_28.addWidget(self.label_79, 1, 0, 1, 1)


  		




  
  427
  
    
        self.horizontalLayout_30 = QtWidgets.QHBoxLayout()


  		




  
  428
  
    
        self.horizontalLayout_30.setObjectName("horizontalLayout_30")


  		




  
  429
  
    
        self.horizontalLayout_31 = QtWidgets.QHBoxLayout()


  		




  
  430
  
    
        self.horizontalLayout_31.setObjectName("horizontalLayout_31")


  		




  
  431
  
    
        self.radioButtonLineNoNewlineYes = QtWidgets.QRadioButton(self.groupBoxLineNo)


  		




  
  432
  
    
        self.radioButtonLineNoNewlineYes.setObjectName("radioButtonLineNoNewlineYes")


  		




  
  433
  
    
        self.buttonGroup_26 = QtWidgets.QButtonGroup(ConfigurationDialog)


  		




  
  434
  
    
        self.buttonGroup_26.setObjectName("buttonGroup_26")


  		




  
  435
  
    
        self.buttonGroup_26.addButton(self.radioButtonLineNoNewlineYes)


  		




  
  436
  
    
        self.horizontalLayout_31.addWidget(self.radioButtonLineNoNewlineYes)


  		




  
  437
  
    
        self.radioButtonLineNoNewlineNo = QtWidgets.QRadioButton(self.groupBoxLineNo)


  		




  
  438
  
    
        self.radioButtonLineNoNewlineNo.setObjectName("radioButtonLineNoNewlineNo")


  		




  
  439
  
    
        self.buttonGroup_26.addButton(self.radioButtonLineNoNewlineNo)


  		




  
  440
  
    
        self.horizontalLayout_31.addWidget(self.radioButtonLineNoNewlineNo)


  		




  
  441
  
    
        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  442
  
    
        self.horizontalLayout_31.addItem(spacerItem2)


  		




  
  443
  
    
        self.horizontalLayout_30.addLayout(self.horizontalLayout_31)


  		




  
  444
  
    
        self.gridLayout_28.addLayout(self.horizontalLayout_30, 1, 1, 1, 1)


  		




  424
  445
  
    
        self.gridLayout_3.addLayout(self.gridLayout_28, 0, 0, 1, 1)


  		




  425
  446
  
    
        self.gridLayout_21.addWidget(self.groupBoxLineNo, 2, 1, 1, 1)


  		




  426
  447
  
    
        self.groupBoxSymbol = QtWidgets.QGroupBox(self.Recognition2)


  		




  ......




  454
  475
  
    
        self.lineEditFlange = QtWidgets.QLineEdit(self.groupBoxSymbol)


  		




  455
  476
  
    
        self.lineEditFlange.setObjectName("lineEditFlange")


  		




  456
  477
  
    
        self.gridLayout_39.addWidget(self.lineEditFlange, 2, 1, 1, 1)


  		




  457
  
  
    
        spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  458
  
  
    
        self.gridLayout_39.addItem(spacerItem2, 2, 2, 1, 1)


  		




  
  478
  
    
        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  479
  
    
        self.gridLayout_39.addItem(spacerItem3, 2, 2, 1, 1)


  		




  459
  480
  
    
        self.label_53 = QtWidgets.QLabel(self.groupBoxSymbol)


  		




  460
  481
  
    
        self.label_53.setObjectName("label_53")


  		




  461
  482
  
    
        self.gridLayout_39.addWidget(self.label_53, 1, 0, 1, 1)


  		




  ......




  552
  573
  
    
        self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)


  		




  553
  574
  
    
        self.label.setObjectName("label")


  		




  554
  575
  
    
        self.gridLayout_11.addWidget(self.label, 1, 0, 1, 1)


  		




  555
  
  
    
        spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  556
  
  
    
        self.gridLayout_11.addItem(spacerItem3, 0, 4, 1, 1)


  		




  
  576
  
    
        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  577
  
    
        self.gridLayout_11.addItem(spacerItem4, 0, 4, 1, 1)


  		




  557
  578
  
    
        self.label_28 = QtWidgets.QLabel(self.groupBox)


  		




  558
  579
  
    
        self.label_28.setObjectName("label_28")


  		




  559
  580
  
    
        self.gridLayout_11.addWidget(self.label_28, 4, 0, 1, 1)


  		




  ......




  599
  620
  
    
        self.gridLayout_33.addWidget(self.tableViewTagNo, 1, 0, 1, 5)


  		




  600
  621
  
    
        self.pushButtonDeleteTagProperty = QtWidgets.QToolButton(self.groupBoxEquipTag)


  		




  601
  622
  
    
        self.pushButtonDeleteTagProperty.setText("")


  		




  602
  
  
    
        self.pushButtonDeleteTagProperty.setIcon(icon1)


  		




  
  623
  
    
        self.pushButtonDeleteTagProperty.setIcon(icon3)


  		




  603
  624
  
    
        self.pushButtonDeleteTagProperty.setObjectName("pushButtonDeleteTagProperty")


  		




  604
  625
  
    
        self.gridLayout_33.addWidget(self.pushButtonDeleteTagProperty, 0, 4, 1, 1)


  		




  605
  626
  
    
        self.pushButtonAddTagProperty = QtWidgets.QToolButton(self.groupBoxEquipTag)


  		




  ......




  609
  630
  
    
        self.gridLayout_33.addWidget(self.pushButtonAddTagProperty, 0, 3, 1, 1)


  		




  610
  631
  
    
        self.pushButtonCopyTagProperty = QtWidgets.QPushButton(self.groupBoxEquipTag)


  		




  611
  632
  
    
        self.pushButtonCopyTagProperty.setText("")


  		




  612
  
  
    
        self.pushButtonCopyTagProperty.setIcon(icon3)


  		




  
  633
  
    
        self.pushButtonCopyTagProperty.setIcon(icon1)


  		




  613
  634
  
    
        self.pushButtonCopyTagProperty.setObjectName("pushButtonCopyTagProperty")


  		




  614
  635
  
    
        self.gridLayout_33.addWidget(self.pushButtonCopyTagProperty, 0, 2, 1, 1)


  		




  615
  
  
    
        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  616
  
  
    
        self.gridLayout_33.addItem(spacerItem4, 0, 1, 1, 1)


  		




  
  636
  
    
        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  637
  
    
        self.gridLayout_33.addItem(spacerItem5, 0, 1, 1, 1)


  		




  617
  638
  
    
        self.pushButtonTagNoAttribute = QtWidgets.QPushButton(self.groupBoxEquipTag)


  		




  618
  639
  
    
        self.pushButtonTagNoAttribute.setObjectName("pushButtonTagNoAttribute")


  		




  619
  640
  
    
        self.gridLayout_33.addWidget(self.pushButtonTagNoAttribute, 0, 0, 1, 1)


  		




  ......




  720
  741
  
    
        self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.lineEditOPCToPrefix)


  		




  721
  742
  
    
        self.gridLayout_20.addLayout(self.formLayout_5, 0, 0, 1, 1)


  		




  722
  743
  
    
        self.gridLayout_7.addWidget(self.groupBox_10, 1, 0, 1, 1)


  		




  723
  
  
    
        spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)


  		




  724
  
  
    
        self.gridLayout_7.addItem(spacerItem5, 5, 0, 1, 1)


  		




  
  744
  
    
        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)


  		




  
  745
  
    
        self.gridLayout_7.addItem(spacerItem6, 5, 0, 1, 1)


  		




  725
  746
  
    
        self.tabWidget.addTab(self.tabTagNoRule, "")


  		




  726
  747
  
    
        self.tabDisplayOption = QtWidgets.QWidget()


  		




  727
  748
  
    
        self.tabDisplayOption.setObjectName("tabDisplayOption")


  		




  ......




  747
  768
  
    
        self.lineEditPipingLineType = QtWidgets.QLineEdit(self.groupBox_6)


  		




  748
  769
  
    
        self.lineEditPipingLineType.setObjectName("lineEditPipingLineType")


  		




  749
  770
  
    
        self.horizontalLayout_17.addWidget(self.lineEditPipingLineType)


  		




  750
  
  
    
        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  751
  
  
    
        self.horizontalLayout_17.addItem(spacerItem6)


  		




  
  771
  
    
        spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  772
  
    
        self.horizontalLayout_17.addItem(spacerItem7)


  		




  752
  773
  
    
        self.pushButtonLineTypeAdd = QtWidgets.QPushButton(self.groupBox_6)


  		




  753
  774
  
    
        self.pushButtonLineTypeAdd.setText("")


  		




  754
  775
  
    
        self.pushButtonLineTypeAdd.setIcon(icon2)


  		




  ......




  756
  777
  
    
        self.horizontalLayout_17.addWidget(self.pushButtonLineTypeAdd)


  		




  757
  778
  
    
        self.pushButtonLineTypeDelete = QtWidgets.QPushButton(self.groupBox_6)


  		




  758
  779
  
    
        self.pushButtonLineTypeDelete.setText("")


  		




  759
  
  
    
        self.pushButtonLineTypeDelete.setIcon(icon1)


  		




  
  780
  
    
        self.pushButtonLineTypeDelete.setIcon(icon3)


  		




  760
  781
  
    
        self.pushButtonLineTypeDelete.setObjectName("pushButtonLineTypeDelete")


  		




  761
  782
  
    
        self.horizontalLayout_17.addWidget(self.pushButtonLineTypeDelete)


  		




  762
  783
  
    
        self.gridLayout_16.addLayout(self.horizontalLayout_17, 0, 0, 1, 1)


  		




  ......




  818
  839
  
    
        self.fontComboBox = QtWidgets.QFontComboBox(self.groupBox_5)


  		




  819
  840
  
    
        self.fontComboBox.setObjectName("fontComboBox")


  		




  820
  841
  
    
        self.gridLayout_29.addWidget(self.fontComboBox, 0, 1, 1, 2)


  		




  821
  
  
    
        spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  822
  
  
    
        self.gridLayout_29.addItem(spacerItem7, 0, 3, 1, 1)


  		




  
  842
  
    
        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  843
  
    
        self.gridLayout_29.addItem(spacerItem8, 0, 3, 1, 1)


  		




  823
  844
  
    
        self.gridLayout_15.addLayout(self.gridLayout_29, 0, 0, 1, 1)


  		




  824
  845
  
    
        self.verticalLayout.addWidget(self.groupBox_5)


  		




  825
  846
  
    
        self.gridLayout_4.addLayout(self.verticalLayout, 0, 0, 1, 1)


  		




  ......




  919
  940
  
    
        self.label_30 = QtWidgets.QLabel(self.groupBox_11)


  		




  920
  941
  
    
        self.label_30.setObjectName("label_30")


  		




  921
  942
  
    
        self.gridLayout_31.addWidget(self.label_30, 2, 0, 1, 1)


  		




  922
  
  
    
        spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  923
  
  
    
        self.gridLayout_31.addItem(spacerItem8, 2, 2, 1, 1)


  		




  
  943
  
    
        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  944
  
    
        self.gridLayout_31.addItem(spacerItem9, 2, 2, 1, 1)


  		




  924
  945
  
    
        self.horizontalLayout_14 = QtWidgets.QHBoxLayout()


  		




  925
  946
  
    
        self.horizontalLayout_14.setObjectName("horizontalLayout_14")


  		




  926
  947
  
    
        self.radioButtonLineListYes = QtWidgets.QRadioButton(self.groupBox_11)


  		




  ......




  1061
  1082
  
    
        self.gridLayout_24.setObjectName("gridLayout_24")


  		




  1062
  1083
  
    
        self.gridLayout_32 = QtWidgets.QGridLayout()


  		




  1063
  1084
  
    
        self.gridLayout_32.setObjectName("gridLayout_32")


  		




  1064
  
  
    
        spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  1065
  
  
    
        self.gridLayout_32.addItem(spacerItem9, 0, 2, 1, 1)


  		




  
  1085
  
    
        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  1086
  
    
        self.gridLayout_32.addItem(spacerItem10, 0, 2, 1, 1)


  		




  1066
  1087
  
    
        self.label_36 = QtWidgets.QLabel(self.groupBox_12)


  		




  1067
  1088
  
    
        self.label_36.setMinimumSize(QtCore.QSize(200, 0))


  		




  1068
  1089
  
    
        self.label_36.setObjectName("label_36")


  		




  ......




  1136
  1157
  
    
        self.spinBoxServerSymbol = QtWidgets.QSpinBox(self.groupBox_13)


  		




  1137
  1158
  
    
        self.spinBoxServerSymbol.setObjectName("spinBoxServerSymbol")


  		




  1138
  1159
  
    
        self.gridLayout_37.addWidget(self.spinBoxServerSymbol, 2, 2, 1, 1)


  		




  1139
  
  
    
        spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  1140
  
  
    
        self.gridLayout_37.addItem(spacerItem10, 1, 2, 1, 1)


  		




  
  1160
  
    
        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  1161
  
    
        self.gridLayout_37.addItem(spacerItem11, 1, 2, 1, 1)


  		




  1141
  1162
  
    
        self.label_51 = QtWidgets.QLabel(self.groupBox_13)


  		




  1142
  1163
  
    
        self.label_51.setObjectName("label_51")


  		




  1143
  1164
  
    
        self.gridLayout_37.addWidget(self.label_51, 2, 0, 1, 1)


  		




  ......




  1196
  1217
  
    
        self.buttonGroup_14.addButton(self.radioButtonOpModeInst)


  		




  1197
  1218
  
    
        self.horizontalLayout_12.addWidget(self.radioButtonOpModeInst)


  		




  1198
  1219
  
    
        self.gridLayout_36.addLayout(self.horizontalLayout_12, 0, 1, 1, 1)


  		




  1199
  
  
    
        spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  1200
  
  
    
        self.gridLayout_36.addItem(spacerItem11, 0, 2, 1, 1)


  		




  
  1220
  
    
        spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)


  		




  
  1221
  
    
        self.gridLayout_36.addItem(spacerItem12, 0, 2, 1, 1)


  		




  1201
  1222
  
    
        self.label_76 = QtWidgets.QLabel(self.groupBox_14)


  		




  1202
  1223
  
    
        self.label_76.setObjectName("label_76")


  		




  1203
  1224
  
    
        self.gridLayout_36.addWidget(self.label_76, 1, 0, 1, 1)


  		




  ......




  1207
  1228
  
    
        self.gridLayout_41.addLayout(self.gridLayout_36, 0, 0, 1, 1)


  		




  1208
  1229
  
    
        self.gridLayout_21.addWidget(self.groupBox_14, 3, 0, 1, 1)


  		




  1209
  1230
  
    
        self.gridLayout_22.addLayout(self.gridLayout_21, 0, 0, 1, 1)


  		




  1210
  
  
    
        spacerItem12 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)


  		




  1211
  
  
    
        self.gridLayout_22.addItem(spacerItem12, 3, 0, 1, 1)


  		




  
  1231
  
    
        spacerItem13 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)


  		




  
  1232
  
    
        self.gridLayout_22.addItem(spacerItem13, 3, 0, 1, 1)


  		




  1212
  1233
  
    
        self.tabWidget.addTab(self.tabETC, "")


  		




  1213
  1234
  
    
        self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)


  		




  1214
  1235
  
    

  		




  ......




  1340
  1361
  
    
        self.groupBoxLineNo.setTitle(_translate("ConfigurationDialog", "Line No"))


  		




  1341
  1362
  
    
        self.radioButtonAllowLineNoSpaceYes.setText(_translate("ConfigurationDialog", "Yes"))


  		




  1342
  1363
  
    
        self.radioButtonAllowLineNoSpaceNo.setText(_translate("ConfigurationDialog", "No"))


  		




  1343
  
  
    
        self.pushButtonLineNoAttribute.setText(_translate("ConfigurationDialog", "Attribute"))


  		




  1344
  1364
  
    
        self.label_65.setText(_translate("ConfigurationDialog", "Allow Spaces : "))


  		




  
  1365
  
    
        self.pushButtonLineNoAttribute.setText(_translate("ConfigurationDialog", "Attribute"))


  		




  
  1366
  
    
        self.label_79.setText(_translate("ConfigurationDialog", "Allow Newline : "))


  		




  
  1367
  
    
        self.radioButtonLineNoNewlineYes.setText(_translate("ConfigurationDialog", "Yes"))


  		




  
  1368
  
    
        self.radioButtonLineNoNewlineNo.setText(_translate("ConfigurationDialog", "No"))


  		




  1345
  1369
  
    
        self.groupBoxSymbol.setTitle(_translate("ConfigurationDialog", "Symbol"))


  		




  1346
  1370
  
    
        self.label_52.setText(_translate("ConfigurationDialog", "Default Flange Name : "))


  		




  1347
  1371
  
    
        self.label_59.setText(_translate("ConfigurationDialog", "OPC Detection Mode : "))


  		












  

    
      DTI_PID/DTI_PID/Shapes/EngineeringLineNoTextItem.py
    
  





  1028
  1028
  
    
        else:


  		




  1029
  1029
  
    
            values = ['?', '?', "(select UID from Symbol where Name='Trim Line NO' and SymbolType_UID=-1)", '?', '?',


  		




  1030
  1030
  
    
                      '?', '?', '?', '?', '?', '?', '?']


  		




  
  1031
  
    
        _from = self.prop('From')


  		




  
  1032
  
    
        if not _from:


  		




  
  1033
  
    
            _from = ''


  		




  
  1034
  
    
        _to = self.prop('To')


  		




  
  1035
  
    
        if not _to:


  		




  
  1036
  
    
            _to = ''


  		




  1031
  1037
  
    
        params = [(str(self.uid), str(app_doc_data.activeDrawing.UID), self.loc[0], self.loc[1], self.size[0],


  		




  1032
  1038
  
    
                   self.size[1], str(self.angle), \


  		




  1033
  
  
    
                   self.text(), str(self.conns[0]) if self.conns else None, str(self.prop('From')),


  		




  1034
  
  
    
                   str(self.prop('To')))]


  		




  
  1039
  
    
                   self.text(), str(self.conns[0]) if self.conns else None, str(_from), str(_to))]


  		




  1035
  1040
  
    
        sql = 'insert into Components({}) values({})'.format(','.join(cols), ','.join(values))


  		




  1036
  1041
  
    
        res.append((sql, tuple(params)))


  		




  1037
  1042
  
    

  		












  

    
      DTI_PID/DTI_PID/UI/Configuration.ui
    
  





  774
  774
  
    
              </item>


  		




  775
  775
  
    
             </layout>


  		




  776
  776
  
    
            </item>


  		




  777
  
  
    
            <item row="1" column="1">


  		




  778
  
  
    
             <spacer name="horizontalSpacer_10">


  		




  779
  
  
    
              <property name="orientation">


  		




  780
  
  
    
               <enum>Qt::Horizontal</enum>


  		




  
  777
  
    
            <item row="2" column="2">


  		




  
  778
  
    
             <widget class="QPushButton" name="pushButtonCopyProperty">


  		




  
  779
  
    
              <property name="text">


  		




  
  780
  
    
               <string/>


  		




  781
  781
  
    
              </property>


  		




  782
  
  
    
              <property name="sizeHint" stdset="0">


  		




  783
  
  
    
               <size>


  		




  784
  
  
    
                <width>40</width>


  		




  785
  
  
    
                <height>20</height>


  		




  786
  
  
    
               </size>


  		




  
  782
  
    
              <property name="icon">


  		




  
  783
  
    
               <iconset resource="../res/MainWindow.qrc">


  		




  
  784
  
    
                <normaloff>:/newPrefix/Copy.svg</normaloff>:/newPrefix/Copy.svg</iconset>


  		




  787
  785
  
    
              </property>


  		




  788
  
  
    
             </spacer>


  		




  
  786
  
    
             </widget>


  		




  
  787
  
    
            </item>


  		




  
  788
  
    
            <item row="2" column="3">


  		




  
  789
  
    
             <widget class="QToolButton" name="pushButtonAddProperty">


  		




  
  790
  
    
              <property name="text">


  		




  
  791
  
    
               <string/>


  		




  
  792
  
    
              </property>


  		




  
  793
  
    
              <property name="icon">


  		




  
  794
  
    
               <iconset resource="../res/MainWindow.qrc">


  		




  
  795
  
    
                <normaloff>:/newPrefix/Add.svg</normaloff>:/newPrefix/Add.svg</iconset>


  		




  
  796
  
    
              </property>


  		




  
  797
  
    
             </widget>


  		




  789
  798
  
    
            </item>


  		




  790
  
  
    
            <item row="2" column="0" colspan="5">


  		




  
  799
  
    
            <item row="3" column="0" colspan="5">


  		




  791
  800
  
    
             <widget class="QTableView" name="tableViewLineNo"/>


  		




  792
  801
  
    
            </item>


  		




  793
  
  
    
            <item row="1" column="4">


  		




  
  802
  
    
            <item row="2" column="4">


  		




  794
  803
  
    
             <widget class="QToolButton" name="pushButtonDeleteProperty">


  		




  795
  804
  
    
              <property name="text">


  		




  796
  805
  
    
               <string/>


  		




  ......




  801
  810
  
    
              </property>


  		




  802
  811
  
    
             </widget>


  		




  803
  812
  
    
            </item>


  		




  804
  
  
    
            <item row="1" column="0">


  		




  
  813
  
    
            <item row="0" column="0">


  		




  
  814
  
    
             <widget class="QLabel" name="label_65">


  		




  
  815
  
    
              <property name="text">


  		




  
  816
  
    
               <string>Allow Spaces : </string>


  		




  
  817
  
    
              </property>


  		




  
  818
  
    
             </widget>


  		




  
  819
  
    
            </item>


  		




  
  820
  
    
            <item row="2" column="0">


  		




  805
  821
  
    
             <widget class="QPushButton" name="pushButtonLineNoAttribute">


  		




  806
  822
  
    
              <property name="minimumSize">


  		




  807
  823
  
    
               <size>


  		




  ......




  820
  836
  
    
              </property>


  		




  821
  837
  
    
             </widget>


  		




  822
  838
  
    
            </item>


  		




  823
  
  
    
            <item row="0" column="0">


  		




  824
  
  
    
             <widget class="QLabel" name="label_65">


  		




  825
  
  
    
              <property name="text">


  		




  826
  
  
    
               <string>Allow Spaces : </string>


  		




  827
  
  
    
              </property>


  		




  828
  
  
    
             </widget>


  		




  829
  
  
    
            </item>


  		




  830
  
  
    
            <item row="1" column="3">


  		




  831
  
  
    
             <widget class="QToolButton" name="pushButtonAddProperty">


  		




  832
  
  
    
              <property name="text">


  		




  833
  
  
    
               <string/>


  		




  
  839
  
    
            <item row="2" column="1">


  		




  
  840
  
    
             <spacer name="horizontalSpacer_10">


  		




  
  841
  
    
              <property name="orientation">


  		




  
  842
  
    
               <enum>Qt::Horizontal</enum>


  		




  834
  843
  
    
              </property>


  		




  835
  
  
    
              <property name="icon">


  		




  836
  
  
    
               <iconset resource="../res/MainWindow.qrc">


  		




  837
  
  
    
                <normaloff>:/newPrefix/Add.svg</normaloff>:/newPrefix/Add.svg</iconset>


  		




  
  844
  
    
              <property name="sizeHint" stdset="0">


  		




  
  845
  
    
               <size>


  		




  
  846
  
    
                <width>40</width>


  		




  
  847
  
    
                <height>20</height>


  		




  
  848
  
    
               </size>


  		




  838
  849
  
    
              </property>


  		




  839
  
  
    
             </widget>


  		




  
  850
  
    
             </spacer>


  		




  840
  851
  
    
            </item>


  		




  841
  
  
    
            <item row="1" column="2">


  		




  842
  
  
    
             <widget class="QPushButton" name="pushButtonCopyProperty">


  		




  
  852
  
    
            <item row="1" column="0">


  		




  
  853
  
    
             <widget class="QLabel" name="label_79">


  		




  843
  854
  
    
              <property name="text">


  		




  844
  
  
    
               <string/>


  		




  845
  
  
    
              </property>


  		




  846
  
  
    
              <property name="icon">


  		




  847
  
  
    
               <iconset resource="../res/MainWindow.qrc">


  		




  848
  
  
    
                <normaloff>:/newPrefix/Copy.svg</normaloff>:/newPrefix/Copy.svg</iconset>


  		




  
  855
  
    
               <string>Allow Newline : </string>


  		




  849
  856
  
    
              </property>


  		




  850
  857
  
    
             </widget>


  		




  851
  858
  
    
            </item>


  		




  
  859
  
    
            <item row="1" column="1">


  		




  
  860
  
    
             <layout class="QHBoxLayout" name="horizontalLayout_30">


  		




  
  861
  
    
              <item>


  		




  
  862
  
    
               <layout class="QHBoxLayout" name="horizontalLayout_31">


  		




  
  863
  
    
                <item>


  		




  
  864
  
    
                 <widget class="QRadioButton" name="radioButtonLineNoNewlineYes">


  		




  
  865
  
    
                  <property name="text">


  		




  
  866
  
    
                   <string>Yes</string>


  		




  
  867
  
    
                  </property>


  		




  
  868
  
    
                  <attribute name="buttonGroup">


  		




  
  869
  
    
                   <string notr="true">buttonGroup_26</string>


  		




  
  870
  
    
                  </attribute>


  		




  
  871
  
    
                 </widget>


  		




  
  872
  
    
                </item>


  		




  
  873
  
    
                <item>


  		




  
  874
  
    
                 <widget class="QRadioButton" name="radioButtonLineNoNewlineNo">


  		




  
  875
  
    
                  <property name="text">


  		




  
  876
  
    
                   <string>No</string>


  		




  
  877
  
    
                  </property>


  		




  
  878
  
    
                  <attribute name="buttonGroup">


  		




  
  879
  
    
                   <string notr="true">buttonGroup_26</string>


  		




  
  880
  
    
                  </attribute>


  		




  
  881
  
    
                 </widget>


  		




  
  882
  
    
                </item>


  		




  
  883
  
    
                <item>


  		




  
  884
  
    
                 <spacer name="horizontalSpacer_12">


  		




  
  885
  
    
                  <property name="orientation">


  		




  
  886
  
    
                   <enum>Qt::Horizontal</enum>


  		




  
  887
  
    
                  </property>


  		




  
  888
  
    
                  <property name="sizeHint" stdset="0">


  		




  
  889
  
    
                   <size>


  		




  
  890
  
    
                    <width>40</width>


  		




  
  891
  
    
                    <height>20</height>


  		




  
  892
  
    
                   </size>


  		




  
  893
  
    
                  </property>


  		




  
  894
  
    
                 </spacer>


  		




  
  895
  
    
                </item>


  		




  
  896
  
    
               </layout>


  		




  
  897
  
    
              </item>


  		




  
  898
  
    
             </layout>


  		




  
  899
  
    
            </item>


  		




  852
  900
  
    
           </layout>


  		




  853
  901
  
    
          </item>


  		




  854
  902
  
    
         </layout>


  		




  ......




  2609
  2657
  
    
  </connection>


  		




  2610
  2658
  
    
 </connections>


  		




  2611
  2659
  
    
 <buttongroups>


  		




  
  2660
  
    
  <buttongroup name="buttonGroup_17"/>


  		




  
  2661
  
    
  <buttongroup name="buttonGroup"/>


  		




  
  2662
  
    
  <buttongroup name="buttonGroup_10"/>


  		




  
  2663
  
    
  <buttongroup name="buttonGroup_16"/>


  		




  
  2664
  
    
  <buttongroup name="buttonGroup_14"/>


  		




  
  2665
  
    
  <buttongroup name="buttonGroup_25"/>


  		




  2612
  2666
  
    
  <buttongroup name="buttonGroup_7"/>


  		




  2613
  
  
    
  <buttongroup name="buttonGroup_15"/>


  		




  2614
  
  
    
  <buttongroup name="buttonGroup_8"/>


  		




  2615
  2667
  
    
  <buttongroup name="buttonGroup_21"/>


  		




  
  2668
  
    
  <buttongroup name="buttonGroup_22"/>


  		




  
  2669
  
    
  <buttongroup name="buttonGroup_2"/>


  		




  
  2670
  
    
  <buttongroup name="buttonGroup_11"/>


  		




  
  2671
  
    
  <buttongroup name="buttonGroup_15"/>


  		




  
  2672
  
    
  <buttongroup name="buttonGroup_23"/>


  		




  2616
  2673
  
    
  <buttongroup name="buttonGroup_24"/>


  		




  2617
  
  
    
  <buttongroup name="buttonGroup_12"/>


  		




  2618
  
  
    
  <buttongroup name="buttonGroup_14"/>


  		




  2619
  
  
    
  <buttongroup name="buttonGroup"/>


  		




  
  2674
  
    
  <buttongroup name="buttonGroup_8"/>


  		




  2620
  2675
  
    
  <buttongroup name="buttonGroup_5"/>


  		




  2621
  
  
    
  <buttongroup name="buttonGroup_23"/>


  		




  2622
  
  
    
  <buttongroup name="buttonGroup_4"/>


  		




  2623
  
  
    
  <buttongroup name="buttonGroup_10"/>


  		




  2624
  
  
    
  <buttongroup name="buttonGroup_11"/>


  		




  2625
  
  
    
  <buttongroup name="buttonGroup_18"/>


  		




  2626
  2676
  
    
  <buttongroup name="buttonGroup_20"/>


  		




  
  2677
  
    
  <buttongroup name="buttonGroup_13"/>


  		




  2627
  2678
  
    
  <buttongroup name="buttonGroup_3"/>


  		




  2628
  
  
    
  <buttongroup name="buttonGroup_17"/>


  		




  
  2679
  
    
  <buttongroup name="buttonGroup_4"/>


  		




  2629
  2680
  
    
  <buttongroup name="buttonGroup_9"/>


  		




  2630
  
  
    
  <buttongroup name="buttonGroup_2"/>


  		




  2631
  
  
    
  <buttongroup name="buttonGroup_16"/>


  		




  2632
  
  
    
  <buttongroup name="buttonGroup_13"/>


  		




  
  2681
  
    
  <buttongroup name="buttonGroup_18"/>


  		




  2633
  2682
  
    
  <buttongroup name="buttonGroup_6"/>


  		




  
  2683
  
    
  <buttongroup name="buttonGroup_12"/>


  		




  2634
  2684
  
    
  <buttongroup name="buttonGroup_19"/>


  		




  2635
  
  
    
  <buttongroup name="buttonGroup_22"/>


  		




  2636
  
  
    
  <buttongroup name="buttonGroup_25"/>


  		




  
  2685
  
    
  <buttongroup name="buttonGroup_26"/>


  		




  2637
  2686
  
    
 </buttongroups>


  		




  2638
  2687
  
    
</ui>


  		












내보내기  Unified diff




        
        

    















   



  

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