개정판 e59e6c8e
issue #000: TextControl Adoner Margin 값 계산하여 적용, FinalService DL_TEST DB 접속 정보로 변경
Change-Id: I29b3d8450d8d22776f84505672447372ed060673
| FinalService/KCOM_FinalService_DL/ConnectionStrEncrypt/Program.cs | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
if (args == null || args?.Count() == 0) |
| 25 | 25 |
{
|
| 26 |
args = new[] { "-en", "data source=10.10.130.11,14950;database=markus;user id=doftech;password=gasadmin1!" };
|
|
| 26 |
args = new[] { "-en", "data source=10.210.80.4,14950;database=markus;user id=markus;password=markus#8576" };
|
|
| 27 |
//args = new[] { "-en", "data source=10.10.130.11,14950;database=markus;user id=doftech;password=gasadmin1!" };
|
|
| 27 | 28 |
//args = new[] { "-en", "data source=210.94.128.101;database=markus;user id=doftech;password=xpdhtm!1" };
|
| 28 | 29 |
//args = new[] { "-en", "data source=10.11.142.77;database=markus;user id=doftech;password=dof1073#" };
|
| 29 | 30 |
} |
| FinalService/KCOM_FinalService_DL/KCOM_FinalService/FinalService.ini | ||
|---|---|---|
| 13 | 13 |
[UpLoadServiceUrl] |
| 14 | 14 |
URL= |
| 15 | 15 |
[ConnectionString] |
| 16 |
STRING=EVCOYxwadMNh7qzjMvRTwOacwyFatXgWjx//sssrSKTsvMkdvpdBa3Sj3mmhwABTiweSqNnWYgsIxUWXaBe8XE8G1CLaux2zPbyBWvqxJruTX0H5MqABZSEXXG82XaGL
|
|
| 16 |
STRING=tyEJJeokhOMWTRIHqgLi0qve/PPa9qxNVm2a189gFDOPmdHZQ7xISL4D8Q8DXx4tf6pLtd3S3NwuvIA3sDfqw3qhjd+ZczfJ/G3XuAjFpYg4IivByLMdGnc+VwMh/bRv
|
|
| 17 | 17 |
[MARKUS_API] |
| 18 | 18 |
URL=http://www.devdoftech.co.kr:5979/ServiceDeepView.svc |
| 19 | 19 |
#[Remoting] |
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 639 | 639 |
double minY = double.MaxValue; |
| 640 | 640 |
double maxX = double.MinValue; |
| 641 | 641 |
double maxY = double.MinValue; |
| 642 |
double LineSize = 0; |
|
| 642 |
double lineSize = 0; |
|
| 643 |
double marginSize = 0; |
|
| 643 | 644 |
if (this.Members.Count == 1) |
| 644 | 645 |
{
|
| 645 | 646 |
if (this.Members[0].DrawingData.GetType().Name == "TextControl") |
| ... | ... | |
| 673 | 674 |
{
|
| 674 | 675 |
double textControlWidth; |
| 675 | 676 |
double textControlHeight; |
| 676 |
//LineSize = ((dynamic)currentControl).LineSize.Left; |
|
| 677 |
|
|
| 677 | 678 |
if (((currentControl as TextControl).Base_TextBox.ActualWidth) == 0) |
| 678 | 679 |
{
|
| 679 | 680 |
textControlWidth = ((currentControl as TextControl).Base_TextBlock.ActualWidth); |
| ... | ... | |
| 704 | 705 |
{
|
| 705 | 706 |
maxY = textControlHeight + (currentControl as TextControl).EndPoint.Y; |
| 706 | 707 |
} |
| 708 |
marginSize = ((dynamic)currentControl).LineSize.Left; |
|
| 707 | 709 |
} |
| 708 | 710 |
else if ((currentControl as IViewBox) != null) |
| 709 | 711 |
{
|
| ... | ... | |
| 747 | 749 |
else if (currentControl is CircleControl CircleCtrl) |
| 748 | 750 |
{
|
| 749 | 751 |
List<Point> am = CircleCtrl.PointSet; |
| 750 |
LineSize = CircleCtrl.LineSize;
|
|
| 752 |
lineSize = CircleCtrl.LineSize;
|
|
| 751 | 753 |
minX = am.Min(x => x.X); |
| 752 | 754 |
minY = am.Min(x => x.Y); |
| 753 | 755 |
maxX = am.Max(x => x.X); |
| ... | ... | |
| 755 | 757 |
} |
| 756 | 758 |
else |
| 757 | 759 |
{
|
| 758 |
//if(item.DrawingData.GetType().Name == "TriControl") |
|
| 759 |
// LineSize = ((MarkupToPDF.Controls.Shape.TriControl)currentControl).LineSize; |
|
| 760 |
//else if(item.DrawingData.GetType().Name == "RectangleControl") |
|
| 761 |
// LineSize = ((MarkupToPDF.Controls.Shape.RectangleControl)currentControl).LineSize; |
|
| 762 |
//else if (item.DrawingData.GetType().Name == "RectCloudControl") |
|
| 763 |
// LineSize = ((MarkupToPDF.Controls.Shape.RectCloudControl)currentControl).LineSize; |
|
| 764 |
//else if (item.DrawingData.GetType().Name == "CloudControl") |
|
| 765 |
// LineSize = ((MarkupToPDF.Controls.Polygon.CloudControl)currentControl).LineSize; |
|
| 766 |
//else if (item.DrawingData.GetType().Name == "PolygonControl") |
|
| 767 |
LineSize = ((dynamic)currentControl).LineSize; |
|
| 768 |
|
|
| 760 |
lineSize = ((dynamic)currentControl).LineSize; |
|
| 769 | 761 |
if ((currentControl as IPath).PathData.Bounds.Left < minX) minX = (currentControl as IPath).PathData.Bounds.Left; |
| 770 | 762 |
if ((currentControl as IPath).PathData.Bounds.Top < minY) minY = (currentControl as IPath).PathData.Bounds.Top; |
| 771 | 763 |
if ((currentControl as IPath).PathData.Bounds.Right > maxX) maxX = (currentControl as IPath).PathData.Bounds.Right; |
| ... | ... | |
| 773 | 765 |
} |
| 774 | 766 |
} |
| 775 | 767 |
|
| 776 |
|
|
| 777 |
Rect ac = new Rect(minX, minY, maxX - minX, maxY - minY); |
|
| 768 |
Rect ac = new Rect(minX , minY, maxX - minX, maxY - minY); |
|
| 778 | 769 |
bool addWidthSize = false; |
| 779 | 770 |
bool addHeightSize = false; |
| 780 | 771 |
if (ac.Width <= 10) |
| ... | ... | |
| 788 | 779 |
addHeightSize = true; |
| 789 | 780 |
} |
| 790 | 781 |
BorderSize = ac; |
| 791 |
ac.Width += LineSize; |
|
| 792 |
ac.Height += LineSize; |
|
| 782 |
//lineSize : Thickness 굵기에 따라서 adoner 수정 |
|
| 783 |
ac.Width += lineSize; |
|
| 784 |
ac.Height += lineSize; |
|
| 793 | 785 |
AdornerBorder.MinWidth = 10; |
| 794 | 786 |
AdornerBorder.MinHeight = 10; |
| 795 | 787 |
AdornerBorder.Width = ac.Width; |
| 796 | 788 |
AdornerBorder.Height = ac.Height; |
| 797 |
|
|
| 798 |
minX -= LineSize / 2; |
|
| 799 |
minY -= LineSize / 2; |
|
| 789 |
minX -= lineSize / 2; |
|
| 790 |
minY -= lineSize / 2; |
|
| 800 | 791 |
Canvas.SetLeft(AdornerBorder, minX); |
| 801 | 792 |
Canvas.SetTop(AdornerBorder, minY); |
| 802 | 793 |
|
| 803 | 794 |
DragThumb.Width = ac.Width; |
| 804 | 795 |
DragThumb.Height = ac.Height; |
| 805 |
|
|
| 796 |
rotateTop.Margin = new Thickness(rotateTop.Margin.Left, rotateTop.Margin.Top - marginSize, rotateTop.Margin.Right, rotateTop.Margin.Bottom); |
|
| 806 | 797 |
DragThumb.MinWidth = 10; |
| 807 | 798 |
DragThumb.MinHeight = 10; |
| 808 | 799 |
if (addWidthSize) |
| KCOM/Controls/CustomWindow.cs | ||
|---|---|---|
| 152 | 152 |
win.Top = 0 + screen.Bounds.Y; |
| 153 | 153 |
win.Height = screen.WorkingArea.Height; |
| 154 | 154 |
}); |
| 155 |
|
|
| 156 |
int windowHandle = FindWindow("Shell_TrayWnd", string.Empty);
|
|
| 157 |
|
|
| 158 |
ShowWindow(windowHandle, SW_SHOW); |
|
| 155 | 159 |
} |
| 156 | 160 |
}); |
| 157 | 161 |
} |
| 162 |
/// <summary> |
|
| 163 |
/// SW_HIDE |
|
| 164 |
/// </summary> |
|
| 165 |
private const int SW_HIDE = 0; |
|
| 166 |
|
|
| 167 |
/// <summary> |
|
| 168 |
/// SW_SHOW |
|
| 169 |
/// </summary> |
|
| 170 |
private const int SW_SHOW = 1; |
|
| 171 |
|
|
| 172 |
#region 윈도우 찾기 - FindWindow(className, windowText) |
|
| 173 |
|
|
| 174 |
/// <summary> |
|
| 175 |
/// 윈도우 찾기 |
|
| 176 |
/// </summary> |
|
| 177 |
/// <param name="className">클래스명</param> |
|
| 178 |
/// <param name="windowText">윈도우 텍스트</param> |
|
| 179 |
/// <returns>윈도우 핸들</returns> |
|
| 180 |
[DllImport("user32.dll")]
|
|
| 181 |
private static extern int FindWindow(string className, string windowText); |
|
| 182 |
|
|
| 183 |
#endregion |
|
| 184 |
#region 윈도우 표시하기 - ShowWindow(windowHandle, command) |
|
| 185 |
|
|
| 186 |
/// <summary> |
|
| 187 |
/// 윈도우 표시하기 |
|
| 188 |
/// </summary> |
|
| 189 |
/// <param name="windowHandle">윈도우 핸들</param> |
|
| 190 |
/// <param name="command">명령</param> |
|
| 191 |
/// <returns>처리 결과</returns> |
|
| 192 |
[DllImport("user32.dll")]
|
|
| 193 |
private static extern int ShowWindow(int windowHandle, int command); |
|
| 194 |
|
|
| 195 |
#endregion |
|
| 158 | 196 |
|
| 159 | 197 |
public System.Windows.Forms.Screen GetOnScreen(Window window) |
| 160 | 198 |
{
|
| KCOM/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
| 52 | 52 |
// 지정되도록 할 수 있습니다. |
| 53 | 53 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 54 |
[assembly: AssemblyVersion("5.5.10.0")]
|
|
| 55 |
[assembly: AssemblyFileVersion("5.5.10.0")]
|
|
| 54 |
[assembly: AssemblyVersion("5.5.11.0")]
|
|
| 55 |
[assembly: AssemblyFileVersion("5.5.11.0")]
|
|
| 56 | 56 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 502 | 502 |
|
| 503 | 503 |
if (App.ParameterMode) |
| 504 | 504 |
{
|
| 505 |
|
|
| 505 |
|
|
| 506 | 506 |
App.splashString(ISplashMessage.MAINMENU_1); |
| 507 | 507 |
this.pageNavigator.ThumbInitialized += pageNavigator_ThumbInitialized; |
| 508 | 508 |
this.pageNavigator.PageChanging += pageNavigator_PageChanging; |
| ... | ... | |
| 515 | 515 |
da.Duration = new Duration(TimeSpan.FromSeconds(1)); |
| 516 | 516 |
da.AutoReverse = true; |
| 517 | 517 |
da.RepeatBehavior = System.Windows.Media.Animation.RepeatBehavior.Forever; |
| 518 |
|
|
| 518 |
|
|
| 519 | 519 |
if (!App.ViewInfo.CreateFinalPDFPermission && !App.ViewInfo.NewCommentPermission) |
| 520 | 520 |
{
|
| 521 | 521 |
this.SymbolPane.Visibility = Visibility.Collapsed; |
| ... | ... | |
| 3452 | 3452 |
currentControl = new TriControl |
| 3453 | 3453 |
{
|
| 3454 | 3454 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y), |
| 3455 |
//MidPoint = new Point(0, 0), |
|
| 3455 | 3456 |
Background = new SolidColorBrush(Colors.Black), |
| 3456 | 3457 |
}; |
| 3457 | 3458 |
|
| MarkupToPDF/Controls/Shape/TriControl.cs | ||
|---|---|---|
| 391 | 391 |
List<Point> points = new List<Point>() { this.StartPoint };
|
| 392 | 392 |
if (MidPoint.X != 0 && MidPoint.Y != 0) points.Add(this.MidPoint); |
| 393 | 393 |
points.Add(this.EndPoint); |
| 394 |
|
|
| 395 | 394 |
PolyLineSegment polyline = new PolyLineSegment(points , true); |
| 396 | 395 |
pathFigure.Segments.Add(polyline); |
| 397 | 396 |
|
내보내기 Unified diff
