/ - Diff - MARKUS - 일정관리

ConvertService/ServiceBase/Markus.Service.Convert/ConvertService.cs
193	193	string msg = $"ConvertService Error {saveitem.SavePath} Delete Error";
194	194	logger.Error(msg);
195	195	result.StatusCode = StatusCodeType.FileError;
196		result.Message = msg;
	196	result.Message = LogHelper.GetStack() + " " +LogHelper.GetStack() + " " + msg;
197	197
198	198	return result;
199	199	}
...	...
231	231	\|\| Directory.EnumerateFiles(saveitem.SavePath, "*.jpg").Count() != saveitem.TotalPages))
232	232	{
233	233	result.StatusCode = StatusCodeType.PageError;
234		result.Message = "Page Count Error";
	234	result.Message = LogHelper.GetStack() + " " +"Page Count Error";
235	235	ReConvert = 1;
236	236
237	237	result = ConvertBigFileProcess(saveitem);
...	...
264	264	else
265	265	{
266	266	result.StatusCode = StatusCodeType.FileError;
267		result.Message = $"Doc Set Error. {result.Message}";
	267	result.Message = LogHelper.GetStack() + " " + $"Doc Set Error. {result.Message}";
268	268	}
269	269	}
270	270	else
271	271	{
272	272	result.StatusCode = StatusCodeType.FileError;
273		result.Message = $"Page List Get Error. {result.Message} ";
	273	result.Message = LogHelper.GetStack() + " " +$"Page List Get Error. {result.Message} ";
274	274	}
275	275	}
276	276	else
...	...
281	281	}
282	282	catch (Exception ex)
283	283	{
284		result.Message = "ConvertService Convert Error" + ex.Message;
	284	result.Message = LogHelper.GetStack() + " " +"ConvertService Convert Error" + ex.Message;
285	285	result.StatusCode = StatusCodeType.Error;
286	286
287	287	logger.Error(ex);
...	...
366	366	await webClient.DownloadFileTaskAsync(pdfFileUri, downloadFilePath);
367	367	webClient.Dispose();
368	368	}
	369
	370	await Task.Delay(300);
369	371	}
370	372	catch (Exception ex)
371	373	{
...	...
467	469	gMarkusPDF = new MarkusPDF();
468	470	gMarkusPDF.pdfLoad(saveitem.PdfFilePath, saveitem.MinimumFontSize, saveitem.UseResolution);
469	471	}
	472
470	473	System.Threading.Thread.SpinWait(2);
471	474	}
472	475	}
473	476	catch (Exception ex)
474	477	{
475	478	result.StatusCode = StatusCodeType.PageError;
476		result.Message = "Save Error - " + ex.Message;
	479	result.Message = LogHelper.GetStack() + " " +"Save Error - " + ex.Message;
477	480
478	481	if (gMarkusPDF != null)
479	482	{
...	...
497	500	catch (Exception ex)
498	501	{
499	502	result.StatusCode = StatusCodeType.Error;
500		result.Message = ex.Message;
	503	result.Message = LogHelper.GetStack() + " " +ex.Message;
501	504	}
502	505
503	506	return result;

     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Linq;
     using System.Text;
     using System.Threading.Tasks;
     namespace Markus.Service.Helper
+    {
         public static class LogHelper
+        {
             public static string GetStack()
+            {
                 StackFrame stackFrame = new StackFrame(1, true);
                 string fileName = stackFrame.GetFileName();
                 string methodName = stackFrame.GetMethod().ToString();
                 int lineNumber = stackFrame.GetFileLineNumber();
                return $"{methodName} {System.IO.Path.GetFileName(fileName)} Line:{lineNumber}";
+            }
+        }
+    }

ConvertService/ServiceBase/Markus.Service.Extensions/Markus.Service.Extensions.csproj
68	68	<ItemGroup>
69	69	<Compile Include="Exntensions\CollectionExtenstions.cs" />
70	70	<Compile Include="Exntensions\GenericPluginLoader.cs" />
	71	<Compile Include="Helper\LogHelper.cs" />
71	72	<Compile Include="Exntensions\Sytem.IO.cs" />
72	73	<Compile Include="Exntensions\SytemNet.cs" />
73	74	<Compile Include="Helper\Compress.cs" />

ConvertService/ServiceBase/ServiceTestApp/MainWindow.xaml
78	78	<Button Grid.Row="6" Content="Get Confing Section Test" Click="ConfingSectionTest_click"/>
79	79	<Button Grid.Row="7" Content="PEMSS PlugIn Test" Click="PemssPluginTest_click"/>
80	80	<Button Grid.Row="8" Content="Monitor Service Test" Click="MonitorTest_Click"/>
	81	<Button Grid.Row="9" Content="Get Stack Test" Click="GetStackTest_Click"/>
81	82	</Grid>
82	83	</Grid>
83	84	<Grid Grid.Row="3" Margin="0,10">

ConvertService/ServiceBase/ServiceTestApp/MainWindow.xaml.cs
817	817
818	818	return builder.ToString();
819	819	}
	820
	821	private void GetStackTest_Click(object sender, RoutedEventArgs e)
	822	{
	823	System.Windows.MessageBox.Show(LogHelper.GetStack());
	824	}
820	825	}
821	826
822	827

                         foreach (var item in newList)
+                        {
                             Color _color = Common.Converter.StringToColorConverter.Parse(item.DisplayColor);
                             _color.A = (byte)90;
                             _color.A = 0x5A;
                             GradientStop _stop = new GradientStop { Color = _color, Offset = _offset };
                             _offset = 1.0 / (double)(newList.Count()) * _count; /// 색을 분리하기 위해서
                             GradientStop _stop2 = new GradientStop { Color = _color, Offset = _offset };

     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Net;
     using System.Text;
     using System.Threading.Tasks;
     using System.Windows;
     using System.Windows.Data;
     namespace KCOM.Common
+    {
         public class ImageAsyncHelper : DependencyObject
+        {
             public static Uri GetSourceUri(DependencyObject obj) { return (Uri)obj.GetValue(SourceUriProperty); }
             public static void SetSourceUri(DependencyObject obj, Uri value) { obj.SetValue(SourceUriProperty, value); }
             public static readonly DependencyProperty SourceUriProperty = DependencyProperty.RegisterAttached("SourceUri", typeof(Uri), typeof(ImageAsyncHelper), new PropertyMetadata
+            {
                 PropertyChangedCallback = (obj, e) =>
+                {
                     //if (((System.Windows.Controls.Image)obj).Source == null)
                     //{
                         System.Diagnostics.Debug.WriteLine(e.NewValue);
                         ((System.Windows.Controls.Image)obj).SetBinding(System.Windows.Controls.Image.SourceProperty,
                             new Binding("VerifiedUri")
+                            {
                                 Source = new ImageAsyncHelper { GivenUri = (Uri)e.NewValue },
                                 IsAsync = true,
                             });
                     //}
+                }
             });
             Uri GivenUri;
             public Uri VerifiedUri
+            {
                 get
+                {
                     try
+                    {
                         //Dns.GetHostEntry(GivenUri.DnsSafeHost);
                         return GivenUri;
+                    }
                     catch (Exception)
+                    {
                         return null;
+                    }
+                }
+            }
+        }
+    }

KCOM/Common/InitData.cs
50	50	}
51	51	}
52	52	comboFontFamily.ItemsSource = fontSet.ToList();
	53
	54	if (KCOM.Properties.Settings.Default.FontFamily != null)
	55	{
	56	comboFontFamily.SelectedItem = KCOM.Properties.Settings.Default.FontFamily;
	57	}
53	58	}
54	59
55	60	/// <summary>

                 </Grid>
             </ControlTemplate>
             <DataTemplate x:Key="CommentSelectTemplate">
                 <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" telerik:StyleManager.Theme="Windows8">
                 <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" telerik:StyleManager.Theme="Windows8"
                           Command="{Binding SelectCommentCommand, ElementName=userControl, Mode=OneWay}">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="{Binding Depart}" />
                         <TextBlock Text="/" />
-...
                                             ItemContainerStyle="{StaticResource ItemContainerStyle}"
                                             BorderBrush="#FFC2C2C2" BorderThickness="0"
                                             SelectedIndex="0"
                                              VirtualizingStackPanel.VirtualizationMode="Recycling"
                                             VirtualizingStackPanel.IsVirtualizing="True"
                                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                             ScrollViewer.VerticalScrollBarVisibility="Auto"
                                             ScrollViewer.VerticalScrollBarVisibility="Auto"
                                             ScrollViewer.CanContentScroll="True"
                                             telerik:StyleManager.Theme="Office2016"
                                             ItemsSource="{Binding FilteredThumbnail.View, ElementName=userControl}" >
                                             ItemsSource="{Binding FilteredThumbnail.View, ElementName=userControl}">
                             <!--<telerik:RadListBox.ItemsPanel>
                                 <ItemsPanelTemplate>
                                     <VirtualizingStackPanel/>
-...
                                                     <Border.RenderTransform>
                                                         <RotateTransform Angle="{Binding Angle, Mode=TwoWay}"/>
                                                     </Border.RenderTransform>
                                                     <Image Stretch="Uniform" Source="{Binding ImageUri,IsAsync=True}"/>
                                                     <Image Stretch="Uniform" common:ImageAsyncHelper.SourceUri="{Binding ImageUri}"/>
                                                 </Border>
                                             </Grid>
                                             <TextBlock Grid.Row="1" Text="{Binding PageNumber, FallbackValue=PageNo}" FontStyle="Italic" FontSize="14" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>

+        {
             public List<FAVORITE_DOC> _FavoriteSet { get; set; }
             public event PropertyChangedEventHandler PropertyChanged;
             public DelegateCommand SelectCommentCommand { get; private set; }
             //PageManager.PageStorage samplePageStorage;
-...
                 if(!_Initialize)
+                {
                     _Initialize = true;
                     SelectCommentCommand = new DelegateCommand(SetCommentPages);
                     this.SizeChanged += Sample_SizeChanged;
                     this.lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged);
                     this.ImgListbox.SelectionChanged += new SelectionChangedEventHandler(ImgListbox_SelectionChanged);
-...
             public event EventHandler<PageChangeEventArgs> PageChanged;
             public event EventHandler<PageChangeEventArgs> PageChanging;
             private List<UsersCommentPagesMember> _UsersCommentPagesList;
             private ObservableCollection<UsersCommentPagesMember> _UsersCommentPagesList;
             public List<UsersCommentPagesMember> UsersCommentPagesList
             public ObservableCollection<UsersCommentPagesMember> UsersCommentPagesList
+            {
                 get {
                     if(_UsersCommentPagesList == null)
+                    {
                         _UsersCommentPagesList = new List<UsersCommentPagesMember>();
                         _UsersCommentPagesList = new ObservableCollection<UsersCommentPagesMember>();
+                    }
                     return _UsersCommentPagesList; }
-...
+            {
                 SetCommentPages();
+            }
             void user_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+            {
                 SetCommentPages();
                 //System.Diagnostics.Debug.WriteLine(e.PropertyName);
+            }
             public async void SetCommentPages()
             public async void SetCommentPages(object obj = null)
+            {
                 await this.Dispatcher.InvokeAsync(() => ThumbnailSetAsync());
+            }
-...
                 UsersCommentPagesList.ForEach(user =>
+                {
                     user.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
                     user.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
                     //user.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
                     //user.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
                     var _commLst = this.UsersCommentPagesList.Where(o => o.MarkupInfoID == user.MarkupInfoID);
-...
                 Logger.sendCheckLog("SetCommentList_SelectComment.ItemsSource 설정", 1);
                 var data = UsersCommentPagesList.OrderByDescending(p => p.isConSolidation == Convert.ToInt32(true)).ToList();
                 if (data.Count() != 0)
+                {
                     if (Convert.ToBoolean(data.First().isConSolidation))
-...
                         data.Where(p => p.isConSolidation == Convert.ToInt32(true)).FirstOrDefault().Depart = "";
                         this.lstSelectComment.ItemsSource = data;
+                    }
                     else
+                    {
                         this.lstSelectComment.ItemsSource = this.UsersCommentPagesList;  //섬네일
+                    }
+                }
                 else
+                {
                     this.lstSelectComment.ItemsSource = this.UsersCommentPagesList;  //섬네일
+                }
                 this.lstSelectComment.ItemsSource = this.UsersCommentPagesList;  //섬네일
                 Logger.sendCheckLog("SetComme6ntList_ImgListbox 설정", 1);
-...
                     var items = from page in pageList
                                 let pageLink = uri.Replace("{PageNo}", page.PAGE_NUMBER.ToString())
                                 orderby page.PAGE_NUMBER
                                 select new ThumbnailItem
+                                {
                                     ImageUri = new Uri(pageLink),
-...
                     _thumbnailItems = new ObservableCollection<ThumbnailItem>(items);
                     FilteredThumbnail = new CollectionViewSource();
                     FilteredThumbnail.SortDescriptions.Add(new SortDescription { Direction = ListSortDirection.Ascending, PropertyName = "PageNumber" });
                     FilteredThumbnail.Source = _thumbnailItems;
                     FilterPages = _thumbnailItems.Select(x=>x.PageNumber).ToList();

KCOM/Controls/SearchPanel.xaml.cs
264	264	if (btnSearch.Content.ToString() == _strCancel)
265	265	{
266	266	IsCancelWork = true;
	267	worker.CancelAsync();
267	268	}
268	269
269	270	if (!worker.IsBusy)

KCOM/Events/Implementation/TopMenuEvent.cs
84	84	}
85	85	}
86	86
	87	/// <summary>
	88	/// comment의 속성 변경시 저장여부 확인 하도록 undocommand에 추가
	89	/// </summary>
	90	/// <param name="adnoerFinal"></param>
	91	public void ChangeComment(Controls.AdornerFinal adnoerFinal)
	92	{
	93	var adornerMembers = adnoerFinal.Members.Cast<Controls.AdornerMember>();
	94
	95	if (adornerMembers.Count() > 0)
	96	{
	97	UndoCommand.Instance.Push(adornerMembers.Select(x => x.DrawingData).Cast<CommentUserInfo>().ToList(), adnoerFinal.AngleValue);
	98	}
	99	}
	100
87	101	//강인구 추가(Undo End)
88	102	private void SetPaintEvent()
89	103	{
...	...
350	364	ViewerDataModel.Instance._markupInfoList.Where(data => data.MarkupInfoID == (item as IKCOM.MarkupInfoItem).MarkupInfoID).FirstOrDefault().UpdateTime = DateTime.Now;
351	365	if (!ViewerDataModel.Instance.IsConsolidate && (sender != null))
352	366	{
353		this.ParentOfType<MainWindow>().DialogMessage_Alert("Save 가 완료되었습니다.", "Alert");
	367	this.ParentOfType<MainWindow>().DialogMessage_Alert("Save is complete.", "Info");
354	368	}
355	369	}
356	370	}
...	...
1129	1143	break;
1130	1144	}
1131	1145	}
	1146
	1147	ChangeComment(item as Controls.AdornerFinal);
1132	1148	}
1133	1149	}
1134	1150	}
1135	1151	}
	1152
1136	1153	KCOM.Properties.Settings.Default.TextSize = (double)comboFontSize.Value;
1137	1154	Properties.Settings.Default.Save();
1138	1155	}
...	...
1140	1157	//강인구 추가
1141	1158	private void RadRibbonComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
1142	1159	{
1143		if (this.ParentOfType<MainWindow>() != null)
	1160	if (this.ParentOfType<MainWindow>()?.dzMainMenu.SelectLayer.Children.Count > 0)
1144	1161	{
1145		if (this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children.Count > 0)
	1162	foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children)
1146	1163	{
1147		foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children)
	1164	if (item.GetType().Name == "AdornerFinal")
1148	1165	{
1149		if (item.GetType().Name == "AdornerFinal")
	1166	var adnoerFinal = (item as Controls.AdornerFinal);
	1167
	1168	var adornerMembers = adnoerFinal.Members.Cast<Controls.AdornerMember>();
	1169
	1170	foreach (var InnerItem in adornerMembers)
1150	1171	{
1151		foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>())
	1172	switch (InnerItem.DrawingData.GetType().Name)
1152	1173	{
1153		switch (InnerItem.DrawingData.GetType().Name)
1154		{
1155		case ("TextControl"):
1156		{
1157		//if ((InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).FontFamily == TextDecorations.Underline)
1158		//{
1159		(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).SetFontFamily(new FontFamily(comboFontFamily.Text));
1160		//(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).Base_TextBlock.FontFamily = new FontFamily(comboFontFamily.Text);
1161		//(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).Base_TextBox.FontFamily = new FontFamily(comboFontFamily.Text);
1162		//(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).TextFamily = new FontFamily(comboFontFamily.Text);
1163		//}
1164		//else
1165		//{
1166		// (InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).UnderLine = TextDecorations.Underline;
1167		//}
1168		}
1169		break;
1170		case ("ArrowTextControl"):
1171		{
1172		(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).SetFontFamily(new FontFamily(comboFontFamily.Text));
1173		//if ((InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).UnderLine == TextDecorations.Underline)
1174		//{
1175		// (InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).UnderLine = null;
1176		//}
1177		//else
1178		//{
1179		// (InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).UnderLine = TextDecorations.Underline;
1180		//}
1181		}
	1174	case ("TextControl"):
	1175	(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).SetFontFamily(new FontFamily(comboFontFamily.Text));
1182	1176	break;
1183		}
	1177	case ("ArrowTextControl"):
	1178	(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).SetFontFamily(new FontFamily(comboFontFamily.Text));
	1179	break;
1184	1180	}
1185	1181	}
	1182
	1183	ChangeComment(adnoerFinal);
1186	1184	}
1187	1185	}
1188	1186	}
	1187
	1188	KCOM.Properties.Settings.Default.FontFamily = comboFontFamily.Text;
	1189	Properties.Settings.Default.Save();
1189	1190	}
1190	1191
	1192
1191	1193	/// <summary>
1192	1194	/// 텍스트 컨트롤 하일라이트 처리
1193	1195	/// </summary>

KCOM/KCOM.csproj
424	424	<Compile Include="Common\Converter\SvgConverter.cs" />
425	425	<Compile Include="Common\Converter\SvgImageConverter.cs" />
426	426	<Compile Include="Common\FileStreamToBase64.cs" />
	427	<Compile Include="Common\ImageAsyncHelper.cs" />
427	428	<Compile Include="Common\ImageSourceHelper.cs" />
428	429	<Compile Include="Common\ISplashMessage.cs" />
429	430	<Compile Include="Common\MarkupUserInfo.cs" />

KCOM/Properties/Settings.Designer.cs
261	261	this["cad"] = value;
262	262	}
263	263	}
	264
	265	[global::System.Configuration.UserScopedSettingAttribute()]
	266	[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
	267	[global::System.Configuration.DefaultSettingValueAttribute("")]
	268	public string FontFamily {
	269	get {
	270	return ((string)(this["FontFamily"]));
	271	}
	272	set {
	273	this["FontFamily"] = value;
	274	}
	275	}
264	276	}
265	277	}

         <Setting Name="cad" Type="System.Int32" Scope="User">
           <Value Profile="(Default)">0</Value>
         </Setting>
         <Setting Name="FontFamily" Type="System.String" Scope="User">
           <Value Profile="(Default)" />
         </Setting>
       </Settings>
     </SettingsFile>

                         <telerik:RadOrderedWrapPanel>
                             <StackPanel Orientation="Horizontal">
                                 <telerik:RadRibbonComboBox Width="60" Name="comboFontFamily" SelectedIndex="0" telerik:ScreenTip.Title="Font" telerik:ScreenTip.Description="Change the font face."
                                                            SelectionChanged="RadRibbonComboBox_SelectionChanged"
                                 <telerik:RadRibbonComboBox Width="60" Name="comboFontFamily" SelectedIndex="0" telerik:ScreenTip.Title="Font"
                                                            telerik:ScreenTip.Description="Change the font face."
                                                            IsEditable="False"/>
                                 <telerik:RadNumericUpDown x:Name="comboFontSize"
                                                           Width="35"

KCOM/Views/TopMenu.xaml.cs
36	36	{
37	37	if(!_Initialize)
38	38	{
	39	InitDataSet();
	40
39	41	_Initialize = true;
40	42
41		InitDataSet();
	43	comboFontFamily.SelectionChanged += RadRibbonComboBox_SelectionChanged;
	44
42	45	if (!App.ViewInfo.CreateFinalPDFPermission && !App.ViewInfo.NewCommentPermission)
43	46	{
44	47	SAVE.Visibility = Visibility.Collapsed;

           <setting name="cad" serializeAs="String">
             <value>0</value>
           </setting>
           <setting name="FontFamily" serializeAs="String">
             <value />
           </setting>
         </KCOM.Properties.Settings>
       </userSettings>
       <system.serviceModel>

ID	c5519c446633f637b8f6a207f8ae0e0421def066
상위	83df6f8f
하위	7b095cc3

프로젝트

일반

사용자정보

MARKUS

개정판 c5519c44