프로젝트

일반

사용자정보

개정판 a0e3dca4

IDa0e3dca465636997b86e34362f8b403766a6fbf7
상위 31911f94
하위 6a85128e

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

dev issue #706 : Line modeling 수정 / ValidationCheck 추가 / 우선순위 Modeling 적용 / 에러 메시지 추가

Change-Id: I382716081a63a8fa2ac2b983ac7194c0c4b57ce7

차이점 보기:

DTI_PID/SPPIDConverter/SPPIDModel/SPPID_Document.cs
106 106

  
107 107
            foreach (var item in LINES)
108 108
            {
109
                double x = double.NaN;
110
                double y = double.NaN;
109
                double startX = double.NaN;
110
                double startY = double.NaN;
111 111

  
112
                SPPIDUtil.ConvertPointBystring(item.STARTPOINT, ref x, ref y);
113
                SPPIDUtil.ConvertSPPIDPoint(ref x, ref y, SIZE_WIDTH, SIZE_HEIGHT, SPPIDDocumentX, SPPIDDocumentY);
114
                item.SPPID.START_X = x;
115
                item.SPPID.START_Y = y;
112
                SPPIDUtil.ConvertPointBystring(item.STARTPOINT, ref startX, ref startY);
113
                SPPIDUtil.ConvertSPPIDPoint(ref startX, ref startY, SIZE_WIDTH, SIZE_HEIGHT, SPPIDDocumentX, SPPIDDocumentY);
114
                item.SPPID.START_X = startX;
115
                item.SPPID.START_Y = startY;
116 116

  
117
                SPPIDUtil.ConvertPointBystring(item.ENDPOINT, ref x, ref y);
118
                SPPIDUtil.ConvertSPPIDPoint(ref x, ref y, SIZE_WIDTH, SIZE_HEIGHT, SPPIDDocumentX, SPPIDDocumentY);
119
                item.SPPID.END_X = x;
120
                item.SPPID.END_Y = y;
117
                double endX = double.NaN;
118
                double endY = double.NaN;
119

  
120
                SPPIDUtil.ConvertPointBystring(item.ENDPOINT, ref endX, ref endY);
121
                SPPIDUtil.ConvertSPPIDPoint(ref endX, ref endY, SIZE_WIDTH, SIZE_HEIGHT, SPPIDDocumentX, SPPIDDocumentY);
122
                item.SPPID.END_X = endX;
123
                item.SPPID.END_Y = endY;
124

  
125
                item.SlopeType = SPPIDUtil.CalcSlope(startX, startY, endX, endY);
121 126
            }
122 127

  
123 128
            foreach (var item in Equipments)
......
278 283
                    }
279 284
                }
280 285
            }
286

  
287
            foreach (Line line in LINES)
288
            {
289
                double tempX = line.SPPID.START_X;
290
                double tempY = line.SPPID.START_Y;
291
                SPPIDUtil.ConvertGridPoint(ref tempX, ref tempY);
292
                line.SPPID.START_X = tempX;
293
                line.SPPID.START_Y = tempY;
294

  
295
                tempX = line.SPPID.END_X;
296
                tempY = line.SPPID.END_Y;
297
                SPPIDUtil.ConvertGridPoint(ref tempX, ref tempY);
298
                line.SPPID.END_X = tempX;
299
                line.SPPID.END_Y = tempY;
300

  
301
                if (line.SlopeType == SlopeType.HORIZONTAL)
302
                    line.SPPID.END_Y = line.SPPID.START_Y;
303
                else if (line.SlopeType == SlopeType.VERTICAL)
304
                    line.SPPID.END_X = line.SPPID.START_X;
305
            }
281 306
        }
282 307

  
283 308
        private void FindGroupBySymbolAndSlopeType(Symbol symbol, List<object> group, SlopeType searchType)

내보내기 Unified diff

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