개정판 25c5df17
dev issue #000 : fix specbreak relocation
Change-Id: Id5be717fbf1ed446c5110372ff4a7468013be680
DTI_PID/SPPIDConverter/ConverterDocking.cs | ||
---|---|---|
53 | 53 |
_ProjectInfo.Port = Settings.Default.ProjectPort; |
54 | 54 |
_ProjectInfo.DBUser = Settings.Default.ProjectDBUser; |
55 | 55 |
_ProjectInfo.DBPassword = Settings.Default.ProjectDBPassword; |
56 |
if (Project_DB.ConnTestAndCreateTable()) |
|
57 |
{ |
|
58 |
_ProjectInfo.Enable = true; |
|
59 |
layoutControlGroup3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always; |
|
60 |
|
|
61 |
DataTable dt = Project_DB.SelectSetting(); |
|
62 |
foreach (DataRow item in dt.Rows) |
|
63 |
{ |
|
64 |
string settingType = item["SettingType"].ToString(); |
|
65 |
if (settingType == "ETCSetting") |
|
66 |
SPPIDUtil.ConvertToETCSetting(item["JsonString"].ToString()); |
|
67 |
else if (settingType == "GridSetting") |
|
68 |
SPPIDUtil.ConvertToGridSetting(item["JsonString"].ToString()); |
|
69 |
} |
|
70 |
} |
|
71 |
else |
|
72 |
{ |
|
73 |
layoutControlGroup3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; |
|
74 |
} |
|
56 | 75 |
|
57 | 76 |
if (!addEvent) |
58 | 77 |
{ |
... | ... | |
963 | 982 |
if (dependency3 != null) |
964 | 983 |
FindRangeWithOutLineString2dAndTextBox(dependency3, out d3X1, out d3Y1, out d3X2, out d3Y2); |
965 | 984 |
|
985 |
GridSetting gridSetting = GridSetting.GetInstance(); |
|
986 |
double move = gridSetting.Length / 2; |
|
966 | 987 |
switch (degree) |
967 | 988 |
{ |
968 | 989 |
case 0: |
969 |
MoveDependency(dependency1, d1X2, d1Y2, crossX, crossY); |
|
970 |
MoveDependency(dependency2, d2X1, d2Y2, crossX, crossY); |
|
990 |
MoveDependency(dependency1, d1X2, d1Y2, crossX - move, crossY);
|
|
991 |
MoveDependency(dependency2, d2X1, d2Y2, crossX + move, crossY);
|
|
971 | 992 |
if (dependency3 != null) |
972 | 993 |
MoveDependency(dependency3, (d3X1 + d3X2) / 2, d3Y1, topX, topY); |
973 | 994 |
break; |
974 | 995 |
case 90: |
975 |
MoveDependency(dependency1, d1X1, d1Y2, crossX, crossY); |
|
976 |
MoveDependency(dependency2, d2X1, d2Y1, crossX, crossY); |
|
996 |
MoveDependency(dependency1, d1X1, d1Y2, crossX + move, crossY);
|
|
997 |
MoveDependency(dependency2, d2X1, d2Y1, crossX + move, crossY);
|
|
977 | 998 |
if (dependency3 != null) |
978 | 999 |
MoveDependency(dependency3, d3X2, (d3Y1 + d3Y2) / 2, topX, topY); |
979 | 1000 |
break; |
980 | 1001 |
case 180: |
981 |
MoveDependency(dependency1, d1X2, d1Y1, crossX, crossY); |
|
982 |
MoveDependency(dependency2, d2X1, d2Y1, crossX, crossY); |
|
1002 |
MoveDependency(dependency1, d1X2, d1Y1, crossX - move, crossY);
|
|
1003 |
MoveDependency(dependency2, d2X1, d2Y1, crossX + move, crossY);
|
|
983 | 1004 |
if (dependency3 != null) |
984 | 1005 |
MoveDependency(dependency3, (d3X1 + d3X2) / 2, d3Y2, topX, topY); |
985 | 1006 |
break; |
986 | 1007 |
case 270: |
987 |
MoveDependency(dependency1, d1X2, d1Y2, crossX, crossY); |
|
988 |
MoveDependency(dependency2, d2X2, d2Y1, crossX, crossY); |
|
1008 |
MoveDependency(dependency1, d1X2, d1Y2, crossX - move, crossY);
|
|
1009 |
MoveDependency(dependency2, d2X2, d2Y1, crossX - move, crossY);
|
|
989 | 1010 |
if (dependency3 != null) |
990 | 1011 |
MoveDependency(dependency3, d3X1, (d3Y1 + d3Y2) / 2, topX, topY); |
991 | 1012 |
break; |
내보내기 Unified diff