프로젝트

일반

사용자정보

개정판 1a3a74a8

ID1a3a74a852f9bc7b336894b94d205a8c5fb1202e
상위 34ec41f5
하위 44c5399a, b65a7e32

gaqhf 이(가) 5년 이상 전에 추가함

dev issue #000 : 라벨들 위치 설정가능하게 / 모델링 수정

Change-Id: I69a1eaa92469426c6e329dde3c7f652660f19f56

차이점 보기:

DTI_PID/SPPIDConverter/Model/SPPID_Document.cs
107 107
                SPPIDUtil.ConvertSPPIDPoint(ref x, ref y, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
108 108
                item.SPPID.ORIGINAL_X = x;
109 109
                item.SPPID.ORIGINAL_Y = y;
110

  
111
                item.SPPIDLabelLocation = new SPPIDLabelLocationInfo();
112
                double x1 = item.X1;
113
                double y1 = item.Y1;
114
                double x2 = item.X2;
115
                double y2 = item.Y2;
116
                SPPIDUtil.ConvertSPPIDPoint(ref x1, ref y1, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
117
                SPPIDUtil.ConvertSPPIDPoint(ref x2, ref y2, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
118
                item.SPPIDLabelLocation.X1 = Math.Min(x1, x2);
119
                item.SPPIDLabelLocation.Y1 = Math.Min(y1, y2);
120
                item.SPPIDLabelLocation.X2 = Math.Max(x1, x2);
121
                item.SPPIDLabelLocation.Y2 = Math.Max(y1, y2);
110 122
            }
111 123

  
112 124
            foreach (var item in TEXTINFOS)
......
119 131
                SPPIDUtil.ConvertSPPIDPoint(ref x, ref y, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
120 132
                item.SPPID.ORIGINAL_X = x;
121 133
                item.SPPID.ORIGINAL_Y = y;
134

  
135
                item.SPPIDLabelLocation = new SPPIDLabelLocationInfo();
136
                double x1 = item.X1;
137
                double y1 = item.Y1;
138
                double x2 = item.X2;
139
                double y2 = item.Y2;
140
                SPPIDUtil.ConvertSPPIDPoint(ref x1, ref y1, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
141
                SPPIDUtil.ConvertSPPIDPoint(ref x2, ref y2, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
142
                item.SPPIDLabelLocation.X1 = Math.Min(x1, x2);
143
                item.SPPIDLabelLocation.Y1 = Math.Min(y1, y2);
144
                item.SPPIDLabelLocation.X2 = Math.Max(x1, x2);
145
                item.SPPIDLabelLocation.Y2 = Math.Max(y1, y2);
122 146
            }
123 147

  
124 148
            foreach (var item in NOTES)
......
131 155
                SPPIDUtil.ConvertSPPIDPoint(ref x, ref y, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
132 156
                item.SPPID.ORIGINAL_X = x;
133 157
                item.SPPID.ORIGINAL_Y = y;
158

  
159
                item.SPPIDLabelLocation = new SPPIDLabelLocationInfo();
160
                double x1 = item.X1;
161
                double y1 = item.Y1;
162
                double x2 = item.X2;
163
                double y2 = item.Y2;
164
                SPPIDUtil.ConvertSPPIDPoint(ref x1, ref y1, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
165
                SPPIDUtil.ConvertSPPIDPoint(ref x2, ref y2, SIZE_WIDTH, SIZE_HEIGHT, testX, testY);
166
                item.SPPIDLabelLocation.X1 = Math.Min(x1, x2);
167
                item.SPPIDLabelLocation.Y1 = Math.Min(y1, y2);
168
                item.SPPIDLabelLocation.X2 = Math.Max(x1, x2);
169
                item.SPPIDLabelLocation.Y2 = Math.Max(y1, y2);
134 170
            }
135 171
        }
136 172

  

내보내기 Unified diff

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