개정판 a6f7f9b6
issue #1136: control 생성자에서 generic.xaml 제거 및 App.xaml 에 generic 추가
Change-Id: Ife79570df09c37a10104924afbd0caebc03f1244
| KCOM/App.xaml | ||
|---|---|---|
| 12 | 12 |
<ResourceDictionary Source="Resources\Theme_CustomControl.xaml"/> |
| 13 | 13 |
<ResourceDictionary Source="Assets\RadGridViewStyleResourceDictionary.xaml"/> |
| 14 | 14 |
<ResourceDictionary Source="Messenger\StyleDictionary.xaml"/> |
| 15 |
|
|
| 15 |
<ResourceDictionary Source="/MarkupToPDF;component/themes/generic.xaml"/> |
|
| 16 | 16 |
<!--<ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/System.Windows.xaml"/> |
| 17 | 17 |
<ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/Telerik.Windows.Controls.xaml"/> |
| 18 | 18 |
<ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/Telerik.Windows.Controls.Input.xaml"/> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2150 | 2150 |
|
| 2151 | 2151 |
//if (currentControl != null) |
| 2152 | 2152 |
{
|
| 2153 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).Base_TextBox.Visibility == Visibility.Visible).FirstOrDefault();
|
|
| 2154 |
if (text_item_ != null )
|
|
| 2153 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).IsEditingMode == true).FirstOrDefault();
|
|
| 2154 |
if (text_item_ != null) |
|
| 2155 | 2155 |
{
|
| 2156 | 2156 |
(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible; |
| 2157 | 2157 |
(text_item_ as TextControl).Base_TextBox.Visibility = Visibility.Collapsed; |
| 2158 |
(text_item_ as TextControl).IsEditingMode = false; |
|
| 2159 |
(text_item_ as TextControl).Base_TextBox.Focusable = false; |
|
| 2158 |
(text_item_ as TextControl).IsEditingMode = false; |
|
| 2160 | 2159 |
currentControl = null; |
| 2161 | 2160 |
} |
| 2162 | 2161 |
|
| MarkupToPDF/Controls/Angle/AngleControl.cs | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
public AngleControl()//Point p1, Point p2) |
| 17 | 17 |
{
|
| 18 |
this.DefaultStyleKey = typeof(AngleControl); |
|
| 18 |
//this.DefaultStyleKey = typeof(AngleControl);
|
|
| 19 | 19 |
} |
| 20 | 20 |
// AngleValue = MathSet.AngleMethod(p1.X, p1.Y, p2.X, p2.Y).ToString("###.#") + "°";
|
| 21 | 21 |
//instanceMargin = new Thickness(p2.X + 30, p2.Y, 0, 0); |
| MarkupToPDF/Controls/Cad/ClipWhiteControlcs.cs | ||
|---|---|---|
| 509 | 509 |
static ClipWhiteControl() |
| 510 | 510 |
{
|
| 511 | 511 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ClipWhiteControl), new FrameworkPropertyMetadata(typeof(ClipWhiteControl))); |
| 512 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 513 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 512 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 513 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 515 | 515 |
} |
| 516 | 516 |
|
| 517 | 517 |
|
| ... | ... | |
| 659 | 659 |
|
| 660 | 660 |
public void Dispose() |
| 661 | 661 |
{
|
| 662 |
GC.Collect(); |
|
| 663 |
GC.SuppressFinalize(this); |
|
| 662 |
//GC.Collect(); |
|
| 663 |
//GC.SuppressFinalize(this); |
|
| 664 |
this.Base_RectPath = null; |
|
| 664 | 665 |
} |
| 665 | 666 |
#endregion Internal Method |
| 666 | 667 |
} |
| MarkupToPDF/Controls/Cad/CoordinateControl.cs | ||
|---|---|---|
| 508 | 508 |
static CoordinateControl() |
| 509 | 509 |
{
|
| 510 | 510 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(CoordinateControl), new FrameworkPropertyMetadata(typeof(CoordinateControl))); |
| 511 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 512 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 513 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 511 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 512 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 513 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 514 | 514 |
} |
| 515 | 515 |
|
| 516 | 516 |
|
| ... | ... | |
| 658 | 658 |
|
| 659 | 659 |
public void Dispose() |
| 660 | 660 |
{
|
| 661 |
GC.Collect(); |
|
| 662 |
GC.SuppressFinalize(this); |
|
| 661 |
//GC.Collect(); |
|
| 662 |
//GC.SuppressFinalize(this); |
|
| 663 |
this.Base_RectPath = null; |
|
| 663 | 664 |
} |
| 664 | 665 |
#endregion Internal Method |
| 665 | 666 |
} |
| MarkupToPDF/Controls/Cad/InsideWhiteControlcs.cs | ||
|---|---|---|
| 509 | 509 |
static InsideWhiteControl() |
| 510 | 510 |
{
|
| 511 | 511 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(InsideWhiteControl), new FrameworkPropertyMetadata(typeof(InsideWhiteControl))); |
| 512 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 513 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 512 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 513 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 515 | 515 |
} |
| 516 | 516 |
|
| 517 | 517 |
|
| ... | ... | |
| 659 | 659 |
|
| 660 | 660 |
public void Dispose() |
| 661 | 661 |
{
|
| 662 |
GC.Collect(); |
|
| 663 |
GC.SuppressFinalize(this); |
|
| 662 |
//GC.Collect(); |
|
| 663 |
//GC.SuppressFinalize(this); |
|
| 664 |
this.Base_RectPath = null; |
|
| 664 | 665 |
} |
| 665 | 666 |
#endregion Internal Method |
| 666 | 667 |
} |
| MarkupToPDF/Controls/Cad/OverlapWhiteControl.cs | ||
|---|---|---|
| 509 | 509 |
static OverlapWhiteControl() |
| 510 | 510 |
{
|
| 511 | 511 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(OverlapWhiteControl), new FrameworkPropertyMetadata(typeof(OverlapWhiteControl))); |
| 512 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 513 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 512 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 513 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 515 | 515 |
} |
| 516 | 516 |
|
| 517 | 517 |
|
| ... | ... | |
| 659 | 659 |
|
| 660 | 660 |
public void Dispose() |
| 661 | 661 |
{
|
| 662 |
GC.Collect(); |
|
| 663 |
GC.SuppressFinalize(this); |
|
| 662 |
//GC.Collect(); |
|
| 663 |
//GC.SuppressFinalize(this); |
|
| 664 |
this.Base_RectPath = null; |
|
| 664 | 665 |
} |
| 665 | 666 |
#endregion Internal Method |
| 666 | 667 |
} |
| MarkupToPDF/Controls/Common/StringToPathConverter.cs | ||
|---|---|---|
| 688 | 688 |
|
| 689 | 689 |
public void Dispose() |
| 690 | 690 |
{
|
| 691 |
GC.Collect(); |
|
| 692 |
GC.SuppressFinalize(this);
|
|
| 691 |
//GC.Collect();
|
|
| 692 |
//GC.SuppressFinalize(this);
|
|
| 693 | 693 |
} |
| 694 | 694 |
} |
| 695 | 695 |
} |
| MarkupToPDF/Controls/Etc/DateControl.cs | ||
|---|---|---|
| 29 | 29 |
{
|
| 30 | 30 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(DateControl), new FrameworkPropertyMetadata(typeof(DateControl))); |
| 31 | 31 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 32 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 33 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 34 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 35 |
System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 32 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 33 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 34 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 35 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
public DateControl() |
| 39 | 39 |
{
|
| 40 |
this.DefaultStyleKey = typeof(DateControl); |
|
| 40 |
//this.DefaultStyleKey = typeof(DateControl);
|
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
|
| ... | ... | |
| 437 | 437 |
|
| 438 | 438 |
public void Dispose() |
| 439 | 439 |
{
|
| 440 |
GC.Collect(); |
|
| 441 |
GC.SuppressFinalize(this); |
|
| 440 |
//GC.Collect(); |
|
| 441 |
//GC.SuppressFinalize(this); |
|
| 442 |
this.Base_TextBox = null; |
|
| 443 |
this.Base_ViewBox = null; |
|
| 442 | 444 |
} |
| 443 | 445 |
|
| 444 | 446 |
public override void ApplyOverViewData() |
| MarkupToPDF/Controls/Etc/ImgControl.cs | ||
|---|---|---|
| 31 | 31 |
{
|
| 32 | 32 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ImgControl), new FrameworkPropertyMetadata(typeof(ImgControl))); |
| 33 | 33 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 34 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 35 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 36 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 34 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 35 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 36 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 37 | 37 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
| 38 | 38 |
} |
| 39 | 39 |
|
| 40 | 40 |
public ImgControl() |
| 41 | 41 |
{
|
| 42 |
this.DefaultStyleKey = typeof(ImgControl); |
|
| 42 |
//this.DefaultStyleKey = typeof(ImgControl);
|
|
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
public void Dispose() |
| 46 | 46 |
{
|
| 47 |
GC.Collect(); |
|
| 48 |
GC.SuppressFinalize(this); |
|
| 47 |
//GC.Collect(); |
|
| 48 |
//GC.SuppressFinalize(this); |
|
| 49 |
this.Base_Image = null; |
|
| 49 | 50 |
} |
| 50 | 51 |
public event PropertyChangedEventHandler PropertyChanged; |
| 51 | 52 |
protected void OnPropertyChanged(string propName) |
| MarkupToPDF/Controls/Etc/SignControl.cs | ||
|---|---|---|
| 34 | 34 |
{
|
| 35 | 35 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(SignControl), new FrameworkPropertyMetadata(typeof(SignControl))); |
| 36 | 36 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 37 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 38 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 39 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 40 |
System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 37 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 38 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 39 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 40 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
public void Dispose() |
| 44 | 44 |
{
|
| 45 |
GC.Collect(); |
|
| 46 |
GC.SuppressFinalize(this); |
|
| 45 |
//GC.Collect(); |
|
| 46 |
//GC.SuppressFinalize(this); |
|
| 47 |
this.Base_Image = null; |
|
| 47 | 48 |
} |
| 48 | 49 |
#region Dependency Properties |
| 49 | 50 |
public static readonly DependencyProperty UserIDProperty = DependencyProperty.Register( |
| MarkupToPDF/Controls/Etc/SymControl.cs | ||
|---|---|---|
| 35 | 35 |
{
|
| 36 | 36 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(SymControl), new FrameworkPropertyMetadata(typeof(SymControl))); |
| 37 | 37 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 38 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 39 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 40 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 41 |
System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 38 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 39 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 40 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 41 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
public void Dispose() |
| 45 | 45 |
{
|
| 46 |
GC.Collect(); |
|
| 47 |
GC.SuppressFinalize(this); |
|
| 46 |
//GC.Collect(); |
|
| 47 |
//GC.SuppressFinalize(this); |
|
| 48 |
this.Base_SymPath = null; |
|
| 49 |
this.Base_ViewBox = null; |
|
| 48 | 50 |
} |
| 49 | 51 |
public event PropertyChangedEventHandler PropertyChanged; |
| 50 | 52 |
protected void RaisePropertyChanged(string propName) |
| MarkupToPDF/Controls/Etc/SymControlN.cs | ||
|---|---|---|
| 30 | 30 |
{
|
| 31 | 31 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(SymControlN), new FrameworkPropertyMetadata(typeof(SymControlN))); |
| 32 | 32 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 33 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 34 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 36 |
System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 33 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 34 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 36 |
// System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
public event PropertyChangedEventHandler PropertyChanged; |
| MarkupToPDF/Controls/Line/ArcControl.cs | ||
|---|---|---|
| 30 | 30 |
{
|
| 31 | 31 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ArcControl), new FrameworkPropertyMetadata(typeof(ArcControl))); |
| 32 | 32 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 33 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 34 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 33 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 34 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 36 | 36 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
public ArcControl() |
| 40 | 40 |
{
|
| 41 |
this.DefaultStyleKey = typeof(ArcControl); |
|
| 41 |
//this.DefaultStyleKey = typeof(ArcControl);
|
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
public void Dispose() |
| 45 | 45 |
{
|
| 46 |
GC.Collect(); |
|
| 47 |
GC.SuppressFinalize(this); |
|
| 48 |
Control control = new Control(); |
|
| 46 |
//GC.Collect(); |
|
| 47 |
//GC.SuppressFinalize(this); |
|
| 48 |
//Control control = new Control(); |
|
| 49 |
this.Base_ArcPath = null; |
|
| 49 | 50 |
} |
| 50 | 51 |
protected void OnPropertyChanged(string propName) |
| 51 | 52 |
{
|
| MarkupToPDF/Controls/Line/ArrowArcControl.cs | ||
|---|---|---|
| 30 | 30 |
{
|
| 31 | 31 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ArrowArcControl), new FrameworkPropertyMetadata(typeof(ArrowArcControl))); |
| 32 | 32 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 33 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 34 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 33 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 34 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 36 | 36 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
| 37 | 37 |
} |
| 38 | 38 |
|
| 39 | 39 |
public ArrowArcControl() |
| 40 | 40 |
{
|
| 41 |
this.DefaultStyleKey = typeof(ArrowArcControl); |
|
| 41 |
//this.DefaultStyleKey = typeof(ArrowArcControl);
|
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
public void Dispose() |
| 45 | 45 |
{
|
| 46 |
GC.Collect(); |
|
| 47 |
GC.SuppressFinalize(this); |
|
| 48 |
Control control = new Control(); |
|
| 46 |
//GC.Collect(); |
|
| 47 |
//GC.SuppressFinalize(this); |
|
| 48 |
//Control control = new Control(); |
|
| 49 |
this.Base_ArcPath = null; |
|
| 49 | 50 |
} |
| 50 | 51 |
protected void OnPropertyChanged(string propName) |
| 51 | 52 |
{
|
| MarkupToPDF/Controls/Line/ArrowControl_Multi.cs | ||
|---|---|---|
| 29 | 29 |
{
|
| 30 | 30 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ArrowControl_Multi), new FrameworkPropertyMetadata(typeof(ArrowControl_Multi))); |
| 31 | 31 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 32 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 33 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 34 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 35 |
System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 32 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 33 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 34 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 35 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
public ArrowControl_Multi() |
| 39 | 39 |
{
|
| 40 |
this.DefaultStyleKey = typeof(ArrowControl_Multi); |
|
| 40 |
//this.DefaultStyleKey = typeof(ArrowControl_Multi);
|
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
#region Dependency Properties |
| ... | ... | |
| 491 | 491 |
|
| 492 | 492 |
public void Dispose() |
| 493 | 493 |
{
|
| 494 |
GC.Collect(); |
|
| 495 |
GC.SuppressFinalize(this); |
|
| 494 |
//GC.Collect(); |
|
| 495 |
//GC.SuppressFinalize(this); |
|
| 496 |
this.Base_ArrowMultiPath = null; |
|
| 496 | 497 |
} |
| 497 | 498 |
} |
| 498 | 499 |
} |
| MarkupToPDF/Controls/Line/LineControl.cs | ||
|---|---|---|
| 30 | 30 |
{
|
| 31 | 31 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(LineControl), new FrameworkPropertyMetadata(typeof(LineControl))); |
| 32 | 32 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 33 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 33 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 34 | 34 |
|
| 35 |
dictionary.Source = new Uri("/MarkupToPDF;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 36 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 35 |
//dictionary.Source = new Uri("/MarkupToPDF;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 36 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 37 | 37 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
| 38 |
}
|
|
| 38 |
} |
|
| 39 | 39 |
|
| 40 | 40 |
public double DimSize |
| 41 | 41 |
{
|
| ... | ... | |
| 52 | 52 |
|
| 53 | 53 |
public LineControl() |
| 54 | 54 |
{
|
| 55 |
this.DefaultStyleKey = typeof(LineControl); |
|
| 55 |
//this.DefaultStyleKey = typeof(LineControl);
|
|
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 | 58 |
public void Dispose() |
| 59 | 59 |
{
|
| 60 |
GC.Collect(); |
|
| 61 |
GC.SuppressFinalize(this); |
|
| 60 |
//GC.Collect(); |
|
| 61 |
//GC.SuppressFinalize(this); |
|
| 62 |
this.Base_LinePath = null; |
|
| 62 | 63 |
} |
| 63 | 64 |
protected void OnPropertyChanged(string propName) |
| 64 | 65 |
{
|
| MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 32 | 32 |
{
|
| 33 | 33 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(CloudControl), new FrameworkPropertyMetadata(typeof(CloudControl))); |
| 34 | 34 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 35 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 36 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 37 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 35 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 36 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 37 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 38 | 38 |
} |
| 39 | 39 |
public CloudControl() |
| 40 | 40 |
{
|
| 41 |
this.DefaultStyleKey = typeof(CloudControl); |
|
| 41 |
//this.DefaultStyleKey = typeof(CloudControl);
|
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
#region Dependency Properties |
| ... | ... | |
| 786 | 786 |
} |
| 787 | 787 |
public void Dispose() |
| 788 | 788 |
{
|
| 789 |
GC.Collect(); |
|
| 790 |
GC.SuppressFinalize(this); |
|
| 789 |
//GC.Collect(); |
|
| 790 |
//GC.SuppressFinalize(this); |
|
| 791 |
this.Base_CloudPath = null; |
|
| 792 |
this.Base_CloudSubPath = null; |
|
| 791 | 793 |
} |
| 792 | 794 |
public event PropertyChangedEventHandler PropertyChanged; |
| 793 | 795 |
protected void OnPropertyChanged(string propName) |
| MarkupToPDF/Controls/Polygon/InkControl.cs | ||
|---|---|---|
| 22 | 22 |
static InkControl() |
| 23 | 23 |
{
|
| 24 | 24 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(InkControl), new FrameworkPropertyMetadata(typeof(InkControl))); |
| 25 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 26 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 27 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 25 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 26 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 27 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 28 | 28 |
} |
| 29 | 29 |
|
| 30 | 30 |
public InkControl() |
| 31 | 31 |
{
|
| 32 |
this.DefaultStyleKey = typeof(InkControl); |
|
| 32 |
//this.DefaultStyleKey = typeof(InkControl);
|
|
| 33 | 33 |
} |
| 34 | 34 |
|
| 35 | 35 |
#endregion |
| ... | ... | |
| 639 | 639 |
#region Dispose |
| 640 | 640 |
public void Dispose() |
| 641 | 641 |
{
|
| 642 |
GC.Collect(); |
|
| 643 |
GC.SuppressFinalize(this); |
|
| 642 |
//GC.Collect(); |
|
| 643 |
//GC.SuppressFinalize(this); |
|
| 644 |
this.Base_PolyPath = null; |
|
| 644 | 645 |
} |
| 645 | 646 |
#endregion |
| 646 | 647 |
|
| MarkupToPDF/Controls/Polygon/PolygonControl.cs | ||
|---|---|---|
| 22 | 22 |
static PolygonControl() |
| 23 | 23 |
{
|
| 24 | 24 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(PolygonControl), new FrameworkPropertyMetadata(typeof(PolygonControl))); |
| 25 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 26 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 27 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 25 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 26 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 27 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 28 | 28 |
} |
| 29 | 29 |
|
| 30 | 30 |
public PolygonControl() |
| 31 | 31 |
{
|
| 32 |
this.DefaultStyleKey = typeof(PolygonControl); |
|
| 32 |
//this.DefaultStyleKey = typeof(PolygonControl);
|
|
| 33 | 33 |
} |
| 34 | 34 |
|
| 35 | 35 |
#endregion |
| ... | ... | |
| 626 | 626 |
#region Dispose |
| 627 | 627 |
public void Dispose() |
| 628 | 628 |
{
|
| 629 |
GC.Collect(); |
|
| 630 |
GC.SuppressFinalize(this); |
|
| 629 |
//GC.Collect(); |
|
| 630 |
//GC.SuppressFinalize(this); |
|
| 631 |
this.Base_PolyPath = null; |
|
| 631 | 632 |
} |
| 632 | 633 |
#endregion |
| 633 | 634 |
|
| MarkupToPDF/Controls/Shape/CircleControl.cs | ||
|---|---|---|
| 22 | 22 |
{
|
| 23 | 23 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(CircleControl), new FrameworkPropertyMetadata(typeof(CircleControl))); |
| 24 | 24 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 25 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 26 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 27 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 25 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 26 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 27 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 28 | 28 |
} |
| 29 | 29 |
|
| 30 | 30 |
#region Dependency Properties |
| ... | ... | |
| 349 | 349 |
} |
| 350 | 350 |
public void Dispose() |
| 351 | 351 |
{
|
| 352 |
GC.Collect(); |
|
| 353 |
GC.SuppressFinalize(this); |
|
| 352 |
//GC.Collect(); |
|
| 353 |
//GC.SuppressFinalize(this); |
|
| 354 |
this.Base_CirclePath = null; |
|
| 354 | 355 |
} |
| 355 | 356 |
|
| 356 | 357 |
public event PropertyChangedEventHandler PropertyChanged; |
| MarkupToPDF/Controls/Shape/RectCloudControl.cs | ||
|---|---|---|
| 36 | 36 |
{
|
| 37 | 37 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(RectCloudControl), new FrameworkPropertyMetadata(typeof(RectCloudControl))); |
| 38 | 38 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 39 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 40 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 41 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 39 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 40 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 41 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
#region Dependency Properties |
| ... | ... | |
| 358 | 358 |
} |
| 359 | 359 |
public void Dispose() |
| 360 | 360 |
{
|
| 361 |
GC.Collect(); |
|
| 362 |
GC.SuppressFinalize(this); |
|
| 361 |
//GC.Collect(); |
|
| 362 |
//GC.SuppressFinalize(this); |
|
| 363 |
this.Base_ArcPath = null; |
|
| 364 |
this.Base_BodyPath = null; |
|
| 363 | 365 |
} |
| 364 | 366 |
|
| 365 | 367 |
public static void IsSelectedChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) |
| MarkupToPDF/Controls/Shape/RectangleControl.cs | ||
|---|---|---|
| 505 | 505 |
static RectangleControl() |
| 506 | 506 |
{
|
| 507 | 507 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(RectangleControl), new FrameworkPropertyMetadata(typeof(RectangleControl))); |
| 508 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 509 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 510 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 508 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 509 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 510 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 511 | 511 |
} |
| 512 | 512 |
|
| 513 | 513 |
|
| ... | ... | |
| 698 | 698 |
|
| 699 | 699 |
public void Dispose() |
| 700 | 700 |
{
|
| 701 |
GC.Collect(); |
|
| 702 |
GC.SuppressFinalize(this); |
|
| 701 |
//GC.Collect(); |
|
| 702 |
//GC.SuppressFinalize(this); |
|
| 703 |
this.Base_RectPath = null; |
|
| 703 | 704 |
} |
| 704 | 705 |
#endregion Internal Method |
| 705 | 706 |
} |
| MarkupToPDF/Controls/Shape/TriControl.cs | ||
|---|---|---|
| 30 | 30 |
static TriControl() |
| 31 | 31 |
{
|
| 32 | 32 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(TriControl), new FrameworkPropertyMetadata(typeof(TriControl))); |
| 33 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 34 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 33 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 34 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 35 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
#region Dependency Properties |
| ... | ... | |
| 380 | 380 |
} |
| 381 | 381 |
public void Dispose() |
| 382 | 382 |
{
|
| 383 |
GC.Collect(); |
|
| 384 |
GC.SuppressFinalize(this); |
|
| 383 |
//GC.Collect(); |
|
| 384 |
//GC.SuppressFinalize(this); |
|
| 385 |
this.Base_TriPath = null; |
|
| 385 | 386 |
} |
| 386 | 387 |
public event PropertyChangedEventHandler PropertyChanged; |
| 387 | 388 |
protected void OnPropertyChanged(string propName) |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 47 | 47 |
static ArrowTextControl() |
| 48 | 48 |
{
|
| 49 | 49 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ArrowTextControl), new FrameworkPropertyMetadata(typeof(ArrowTextControl))); |
| 50 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 51 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 52 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 50 |
//ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 51 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 52 |
//if(!Application.Current.Resources.MergedDictionaries.Any(x=>x.Source == dictionary.Source)) |
|
| 53 |
// Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 53 | 54 |
} |
| 54 | 55 |
|
| 55 | 56 |
public ArrowTextControl() |
| 56 | 57 |
{
|
| 57 |
this.DefaultStyleKey = typeof(ArrowTextControl); |
|
| 58 |
//this.DefaultStyleKey = typeof(ArrowTextControl);
|
|
| 58 | 59 |
} |
| 59 | 60 |
|
| 60 | 61 |
public override void OnApplyTemplate() |
| ... | ... | |
| 1703 | 1704 |
#region Dispose |
| 1704 | 1705 |
public void Dispose() |
| 1705 | 1706 |
{
|
| 1706 |
GC.Collect(); |
|
| 1707 |
GC.SuppressFinalize(this); |
|
| 1707 |
//GC.Collect(); |
|
| 1708 |
//GC.SuppressFinalize(this); |
|
| 1709 |
this.BaseTextbox_Caret = null; |
|
| 1710 |
this.Base_ArrowPath = null; |
|
| 1711 |
this.Base_ArrowSubPath = null; |
|
| 1712 |
this.Base_TextBlock = null; |
|
| 1713 |
this.Base_TextBox = null; |
|
| 1708 | 1714 |
} |
| 1709 | 1715 |
#endregion |
| 1710 | 1716 |
|
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 61 | 61 |
|
| 62 | 62 |
public TextControl() |
| 63 | 63 |
{
|
| 64 |
this.DefaultStyleKey = typeof(TextControl); |
|
| 64 |
//this.DefaultStyleKey = typeof(TextControl);
|
|
| 65 | 65 |
} |
| 66 | 66 |
|
| 67 | 67 |
static TextControl() |
| 68 | 68 |
{
|
| 69 | 69 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(TextControl), new FrameworkPropertyMetadata(typeof(TextControl))); |
| 70 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 71 |
dictionary.Source = new Uri("/MarkupToPDF;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 72 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 70 |
//ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 71 |
//dictionary.Source = new Uri("/MarkupToPDF;component/Themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 72 |
//if (!Application.Current.Resources.MergedDictionaries.Any(x => x.Source == dictionary.Source)) |
|
| 73 |
// Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 73 | 74 |
|
| 74 | 75 |
} |
| 75 | 76 |
|
| ... | ... | |
| 306 | 307 |
|
| 307 | 308 |
public void Dispose() |
| 308 | 309 |
{
|
| 309 |
GC.Collect(); |
|
| 310 |
GC.SuppressFinalize(this); |
|
| 310 |
//GC.Collect(); |
|
| 311 |
//GC.SuppressFinalize(this); |
|
| 312 |
this.Base_Border = null; |
|
| 313 |
this.Base_Canvas = null; |
|
| 314 |
this.Base_Grid = null; |
|
| 315 |
this.Base_TextBlock = null; |
|
| 316 |
this.Base_TextBox = null; |
|
| 311 | 317 |
} |
| 312 | 318 |
|
| 313 | 319 |
public override void UpdateControl() |
내보내기 Unified diff
