개정판 120b8b00
issue #000 Arrow 꺽은 선 생성 과정에서 Move로 Drawing 할 때 꺽은 선이 안그려지는 에러 발생
OnCreatingMouseMove 함수에서 ControlType 체크 시 ControlType이 꺾은선 타입으로 안되어 있어서 this.isFixed 변하지 않기 때문이다. 해결.
Change-Id: I63cff3bde7aabad6903fd7c65e3247ccf626db2b
| KCOM/KCOM.csproj | ||
|---|---|---|
| 80 | 80 |
<SpecificVersion>False</SpecificVersion> |
| 81 | 81 |
<HintPath>..\packages\PDFExtractorSDK\FULL\net4.00\Bytescout.PDFExtractor.OCRExtension.dll</HintPath> |
| 82 | 82 |
</Reference> |
| 83 |
<Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> |
|
| 84 |
<HintPath>..\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath> |
|
| 85 |
</Reference> |
|
| 86 | 83 |
<Reference Include="Interop.OdaX"> |
| 87 | 84 |
<HintPath>..\packages\ODA\Interop.OdaX.dll</HintPath> |
| 88 | 85 |
<EmbedInteropTypes>True</EmbedInteropTypes> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2269 | 2269 |
} |
| 2270 | 2270 |
else if ((control as ArrowTextControl) != null) |
| 2271 | 2271 |
{
|
| 2272 |
if (!((control as ArrowTextControl).EnableEditing)){
|
|
| 2272 |
if (!((control as ArrowTextControl).EnableEditing)) |
|
| 2273 |
{
|
|
| 2273 | 2274 |
(control as ArrowTextControl).EnableEditing = true; |
| 2274 | 2275 |
} |
| 2275 | 2276 |
if ((control as ArrowTextControl).TextStyle == FontStyles.Italic) |
| ... | ... | |
| 3303 | 3304 |
{
|
| 3304 | 3305 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 3305 | 3306 |
//{
|
| 3306 |
currentControl = new ArrowTextControl(); |
|
| 3307 |
currentControl.CommentID = Commons.shortGuid(); |
|
| 3308 |
currentControl.IsNew = true; |
|
| 3309 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3310 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3311 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
|
| 3312 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, canvasDrawingMouseDownPoint); |
|
| 3313 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, canvasDrawingMouseDownPoint); |
|
| 3314 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
|
| 3315 |
(currentControl as ArrowTextControl).isFixed = true; |
|
| 3316 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
|
| 3317 |
|
|
| 3318 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
|
| 3319 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3320 |
|
|
| 3321 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
|
| 3322 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
|
| 3323 |
(currentControl as ArrowTextControl).isTrans = true; |
|
| 3307 |
currentControl = new ArrowTextControl() |
|
| 3308 |
{
|
|
| 3309 |
ControlType = ControlType.ArrowTransTextControl |
|
| 3310 |
}; |
|
| 3311 |
currentControl.CommentID = Commons.shortGuid(); |
|
| 3312 |
currentControl.IsNew = true; |
|
| 3313 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
|
| 3314 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3315 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
|
| 3316 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, canvasDrawingMouseDownPoint); |
|
| 3317 |
currentControl.SetValue(ArrowTextControl.EndPointProperty, canvasDrawingMouseDownPoint); |
|
| 3318 |
(currentControl as ArrowTextControl).TextSize = ViewerDataModel.Instance.TextSize; |
|
| 3319 |
(currentControl as ArrowTextControl).isFixed = true; |
|
| 3320 |
(currentControl as ArrowTextControl).isHighLight = ViewerDataModel.Instance.checkHighShape; |
|
| 3321 |
|
|
| 3322 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
|
| 3323 |
(currentControl as ArrowTextControl).Angle -= rotate.Angle; |
|
| 3324 |
|
|
| 3325 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
|
| 3326 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
|
| 3327 |
(currentControl as ArrowTextControl).isTrans = true; |
|
| 3324 | 3328 |
} |
| 3325 | 3329 |
} |
| 3326 | 3330 |
} |
| ... | ... | |
| 3398 | 3402 |
|
| 3399 | 3403 |
|
| 3400 | 3404 |
currentControl = new ArrowTextControl() |
| 3401 |
{
|
|
| 3402 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect |
|
| 3403 |
}; |
|
| 3405 |
{
|
|
| 3406 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect, |
|
| 3407 |
ControlType = ControlType.ArrowTransTextBorderControl |
|
| 3408 |
|
|
| 3409 |
}; |
|
| 3404 | 3410 |
currentControl.CommentID = Commons.shortGuid(); |
| 3405 | 3411 |
currentControl.IsNew = true; |
| 3406 | 3412 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| ... | ... | |
| 3500 | 3506 |
//{
|
| 3501 | 3507 |
currentControl = new ArrowTextControl() |
| 3502 | 3508 |
{
|
| 3503 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud |
|
| 3509 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud, |
|
| 3510 |
ControlType = ControlType.ArrowTransTextCloudControl |
|
| 3511 |
|
|
| 3504 | 3512 |
}; |
| 3505 | 3513 |
currentControl.CommentID = Commons.shortGuid(); |
| 3506 | 3514 |
currentControl.IsNew = true; |
내보내기 Unified diff
