개정판 5ce56a3a
Symbol 기능 추가 및 Entity 테이블 추가
상단 네비게이션 View데이터 Comment로 통합
KCOM/Common/ViewerDataModel.cs | ||
---|---|---|
185 | 185 |
} |
186 | 186 |
} |
187 | 187 |
|
188 |
private double _Interval { get; set; } |
|
189 |
public double Interval |
|
190 |
{ |
|
191 |
get |
|
192 |
{ |
|
193 |
return _Interval; |
|
194 |
} |
|
195 |
set |
|
196 |
{ |
|
197 |
_Interval = value; |
|
198 |
OnPropertyChanged("Interval"); |
|
199 |
} |
|
200 |
} |
|
201 |
|
|
188 | 202 |
private bool _IsPressShift { get; set; } |
189 | 203 |
public bool IsPressShift |
190 | 204 |
{ |
... | ... | |
985 | 999 |
|
986 | 1000 |
this.LineSize = 3; |
987 | 1001 |
|
1002 |
this.Interval = 10; |
|
1003 |
|
|
988 | 1004 |
this.DashSize = new DoubleCollection(99999999); |
989 | 1005 |
} |
990 | 1006 |
|
KCOM/Controls/Sample.xaml | ||
---|---|---|
422 | 422 |
</Grid> |
423 | 423 |
</Border> |
424 | 424 |
</Grid> |
425 |
|
|
426 | 425 |
</ControlTemplate> |
427 | 426 |
<DataTemplate x:Key="CommentSelectTemplate"> |
428 | 427 |
<CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" telerik:StyleManager.Theme="Windows8"> |
... | ... | |
438 | 437 |
<!--<TextBlock Text="Sort By:" Foreground="{DynamicResource KCOMColor_MarkerBrush}"/>--> |
439 | 438 |
<telerik:RadTabControl BorderThickness="0" telerik:StyleManager.Theme="Office2016" HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" |
440 | 439 |
ScrollViewer.HorizontalScrollBarVisibility ="Disabled" SelectedIndex="0" > |
440 |
|
|
441 | 441 |
<telerik:RadTabItem Header="Thumbnail" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="10"> |
442 | 442 |
<Grid> |
443 | 443 |
<Grid.RowDefinitions> |
... | ... | |
485 | 485 |
<!--<telerik:RadExpander Content="Commented Pages" />--> |
486 | 486 |
</StackPanel> |
487 | 487 |
</Border> |
488 |
<telerik:RadListBox x:Name="ImgListbox" ItemTemplate="{StaticResource ThumbnailDataTemplate}" Grid.Row="1" VirtualizingStackPanel.IsVirtualizing="True" |
|
489 |
Background="{DynamicResource KCOMColor_AlternativeBrush}" ItemContainerStyle="{StaticResource ItemContainerStyle}" |
|
490 |
BorderBrush="#FFC2C2C2" BorderThickness="0" SelectedIndex="0" |
|
491 |
ScrollViewer.HorizontalScrollBarVisibility="Disabled" |
|
492 |
SelectionChanged="ImgListbox_SelectionChanged" |
|
493 |
telerik:StyleManager.Theme="Office2016" > |
|
488 |
<telerik:RadListBox x:Name="ImgListbox" |
|
489 |
ItemTemplate="{StaticResource ThumbnailDataTemplate}" |
|
490 |
Grid.Row="1" |
|
491 |
VirtualizingStackPanel.IsVirtualizing="True" |
|
492 |
Background="{DynamicResource KCOMColor_AlternativeBrush}" |
|
493 |
ItemContainerStyle="{StaticResource ItemContainerStyle}" |
|
494 |
BorderBrush="#FFC2C2C2" BorderThickness="0" |
|
495 |
SelectedIndex="0" |
|
496 |
ScrollViewer.HorizontalScrollBarVisibility="Disabled" |
|
497 |
SelectionChanged="ImgListbox_SelectionChanged" |
|
498 |
telerik:StyleManager.Theme="Office2016" > |
|
494 | 499 |
<telerik:RadListBox.ItemsPanel> |
495 | 500 |
<ItemsPanelTemplate> |
496 | 501 |
<VirtualizingStackPanel/> |
... | ... | |
577 | 582 |
</Border> |
578 | 583 |
|
579 | 584 |
<Border VerticalAlignment="Stretch" Margin="0" Grid.Row="1" BorderThickness="0,0,0,0.5" BorderBrush="#828282" x:Name="gogo"> |
580 |
<telerik:RadListBox telerik:StyleManager.Theme="Office2016" Padding="0" HorizontalAlignment="Stretch" x:Name="gogogo" |
|
585 |
<telerik:RadListBox telerik:StyleManager.Theme="Office2016" Padding="0" HorizontalAlignment="Stretch" x:Name="gogogo" ScrollViewer.VerticalScrollBarVisibility="Auto"
|
|
581 | 586 |
Background="Transparent" ItemsSource="{Binding MarkupInfoSmallList}" Loaded="gogogo_Loaded"> |
582 | 587 |
<telerik:RadListBox.ItemContainerStyle> |
583 | 588 |
<Style TargetType="telerik:RadListBoxItem"> |
KCOM/Controls/Symbol.xaml | ||
---|---|---|
3 | 3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
4 | 4 |
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
5 | 5 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
6 |
xmlns:WrapPanel ="clr-namespace:KCOM.WrapPanel" |
|
6 | 7 |
xmlns:local="clr-namespace:KCOM.Controls" |
7 | 8 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
8 |
mc:Ignorable="d" Background="White"
|
|
9 |
mc:Ignorable="d" Background="#f5f5f5"
|
|
9 | 10 |
d:DesignHeight="900" d:DesignWidth="300"> |
10 | 11 |
|
11 | 12 |
<UserControl.Resources> |
12 | 13 |
<DataTemplate x:Key="SymbolTemplate_Private"> |
13 |
<StackPanel MouseLeftButtonDown="lsySymbolPrivate_MouseLeftButtonDown" ToolTipService.ToolTip="{Binding Name}">
|
|
14 |
<StackPanel MouseLeftButtonDown="Move_Symbol" MouseLeave="StackPanel_MouseLeave" MouseUp="StackPanel_MouseUp" ToolTipService.ToolTip="{Binding Name}">
|
|
14 | 15 |
<Grid> |
15 | 16 |
<StackPanel> |
16 |
<Border Background="#FF1FA3EB"> |
|
17 |
<TextBlock MaxWidth="60" |
|
17 |
<!--<Border Background="#FF1FA3EB">--> |
|
18 |
<Border Background="#FF2A579A"> |
|
19 |
<TextBlock MaxWidth="200" |
|
18 | 20 |
HorizontalAlignment="Center" |
19 | 21 |
VerticalAlignment="Center" |
20 | 22 |
Foreground="White" |
21 | 23 |
Text="{Binding Name}" /> |
22 | 24 |
</Border> |
23 |
<Image Width="64"
|
|
25 |
<Image Width="200"
|
|
24 | 26 |
Height="64" |
25 | 27 |
Margin="3" |
26 | 28 |
HorizontalAlignment="Center" |
... | ... | |
37 | 39 |
</Style> |
38 | 40 |
</UserControl.Resources> |
39 | 41 |
<Grid Margin="10"> |
40 |
<Grid.RowDefinitions> |
|
41 |
<RowDefinition Height="Auto"/> |
|
42 |
<RowDefinition Height="*"/> |
|
43 |
</Grid.RowDefinitions> |
|
44 |
<StackPanel Grid.Row="0" Orientation="Vertical"> |
|
45 |
<TextBlock Text="Symbol" FontSize="15"/> |
|
46 |
<Grid Margin="0,10"> |
|
47 |
<Grid.ColumnDefinitions> |
|
48 |
<ColumnDefinition Width="3*"/> |
|
49 |
<ColumnDefinition Width="3*"/> |
|
50 |
<ColumnDefinition Width="3*"/> |
|
51 |
<ColumnDefinition Width="3*"/> |
|
52 |
</Grid.ColumnDefinitions> |
|
53 |
<Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
54 |
<Button Content="Rename" Grid.Column="2" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
55 |
<Button Content="Remove" Grid.Column="3" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
56 |
</Grid> |
|
57 |
<TextBlock Text="[Tip : Double Click, Drag]" FontSize="10" HorizontalAlignment="Right"/> |
|
58 |
</StackPanel> |
|
59 |
<StackPanel Grid.Row="1"> |
|
60 |
<ListBox x:Name="lstSymbolPrivate" ItemTemplate="{StaticResource SymbolTemplate_Private}"> |
|
61 |
<!--<telerik:ListBoxDragDrop></telerik:ListBoxDragDrop>--> |
|
62 |
</ListBox> |
|
63 |
</StackPanel> |
|
42 |
<telerik:RadTabControl BorderThickness="0" x:Name="RadTab" telerik:StyleManager.Theme="Office2016" HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" |
|
43 |
ScrollViewer.HorizontalScrollBarVisibility ="Disabled" SelectedIndex="0" PreviewSelectionChanged="RadTabControl_PreviewSelectionChanged"> |
|
44 |
|
|
45 |
<telerik:RadTabItem Header="Private" FontSize="10" FontWeight="Bold" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}"> |
|
46 |
<Grid> |
|
47 |
<Grid.RowDefinitions> |
|
48 |
<RowDefinition Height="Auto"/> |
|
49 |
<RowDefinition Height="*"/> |
|
50 |
</Grid.RowDefinitions> |
|
51 |
|
|
52 |
<StackPanel Grid.Row="0" Orientation="Vertical"> |
|
53 |
<!--<TextBlock Text="Symbol" FontSize="15"/>--> |
|
54 |
<Grid Margin="0,10"> |
|
55 |
<Grid.ColumnDefinitions> |
|
56 |
<ColumnDefinition Width="3*"/> |
|
57 |
<ColumnDefinition Width="3*"/> |
|
58 |
<ColumnDefinition Width="3*"/> |
|
59 |
<ColumnDefinition Width="3*"/> |
|
60 |
</Grid.ColumnDefinitions> |
|
61 |
<Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
62 |
<Button Content="Rename" Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
63 |
<Button Content="Remove" Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
64 |
|
|
65 |
<!--<Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
66 |
<Button Content="Rename" Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
67 |
<Button Content="Remove" Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/>--> |
|
68 |
</Grid> |
|
69 |
<TextBlock Text="[Tip : Double Click]" FontSize="10" HorizontalAlignment="Right"/> |
|
70 |
</StackPanel> |
|
71 |
<ScrollViewer x:Name="ScView" Grid.Row="1" > |
|
72 |
<ListBox x:Name="lstSymbolPrivate" Background="#f5f5f5" FontWeight="Normal" ItemTemplate="{StaticResource SymbolTemplate_Private}" |
|
73 |
MouseDown="lstSymbolPrivate_MouseDown" |
|
74 |
PreviewMouseUp="lstSymbolPrivate_PreviewMouseUp" |
|
75 |
MouseLeave="lstSymbolPrivate_MouseLeave" |
|
76 |
PreviewMouseWheel ="lstSymbolPrivate_PreviewMouseWheel"> |
|
77 |
<telerik:ListBoxDragDrop.Behavior> |
|
78 |
<telerik:ListBoxDragDropBehavior AllowReorder="True" /> |
|
79 |
</telerik:ListBoxDragDrop.Behavior> |
|
80 |
|
|
81 |
<!--<ListBox.ItemsPanel> |
|
82 |
<ItemsPanelTemplate> |
|
83 |
<WrapPanel:WrapPanel /> |
|
84 |
</ItemsPanelTemplate> |
|
85 |
</ListBox.ItemsPanel>--> |
|
86 |
<!--<telerik:ListBoxDragDrop></telerik:ListBoxDragDrop>--> |
|
87 |
</ListBox> |
|
88 |
</ScrollViewer> |
|
89 |
</Grid> |
|
90 |
</telerik:RadTabItem> |
|
91 |
|
|
92 |
<telerik:RadTabItem Header="Public" FontSize="10" FontWeight="Normal" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" > |
|
93 |
<Grid> |
|
94 |
<Grid.RowDefinitions> |
|
95 |
<RowDefinition Height="Auto"/> |
|
96 |
<RowDefinition Height="*"/> |
|
97 |
</Grid.RowDefinitions> |
|
98 |
|
|
99 |
<StackPanel Grid.Row="0" Orientation="Vertical"> |
|
100 |
<!--<TextBlock Text="Symbol" FontSize="15"/>--> |
|
101 |
<Grid Margin="0,10"> |
|
102 |
<Grid.ColumnDefinitions> |
|
103 |
<ColumnDefinition Width="1*"/> |
|
104 |
<ColumnDefinition Width="3*"/> |
|
105 |
</Grid.ColumnDefinitions> |
|
106 |
<!--<Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
107 |
<Button Content="Rename" Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
108 |
<Button Content="Remove" Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" FontWeight="Normal" Padding="5" Background="#3d3d3d" Foreground="White"/>--> |
|
109 |
|
|
110 |
<!--<Button Content="Register" Grid.Column="1" Click="Create_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
111 |
<Button Content="Rename" Grid.Column="2" Click="Rename_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/> |
|
112 |
<Button Content="Remove" Grid.Column="3" Click="Remove_Symbol" Margin="5,0,0,0" Padding="5" Background="#3d3d3d" Foreground="White"/>--> |
|
113 |
<TextBlock VerticalAlignment="Center">Department</TextBlock> |
|
114 |
<telerik:RadComboBox EmptyText="ALL" Grid.Column="1" HorizontalAlignment="Stretch" Margin="5" DropDownWidth="*" Background="White" BorderBrush="#d6d6d6" x:Name="deptlist" |
|
115 |
ClearSelectionButtonVisibility="Visible" ClearSelectionButtonContent="Show All" SelectionChanged="deptlist_SelectionChanged"/> |
|
116 |
|
|
117 |
</Grid> |
|
118 |
<TextBlock Text="[Tip : Double Click]" FontSize="10" HorizontalAlignment="Right"/> |
|
119 |
</StackPanel> |
|
120 |
<ScrollViewer x:Name="ScView_Public" Grid.Row="1" > |
|
121 |
<ListBox x:Name="lstSymbolPublic" Background="#f5f5f5" FontWeight="Normal" ItemTemplate="{StaticResource SymbolTemplate_Private}" MouseDoubleClick="Move_Symbol" PreviewMouseWheel ="lstSymbolPublic_PreviewMouseWheel"> |
|
122 |
<telerik:ListBoxDragDrop.Behavior> |
|
123 |
<telerik:ListBoxDragDropBehavior AllowReorder="True" /> |
|
124 |
</telerik:ListBoxDragDrop.Behavior> |
|
125 |
<!--<ListBox.ItemsPanel> |
|
126 |
<ItemsPanelTemplate> |
|
127 |
<WrapPanel:WrapPanel /> |
|
128 |
</ItemsPanelTemplate> |
|
129 |
</ListBox.ItemsPanel>--> |
|
130 |
<!--<telerik:ListBoxDragDrop></telerik:ListBoxDragDrop>--> |
|
131 |
</ListBox> |
|
132 |
</ScrollViewer> |
|
133 |
</Grid> |
|
134 |
</telerik:RadTabItem> |
|
135 |
</telerik:RadTabControl> |
|
64 | 136 |
</Grid> |
65 | 137 |
</UserControl> |
KCOM/Controls/Symbol.xaml.cs | ||
---|---|---|
1 | 1 |
using KCOM.Common; |
2 | 2 |
using KCOM.Events; |
3 |
using KCOMDataModel.Common; |
|
4 |
using KCOMDataModel.DataModel; |
|
3 | 5 |
using System; |
4 | 6 |
using System.Collections.Generic; |
5 | 7 |
using System.Linq; |
... | ... | |
14 | 16 |
using System.Windows.Navigation; |
15 | 17 |
using System.Windows.Shapes; |
16 | 18 |
using Telerik.Windows.Controls; |
19 |
using Telerik.Windows.Controls.DragDrop; |
|
17 | 20 |
|
18 | 21 |
namespace KCOM.Controls |
19 | 22 |
{ |
20 | 23 |
public class Symbol_Custom |
21 | 24 |
{ |
25 |
public string ID { get; set; } |
|
22 | 26 |
public string Name { get; set; } |
23 | 27 |
public string ImageUri { get; set; } |
24 | 28 |
} |
... | ... | |
29 | 33 |
public partial class Symbol : UserControl |
30 | 34 |
{ |
31 | 35 |
AdornerFinal finalItem; |
36 |
bool IsMouseDown = false; |
|
37 |
string moveItem_id = ""; |
|
32 | 38 |
public string filename { get; set; } |
33 | 39 |
MarkupToPDF.Controls.Parsing.LayerControl layer = new MarkupToPDF.Controls.Parsing.LayerControl(); |
34 | 40 |
|
35 | 41 |
public Symbol() |
36 | 42 |
{ |
37 | 43 |
InitializeComponent(); |
44 |
|
|
45 |
RadDragAndDropManager.AddDragInfoHandler(lstSymbolPrivate, OnDragPrivateInfo); |
|
46 |
RadDragAndDropManager.AddDragQueryHandler(lstSymbolPrivate, OnDragPrivateQuery); |
|
47 |
RadDragAndDropManager.SetAllowDrag(lstSymbolPrivate, true); |
|
38 | 48 |
|
39 | 49 |
DataBind(); |
40 | 50 |
} |
41 | 51 |
|
52 |
private void OnDragPrivateInfo(object sender, DragDropEventArgs e) |
|
53 |
{ |
|
54 |
} |
|
55 |
|
|
56 |
private void OnDragPrivateQuery(object sender, DragDropQueryEventArgs e) |
|
57 |
{ |
|
58 |
if (e.Options.Status == DragStatus.DragQuery) |
|
59 |
{ |
|
60 |
//var draggedListBoxItem = (e.Options.Source as System.Windows.Controls.ListBox).SelectedItem; |
|
61 |
//BitmapImage im = new BitmapImage(new Uri((draggedListBoxItem as DeepView.ServiceDeepView_Symbol.SymbolPrivate).ImageUri)); |
|
62 |
//ImageSource _source = im; |
|
63 |
//Image img = new Image(); |
|
64 |
//img.Source = _source; |
|
65 |
|
|
66 |
//e.Options.Payload = im; |
|
67 |
//var dragCue = new Image(); |
|
68 |
//dragCue.Source = img.Source; |
|
69 |
//dragCue.Width = 0; |
|
70 |
//dragCue.Height = 0; |
|
71 |
//e.Options.DragCue = dragCue; |
|
72 |
|
|
73 |
|
|
74 |
//PayLoadAdorner = new AdornerFinal(); |
|
75 |
//DeepView.ServiceDeepView_Symbol.SymbolPrivate tempDragableControl = (e.Options.Source as System.Windows.Controls.ListBox).SelectedItem as DeepView.ServiceDeepView_Symbol.SymbolPrivate; |
|
76 |
//var xamldata = tempDragableControl.Data; |
|
77 |
////this.DeepLayer.markupParse(xamldata, this.DeepLayer._TempLayer, "복사된 데이터_이름으로 수정해야함"); |
|
78 |
//PayLoadAdorner = this.DeepLayer.markupParseToAdorner(xamldata, this.DeepLayer._SelectLayer, ""); |
|
79 |
//this.DeepLayer._SelectLayer.Children.Add(PayLoadAdorner); |
|
80 |
} |
|
81 |
|
|
82 |
e.QueryResult = true; |
|
83 |
e.Handled = true; |
|
84 |
} |
|
85 |
|
|
42 | 86 |
private void DataBind() |
43 | 87 |
{ |
44 |
lstSymbolPrivate.ItemsSource = null; |
|
88 |
//lstSymbolPrivate.ItemsSource = null; |
|
89 |
//lstSymbolPublic.ItemsSource = null; |
|
45 | 90 |
|
46 | 91 |
Symbol_Custom Custom = new Symbol_Custom(); |
47 | 92 |
List<Symbol_Custom> Custom_List = new List<Symbol_Custom>(); |
48 |
Custom.Name = "테스트"; |
|
49 |
Custom.ImageUri = "http://cloud.devdoftech.co.kr:5977/UserData/000000/H2009115/JsInNjZNgC8d59543c6854eb4.png"; |
|
50 | 93 |
|
51 |
Custom_List.Add(Custom); |
|
52 |
Custom_List.Add(Custom); |
|
94 |
using (KCOMEntities Entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString())) |
|
95 |
{ |
|
96 |
var symbol_Private = Entity.SYMBOL_PRIVATE.Where(data => data.MEMBER_USER_ID == App.ViewInfo.UserID).ToList(); |
|
97 |
foreach(var item in symbol_Private) |
|
98 |
{ |
|
99 |
Custom.Name = item.NAME; |
|
100 |
Custom.ImageUri = item.IMAGE_URL; |
|
101 |
Custom.ID = item.ID; |
|
102 |
Custom_List.Add(Custom); |
|
103 |
Custom = new Symbol_Custom(); |
|
104 |
} |
|
105 |
lstSymbolPrivate.ItemsSource = Custom_List; |
|
106 |
|
|
107 |
Custom = new Symbol_Custom(); |
|
108 |
Custom_List = new List<Symbol_Custom>(); |
|
109 |
|
|
110 |
deptlist.ItemsSource = Entity.SYMBOL_PUBLIC.Select(data => data.DEPARTMENT).ToList(); |
|
111 |
|
|
112 |
var symbol_Public = Entity.SYMBOL_PUBLIC.ToList(); |
|
113 |
|
|
114 |
if (deptlist.SelectedValue != null) |
|
115 |
{ |
|
116 |
symbol_Public = symbol_Public.Where(data => data.DEPARTMENT == deptlist.SelectedValue.ToString()).ToList(); |
|
117 |
} |
|
118 |
//var symbol_Public = Entity.SYMBOL_PUBLIC.Where(data => data.DEPARTMENT == "PIPING").ToList(); |
|
119 |
|
|
120 |
foreach (var item in symbol_Public) |
|
121 |
{ |
|
122 |
Custom.Name = item.NAME; |
|
123 |
Custom.ImageUri = item.IMAGE_URL; |
|
124 |
Custom.ID = item.ID; |
|
125 |
Custom_List.Add(Custom); |
|
126 |
Custom = new Symbol_Custom(); |
|
127 |
} |
|
128 |
lstSymbolPublic.ItemsSource = Custom_List; |
|
129 |
} |
|
130 |
} |
|
131 |
|
|
132 |
public PngBitmapEncoder symImage(string data) |
|
133 |
{ |
|
134 |
|
|
135 |
Canvas _canvas = new Canvas(); |
|
136 |
_canvas.Background = Brushes.White; |
|
137 |
_canvas.Width = finalItem.BorderSize.Width; |
|
138 |
_canvas.Height = finalItem.BorderSize.Height; |
|
139 |
layer.markupParse(data, _canvas, "#FFFF0000", ""); |
|
140 |
|
|
141 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
|
142 |
|
|
143 |
|
|
144 |
RenderTargetBitmap renderBitmap = new RenderTargetBitmap((int)_canvas.Width + 50, (int)_canvas.Height + 50, 96d, 96d, PixelFormats.Pbgra32); |
|
145 |
|
|
146 |
DrawingVisual dv = new DrawingVisual(); |
|
147 |
|
|
148 |
_canvas.Measure(new System.Windows.Size(finalItem.BorderSize.Width + 50, finalItem.BorderSize.Height + 50)); |
|
149 |
//_canvas.Arrange(new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X - 50, Y = -finalItem.BorderSize.Y - 50 }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
150 |
_canvas.Arrange(new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X - 20, Y = -finalItem.BorderSize.Y - 20 }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
151 |
|
|
152 |
using (DrawingContext ctx = dv.RenderOpen()) |
|
153 |
{ |
|
154 |
VisualBrush vb = new VisualBrush(_canvas); |
|
155 |
//ctx.DrawRectangle(vb, null, new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X - 20, Y = -finalItem.BorderSize.Y - 20 }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
156 |
ctx.DrawRectangle(vb, null, new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X, Y = -finalItem.BorderSize.Y }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
157 |
} |
|
158 |
|
|
159 |
try |
|
160 |
{ |
|
161 |
renderBitmap.Render(dv); |
|
162 |
|
|
163 |
GC.Collect(); |
|
164 |
GC.WaitForPendingFinalizers(); |
|
165 |
GC.Collect(); |
|
166 |
//bitmap.Render(controlToConvert); |
|
167 |
// encode png data |
|
168 |
PngBitmapEncoder pngEncoder = new PngBitmapEncoder(); |
|
169 |
// puch rendered bitmap into it |
|
170 |
pngEncoder.Interlace = PngInterlaceOption.Off; |
|
171 |
pngEncoder.Frames.Add(BitmapFrame.Create(renderBitmap)); |
|
172 |
return pngEncoder; |
|
173 |
|
|
174 |
} |
|
175 |
catch (Exception ex) |
|
176 |
{ |
|
177 |
return null; |
|
178 |
} |
|
53 | 179 |
|
54 |
lstSymbolPrivate.ItemsSource = Custom_List; |
|
55 | 180 |
} |
56 | 181 |
|
182 |
public void DialogMessage_Alert(string content, string header) |
|
183 |
{ |
|
184 |
var box = new TextBlock(); |
|
185 |
box.MinWidth = 400; |
|
186 |
box.FontSize = 11; |
|
187 |
//box.FontSize = 12; |
|
188 |
box.Text = content; |
|
189 |
box.TextWrapping = System.Windows.TextWrapping.Wrap; |
|
190 |
|
|
191 |
DialogParameters parameters = new DialogParameters() |
|
192 |
{ |
|
193 |
Content = box, |
|
194 |
Header = header, |
|
195 |
Theme = new VisualStudio2013Theme(), |
|
196 |
ModalBackground = new SolidColorBrush { Color = Colors.Black, Opacity = 0.6 }, |
|
197 |
}; |
|
198 |
RadWindow.Alert(parameters); |
|
199 |
} |
|
200 |
|
|
201 |
#region Event |
|
202 |
|
|
203 |
#region Symbol Add Event |
|
57 | 204 |
private void Create_Symbol(object sender, RoutedEventArgs e) |
58 | 205 |
{ |
59 | 206 |
MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn(); |
... | ... | |
95 | 242 |
} |
96 | 243 |
|
97 | 244 |
} |
245 |
#endregion |
|
98 | 246 |
|
247 |
#region Symbol Add Close Event |
|
99 | 248 |
private void MarkupNamePromptClose(string data, WindowClosedEventArgs args) |
100 | 249 |
{ |
101 | 250 |
Save save = new Save(); |
... | ... | |
114 | 263 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Save.shortGuid() + ".png", Img_byte); |
115 | 264 |
|
116 | 265 |
save.SymbolSave(args.PromptResult, filename, data); |
266 |
|
|
267 |
DataBind(); |
|
117 | 268 |
} |
118 | 269 |
} |
270 |
#endregion |
|
119 | 271 |
|
120 |
public PngBitmapEncoder symImage(string data) |
|
272 |
#region Symbol Delete Event |
|
273 |
private void Remove_Symbol(object sender, RoutedEventArgs e) |
|
121 | 274 |
{ |
275 |
if (lstSymbolPrivate.SelectedItem == null) |
|
276 |
{ |
|
277 |
DialogMessage_Alert("Please Select Symbol", "Alert"); |
|
278 |
return; |
|
279 |
} |
|
122 | 280 |
|
123 |
Canvas _canvas = new Canvas(); |
|
124 |
_canvas.Background = Brushes.White; |
|
125 |
_canvas.Width = finalItem.BorderSize.Width; |
|
126 |
_canvas.Height = finalItem.BorderSize.Height; |
|
127 |
layer.markupParse(data, _canvas, "#FFFF0000", ""); |
|
281 |
using (KCOMEntities Entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString())) |
|
282 |
{ |
|
283 |
string delItem_ID = (lstSymbolPrivate.SelectedItem as Symbol_Custom).ID; |
|
284 |
var delitem = Entity.SYMBOL_PRIVATE.Where(data => data.ID == delItem_ID).FirstOrDefault(); |
|
285 |
Entity.SYMBOL_PRIVATE.DeleteObject(delitem); |
|
286 |
Entity.SaveChanges(); |
|
128 | 287 |
|
129 |
BitmapEncoder encoder = new PngBitmapEncoder(); |
|
288 |
DataBind(); |
|
289 |
} |
|
290 |
} |
|
291 |
#endregion |
|
130 | 292 |
|
293 |
#region Symbol DoubleClick Event |
|
294 |
private void Move_Symbol(object sender, MouseButtonEventArgs e) |
|
295 |
{ |
|
296 |
moveItem_id = ((e.OriginalSource as Image).DataContext as Symbol_Custom).ID; |
|
131 | 297 |
|
132 |
RenderTargetBitmap renderBitmap = new RenderTargetBitmap((int)_canvas.Width + 50, (int)_canvas.Height + 50, 96d, 96d, PixelFormats.Pbgra32);
|
|
298 |
IsMouseDown = true;
|
|
133 | 299 |
|
134 |
DrawingVisual dv = new DrawingVisual(); |
|
300 |
if (e.ClickCount > 1) |
|
301 |
{ |
|
302 |
//string moveItem_id = ((e.Source as ListBox).SelectedItem as Symbol_Custom).ID; |
|
303 |
string Data_ = ""; |
|
135 | 304 |
|
136 |
_canvas.Measure(new System.Windows.Size(finalItem.BorderSize.Width + 50, finalItem.BorderSize.Height + 50)); |
|
137 |
//_canvas.Arrange(new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X - 50, Y = -finalItem.BorderSize.Y - 50 }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
138 |
_canvas.Arrange(new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X - 20, Y = -finalItem.BorderSize.Y - 20 }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
305 |
using (KCOMEntities Entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString())) |
|
306 |
{ |
|
307 |
if (RadTab.SelectedIndex == 0) |
|
308 |
Data_ = Entity.SYMBOL_PRIVATE.Where(data => data.ID == moveItem_id).FirstOrDefault().DATA; |
|
309 |
else |
|
310 |
Data_ = Entity.SYMBOL_PUBLIC.Where(data => data.ID == moveItem_id).FirstOrDefault().DATA; |
|
311 |
} |
|
139 | 312 |
|
140 |
using (DrawingContext ctx = dv.RenderOpen()) |
|
313 |
if (Data_.Contains("|DZ|")) |
|
314 |
{ |
|
315 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
|
316 |
|
|
317 |
string[] delimiterChars = { "|DZ|" }; |
|
318 |
string[] data = Data_.Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
|
319 |
|
|
320 |
foreach (string parse in data) |
|
321 |
{ |
|
322 |
if (parse != "") |
|
323 |
{ |
|
324 |
System.Windows.Controls.Control item = layer.markupParse_Paste(parse, ViewerDataModel.Instance.MarkupControls_USER); |
|
325 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
326 |
|
|
327 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
328 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
329 |
|
|
330 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
|
331 |
} |
|
332 |
} |
|
333 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
|
334 |
|
|
335 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
|
336 |
} |
|
337 |
} |
|
338 |
} |
|
339 |
#endregion |
|
340 |
|
|
341 |
#region Symbol Rename Event |
|
342 |
private void Rename_Symbol(object sender, RoutedEventArgs e) |
|
343 |
{ |
|
344 |
if (lstSymbolPrivate.SelectedItem == null) |
|
141 | 345 |
{ |
142 |
VisualBrush vb = new VisualBrush(_canvas); |
|
143 |
//ctx.DrawRectangle(vb, null, new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X - 20, Y = -finalItem.BorderSize.Y - 20 }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
144 |
ctx.DrawRectangle(vb, null, new Rect(new System.Windows.Point { X = -finalItem.BorderSize.X, Y = -finalItem.BorderSize.Y }, new Point(finalItem.BorderSize.Width + 20, finalItem.BorderSize.Height + 20))); |
|
346 |
DialogMessage_Alert("Please Select Symbol", "Alert"); |
|
347 |
return; |
|
145 | 348 |
} |
146 | 349 |
|
147 |
try
|
|
350 |
DialogParameters parameters = new DialogParameters()
|
|
148 | 351 |
{ |
149 |
renderBitmap.Render(dv); |
|
352 |
Closed = (obj, args) => this.MarkupReNamePromptClose("", args), |
|
353 |
//DefaultPromptResultValue = "Custom State", |
|
354 |
DefaultPromptResultValue = (lstSymbolPrivate.SelectedItem as Symbol_Custom).Name, |
|
355 |
Content = "Name :", |
|
356 |
Header = "Update Custom Symbol Name", |
|
357 |
Theme = new VisualStudio2013Theme(), |
|
358 |
ModalBackground = new SolidColorBrush { Color = Colors.Black, Opacity = 0.6 }, |
|
359 |
}; |
|
360 |
RadWindow.Prompt(parameters); |
|
150 | 361 |
|
151 |
GC.Collect(); |
|
152 |
GC.WaitForPendingFinalizers(); |
|
153 |
GC.Collect(); |
|
154 |
//bitmap.Render(controlToConvert); |
|
155 |
// encode png data |
|
156 |
PngBitmapEncoder pngEncoder = new PngBitmapEncoder(); |
|
157 |
// puch rendered bitmap into it |
|
158 |
pngEncoder.Interlace = PngInterlaceOption.Off; |
|
159 |
pngEncoder.Frames.Add(BitmapFrame.Create(renderBitmap)); |
|
160 |
return pngEncoder; |
|
362 |
} |
|
363 |
#endregion |
|
161 | 364 |
|
365 |
#region Symbol Rename Close Event |
|
366 |
private void MarkupReNamePromptClose(string data, WindowClosedEventArgs args) |
|
367 |
{ |
|
368 |
if (args.DialogResult != null && args.DialogResult.Value) |
|
369 |
{ |
|
370 |
using (KCOMEntities Entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString())) |
|
371 |
{ |
|
372 |
string ID = (lstSymbolPrivate.SelectedItem as Symbol_Custom).ID; |
|
373 |
var UpdateItem = Entity.SYMBOL_PRIVATE.Where(info => info.ID == ID).FirstOrDefault(); |
|
374 |
|
|
375 |
UpdateItem.NAME = args.PromptResult; |
|
376 |
Entity.SaveChanges(); |
|
377 |
DataBind(); |
|
378 |
//args.PromptResult |
|
379 |
} |
|
162 | 380 |
} |
163 |
catch (Exception ex) |
|
381 |
} |
|
382 |
#endregion |
|
383 |
|
|
384 |
#region Wheel Event |
|
385 |
private void lstSymbolPrivate_PreviewMouseWheel(object sender, MouseWheelEventArgs e) |
|
386 |
{ |
|
387 |
ScView.ScrollToVerticalOffset(ScView.ContentVerticalOffset - (e.Delta / 2)); |
|
388 |
} |
|
389 |
private void lstSymbolPublic_PreviewMouseWheel(object sender, MouseWheelEventArgs e) |
|
390 |
{ |
|
391 |
ScView_Public.ScrollToVerticalOffset(ScView_Public.ContentVerticalOffset - (e.Delta / 2)); |
|
392 |
} |
|
393 |
#endregion |
|
394 |
|
|
395 |
#region Tab Selection Event |
|
396 |
private void RadTabControl_PreviewSelectionChanged(object sender, RadSelectionChangedEventArgs e) |
|
397 |
{ |
|
398 |
foreach (var item in (e.OriginalSource as RadTabControl).Items) |
|
164 | 399 |
{ |
165 |
return null;
|
|
400 |
(item as RadTabItem).FontWeight = FontWeights.Normal;
|
|
166 | 401 |
} |
402 |
((e.OriginalSource as RadTabControl).SelectedItem as RadTabItem).FontWeight = FontWeights.Bold; |
|
403 |
} |
|
404 |
#endregion |
|
167 | 405 |
|
406 |
#region Department Selection Event |
|
407 |
private void deptlist_SelectionChanged(object sender, SelectionChangedEventArgs e) |
|
408 |
{ |
|
409 |
DataBind(); |
|
168 | 410 |
} |
411 |
#endregion |
|
169 | 412 |
|
413 |
#endregion |
|
170 | 414 |
|
171 |
public void DialogMessage_Alert(string content, string header) |
|
415 |
private void lstSymbolPrivate_PreviewMouseUp(object sender, MouseButtonEventArgs e) |
|
416 |
{ |
|
417 |
|
|
418 |
} |
|
419 |
|
|
420 |
private void lstSymbolPrivate_MouseLeave(object sender, MouseEventArgs e) |
|
421 |
{ |
|
422 |
|
|
423 |
} |
|
424 |
|
|
425 |
private void lstSymbolPrivate_MouseDown(object sender, MouseButtonEventArgs e) |
|
172 | 426 |
{ |
173 |
var box = new TextBlock(); |
|
174 |
box.MinWidth = 400; |
|
175 |
box.FontSize = 11; |
|
176 |
//box.FontSize = 12; |
|
177 |
box.Text = content; |
|
178 |
box.TextWrapping = System.Windows.TextWrapping.Wrap; |
|
179 | 427 |
|
180 |
DialogParameters parameters = new DialogParameters() |
|
181 |
{ |
|
182 |
Content = box, |
|
183 |
Header = header, |
|
184 |
Theme = new VisualStudio2013Theme(), |
|
185 |
ModalBackground = new SolidColorBrush { Color = Colors.Black, Opacity = 0.6 }, |
|
186 |
}; |
|
187 |
RadWindow.Alert(parameters); |
|
188 | 428 |
} |
189 | 429 |
|
190 |
private void lsySymbolPrivate_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
|
430 |
private void StackPanel_MouseLeave(object sender, MouseEventArgs e)
|
|
191 | 431 |
{ |
432 |
if(IsMouseDown && e.LeftButton == MouseButtonState.Pressed) |
|
433 |
{ |
|
434 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.Symbol_ID = moveItem_id; |
|
435 |
} |
|
436 |
else |
|
437 |
{ |
|
438 |
IsMouseDown = false; |
|
439 |
} |
|
440 |
} |
|
192 | 441 |
|
442 |
private void StackPanel_MouseUp(object sender, MouseButtonEventArgs e) |
|
443 |
{ |
|
444 |
IsMouseDown = false; |
|
193 | 445 |
} |
194 | 446 |
} |
195 | 447 |
} |
KCOM/Controls/thumbnailControl.xaml | ||
---|---|---|
19 | 19 |
Storyboard.TargetProperty="Opacity" /> |
20 | 20 |
</Storyboard> |
21 | 21 |
</Grid.Resources> |
22 |
|
|
22 | 23 |
<!--d:LayoutOverrides="Width, Height"--> |
23 | 24 |
<!--<Grid RenderTransformOrigin="0.5,0.5"> |
24 | 25 |
<Grid.RowDefinitions> |
KCOM/Events/Implementation/TopMenuEvent.cs | ||
---|---|---|
173 | 173 |
ViewerDataModel.Instance.paintSet = MarkupToPDF.Controls.Common.PaintSet.None; |
174 | 174 |
} |
175 | 175 |
SetPaintEvent(); |
176 |
|
|
177 |
|
|
178 |
|
|
179 | 176 |
} |
180 | 177 |
|
181 | 178 |
/// <summary> |
... | ... | |
709 | 706 |
} |
710 | 707 |
} |
711 | 708 |
|
709 |
|
|
710 |
private void cbIntervalSize_ValueChanged(object sender, RadRangeBaseValueChangedEventArgs e) |
|
711 |
{ |
|
712 |
List<AdornerMember> AdonerList = GetAdornerItem(); |
|
713 |
if (AdonerList.Count > 0) |
|
714 |
{ |
|
715 |
|
|
716 |
Undo_data UndoData = new Undo_data() |
|
717 |
{ |
|
718 |
IsUndo = false, |
|
719 |
Event = Event_Type.Option, |
|
720 |
EventTime = DateTime.Now, |
|
721 |
Interval = ViewerDataModel.Instance.Interval, |
|
722 |
Markup_List = new List<Multi_Undo_data>() |
|
723 |
}; |
|
724 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
|
725 |
|
|
726 |
foreach (AdornerMember InnerItem in AdonerList) |
|
727 |
{ |
|
728 |
switch (InnerItem.DrawingData.GetType().Name) |
|
729 |
{ |
|
730 |
case ("LineControl"): |
|
731 |
{ |
|
732 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Line.LineControl).Interval = ViewerDataModel.Instance.Interval; |
|
733 |
|
|
734 |
multi_Undo_Data.Markup = InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo; |
|
735 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
736 |
multi_Undo_Data = new Multi_Undo_data(); |
|
737 |
} |
|
738 |
break; |
|
739 |
} |
|
740 |
} |
|
741 |
|
|
742 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
|
743 |
{ |
|
744 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
|
745 |
}); |
|
746 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
747 |
} |
|
748 |
} |
|
749 |
|
|
712 | 750 |
//강인구 추가(Undo End) |
713 | 751 |
private void cbDashStyle_SelectionChanged(object sender, SelectionChangedEventArgs e) |
714 | 752 |
{ |
... | ... | |
974 | 1012 |
} |
975 | 1013 |
} |
976 | 1014 |
} |
977 |
|
|
1015 |
|
|
1016 |
private void AxisLockEvent(object sender, RoutedEventArgs e) |
|
1017 |
{ |
|
1018 |
ViewerDataModel.Instance.checkAxis = cbAxisLock.IsChecked.Value; |
|
1019 |
} |
|
1020 |
|
|
978 | 1021 |
//강인구 추가 |
979 | 1022 |
private void RadRibbonComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) |
980 | 1023 |
{ |
KCOM/Resources/Theme_Color.xaml | ||
---|---|---|
5 | 5 |
<SolidColorBrush x:Key="KCOMColor_PrimaryBrush" Color="#FFE6E6E6"/> |
6 | 6 |
<SolidColorBrush x:Key="KCOMColor_ComplementaryBrush" Color="#FFE1E1E1"/> |
7 | 7 |
<SolidColorBrush x:Key="KCOMColor_AlternativeBrush" Color="#FFF1F1F1"/> |
8 |
<!--<SolidColorBrush x:Key="KCOMColor_MarkerBrush" Color="#FF444444"/>--> |
|
8 | 9 |
<SolidColorBrush x:Key="KCOMColor_MarkerBrush" Color="#FF444444"/> |
9 | 10 |
<SolidColorBrush x:Key="KCOMColor_MarkerInvertedBrush" Color="#FFF9F9F9"/> |
10 | 11 |
<SolidColorBrush x:Key="KCOMColor_IconBrush" Color="#FF444444"/> |
KCOM/Views/MainMenu.xaml | ||
---|---|---|
201 | 201 |
<Angle:AngleControl x:Name="MainAngle" |
202 | 202 |
Grid.Column="1" |
203 | 203 |
Grid.ColumnSpan="2" |
204 |
Margin="10" |
|
204 |
Margin="10" |
|
205 |
AngleValue="{Binding AngleValue, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" |
|
205 | 206 |
HorizontalAlignment="Right" |
206 | 207 |
VerticalAlignment="Top" |
207 | 208 |
IsHitTestVisible="False" |
... | ... | |
503 | 504 |
</telerik:RadPane> |
504 | 505 |
</telerik:RadPaneGroup> |
505 | 506 |
<telerik:RadPaneGroup Visibility="Visible" telerik:StyleManager.Theme="Office2016"> |
506 |
<telerik:RadPane Header="Symbol" Visibility="Collapsed" CanFloat="False" CanUserClose="False" ContextMenuTemplate="{x:Null}" IsPinned="False" telerik:StyleManager.Theme="Office2016" x:Name="SymbolPane">
|
|
507 |
<telerik:RadPane Header="Symbol" Visibility="Visible" CanFloat="False" CanUserClose="False" ContextMenuTemplate="{x:Null}" IsPinned="False" telerik:StyleManager.Theme="Office2016" x:Name="SymbolPane">
|
|
507 | 508 |
<controls:Symbol /> |
508 | 509 |
<!--<telerik:RadButton Click="Create_Symbol">Create</telerik:RadButton>--> |
509 | 510 |
</telerik:RadPane> |
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
143 | 143 |
public double L_Size = 0; |
144 | 144 |
public AdornerFinal adorner_; |
145 | 145 |
public Multi_Undo_data multi_Undo_Data; |
146 |
public string Symbol_ID = ""; |
|
146 | 147 |
/// <summary> |
147 | 148 |
/// Set to 'true' when the left mouse-button is down. |
148 | 149 |
/// </summary> |
... | ... | |
1139 | 1140 |
|
1140 | 1141 |
private void zoomAndPanControl_MouseMove(object sender, MouseEventArgs e) |
1141 | 1142 |
{ |
1143 |
|
|
1144 |
//if(e.LeftButton == MouseButtonState.Pressed && Symbol_ID != "") |
|
1145 |
//{ |
|
1146 |
|
|
1147 |
|
|
1148 |
//} |
|
1149 |
|
|
1150 |
|
|
1142 | 1151 |
//var ct = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseOver).FirstOrDefault(); |
1143 | 1152 |
//if (ct != null) |
1144 | 1153 |
//{ |
... | ... | |
1324 | 1333 |
{ |
1325 | 1334 |
(currentControl as IPath).LineSize = ViewerDataModel.Instance.LineSize; |
1326 | 1335 |
} |
1336 |
if ((currentControl as LineControl) != null) |
|
1337 |
{ |
|
1338 |
(currentControl as LineControl).Interval = ViewerDataModel.Instance.Interval; |
|
1339 |
} |
|
1340 |
|
|
1327 | 1341 |
if ((currentControl as IShapeControl) != null) |
1328 | 1342 |
{ |
1329 | 1343 |
(currentControl as IShapeControl).Paint = ViewerDataModel.Instance.paintSet; |
... | ... | |
1445 | 1459 |
control.ControlType = controlType; |
1446 | 1460 |
if (control != null) |
1447 | 1461 |
{ |
1448 |
if (move.mousemode == MouseMode.Drawing) |
|
1462 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1463 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1464 |
Point tempPoint = control.EndPoint; |
|
1465 |
|
|
1466 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
1449 | 1467 |
{ |
1450 |
//move.control_Move(ControlList, true, moveX, moveY); |
|
1468 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1469 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1470 |
control.EndPoint = tempPoint; |
|
1451 | 1471 |
} |
1452 | 1472 |
else |
1453 | 1473 |
{ |
1454 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
1455 |
{ |
|
1456 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1457 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1458 |
|
|
1459 |
Point tempPoint = control.EndPoint; |
|
1460 |
var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1461 |
control.EndPoint = tempPoint; |
|
1462 |
} |
|
1463 |
else |
|
1464 |
{ |
|
1465 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1466 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1467 |
} |
|
1468 |
|
|
1469 |
control.PointSet = new List<Point> |
|
1470 |
{ |
|
1471 |
control.StartPoint, |
|
1472 |
control.EndPoint, |
|
1473 |
}; |
|
1474 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1474 | 1475 |
} |
1476 |
|
|
1477 |
control.PointSet = new List<Point> |
|
1478 |
{ |
|
1479 |
control.StartPoint, |
|
1480 |
control.EndPoint, |
|
1481 |
}; |
|
1475 | 1482 |
//강인구 추가 |
1476 | 1483 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
1477 | 1484 |
} |
... | ... | |
1490 | 1497 |
control.ControlType = controlType; |
1491 | 1498 |
if (control != null) |
1492 | 1499 |
{ |
1493 |
//control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1494 |
//control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1500 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1501 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1502 |
Point tempPoint = control.EndPoint; |
|
1495 | 1503 |
|
1496 | 1504 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
1497 | 1505 |
{ |
1498 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1499 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1500 |
|
|
1501 |
Point tempPoint = control.EndPoint; |
|
1502 |
var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1506 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1507 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1503 | 1508 |
control.EndPoint = tempPoint; |
1504 | 1509 |
} |
1505 | 1510 |
else |
1506 | 1511 |
{ |
1507 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1508 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1512 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1509 | 1513 |
} |
1510 | 1514 |
|
1511 | 1515 |
|
... | ... | |
1530 | 1534 |
control.ControlType = controlType; |
1531 | 1535 |
if (control != null) |
1532 | 1536 |
{ |
1533 |
//control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y);
|
|
1534 |
|
|
1535 |
//control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
1537 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1538 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1539 |
Point tempPoint = control.EndPoint;
|
|
1536 | 1540 |
|
1537 | 1541 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
1538 | 1542 |
{ |
1539 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1540 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1541 |
|
|
1542 |
Point tempPoint = control.EndPoint; |
|
1543 |
var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1543 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1544 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1544 | 1545 |
control.EndPoint = tempPoint; |
1545 | 1546 |
} |
1546 | 1547 |
else |
1547 | 1548 |
{ |
1548 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1549 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1549 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1550 | 1550 |
} |
1551 | 1551 |
|
1552 | 1552 |
|
... | ... | |
1572 | 1572 |
control.ControlType = controlType; |
1573 | 1573 |
if (control != null) |
1574 | 1574 |
{ |
1575 |
//control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y);
|
|
1576 |
|
|
1577 |
//control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
1575 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1576 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1577 |
Point tempPoint = control.EndPoint;
|
|
1578 | 1578 |
|
1579 | 1579 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
1580 | 1580 |
{ |
1581 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1582 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1583 |
|
|
1584 |
Point tempPoint = control.EndPoint; |
|
1585 |
var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1581 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1582 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1586 | 1583 |
control.EndPoint = tempPoint; |
1587 | 1584 |
} |
1588 | 1585 |
else |
1589 | 1586 |
{ |
1590 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1591 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1587 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1592 | 1588 |
} |
1593 | 1589 |
|
1594 | 1590 |
|
... | ... | |
1614 | 1610 |
control.ControlType = controlType; |
1615 | 1611 |
if (control != null) |
1616 | 1612 |
{ |
1617 |
//control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y);
|
|
1618 |
|
|
1619 |
//control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
1613 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1614 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1615 |
Point tempPoint = control.EndPoint;
|
|
1620 | 1616 |
|
1621 | 1617 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
1622 | 1618 |
{ |
1623 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1624 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1625 |
|
|
1626 |
Point tempPoint = control.EndPoint; |
|
1627 |
var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1619 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1620 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1628 | 1621 |
control.EndPoint = tempPoint; |
1629 | 1622 |
} |
1630 | 1623 |
else |
1631 | 1624 |
{ |
1632 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1633 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1625 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1634 | 1626 |
} |
1635 | 1627 |
|
1636 |
|
|
1637 | 1628 |
control.PointSet = new List<Point> |
1638 | 1629 |
{ |
1639 | 1630 |
control.StartPoint, |
... | ... | |
1676 | 1667 |
|
1677 | 1668 |
if (control != null) |
1678 | 1669 |
{ |
1679 |
if (move.mousemode == MouseMode.Drawing) |
|
1670 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1671 |
control.MidPoint = new Point(0, 0); |
|
1672 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1673 |
Point tempPoint = control.EndPoint; |
|
1674 |
|
|
1675 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
1680 | 1676 |
{ |
1681 |
//move.control_Move(ControlList, false, moveX, moveY); |
|
1677 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1678 |
control.EndPoint = tempPoint; |
|
1682 | 1679 |
} |
1683 | 1680 |
else |
1684 | 1681 |
{ |
1685 |
control.StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y); |
|
1686 |
control.MidPoint = new Point(0, 0); |
|
1687 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1682 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1688 | 1683 |
} |
1689 | 1684 |
|
1690 | 1685 |
|
... | ... | |
1723 | 1718 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
1724 | 1719 |
} |
1725 | 1720 |
|
1726 |
|
|
1727 | 1721 |
control.PointSet = new List<Point> |
1728 | 1722 |
{ |
1729 | 1723 |
control.StartPoint, |
... | ... | |
1734 | 1728 |
//강인구 추가 |
1735 | 1729 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
1736 | 1730 |
} |
1737 |
|
|
1738 | 1731 |
} |
1739 | 1732 |
break; |
1740 | 1733 |
|
... | ... | |
1746 | 1739 |
|
1747 | 1740 |
if (control != null) |
1748 | 1741 |
{ |
1742 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1743 |
Point tempPoint = control.EndPoint; |
|
1749 | 1744 |
if (control.MiddlePoint == new Point(0, 0)) |
1750 | 1745 |
{ |
1751 | 1746 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
1752 | 1747 |
{ |
1753 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1754 |
Point tempPoint = control.EndPoint; |
|
1755 |
var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1748 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1749 |
//var AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1756 | 1750 |
control.EndPoint = tempPoint; |
1757 | 1751 |
} |
1758 | 1752 |
else |
1759 | 1753 |
{ |
1760 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
1754 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
1761 | 1755 |
} |
1762 |
|
|
1763 |
|
|
1764 | 1756 |
} |
1765 | 1757 |
else |
1766 | 1758 |
{ |
1767 | 1759 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
1768 | 1760 |
{ |
1769 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y); |
|
1770 |
Point tempPoint = control.EndPoint; |
|
1771 |
var AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
|
1761 |
//var AngleValue = MathSet.returnAngleString(control.MiddlePoint, ref tempPoint, true); |
|
1762 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1772 | 1763 |
control.EndPoint = tempPoint; |
1773 | 1764 |
} |
1774 | 1765 |
else |
1775 | 1766 |
{ |
1776 |
control.EndPoint = new Point(currentCanvasDrawingMouseMovePoint.X, currentCanvasDrawingMouseMovePoint.Y);
|
|
1767 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false);
|
|
1777 | 1768 |
} |
1778 | 1769 |
|
1779 | 1770 |
} |
... | ... | |
1926 | 1917 |
if (control != null) |
1927 | 1918 |
{ |
1928 | 1919 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
1920 |
Point tempPoint = control.EndPoint; |
|
1921 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
1922 |
{ |
|
1923 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1924 |
control.EndPoint = tempPoint; |
|
1925 |
} |
|
1926 |
else |
|
1927 |
{ |
|
1928 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1929 |
} |
|
1929 | 1930 |
|
1930 | 1931 |
control.PointSet = new List<Point> |
1931 | 1932 |
{ |
... | ... | |
1934 | 1935 |
control.EndPoint, |
1935 | 1936 |
}; |
1936 | 1937 |
} |
1937 |
|
|
1938 | 1938 |
} |
1939 | 1939 |
break; |
1940 | 1940 |
|
... | ... | |
1945 | 1945 |
if (control != null) |
1946 | 1946 |
{ |
1947 | 1947 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
1948 |
Point tempPoint = control.EndPoint; |
|
1949 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
1950 |
{ |
|
1951 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1952 |
control.EndPoint = tempPoint; |
|
1953 |
} |
|
1954 |
else |
|
1955 |
{ |
|
1956 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1957 |
} |
|
1948 | 1958 |
control.isFixed = true; |
1949 | 1959 |
|
1950 | 1960 |
control.PointSet = new List<Point> |
... | ... | |
1964 | 1974 |
if (control != null) |
1965 | 1975 |
{ |
1966 | 1976 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
1977 |
Point tempPoint = control.EndPoint; |
|
1978 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
1979 |
{ |
|
1980 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
1981 |
control.EndPoint = tempPoint; |
|
1982 |
} |
|
1983 |
else |
|
1984 |
{ |
|
1985 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
1986 |
} |
|
1967 | 1987 |
control.PointSet = new List<Point> |
1968 | 1988 |
{ |
1969 | 1989 |
control.StartPoint, |
... | ... | |
1982 | 2002 |
{ |
1983 | 2003 |
control.isFixed = true; |
1984 | 2004 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
2005 |
Point tempPoint = control.EndPoint; |
|
2006 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
2007 |
{ |
|
2008 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
2009 |
control.EndPoint = tempPoint; |
|
2010 |
} |
|
2011 |
else |
|
2012 |
{ |
|
2013 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
2014 |
} |
|
1985 | 2015 |
control.PointSet = new List<Point> |
1986 | 2016 |
{ |
1987 | 2017 |
control.StartPoint, |
... | ... | |
1999 | 2029 |
if (control != null) |
2000 | 2030 |
{ |
2001 | 2031 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
2032 |
Point tempPoint = control.EndPoint; |
|
2033 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
2034 |
{ |
|
2035 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
2036 |
control.EndPoint = tempPoint; |
|
2037 |
} |
|
2038 |
else |
|
2039 |
{ |
|
2040 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
2041 |
} |
|
2002 | 2042 |
control.PointSet = new List<Point> |
2003 | 2043 |
{ |
2004 | 2044 |
control.StartPoint, |
... | ... | |
2017 | 2057 |
{ |
2018 | 2058 |
control.isFixed = true; |
2019 | 2059 |
control.EndPoint = currentCanvasDrawingMouseMovePoint; |
2060 |
Point tempPoint = control.EndPoint; |
|
2061 |
if (ViewerDataModel.Instance.checkAxis || ViewerDataModel.Instance.IsPressShift) |
|
2062 |
{ |
|
2063 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, true); |
|
2064 |
control.EndPoint = tempPoint; |
|
2065 |
} |
|
2066 |
else |
|
2067 |
{ |
|
2068 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
|
2069 |
} |
|
2020 | 2070 |
control.PointSet = new List<Point> |
2021 | 2071 |
{ |
2022 | 2072 |
control.StartPoint, |
... | ... | |
3000 | 3050 |
//Control_Init(control); |
3001 | 3051 |
|
3002 | 3052 |
|
3053 |
|
|
3054 |
|
|
3003 | 3055 |
|
3004 | 3056 |
//강인구 폰트 변경 보류 |
3005 | 3057 |
|
... | ... | |
3245 | 3297 |
(currentControl as LineControl).ApplyOverViewData(); |
3246 | 3298 |
//controlType = ControlType.None; |
3247 | 3299 |
currentControl = null; |
3300 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3248 | 3301 |
} |
3249 | 3302 |
else |
3250 | 3303 |
{ |
... | ... | |
3257 | 3310 |
currentControl.CommentID = Save.shortGuid(); |
3258 | 3311 |
currentControl.IsNew = true; |
3259 | 3312 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3313 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3260 | 3314 |
} |
3261 | 3315 |
} |
3262 | 3316 |
} |
... | ... | |
3275 | 3329 |
(currentControl as LineControl).ApplyOverViewData(); |
3276 | 3330 |
//controlType = ControlType.None; |
3277 | 3331 |
currentControl = null; |
3332 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3278 | 3333 |
} |
3279 | 3334 |
else |
3280 | 3335 |
{ |
... | ... | |
3287 | 3342 |
currentControl.CommentID = Save.shortGuid(); |
3288 | 3343 |
currentControl.IsNew = true; |
3289 | 3344 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3345 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3290 | 3346 |
} |
3291 | 3347 |
} |
3292 | 3348 |
} |
... | ... | |
3305 | 3361 |
(currentControl as LineControl).ApplyOverViewData(); |
3306 | 3362 |
//controlType = ControlType.None; |
3307 | 3363 |
currentControl = null; |
3364 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3308 | 3365 |
} |
3309 | 3366 |
else |
3310 | 3367 |
{ |
... | ... | |
3317 | 3374 |
currentControl.CommentID = Save.shortGuid(); |
3318 | 3375 |
currentControl.IsNew = true; |
3319 | 3376 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3377 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3320 | 3378 |
} |
3321 | 3379 |
} |
3322 | 3380 |
} |
... | ... | |
3335 | 3393 |
(currentControl as LineControl).ApplyOverViewData(); |
3336 | 3394 |
//controlType = ControlType.None; |
3337 | 3395 |
currentControl = null; |
3396 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3338 | 3397 |
} |
3339 | 3398 |
else |
3340 | 3399 |
{ |
... | ... | |
3346 | 3405 |
currentControl.CommentID = Save.shortGuid(); |
3347 | 3406 |
currentControl.IsNew = true; |
3348 | 3407 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3408 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3349 | 3409 |
} |
3350 | 3410 |
} |
3351 | 3411 |
} |
... | ... | |
3364 | 3424 |
(currentControl as LineControl).ApplyOverViewData(); |
3365 | 3425 |
//controlType = ControlType.None; |
3366 | 3426 |
currentControl = null; |
3427 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3367 | 3428 |
} |
3368 | 3429 |
else |
3369 | 3430 |
{ |
... | ... | |
3375 | 3436 |
currentControl.CommentID = Save.shortGuid(); |
3376 | 3437 |
currentControl.IsNew = true; |
3377 | 3438 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3439 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3378 | 3440 |
} |
3379 | 3441 |
} |
3380 | 3442 |
} |
... | ... | |
3459 | 3521 |
(currentControl as ArcControl).ApplyOverViewData(); |
3460 | 3522 |
//controlType = ControlType.None; |
3461 | 3523 |
currentControl = null; |
3524 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3462 | 3525 |
} |
3463 | 3526 |
else |
3464 | 3527 |
{ |
... | ... | |
3470 | 3533 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
3471 | 3534 |
currentControl.IsNew = true; |
3472 | 3535 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3536 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3473 | 3537 |
} |
3474 | 3538 |
} |
3475 | 3539 |
} |
... | ... | |
3497 | 3561 |
(currentControl as ArcControl).ApplyOverViewData(); |
3498 | 3562 |
//controlType = ControlType.None; |
3499 | 3563 |
currentControl = null; |
3564 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3500 | 3565 |
} |
3501 | 3566 |
else |
3502 | 3567 |
{ |
... | ... | |
3509 | 3574 |
currentControl.IsNew = true; |
3510 | 3575 |
(currentControl as IMarkupCommonData).ControlType = ControlType.ArcArrow; |
3511 | 3576 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3577 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3512 | 3578 |
} |
3513 | 3579 |
} |
3514 | 3580 |
} |
... | ... | |
3539 | 3605 |
(currentControl as ArrowControl_Multi).ApplyOverViewData(); |
3540 | 3606 |
//controlType = ControlType.None; |
3541 | 3607 |
currentControl = null; |
3608 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3542 | 3609 |
} |
3543 | 3610 |
} |
3544 | 3611 |
else |
... | ... | |
3552 | 3619 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
3553 | 3620 |
currentControl.IsNew = true; |
3554 | 3621 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
3622 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3555 | 3623 |
} |
3556 | 3624 |
|
3557 | 3625 |
//if (currentControl is ArrowControl_Multi) |
... | ... | |
3854 | 3922 |
(currentControl as ArrowTextControl).IsEditing = false; |
3855 | 3923 |
(currentControl as ArrowTextControl).EnableEditing = false; |
3856 | 3924 |
currentControl = null; |
3925 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3857 | 3926 |
|
3858 | 3927 |
} |
3859 | 3928 |
else |
... | ... | |
3877 | 3946 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
3878 | 3947 |
|
3879 | 3948 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
3949 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3880 | 3950 |
//currentControl.Focus(); |
3881 | 3951 |
} |
3882 | 3952 |
} |
... | ... | |
3893 | 3963 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
3894 | 3964 |
//controlType = ControlType.None; |
3895 | 3965 |
currentControl = null; |
3966 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3896 | 3967 |
} |
3897 | 3968 |
else |
3898 | 3969 |
{ |
... | ... | |
3916 | 3987 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
3917 | 3988 |
|
3918 | 3989 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
3990 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3919 | 3991 |
//currentControl.Focus(); |
3920 | 3992 |
} |
3921 | 3993 |
} |
... | ... | |
3932 | 4004 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
3933 | 4005 |
//controlType = ControlType.None; |
3934 | 4006 |
currentControl = null; |
4007 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3935 | 4008 |
} |
3936 | 4009 |
else |
3937 | 4010 |
{ |
... | ... | |
3956 | 4029 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
3957 | 4030 |
|
3958 | 4031 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
3959 |
|
|
4032 |
this.MainAngle.Visibility = Visibility.Visible; |
|
3960 | 4033 |
//currentControl.Focus(); |
3961 | 4034 |
} |
3962 | 4035 |
} |
... | ... | |
3973 | 4046 |
//controlType = ControlType.None; |
3974 | 4047 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
3975 | 4048 |
currentControl = null; |
4049 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
3976 | 4050 |
} |
3977 | 4051 |
else |
3978 | 4052 |
{ |
... | ... | |
3999 | 4073 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
4000 | 4074 |
|
4001 | 4075 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
4076 |
this.MainAngle.Visibility = Visibility.Visible; |
|
4002 | 4077 |
//currentControl.Focus(); |
4003 | 4078 |
} |
4004 | 4079 |
} |
... | ... | |
4015 | 4090 |
//controlType = ControlType.None; |
4016 | 4091 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
4017 | 4092 |
currentControl = null; |
4093 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
4018 | 4094 |
} |
4019 | 4095 |
else |
4020 | 4096 |
{ |
... | ... | |
4038 | 4114 |
(currentControl as ArrowTextControl).ApplyTemplate(); |
4039 | 4115 |
|
4040 | 4116 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
4041 |
|
|
4117 |
this.MainAngle.Visibility = Visibility.Visible; |
|
4042 | 4118 |
//currentControl.Focus(); |
4043 | 4119 |
} |
4044 | 4120 |
} |
... | ... | |
4055 | 4131 |
//controlType = ControlType.None; |
4056 | 4132 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
4057 | 4133 |
currentControl = null; |
4134 |
this.MainAngle.Visibility = Visibility.Collapsed; |
|
4058 | 4135 |
} |
4059 | 4136 |
else |
4060 | 4137 |
{ |
... | ... | |
4082 | 4159 |
|
4083 | 4160 |
(currentControl as ArrowTextControl).Base_TextBox.Focus(); |
4084 | 4161 |
//currentControl.Focus(); |
4162 |
this.MainAngle.Visibility = Visibility.Visible; |
|
4085 | 4163 |
} |
4086 | 4164 |
} |
4087 | 4165 |
} |
... | ... | |
5689 | 5767 |
{ |
5690 | 5768 |
(item.Markup as IDashControl).DashSize = undo.DashSize; |
5691 | 5769 |
} |
5770 |
else if (undo.Interval != 0 && item.Markup as LineControl != null) |
|
5771 |
{ |
|
5772 |
(item.Markup as LineControl).Interval = undo.Interval; |
|
5773 |
} |
|
5692 | 5774 |
else if (item.Markup as IShapeControl != null) |
5693 | 5775 |
{ |
5694 | 5776 |
(item.Markup as IShapeControl).Paint = undo.paint; |
... | ... | |
5817 | 5899 |
{ |
5818 | 5900 |
(item.Markup as IDashControl).DashSize = redo.DashSize; |
5819 | 5901 |
} |
5902 |
else if(redo.Interval != 0 && item.Markup as LineControl != null) |
|
5903 |
{ |
|
5904 |
(item.Markup as LineControl).Interval = redo.Interval; |
|
5905 |
} |
|
5820 | 5906 |
else if (item.Markup as IShapeControl != null) |
5821 | 5907 |
{ |
5822 | 5908 |
(item.Markup as IShapeControl).Paint = redo.paint; |
KCOM/Views/TopMenu.xaml | ||
---|---|---|
55 | 55 |
<StackPanel Orientation="Horizontal"> |
56 | 56 |
<telerik:RadRibbonButton Content="Print" Size="Large" LargeImage="/KCOM;component/Resources/Images/MenuImage_new/printer.png" Click="PrintEvent"/> |
57 | 57 |
<telerik:RadRibbonButton Content="Export" Size="Large" LargeImage="/KCOM;component/Resources/Images/MenuImage_new/topdf.png" Click="PrintEvent"/> |
내보내기 Unified diff