개정판 dbddfdd0
issue #0000 color select 제거
Change-Id: I026e52ed99c0f2ad2b48692a8ae111024aab9d6e
| 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) |
내보내기 Unified diff
