프로젝트

일반

사용자정보

개정판 f549c1b3

IDf549c1b33dec5886beeb67b682d1a9d269bc5563
상위 cc993b9b
하위 cb647869

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

cad line

Change-Id: Ie7ed31397b4d79ec7ad49210afd5ab986e585ebe

차이점 보기:

DTI_PID/DTI_PID/ImportTextFromCADDialog.py
26 26
        if not item.parent():
27 27
            if index.column() == 1:
28 28
                editor = QComboBox(parent)
29
                editor.addItems(self._line_types if self._line_types else [''])
29
                editor.addItems(self._layer_names if self._layer_names else [''])
30 30

  
31 31
        return editor if editor else super(LineTypeMappingDelegate, self).createEditor(parent, option, index)
32 32

  
......
85 85
                        child.setEditable(False)
86 86
                    items[0].appendRow(childs)
87 87

  
88
        headers = [QStandardItem("ID2 Line Type"), QStandardItem("AutoCAD Line Type"), QStandardItem('')]
88
        headers = [QStandardItem("ID2 Line Type"), QStandardItem("AutoCAD Line Layer"), QStandardItem('')]
89 89
        for idx, header in enumerate(headers):
90 90
            header.setTextAlignment(Qt.AlignCenter)
91 91
            self.setHorizontalHeaderItem(idx, header)
......
1072 1072
        def get_line_type(layers: list, line_types: list, layer_name: str, line_type: str) -> str:
1073 1073
            """return line type"""
1074 1074

  
1075
            '''
1075 1076
            res = line_type
1076 1077
            if line_type.upper() == 'ByLayer'.upper():
1077 1078
                matches = [layer for layer in layers if layer[0] == layer_name]
......
1080 1081
                    matches = [line_node for line_node in line_types if line_node[0] == line_type_oid]
1081 1082
                    if matches:
1082 1083
                        res = matches[0][1]
1084
            '''
1085
            res = layer_name
1083 1086

  
1084 1087
            return res
1085 1088

  
DTI_PID/DTI_PID/Scripts/MSSQL/ID2.sql
2749 2749
                              '#ff007f',
2750 2750
                              'Color',
2751 2751
                              'Equipment'
2752
                          ),
2753
                          (
2754
                              'Line Type Mapping',
2755
                              'Capillary',
2756
                              'Capillary'
2757
                          ),
2758
                          (
2759
                              'Line Type Mapping',
2760
                              'Connect To Process',
2761
                              'Connect To Process'
2762
                          ),
2763
                          (
2764
                              'Line Type Mapping',
2765
                              'Electric',
2766
                              'Electric'
2767
                          ),
2768
                          (
2769
                              'Line Type Mapping',
2770
                              'Electric Binary',
2771
                              'Electric Binary'
2772
                          ),
2773
                          (
2774
                              'Line Type Mapping',
2775
                              'Guided Electromagnetic',
2776
                              'Guided Electromagnetic'
2777
                          ),
2778
                          (
2779
                              'Line Type Mapping',
2780
                              'Hydraulic',
2781
                              'Hydraulic'
2782
                          ),
2783
                          (
2784
                              'Line Type Mapping',
2785
                              'Mechanical',
2786
                              'Mechanical'
2787
                          ),
2788
                          (
2789
                              'Line Type Mapping',
2790
                              'Pneumatic',
2791
                              'Pneumatic'
2792
                          ),
2793
                          (
2794
                              'Line Type Mapping',
2795
                              'Pneumatic Binary',
2796
                              'Pneumatic Binary'
2797
                          ),
2798
                          (
2799
                              'Line Type Mapping',
2800
                              'Primary',
2801
                              'Primary'
2802
                          ),
2803
                          (
2804
                              'Line Type Mapping',
2805
                              'Secondary',
2806
                              'Secondary'
2807
                          ),
2808
                          (
2809
                              'Line Type Mapping',
2810
                              'Software',
2811
                              'Software'
2752 2812
                          );
2753 2813

  
2754 2814
CREATE TABLE EqpTagNames (
DTI_PID/DTI_PID/TcpServer.py
59 59

  
60 60
            finally:
61 61
                # 연결 모두 지움
62
                print("HighLight")
62
                # print("HighLight")
63
                pass
63 64

  
64 65
        from App import App
65 66
        from AppDocData import AppDocData

내보내기 Unified diff

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