개정판 41c4405e
sync 대상 수정
Change-Id: I61b1e61a9776fb68f67fc6004ac4709da7d88962
KCOM/Controls/AdornerFinal.xaml.cs | ||
---|---|---|
1084 | 1084 |
double newHorizontalChange = e.HorizontalChange; |
1085 | 1085 |
double newVerticalChange = e.VerticalChange; |
1086 | 1086 |
|
1087 |
var newpoint = MathHelper.RotatePoint(new Point(newHorizontalChange, newVerticalChange), new Point(), ViewerDataModel.Instance.PageAngle);// commentInfo.VisualPageAngle);
|
|
1087 |
var newpoint = MathHelper.RotatePoint(new Point(newHorizontalChange, newVerticalChange), new Point(), 0);// commentInfo.VisualPageAngle);
|
|
1088 | 1088 |
|
1089 | 1089 |
var direction = VisualHelper.GetPointDirection(newpoint, ViewerDataModel.Instance.PageAngle); |
1090 | 1090 |
|
... | ... | |
1102 | 1102 |
//var midPoint = MathSet.getMiddlePoint(arrowText.StartPoint, arrowText.EndPoint); |
1103 | 1103 |
//arrowText.MidPoint = newpoint; |
1104 | 1104 |
thumb.Translate(newpoint.X, newpoint.Y, this.AngleValue); |
1105 |
|
|
1105 | 1106 |
commentInfo.OnMoveCtrlPoint(getThumbPoint, newpoint.X, newpoint.Y, ViewerDataModel.Instance.IsAxisLock || ViewerDataModel.Instance.IsPressShift); |
1106 | 1107 |
|
1107 | 1108 |
control.UpdateThumb(); |
... | ... | |
1152 | 1153 |
ratatePointAngle = commentInfo.VisualPageAngle; |
1153 | 1154 |
} |
1154 | 1155 |
else |
1155 |
{ |
|
1156 |
Point tempPoint = textControl.EndPoint; |
|
1157 |
textControl.OnCreatingMouseMove(tempPoint, ViewerDataModel.Instance.IsPressShift); |
|
1156 |
{ |
|
1158 | 1157 |
//textControl.CommentAngle = commentInfo.VisualPageAngle + MathSet.returnAngle(textControl.StartPoint, ref tempPoint, ViewerDataModel.Instance.IsPressShift); |
1158 |
textControl.OnCreatingMouseMove(textControl.EndPoint, ViewerDataModel.Instance.IsPressShift); |
|
1159 | 1159 |
this.AngleValue = textControl.CommentAngle; |
1160 | 1160 |
commentInfo.CommentAngle = this.AngleValue; |
1161 | 1161 |
} |
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
4939 | 4939 |
|
4940 | 4940 |
//Logger.sendReqLog("GetCompareRectAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID + "," + CurrentRev.DOCUMENT_ID +"," + pageNavigator.CurrentPage.PageNumber.ToString() + "," + ViewerDataModel.Instance.PageNumber.ToString() + "," + userData.COMPANY != "EXT" ? "true" : "false", 1); |
4941 | 4941 |
|
4942 |
BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString(), userData.COMPANY != "EXT" ? "true" : "false"); |
|
4942 |
/// 비교대상원본, 비교할 대상 |
|
4943 |
BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, _ViewInfo.DocumentItemID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString(), userData.COMPANY != "EXT" ? "true" : "false"); |
|
4943 | 4944 |
} |
4944 | 4945 |
else |
4945 | 4946 |
{ |
내보내기 Unified diff