/ - Diff - MARKUS - 일정관리

개정판 86bff326

ID	86bff326fb25f02d809b59ae6219c9eeb230e0c9
상위	285635d3
하위	1e901a8d

김태성이(가) 약 5년 전에 추가함

- pdf export 수정

Change-Id: I44d70e1a8adce8d9b1dcaa92958594d1780fa02f

         xmlns:wrappanel ="clr-namespace:KCOM.WrapPanel"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         xmlns:converter="clr-namespace:KCOM.Common.Converter"
         xmlns:telInput="clr-namespace:Telerik.Windows.Controls;assembly=Telerik.Windows.Controls.Input"
         xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
         xmlns:telerikGrid="clr-namespace:Telerik.Windows.Controls.GridView;assembly=Telerik.Windows.Controls.GridView"
         d:DesignHeight="550" d:DesignWidth="650">
         <UserControl.Resources>
             <converter:BoolToVisibleConverter x:Key="BoolToVisibleConverter" />
             <Style TargetType="telerik:GridViewCell" x:Key="GridViewCellCenterStyle">
                 <Setter Property="HorizontalAlignment" Value="Center"/>
             </Style>
-...
                     </Border>
                 </Grid>
             </Border>
             <telerik:RadBusyIndicator x:Name="printIndy"
             <telerik:RadBusyIndicator x:Name="printIndy"  Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibleConverter}, RelativeSource={RelativeSource Self}}"
                                               Grid.Row="1"
                                               Grid.ColumnSpan="2"
                                               VerticalAlignment="Stretch"
                                               BorderThickness="0"
                                               BusyContent="Printing. . ."
                                               IsBusy="False"
                                               telerik:StyleManager.Theme="Office2016" />
                                               telerik:StyleManager.Theme="Office2016" DisplayAfter="0:0:0.3" />
         </Grid>
     </UserControl>

     using iTextSharp.text.pdf;
     using Microsoft.Office.Core;
     using System.Net;
     using Image = System.Windows.Controls.Image;
     namespace KCOM.Control
+    {
         public class DefinedPages
+        {
             public DOCINFO DocumentInfo { get; set; }
             public int PagesCount { get; set; }
             public string vpSlip { get; set; }
             public string vpTitle { get; set; }
             public string fileUrl { get; set; }
             public ImageBrush Back_Image { get; set; }
             public double CurrentValue { get; set; }
             string _DefinedPagesStrings;
             /// <summary>
             /// 사용자 정의 페이지를 입력시 오류를 방지하기 위해 적용
-...
                     chkOnlyMarkup.IsChecked = false;
                 this.CurrentPageNo = _StartPageNo;
                 _definePages = new DefinedPages { DefinedPagesStrings = "", PagesCount = Convert.ToInt32(this._DocInfo.PAGE_COUNT), vpSlip = slip, vpTitle = title, fileUrl = fileurl };
                 _definePages = new DefinedPages { DefinedPagesStrings = "", DocumentInfo = this._DocInfo
                                 , PagesCount = Convert.ToInt32(this._DocInfo.PAGE_COUNT), vpSlip = slip, vpTitle = title, fileUrl = fileurl };
                 DocumentInfo = _definePages;
                 this.DataContext = _definePages;
-...
+                {
                     gridViewMarkup.SelectedItems.Add(item);
+                }
                 PageChanged(_StartPageNo);
                 PageChangeAsync(_StartPageNo).ConfigureAwait(true);
                 sliderPages.Maximum = Convert.ToDouble(this._DocInfo.PAGE_COUNT);
                 this.stPageNo.Maximum = Convert.ToDouble(this._DocInfo.PAGE_COUNT);
-...
             private void _Timer_Elapsed(object sender, ElapsedEventArgs e)
+            {
                 timm.Enabled = false;
                 PageChanged(_StartPageNo);
                 PageChangeAsync(_StartPageNo);
+            }
             #endregion
             #region Control Event
             private void sliderPages_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
             private async void sliderPages_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+            {
                 if (_initializeComponentFinished)
+                {
                     if (!_IsDagSlider)
+                    {
                         this.CurrentPageNo = (int)this.sliderPages.Value;
                         PageChanged(this.CurrentPageNo);
                         await PageChangeAsync(this.CurrentPageNo);
                         if (_ButtonName == "Current")
+                        {
-...
+                }
+            }
             private void sliderPages_DragCompleted(object sender, RadDragCompletedEventArgs e)
             private async void sliderPages_DragCompleted(object sender, RadDragCompletedEventArgs e)
+            {
                 _IsDagSlider = false;
                 this.CurrentPageNo = (int)this.sliderPages.Value;
                 if (_initializeComponentFinished)
+                {
                     PageChanged(this.CurrentPageNo);
                     await PageChangeAsync(this.CurrentPageNo);
+                }
+            }
-...
                         this.CurrentPageNo = (CommentPageList.SelectedItem as MarkupPageItem).PageNumber;
+            }
             private void gridViewMarkup_SelectionChanged(object sender, SelectionChangeEventArgs e)
             private async void gridViewMarkup_SelectionChanged(object sender, SelectionChangeEventArgs e)
+            {
                 if (_initializeComponentFinished)
+                {
                     PageChanged(this.CurrentPageNo);
                     await PageChangeAsync(this.CurrentPageNo);
+                }
+            }
             #endregion
             public void PageChanged(int PageNo, bool Flag = false)
             public async System.Threading.Tasks.Task<bool> PageChangeAsync(int PageNo, bool Flag = false)
+            {
                 Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate
                 bool result = false;
                 //Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate
                 //{
                 try
+                {
                     try
                     Load load = new Load();
                     _definePages.Back_Image = new ImageBrush();
                     //var defaultBitmapImage = new BitmapImage(new Uri(_DefaultTileUri + PageNo + ".png"));
                     var pages = _definePages.DocumentInfo.DOCPAGE.Where(x => x.PAGE_NUMBER == PageNo);
                     if(pages.Count() > 0)
+                    {
                         Load load = new Load();
                         var currentPage = pages.First();
                         _definePages.Back_Image = new ImageBrush();
                         //var defaultBitmapImage = new BitmapImage(new Uri(_DefaultTileUri + PageNo + ".png"));
                         var buffer = new WebClient().DownloadData(_DefaultTileUri + PageNo + ".png");
                         var bitmap = new BitmapImage();
                         using (var stream = new MemoryStream(buffer))
+                        {
                             bitmap.BeginInit();
                             bitmap.CacheOption = BitmapCacheOption.OnLoad;
                             bitmap.StreamSource = stream;
                             bitmap.EndInit();
                         //var buffer = await new WebClient().DownloadDataTaskAsync(_DefaultTileUri + PageNo + ".png");
                         //var bitmap = new BitmapImage();
                         //using (var stream = new MemoryStream(buffer))
                         //{
                             //bitmap.BeginInit();
                             //bitmap.CacheOption = BitmapCacheOption.OnLoad;
                             //bitmap.StreamSource = stream;
                             //bitmap.EndInit();
                             printCanvas.Children.Clear();
                             var bitmapframe = await  App.PageStorage.GetPageAsync(PageNo);
                             Image bitmap = new Image();
                             ImageBrush background = new ImageBrush(bitmap);
                             printCanvas.Background = background;
                             bitmap.Source = bitmapframe;
                             printCanvas.Children.Add(bitmap);
                             //ImageBrush background = new ImageBrush(bitmap);
                             //printCanvas.Background = background;
                             printCanvas.Background = new SolidColorBrush(Colors.Transparent);
                             iTextSharp.text.Image image = iTextSharp.text.Image.GetInstance(new Uri(_DefaultTileUri + PageNo + ".png"));
                             printCanvas.Width = image.Width;
                             printCanvas.Height = image.Height;
                             printCanvas.Width = Convert.ToDouble(currentPage.PAGE_WIDTH);
                             printCanvas.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT);
                             foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>())
+                            {
-...
                                 load.Page_No = PageNo;
                                 load.DisplayColor = info.DisplayColor;
                                 load.Markupinfoid = info.MarkupInfoID;
                                 load.Markup_Load(printCanvas);
                                 await load.Markup_LoadAsync(printCanvas);
+                            }
                             printCanvas.UpdateLayout();
                             if (Flag)
+                            {
                                 //MemoryStream ms = new MemoryStream();
                                 //BmpBitmapEncoder bbe = new BmpBitmapEncoder();
                                 //bbe.Frames.Add(BitmapFrame.Create(new Uri(_DefaultTileUri + PageNo + ".png")));
                                 //bbe.Save(ms);
                                 //System.Drawing.Image.FromFile()
                                 Printimg = System.Drawing.Image.FromStream(stream);
                                 //Printimg = System.Drawing.Image.FromStream(stream);
                                 Export export = new Export();
                                 p_img = export.Exporting(printCanvas, Printimg);
                                 p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height);
                                 Printimg_List.Add(Printimg_List.Count() + 1, p_img);
+                            }
+                        }
+                    }
                     catch (Exception ex)
+                    {
                         Logger.sendResLog("PrintControl.PageChanged", ex.Message, 0);
+                    }
                 }));
                             result = true;
                         //}
+                    }
+                }
                 catch (Exception ex)
+                {
                     Logger.sendResLog("PrintControl.PageChanged", ex.Message, 0);
+                }
                 return result;
                 //}));
+            }
             public static MemoryStream ByteBufferFromImage(BitmapImage imageSource)
+            {
-...
+            }
             //Print 버튼 클릭 이벤트
             #region Method - 명령
             void PrintMethod(object sender, RoutedEventArgs e)
             async void PrintMethod(object sender, RoutedEventArgs e)
+            {
                 try
+                {
                     if (this.printIndy.IsBusy == true)
                         return;
                     System.Threading.Tasks.Task.Factory.StartNew(() =>
+                    {
                         Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate
+                        {
                     await this.Dispatcher.InvokeAsync(() => {
                             this.printIndy.IsBusy = true;
                             printIndy.BusyContent = "Printing. . .";
                         }));
                     });
-...
                         this.printIndy.IsBusy = false;
                         return;
+                    }
                     int cnt = 0;
                     List<System.Threading.Tasks.Task> tasks = new List<System.Threading.Tasks.Task>();
                     Printimg_List = new Dictionary<int, System.Drawing.Image>();
-...
+                    {
                         cnt++;
                         sliderPages.Value = PageNo;
                         PageChanged(PageNo, true);
                         await PageChangeAsync(PageNo, true);
                         //PageChanged(cnt, true);
+                    }
                     PrintName = cbPrint.SelectedItem.ToString();
                     System.Threading.Tasks.Task.Factory.StartNew(() =>
+                    {
                     await this.Dispatcher.InvokeAsync(() => {
                         if (cnt == _lstPrintPageNo.Count)
+                        {
                             Printing();
-...
+            }
             //Export 버튼 클릭 이벤트
             void ExportMethod(object sender, RoutedEventArgs e)
             async void ExportMethod(object sender, RoutedEventArgs e)
+            {
                 try
+                {
-...
                         foreach (int PageNo in _lstPrintPageNo)
+                        {
                             sliderPages.Value = PageNo;
                             PageChanged(PageNo, true);
                             await PageChangeAsync(PageNo, true);
+                        }
                         //using (FileStream fs = new FileStream(@"D:\Temp\Text.pdf", FileMode.OpenOrCreate, FileAccess.Write, FileShare.None))
-...
                             this.printIndy.IsBusy = false;
                             return;
+                        }
                         Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate
                         await this.Dispatcher.InvokeAsync(() =>
+                        {
                             printIndy.IsBusy = false;
                         }));
                         PageChanged(_StartPageNo);
                         });
                         await PageChangeAsync(_StartPageNo);
                         (Application.Current.MainWindow as MainWindow).dzMainMenu.DialogMessage_Alert("Success", "Alert");
                     }else
-...
+                }
                 catch (Exception ex)
+                {
                     printIndy.IsBusy = false;
                     Logger.sendResLog("Export Method", ex.Message, 0);
                     //(Application.Current.MainWindow as MainWindow).dzMainMenu.DialogMessage_Alert("Alert", "관리자 확인이 필요합니다. 다시 시도해 주세요.\n"+ex.Message);
+                }
-...
             #endregion
             #region 프린트 실행
             public void Printing()
             public async void Printing()
+            {
                 PageChanged(1);
                 await PageChangeAsync(1);
                 if (PrinterSettings.InstalledPrinters != null && PrinterSettings.InstalledPrinters.Count > 0)
+                {
                     printDocument = new PrintDocument();

             #endregion
             //코멘트가 있는 페이지
             public System.Drawing.Image Exporting(Canvas canvas, System.Drawing.Image img)
             public System.Drawing.Image Exporting(Visual visual,double pageWidth,double pageHeight)
+            {
                 BitmapEncoder encoder = new PngBitmapEncoder();
                 RenderTargetBitmap renderBitmap = new RenderTargetBitmap((int)pageWidth, (int)pageHeight, 96d, 96d, PixelFormats.Default);
                 DrawingVisual drawingVisual = new DrawingVisual();
                 using (DrawingContext drawingContext = drawingVisual.RenderOpen())
+                {
                     VisualBrush visualBrush = new VisualBrush(visual);
                     drawingContext.DrawRectangle(visualBrush, null, new System.Windows.Rect(new System.Windows.Point(0,0), new System.Windows.Point(pageWidth, pageHeight)));
+                }
                 renderBitmap.Render(drawingVisual);
                 MemoryStream mystream = new MemoryStream();
                 encoder.Frames.Add(BitmapFrame.Create(renderBitmap));
                 encoder.Save(mystream);
                 System.Drawing.Image myImage;
                 myImage = System.Drawing.Image.FromStream(mystream);
                 //using (Graphics gr = Graphics.FromImage(Resultimg))
                 //{
                 //    //Graphics 객체에 Image 를 그릴때 Rectangle x,y 값을 추가 입력
                 //    gr.DrawImage(myImage, new Rectangle(0,0,img.Width,img.Height));
                 //}
                 //image = RasterImageConverter.ConvertFromImage(Resultimg, ConvertFromImageOptions.None);
                 return myImage;
+            }
             public System.Drawing.Image Exporting_old(Canvas canvas, System.Drawing.Image img)
+            {
                 System.Drawing.Image Resultimg = new System.Drawing.Bitmap(img, img.Width, img.Height);
-...
                 using (Graphics gr = Graphics.FromImage(Resultimg))
+                {
                     //Graphics 객체에 Image 를 그릴때 Rectangle x,y 값을 추가 입력
                     gr.DrawImage(myImage, new Rectangle(0,0,img.Width,img.Height));
                     gr.DrawImage(myImage, new Rectangle(0, 0, img.Width, img.Height));
+                }
                 //image = RasterImageConverter.ConvertFromImage(Resultimg, ConvertFromImageOptions.None);

KCOM/Events/Load.cs
9	9	using KCOMDataModel.Common;
10	10	using System.Windows.Controls;
11	11	using MarkupToPDF.Controls.Parsing;
	12	using System.Threading.Tasks;
12	13	//강인구 추가
13	14	namespace KCOM.Event
14	15	{
...	...
42	43	}
43	44
44	45	//마크업 불러오기
45		public async void Markup_Load(Canvas printCanvas)
	46	public async Task Markup_LoadAsync(Canvas printCanvas)
46	47	{
47	48	List<string> markupdata = new List<string>();
48	49
49	50	Logger.sendReqLog("GetMarkupDataListperPage: ", App.ViewInfo.ProjectNO + "," + Markupinfoid + "," + Page_No, 1);
50		markupdata = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupDataListperPage(App.ViewInfo.ProjectNO, Markupinfoid, Page_No);
	51	markupdata = await Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetMarkupDataListperPageAsync(App.ViewInfo.ProjectNO, Markupinfoid, Page_No);
51	52
52	53	if (markupdata.Count() > 0)
53	54	{

         </sectionGroup>
       </configSections>
       <connectionStrings>
         <!--효성 Connection String-->
         <add name="ConnectionString"
           connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"
           connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
           providerName="System.Data.EntityClient"/>
         <add name="CIConnectionString"
           connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"
           connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
           providerName="System.Data.EntityClient"/>
       </connectionStrings>
       <!--
-...
       <applicationSettings>
         <KCOM_API.Properties.Settings>
           <setting name="TileSoucePath" serializeAs="String">
             <value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
             <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
           </setting>
           <setting name="TileSoucePath_SUB" serializeAs="String">
             <value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
             <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
           </setting>
           <setting name="IsProjectNoPass" serializeAs="String">
             <value>True</value>

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 86bff326