프로젝트

일반

사용자정보

개정판 dbddfdd0

IDdbddfdd079b66b58dfb988459f65300bcd449ad8
상위 26ec6226
하위 5b48dae7

김태성이(가) 일년 이상 전에 추가함

issue #0000 color select 제거

Change-Id: I026e52ed99c0f2ad2b48692a8ae111024aab9d6e

차이점 보기:

KCOM/Extensions/VisualHelper.cs
1
using System;
1
using MarkupToPDF.Common;
2
using System;
2 3
using System.Collections.Generic;
3 4
using System.Linq;
4 5
using System.Text;
5 6
using System.Threading.Tasks;
6 7
using System.Windows;
8
using System.Windows.Controls;
7 9
using System.Windows.Media;
8 10

  
9 11
namespace KCOM
......
99 101
                //results.AddRange(subChildren);
100 102
            }
101 103
        }
104

  
105
        public static IEnumerable<CommentUserInfo> FindComment(this System.Windows.Controls.Canvas canvas, Rect searchRect)
106
        {
107
            foreach (CommentUserInfo child in canvas.FindAllChildren(x=>x is CommentUserInfo))
108
            {
109
                if (child is CommentUserInfo comment)
110
                {
111
                    if (searchRect.IntersectsWith(child.ItemRect))
112
                    {
113
                        yield return child;
114
                    }
115
                }
116
            }
117
        }
118

  
119
        public static CommentUserInfo FindDistanceComment(this Canvas canvas, Point point,double squareSize = 1)
120
        {
121
            double minDistance = double.MaxValue;
122
            CommentUserInfo closestComment = null;
123

  
124
            Rect searchRect = new Rect(
125
                point.X - squareSize,
126
                point.Y - squareSize,
127
                squareSize * 2,
128
                squareSize * 2
129
            );
130

  
131
            foreach (CommentUserInfo child in canvas.FindComment(searchRect))
132
            {
133
                if (child is CommentUserInfo comment)
134
                {
135
                    double left = comment.ItemRect.Left;
136
                    double top = comment.ItemRect.Top;
137
                    double centerX = left + comment.ItemRect.Width / 2;
138
                    double centerY = top + comment.ItemRect.Height / 2;
139
                    double distance = Math.Sqrt(Math.Pow(point.X - centerX, 2) + Math.Pow(point.Y - centerY, 2));
140

  
141
                    if (distance < minDistance)
142
                    {
143
                        minDistance = distance;
144
                        closestComment = comment;
145
                    }
146
                }
147
            }
148

  
149
            return closestComment;
150
        }
102 151
    }
103 152

  
104 153
    public class MoveDirection
KCOM/KCOM.csproj
1496 1496
call $(SolutionDir)obfuscarBuild.Bat $(SolutionDir) $(TargetDir) $(ProjectDir)obfuscar.xml
1497 1497
xcopy /s "$(TargetDir)Obfuscator_Output" "$(TargetDir)" /Y /F
1498 1498
rmdir "$(TargetDir)Obfuscator_Output" /s /q
1499
rmdir "$(SolutionDir)Setup\Release_default\" /s /q
1499
rem rmdir "$(SolutionDir)Setup\Release_default\" /s /q
1500 1500

  
1501 1501
xcopy "$(TargetDir)" "$(SolutionDir)Setup\Release_default\" /S /Y /F 
1502 1502

  
......
1505 1505

  
1506 1506
 rem call "appCast_Daelim.bat" "@(VersionNumber)"
1507 1507
 call "appCast_SNI.bat" "@(VersionNumber)"
1508
call "appCast_doftech.bat" "@(VersionNumber)"
1508
 rem call "appCast_doftech.bat" "@(VersionNumber)"
1509 1509
 rem call "appCast_HS.bat" "@(VersionNumber)"
1510 1510
 rem "appCast_bseng.bat" "@(VersionNumber)"
1511 1511
 rem  call "appCast_Daelim_test.bat" "@(VersionNumber)"
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("5.4.0.0")]
55
[assembly: AssemblyFileVersion("5.4.0.0")]
54
[assembly: AssemblyVersion("5.4.1.0")]
55
[assembly: AssemblyFileVersion("5.4.1.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
KCOM/Views/MainMenu.xaml
1294 1294
                                        VerticalAlignment="Center"
1295 1295
                                        telerik:StyleManager.Theme="Office2016"
1296 1296
                                        Click="btnColorList_Click"
1297
                                        ToolTipService.ToolTip="Color Change">
1297
                                        ToolTipService.ToolTip="Color Change"
1298
                                        Visibility="Collapsed">
1298 1299
                                        <Border
1299 1300
                                            Background="#E9F0F8"
1300 1301
                                            BorderBrush="#839AB3"
......
1375 1376
                                        <DataTemplate>
1376 1377
                                            <Grid>
1377 1378
                                                <Grid>
1379
                                                    <!--<telerik:RadColorPicker Click="RadColorPicker_Click" SelectedColor="{Binding DisplayColor, Mode=TwoWay, Converter={StaticResource StringToColorConverter}}" />-->
1378 1380
                                                    <Border Background="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" />
1379 1381
                                                    <TextBlock Foreground="#00000000" Text="Color" />
1380 1382
                                                </Grid>
......
1388 1390

  
1389 1391
                                        </DataTemplate>
1390 1392
                                    </telerik:GridViewDataColumn.CellTemplate>
1391
                                    <telerik:GridViewDataColumn.CellEditTemplate>
1393
                                    <!--<telerik:GridViewDataColumn.CellEditTemplate>
1392 1394
                                        <DataTemplate>
1393 1395
                                            <telerik:RadColorPicker SelectedColor="{Binding DisplayColor, Mode=TwoWay, Converter={StaticResource StringToColorConverter}}" />
1394 1396
                                        </DataTemplate>
1395
                                    </telerik:GridViewDataColumn.CellEditTemplate>
1397
                                    </telerik:GridViewDataColumn.CellEditTemplate>-->
1396 1398
                                </telerik:GridViewDataColumn>
1397 1399
                                <telerik:GridViewDataColumn
1398 1400
                                    Width="Auto"
KCOM/Views/MainMenu.xaml.cs
2179 2179
            else if ((e.LeftButton == MouseButtonState.Released) && (e.MiddleButton == MouseButtonState.Released) &&
2180 2180
                (e.RightButton == MouseButtonState.Released) && ViewerDataModel.Instance.MarkupControls_USER.Count > 0)
2181 2181
            {
2182
                //var comment = drawingRotateCanvas.FindDistanceComment(getCurrentPoint);
2183

  
2184

  
2185
                //if (comment != null)
2186
                //{
2187
                //    comment.IsMouseEnter = true;
2188

  
2189
                //    if (enterMouse != comment)
2190
                //    {
2191
                //        if (enterMouse != null)
2192
                //            enterMouse.IsSelected = false;
2193

  
2194
                //        enterMouse = comment;
2195
                //    }
2196
                //}
2197
                //else
2198
                //{
2199
                //    if(enterMouse != null)
2200
                //        enterMouse.IsSelected = false;
2201
                //}
2202

  
2182 2203
                var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault();
2183 2204
                if (control != null)
2184 2205
                {
......
2199 2220
            }
2200 2221
        }
2201 2222

  
2223
        private CommentUserInfo enterMouse = null;
2224

  
2225
        private object IntersectsControls(Point mousePosition,Canvas drawingRotateCanvas)
2226
        {
2227
            object result = null;
2228

  
2229
            // 검색할 정사각형의 크기 및 반경 설정
2230
            double squareSize = 1;
2231
            Rect searchRect = new Rect(
2232
                mousePosition.X - squareSize,
2233
                mousePosition.Y - squareSize,
2234
                squareSize * 2,
2235
                squareSize * 2
2236
            );
2237

  
2238
            foreach (CommentUserInfo child in drawingRotateCanvas.ChildrenOfType<CommentUserInfo>())
2239
            {
2240
                if (child is CommentUserInfo comment)
2241
                {
2242
                    // 검색 영역과 Rectangle의 경계가 겹치는지 확인합니다.
2243
                    if (searchRect.IntersectsWith(child.ItemRect))
2244
                    {
2245
                        child.IsMouseEnter = true;
2246
                        result = (object)child;
2247
                        // Geometry를 적용하거나 원하는 작업을 수행합니다.
2248
                        // 예: rectangle.Fill = new SolidColorBrush(Colors.Red);
2249
                    }
2250
                    else
2251
                    {
2252
                        child.IsMouseEnter = false;
2253
                    }
2254
                }
2255
            }
2256

  
2257
            return result;
2258
        }
2259

  
2202 2260
        private void zoomAndPanControl2_MouseMove(object sender, MouseEventArgs e)
2203 2261
        {
2204 2262
            if ((e.MiddleButton == MouseButtonState.Pressed) || (e.RightButton == MouseButtonState.Pressed))
......
4650 4708
            //{
4651 4709
            btnFinalPDF.IsEnabled = false;
4652 4710
            btnConsolidate.IsEnabled = false;
4653
            await  ConsolidationMethod();
4711
            var result = await  ConsolidationMethod();
4712

  
4713
            if(result)
4714
            {
4715
                 var consolidateItem = ViewerDataModel.Instance._markupInfoList.Where(x => x.Consolidate == 1 && x.AvoidConsolidate == 0);
4716

  
4717
                if(consolidateItem?.Count() > 0)
4718
                {
4719
                    gridViewMarkup.Select(consolidateItem);
4720
                }
4721
            }
4654 4722
            //}
4655 4723
            //else
4656 4724
            //{
......
6164 6232
                
6165 6233
            }
6166 6234
        }
6167

  
6235
    
6168 6236

  
6169 6237
        /*
6170 6238
        private void zoomAndPanControl_Drop(object sender, DragEventArgs e)
KCOM_API/Web.config
50 50
  </system.diagnostics>-->
51 51
  <connectionStrings>
52 52
    <add name="ConnectionString"
53
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
53
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
54 54
      providerName="System.Data.EntityClient"/>
55 55
    <add name="CIConnectionString"
56
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
56
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
57 57
      providerName="System.Data.EntityClient"/>
58 58
  </connectionStrings>
59 59
  <!--
......
180 180
        <value>True</value>
181 181
      </setting>
182 182
      <setting name="FinalService" serializeAs="String">
183
        <value>tcp://localhost:9092/remFinalPDF</value>
183
        <value>tcp://localhost:9093/remFinalPDF</value>
184 184
      </setting>
185 185
    </KCOM_API.Properties.Settings>
186 186
  </applicationSettings>

내보내기 Unified diff

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