프로젝트

일반

사용자정보

개정판 c32addce

IDc32addceeadf0dcc9cb46e1e53007a1f919c04a3
상위 c290a936
하위 5e21eb5d

함의성이(가) 일년 이상 전에 추가함

add spec break option

Change-Id: I34f47aef9638ef97b16151cdd136c8f248103ce2

차이점 보기:

DTI_PID/DTI_PID/ConfigurationDialog.py
123 123
                self.ui.radioButtonSpecNoneYes.setChecked(False)
124 124
                self.ui.radioButtonSpecNoneNo.setChecked(True)
125 125

  
126
            configs = docData.getConfigs('Symbol', 'Spec System')
127
            if configs:
128
                size = int(configs[0].value)
129
                self.ui.radioButtonSystemYes.setChecked(True if size == 1 else False)
130
                self.ui.radioButtonSystemNo.setChecked(True if size == -1 else False)
131
            else:
132
                self.ui.radioButtonSystemYes.setChecked(True)
133
                self.ui.radioButtonSystemNo.setChecked(False)
134

  
126 135
            configs = docData.getConfigs('Filter', 'MinimumSize')
127 136
            self.ui.spinBoxMinimumSize.setValue(int(configs[0].value)) if 1 == len(configs) else \
128 137
                self.ui.spinBoxMinimumSize.setValue(30)
......
1216 1225
            configs.append(Config('Flow Mark', 'Position', self.ui.spinBoxFlowMarkPosition.value()))
1217 1226
            configs.append(Config('Flow Mark', 'Length', self.ui.spinBoxFlowMarkLength.value()))
1218 1227
            configs.append(Config('Symbol', 'Spec', '1' if self.ui.radioButtonSpecNoneYes.isChecked() else '-1'))
1228
            configs.append(Config('Symbol', 'Spec System', '1' if self.ui.radioButtonSystemYes.isChecked() else '-1'))
1219 1229

  
1220 1230
            configs.append(Config('Filter', 'MinimumSize', self.ui.spinBoxMinimumSize.value()))
1221 1231
            configs.append(Config('Filter', 'ErodeSize', self.ui.spinBoxUnrecognitionIgnoreStep.value()))
DTI_PID/DTI_PID/Configuration_UI.py
229 229
        self.gridLayout_6.setObjectName("gridLayout_6")
230 230
        self.gridLayout_26 = QtWidgets.QGridLayout()
231 231
        self.gridLayout_26.setObjectName("gridLayout_26")
232
        self.label_15 = QtWidgets.QLabel(self.groupBoxAttribute)
233
        self.label_15.setMaximumSize(QtCore.QSize(190, 16777215))
234
        self.label_15.setObjectName("label_15")
235
        self.gridLayout_26.addWidget(self.label_15, 3, 0, 1, 1)
236
        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
237
        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
238
        self.radioButtonSizeUnitImaperial = QtWidgets.QRadioButton(self.groupBoxAttribute)
239
        self.radioButtonSizeUnitImaperial.setObjectName("radioButtonSizeUnitImaperial")
240
        self.buttonGroup_9 = QtWidgets.QButtonGroup(ConfigurationDialog)
241
        self.buttonGroup_9.setObjectName("buttonGroup_9")
242
        self.buttonGroup_9.addButton(self.radioButtonSizeUnitImaperial)
243
        self.horizontalLayout_11.addWidget(self.radioButtonSizeUnitImaperial)
244
        self.radioButtonSizeUnitMetric = QtWidgets.QRadioButton(self.groupBoxAttribute)
245
        self.radioButtonSizeUnitMetric.setObjectName("radioButtonSizeUnitMetric")
246
        self.buttonGroup_9.addButton(self.radioButtonSizeUnitMetric)
247
        self.horizontalLayout_11.addWidget(self.radioButtonSizeUnitMetric)
248
        self.gridLayout_26.addLayout(self.horizontalLayout_11, 0, 1, 1, 1)
249
        self.label_24 = QtWidgets.QLabel(self.groupBoxAttribute)
250
        self.label_24.setMaximumSize(QtCore.QSize(190, 16777215))
251
        self.label_24.setObjectName("label_24")
252
        self.gridLayout_26.addWidget(self.label_24, 4, 0, 1, 1)
232 253
        self.spinBoxFlowMarkLength = QtWidgets.QSpinBox(self.groupBoxAttribute)
233 254
        self.spinBoxFlowMarkLength.setMinimum(1)
234 255
        self.spinBoxFlowMarkLength.setMaximum(99999)
235 256
        self.spinBoxFlowMarkLength.setObjectName("spinBoxFlowMarkLength")
236 257
        self.gridLayout_26.addWidget(self.spinBoxFlowMarkLength, 5, 1, 1, 1)
258
        self.label_60 = QtWidgets.QLabel(self.groupBoxAttribute)
259
        self.label_60.setObjectName("label_60")
260
        self.gridLayout_26.addWidget(self.label_60, 6, 0, 1, 1)
237 261
        self.spinBoxFlowMarkPosition = QtWidgets.QSpinBox(self.groupBoxAttribute)
238 262
        self.spinBoxFlowMarkPosition.setMaximum(100)
239 263
        self.spinBoxFlowMarkPosition.setObjectName("spinBoxFlowMarkPosition")
240 264
        self.gridLayout_26.addWidget(self.spinBoxFlowMarkPosition, 4, 1, 1, 1)
241
        self.lineEditSizeDelimiter = QtWidgets.QLineEdit(self.groupBoxAttribute)
242
        self.lineEditSizeDelimiter.setObjectName("lineEditSizeDelimiter")
243
        self.gridLayout_26.addWidget(self.lineEditSizeDelimiter, 1, 1, 1, 1)
244 265
        self.label_26 = QtWidgets.QLabel(self.groupBoxAttribute)
245 266
        self.label_26.setMaximumSize(QtCore.QSize(220, 16777215))
246 267
        self.label_26.setObjectName("label_26")
......
253 274
        self.doubleSpinBoxDetectionRange.setProperty("value", 1.0)
254 275
        self.doubleSpinBoxDetectionRange.setObjectName("doubleSpinBoxDetectionRange")
255 276
        self.gridLayout_26.addWidget(self.doubleSpinBoxDetectionRange, 3, 1, 1, 1)
256
        self.label_24 = QtWidgets.QLabel(self.groupBoxAttribute)
257
        self.label_24.setMaximumSize(QtCore.QSize(190, 16777215))
258
        self.label_24.setObjectName("label_24")
259
        self.gridLayout_26.addWidget(self.label_24, 4, 0, 1, 1)
260
        self.label_15 = QtWidgets.QLabel(self.groupBoxAttribute)
261
        self.label_15.setMaximumSize(QtCore.QSize(190, 16777215))
262
        self.label_15.setObjectName("label_15")
263
        self.gridLayout_26.addWidget(self.label_15, 3, 0, 1, 1)
264
        self.label_60 = QtWidgets.QLabel(self.groupBoxAttribute)
265
        self.label_60.setObjectName("label_60")
266
        self.gridLayout_26.addWidget(self.label_60, 6, 0, 1, 1)
267 277
        self.label_6 = QtWidgets.QLabel(self.groupBoxAttribute)
268 278
        self.label_6.setObjectName("label_6")
269 279
        self.gridLayout_26.addWidget(self.label_6, 1, 0, 1, 1)
......
280 290
        self.buttonGroup_13.addButton(self.radioButtonSpecNoneNo)
281 291
        self.horizontalLayout_16.addWidget(self.radioButtonSpecNoneNo)
282 292
        self.gridLayout_26.addLayout(self.horizontalLayout_16, 6, 1, 1, 1)
283
        self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
284
        self.horizontalLayout_11.setObjectName("horizontalLayout_11")
285
        self.radioButtonSizeUnitImaperial = QtWidgets.QRadioButton(self.groupBoxAttribute)
286
        self.radioButtonSizeUnitImaperial.setObjectName("radioButtonSizeUnitImaperial")
287
        self.buttonGroup_9 = QtWidgets.QButtonGroup(ConfigurationDialog)
288
        self.buttonGroup_9.setObjectName("buttonGroup_9")
289
        self.buttonGroup_9.addButton(self.radioButtonSizeUnitImaperial)
290
        self.horizontalLayout_11.addWidget(self.radioButtonSizeUnitImaperial)
291
        self.radioButtonSizeUnitMetric = QtWidgets.QRadioButton(self.groupBoxAttribute)
292
        self.radioButtonSizeUnitMetric.setObjectName("radioButtonSizeUnitMetric")
293
        self.buttonGroup_9.addButton(self.radioButtonSizeUnitMetric)
294
        self.horizontalLayout_11.addWidget(self.radioButtonSizeUnitMetric)
295
        self.gridLayout_26.addLayout(self.horizontalLayout_11, 0, 1, 1, 1)
293
        self.lineEditSizeDelimiter = QtWidgets.QLineEdit(self.groupBoxAttribute)
294
        self.lineEditSizeDelimiter.setObjectName("lineEditSizeDelimiter")
295
        self.gridLayout_26.addWidget(self.lineEditSizeDelimiter, 1, 1, 1, 1)
296 296
        self.label_63 = QtWidgets.QLabel(self.groupBoxAttribute)
297 297
        self.label_63.setObjectName("label_63")
298 298
        self.gridLayout_26.addWidget(self.label_63, 2, 0, 1, 1)
299 299
        self.lineEditInchSymbol = QtWidgets.QLineEdit(self.groupBoxAttribute)
300 300
        self.lineEditInchSymbol.setObjectName("lineEditInchSymbol")
301 301
        self.gridLayout_26.addWidget(self.lineEditInchSymbol, 2, 1, 1, 1)
302
        self.label_66 = QtWidgets.QLabel(self.groupBoxAttribute)
303
        self.label_66.setObjectName("label_66")
304
        self.gridLayout_26.addWidget(self.label_66, 7, 0, 1, 1)
305
        self.horizontalLayout_19 = QtWidgets.QHBoxLayout()
306
        self.horizontalLayout_19.setObjectName("horizontalLayout_19")
307
        self.radioButtonSystemYes = QtWidgets.QRadioButton(self.groupBoxAttribute)
308
        self.radioButtonSystemYes.setObjectName("radioButtonSystemYes")
309
        self.buttonGroup_16 = QtWidgets.QButtonGroup(ConfigurationDialog)
310
        self.buttonGroup_16.setObjectName("buttonGroup_16")
311
        self.buttonGroup_16.addButton(self.radioButtonSystemYes)
312
        self.horizontalLayout_19.addWidget(self.radioButtonSystemYes)
313
        self.radioButtonSystemNo = QtWidgets.QRadioButton(self.groupBoxAttribute)
314
        self.radioButtonSystemNo.setObjectName("radioButtonSystemNo")
315
        self.buttonGroup_16.addButton(self.radioButtonSystemNo)
316
        self.horizontalLayout_19.addWidget(self.radioButtonSystemNo)
317
        self.gridLayout_26.addLayout(self.horizontalLayout_19, 7, 1, 1, 1)
302 318
        self.gridLayout_6.addLayout(self.gridLayout_26, 0, 0, 1, 1)
303 319
        self.gridLayout_2.addWidget(self.groupBoxAttribute, 1, 1, 1, 1)
304 320
        self.tabWidget.addTab(self.Recognition, "")
......
1127 1143
        self.label_39.setText(_translate("ConfigurationDialog", "Page Segmentations Modes : "))
1128 1144
        self.label_17.setText(_translate("ConfigurationDialog", "Minimum Text Size : "))
1129 1145
        self.groupBoxAttribute.setTitle(_translate("ConfigurationDialog", "Attribute"))
1130
        self.label_26.setText(_translate("ConfigurationDialog", "Line Flow Mark Minimum Line Length : "))
1131
        self.label_54.setText(_translate("ConfigurationDialog", "Size Unit : "))
1132
        self.label_24.setText(_translate("ConfigurationDialog", "Line Flow Mark Position(Percent) : "))
1133 1146
        self.label_15.setText(_translate("ConfigurationDialog", "Attribute Detection Range(Ratio) : "))
1147
        self.radioButtonSizeUnitImaperial.setText(_translate("ConfigurationDialog", "Imperial"))
1148
        self.radioButtonSizeUnitMetric.setText(_translate("ConfigurationDialog", "Metric"))
1149
        self.label_24.setText(_translate("ConfigurationDialog", "Line Flow Mark Position(Percent) : "))
1134 1150
        self.label_60.setText(_translate("ConfigurationDialog", "Make Spec Break with None : "))
1151
        self.label_26.setText(_translate("ConfigurationDialog", "Line Flow Mark Minimum Line Length : "))
1152
        self.label_54.setText(_translate("ConfigurationDialog", "Size Unit : "))
1135 1153
        self.label_6.setText(_translate("ConfigurationDialog", "Size Delimiter : "))
1136 1154
        self.radioButtonSpecNoneYes.setText(_translate("ConfigurationDialog", "Yes"))
1137 1155
        self.radioButtonSpecNoneNo.setText(_translate("ConfigurationDialog", "No"))
1138
        self.radioButtonSizeUnitImaperial.setText(_translate("ConfigurationDialog", "Imperial"))
1139
        self.radioButtonSizeUnitMetric.setText(_translate("ConfigurationDialog", "Metric"))
1140 1156
        self.label_63.setText(_translate("ConfigurationDialog", "Size Symbol : "))
1157
        self.label_66.setText(_translate("ConfigurationDialog", "<html><head/><body><p>Make Spec Break by System : </p></body></html>"))
1158
        self.radioButtonSystemYes.setText(_translate("ConfigurationDialog", "Yes"))
1159
        self.radioButtonSystemNo.setText(_translate("ConfigurationDialog", "No"))
1141 1160
        self.tabWidget.setTabText(self.tabWidget.indexOf(self.Recognition), _translate("ConfigurationDialog", "Recognition"))
1142 1161
        self.groupBoxLineNo.setTitle(_translate("ConfigurationDialog", "Line No"))
1143 1162
        self.pushButtonLineNoAttribute.setText(_translate("ConfigurationDialog", "Attribute"))
DTI_PID/DTI_PID/LineNoTracer.py
1041 1041
        configs = docdata.getConfigs('Symbol', 'Spec')
1042 1042
        spec_none = int(configs[0].value) if configs else -1
1043 1043

  
1044
        configs = docdata.getConfigs('Symbol', 'Spec System')
1045
        spec_system = int(configs[0].value) if configs else -1
1046

  
1044 1047
        freezed_spec_breaks = []
1045 1048
        for spec_break in spec_breaks:
1046 1049
            if not spec_break.prop('Freeze'):
......
1306 1309
                            spec_break_items.append(spec_break)
1307 1310

  
1308 1311
                for spec_break_item in spec_break_items:
1312
                    if spec_system != 1 and not spec_break_item.prop('Show'):
1313
                        continue
1309 1314
                    spec_break_item.transfer.onRemoved.connect(App.mainWnd().itemRemoved)
1310 1315
                    spec_break_item.addSvgItemToScene(worker.scene)
1311 1316

  
DTI_PID/DTI_PID/UI/Configuration.ui
453 453
         <layout class="QGridLayout" name="gridLayout_6">
454 454
          <item row="0" column="0">
455 455
           <layout class="QGridLayout" name="gridLayout_26">
456
            <item row="3" column="0">
457
             <widget class="QLabel" name="label_15">
458
              <property name="maximumSize">
459
               <size>
460
                <width>190</width>
461
                <height>16777215</height>
462
               </size>
463
              </property>
464
              <property name="text">
465
               <string>Attribute Detection Range(Ratio) : </string>
466
              </property>
467
             </widget>
468
            </item>
469
            <item row="0" column="1">
470
             <layout class="QHBoxLayout" name="horizontalLayout_11">
471
              <item>
472
               <widget class="QRadioButton" name="radioButtonSizeUnitImaperial">
473
                <property name="text">
474
                 <string>Imperial</string>
475
                </property>
476
                <attribute name="buttonGroup">
477
                 <string notr="true">buttonGroup_9</string>
478
                </attribute>
479
               </widget>
480
              </item>
481
              <item>
482
               <widget class="QRadioButton" name="radioButtonSizeUnitMetric">
483
                <property name="text">
484
                 <string>Metric</string>
485
                </property>
486
                <attribute name="buttonGroup">
487
                 <string notr="true">buttonGroup_9</string>
488
                </attribute>
489
               </widget>
490
              </item>
491
             </layout>
492
            </item>
493
            <item row="4" column="0">
494
             <widget class="QLabel" name="label_24">
495
              <property name="maximumSize">
496
               <size>
497
                <width>190</width>
498
                <height>16777215</height>
499
               </size>
500
              </property>
501
              <property name="text">
502
               <string>Line Flow Mark Position(Percent) : </string>
503
              </property>
504
             </widget>
505
            </item>
456 506
            <item row="5" column="1">
457 507
             <widget class="QSpinBox" name="spinBoxFlowMarkLength">
458 508
              <property name="minimum">
......
463 513
              </property>
464 514
             </widget>
465 515
            </item>
516
            <item row="6" column="0">
517
             <widget class="QLabel" name="label_60">
518
              <property name="text">
519
               <string>Make Spec Break with None : </string>
520
              </property>
521
             </widget>
522
            </item>
466 523
            <item row="4" column="1">
467 524
             <widget class="QSpinBox" name="spinBoxFlowMarkPosition">
468 525
              <property name="maximum">
......
470 527
              </property>
471 528
             </widget>
472 529
            </item>
473
            <item row="1" column="1">
474
             <widget class="QLineEdit" name="lineEditSizeDelimiter"/>
475
            </item>
476 530
            <item row="5" column="0">
477 531
             <widget class="QLabel" name="label_26">
478 532
              <property name="maximumSize">
......
503 557
              </property>
504 558
             </widget>
505 559
            </item>
506
            <item row="4" column="0">
507
             <widget class="QLabel" name="label_24">
508
              <property name="maximumSize">
509
               <size>
510
                <width>190</width>
511
                <height>16777215</height>
512
               </size>
513
              </property>
514
              <property name="text">
515
               <string>Line Flow Mark Position(Percent) : </string>
516
              </property>
517
             </widget>
518
            </item>
519
            <item row="3" column="0">
520
             <widget class="QLabel" name="label_15">
521
              <property name="maximumSize">
522
               <size>
523
                <width>190</width>
524
                <height>16777215</height>
525
               </size>
526
              </property>
527
              <property name="text">
528
               <string>Attribute Detection Range(Ratio) : </string>
529
              </property>
530
             </widget>
531
            </item>
532
            <item row="6" column="0">
533
             <widget class="QLabel" name="label_60">
534
              <property name="text">
535
               <string>Make Spec Break with None : </string>
536
              </property>
537
             </widget>
538
            </item>
539 560
            <item row="1" column="0">
540 561
             <widget class="QLabel" name="label_6">
541 562
              <property name="text">
......
567 588
              </item>
568 589
             </layout>
569 590
            </item>
570
            <item row="0" column="1">
571
             <layout class="QHBoxLayout" name="horizontalLayout_11">
591
            <item row="1" column="1">
592
             <widget class="QLineEdit" name="lineEditSizeDelimiter"/>
593
            </item>
594
            <item row="2" column="0">
595
             <widget class="QLabel" name="label_63">
596
              <property name="text">
597
               <string>Size Symbol : </string>
598
              </property>
599
             </widget>
600
            </item>
601
            <item row="2" column="1">
602
             <widget class="QLineEdit" name="lineEditInchSymbol"/>
603
            </item>
604
            <item row="7" column="0">
605
             <widget class="QLabel" name="label_66">
606
              <property name="text">
607
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Make Spec Break by System : &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
608
              </property>
609
             </widget>
610
            </item>
611
            <item row="7" column="1">
612
             <layout class="QHBoxLayout" name="horizontalLayout_19">
572 613
              <item>
573
               <widget class="QRadioButton" name="radioButtonSizeUnitImaperial">
614
               <widget class="QRadioButton" name="radioButtonSystemYes">
574 615
                <property name="text">
575
                 <string>Imperial</string>
616
                 <string>Yes</string>
576 617
                </property>
577 618
                <attribute name="buttonGroup">
578
                 <string notr="true">buttonGroup_9</string>
619
                 <string notr="true">buttonGroup_16</string>
579 620
                </attribute>
580 621
               </widget>
581 622
              </item>
582 623
              <item>
583
               <widget class="QRadioButton" name="radioButtonSizeUnitMetric">
624
               <widget class="QRadioButton" name="radioButtonSystemNo">
584 625
                <property name="text">
585
                 <string>Metric</string>
626
                 <string>No</string>
586 627
                </property>
587 628
                <attribute name="buttonGroup">
588
                 <string notr="true">buttonGroup_9</string>
629
                 <string notr="true">buttonGroup_16</string>
589 630
                </attribute>
590 631
               </widget>
591 632
              </item>
592 633
             </layout>
593 634
            </item>
594
            <item row="2" column="0">
595
             <widget class="QLabel" name="label_63">
596
              <property name="text">
597
               <string>Size Symbol : </string>
598
              </property>
599
             </widget>
600
            </item>
601
            <item row="2" column="1">
602
             <widget class="QLineEdit" name="lineEditInchSymbol"/>
603
            </item>
604 635
           </layout>
605 636
          </item>
606 637
         </layout>
......
2249 2280
  </connection>
2250 2281
 </connections>
2251 2282
 <buttongroups>
2252
  <buttongroup name="buttonGroup_12"/>
2283
  <buttongroup name="buttonGroup_3"/>
2284
  <buttongroup name="buttonGroup_8"/>
2253 2285
  <buttongroup name="buttonGroup_10"/>
2254
  <buttongroup name="buttonGroup_7"/>
2255 2286
  <buttongroup name="buttonGroup_11"/>
2256
  <buttongroup name="buttonGroup_5"/>
2257
  <buttongroup name="buttonGroup_2"/>
2287
  <buttongroup name="buttonGroup_15"/>
2258 2288
  <buttongroup name="buttonGroup_9"/>
2289
  <buttongroup name="buttonGroup_6"/>
2259 2290
  <buttongroup name="buttonGroup"/>
2260
  <buttongroup name="buttonGroup_14"/>
2261
  <buttongroup name="buttonGroup_4"/>
2262
  <buttongroup name="buttonGroup_3"/>
2263
  <buttongroup name="buttonGroup_8"/>
2291
  <buttongroup name="buttonGroup_12"/>
2292
  <buttongroup name="buttonGroup_7"/>
2293
  <buttongroup name="buttonGroup_5"/>
2264 2294
  <buttongroup name="buttonGroup_13"/>
2265
  <buttongroup name="buttonGroup_6"/>
2266
  <buttongroup name="buttonGroup_15"/>
2295
  <buttongroup name="buttonGroup_2"/>
2296
  <buttongroup name="buttonGroup_4"/>
2297
  <buttongroup name="buttonGroup_14"/>
2298
  <buttongroup name="buttonGroup_16"/>
2267 2299
 </buttongroups>
2268 2300
</ui>

내보내기 Unified diff

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