개정판 53deabaf
- markup list 전체 선택 체크박스 추가
- Export 기능 수정
Change-Id: Id37ea925d0296c7bb2115ff00df280b13258f9bd
| KCOM/Controls/PrintControl.xaml | ||
|---|---|---|
| 71 | 71 |
<!--<Border Grid.Row="1" Background="#5F5F5F" MinWidth="200">--> |
| 72 | 72 |
<Border Grid.Row="1" Background="#5F5F5F" MinWidth="200"> |
| 73 | 73 |
<!--잠시 제외 뷰어 부분--> |
| 74 |
<Viewbox x:Name="PrintView" >
|
|
| 74 |
<Viewbox x:Name="PrintView"> |
|
| 75 | 75 |
<!--<Canvas x:Name="printCanvas" Background="{Binding Source={x:Static local:DataModel.Instance}, Path=BackgroundImage, Mode=OneWay}">-->
|
| 76 | 76 |
<!--<Canvas x:Name="printCanvas" Background="{Binding Path=Back_Image}">-->
|
| 77 | 77 |
<Canvas x:Name="printCanvas"> |
| ... | ... | |
| 361 | 361 |
</Border> |
| 362 | 362 |
</Grid> |
| 363 | 363 |
</Border> |
| 364 |
<telerik:RadBusyIndicator x:Name="printIndy" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibleConverter}, RelativeSource={RelativeSource Self}}"
|
|
| 365 |
Grid.Row="1"
|
|
| 364 |
<telerik:RadBusyIndicator x:Name="printIndy" Visibility="{Binding IsBusy, Converter={StaticResource BoolToVisibleConverter}, RelativeSource={RelativeSource Self}}"
|
|
| 365 |
Grid.RowSpan="3"
|
|
| 366 | 366 |
Grid.ColumnSpan="2" |
| 367 | 367 |
VerticalAlignment="Stretch" |
| 368 | 368 |
BorderThickness="0" |
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 286 | 286 |
{
|
| 287 | 287 |
this.CurrentPageNo = (int)this.sliderPages.Value; |
| 288 | 288 |
|
| 289 |
await PageChangeAsync(this.CurrentPageNo);
|
|
| 290 |
|
|
| 289 |
await App.PageStorage.GetPageUriAsync(this.CurrentPageNo);
|
|
| 290 |
|
|
| 291 | 291 |
if (_ButtonName == "Current") |
| 292 | 292 |
{
|
| 293 | 293 |
stPageNo.Value = CurrentPageNo; |
| ... | ... | |
| 415 | 415 |
|
| 416 | 416 |
public async System.Threading.Tasks.Task<bool> PageChangeAsync(int PageNo, bool Flag = false) |
| 417 | 417 |
{
|
| 418 |
System.Diagnostics.Debug.WriteLine("PageChangeAsync " + PageNo);
|
|
| 418 | 419 |
bool result = false; |
| 419 | 420 |
//Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal, new Action(delegate |
| 420 | 421 |
//{
|
| ... | ... | |
| 444 | 445 |
printCanvas.Children.Clear(); |
| 445 | 446 |
var bitmapframe = await App.PageStorage.GetPageImageAsync(PageNo); |
| 446 | 447 |
Image bitmap = new Image(); |
| 447 |
|
|
| 448 |
bitmap.Stretch = Stretch.Fill; |
|
| 448 | 449 |
bitmap.Source = bitmapframe; |
| 450 |
bitmap.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
|
| 451 |
bitmap.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
|
| 449 | 452 |
printCanvas.Children.Add(bitmap); |
| 450 | 453 |
|
| 451 | 454 |
//ImageBrush background = new ImageBrush(bitmap); |
| ... | ... | |
| 478 | 481 |
|
| 479 | 482 |
//System.Drawing.Image.FromFile() |
| 480 | 483 |
//Printimg = System.Drawing.Image.FromStream(stream); |
| 481 |
await System.Threading.Tasks.Task.Run(() => |
|
| 482 |
{
|
|
| 483 |
Dispatcher.InvokeAsync(() => |
|
| 484 |
//await System.Threading.Tasks.Task.Run(() =>
|
|
| 485 |
//{
|
|
| 486 |
await Dispatcher.InvokeAsync(() =>
|
|
| 484 | 487 |
{
|
| 485 |
|
|
| 486 | 488 |
Export export = new Export(); |
| 487 | 489 |
p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height); |
| 488 | 490 |
Printimg_List.Add(Printimg_List.Count() + 1, p_img); |
| 489 | 491 |
}); |
| 490 |
}); |
|
| 492 |
//});
|
|
| 491 | 493 |
} |
| 492 | 494 |
|
| 493 | 495 |
result = true; |
| ... | ... | |
| 622 | 624 |
{
|
| 623 | 625 |
sliderPages.Value = PageNo; |
| 624 | 626 |
}); |
| 627 |
|
|
| 625 | 628 |
await PageChangeAsync(PageNo, true); |
| 626 |
|
|
| 629 |
System.Diagnostics.Debug.WriteLine("Export Page : " + PageNo);
|
|
| 627 | 630 |
} |
| 628 | 631 |
|
| 629 | 632 |
//using (FileStream fs = new FileStream(@"D:\Temp\Text.pdf", FileMode.OpenOrCreate, FileAccess.Write, FileShare.None)) |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 62 | 62 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| 63 | 63 |
</PropertyGroup> |
| 64 | 64 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x86'"> |
| 65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjE2MzgwIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IkxQRyIsIlVzZXJJRCI6ImJzeW9vbiIsIk1vZGUiOjB9/</StartArguments>
|
|
| 65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjE0NTExIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IlBQNCIsIlVzZXJJRCI6IlJFUE9JTlRcXHN5c3RlbSIsIk1vZGUiOjB9/</StartArguments>
|
|
| 66 | 66 |
</PropertyGroup> |
| 67 | 67 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> |
| 68 | 68 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments> |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 380 | 380 |
MarkupInfoID = d.MarkupInfoID, |
| 381 | 381 |
PageNumber = p.PageNumber, |
| 382 | 382 |
Symbol_ID = p.Symbol_ID, |
| 383 |
//Group_ID = p.Group_ID |
|
| 384 |
}; |
|
| 383 |
//Group_ID = p.Group_ID
|
|
| 384 |
};
|
|
| 385 | 385 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
| 386 | 386 |
} |
| 387 | 387 |
else |
| ... | ... | |
| 395 | 395 |
MarkupInfoID = d.MarkupInfoID, |
| 396 | 396 |
PageNumber = p.PageNumber, |
| 397 | 397 |
Symbol_ID = p.Symbol_ID, |
| 398 |
//Group_ID = p.Group_ID |
|
| 399 |
}; |
|
| 398 |
//Group_ID = p.Group_ID
|
|
| 399 |
};
|
|
| 400 | 400 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
| 401 | 401 |
} |
| 402 | 402 |
}); |
| ... | ... | |
| 448 | 448 |
//var markupItem = ViewerDataModel.Instance._markupInfoList.OrderByDescending(p => p.Consolidate == Convert.ToInt32(true)).ToList(); |
| 449 | 449 |
|
| 450 | 450 |
gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
| 451 |
|
|
| 451 | 452 |
SetCommentPages(); |
| 452 | 453 |
|
| 453 | 454 |
// GRIDVIEW에서 팀별 GROUPING |
| ... | ... | |
| 463 | 464 |
gridViewMarkup.GroupDescriptors.Add(descriptor); |
| 464 | 465 |
#endif |
| 465 | 466 |
|
| 466 |
GridViewMarkup_Sorting(gridViewMarkup,new GridViewSortingEventArgs(gridViewMarkup.Columns[0],SortingState.None,SortingState.None));
|
|
| 467 |
GridViewMarkup_Sorting(gridViewMarkup, new GridViewSortingEventArgs(gridViewMarkup.Columns[0], SortingState.None, SortingState.None));
|
|
| 467 | 468 |
|
| 468 | 469 |
var SelectedItem = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.UpdateTime).FirstOrDefault(); |
| 469 |
this.gridViewMarkup.SelectedItem = (PreviewUserMarkupInfoItem != null) ? PreviewUserMarkupInfoItem : SelectedItem; |
|
| 470 |
|
|
| 471 |
if (PreviewUserMarkupInfoItem != null) |
|
| 472 |
{
|
|
| 473 |
this.gridViewMarkup.SelectedItem = PreviewUserMarkupInfoItem; |
|
| 474 |
} |
|
| 475 |
else if (SelectedItem != null) |
|
| 476 |
{
|
|
| 477 |
this.gridViewMarkup.SelectedItem = SelectedItem; |
|
| 478 |
} |
|
| 479 |
else if(ViewerDataModel.Instance._markupInfoList.Count() > 0) |
|
| 480 |
{
|
|
| 481 |
this.gridViewMarkup.SelectedItem = ViewerDataModel.Instance._markupInfoList.First(); |
|
| 482 |
} |
|
| 470 | 483 |
} |
| 471 | 484 |
} |
| 472 | 485 |
|
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 728 | 728 |
<telerik:RadGridView.Columns> |
| 729 | 729 |
<telerik:GridViewSelectColumn Width="Auto"> |
| 730 | 730 |
<telerik:GridViewSelectColumn.Header> |
| 731 |
<telerik:RadRibbonToggleButton telerik:StyleManager.Theme="Office2016" |
|
| 732 |
Visibility="Collapsed" Width="Auto"> |
|
| 733 |
<telerik:RadRibbonToggleButton.Content> |
|
| 734 |
<Image HorizontalAlignment="Center" |
|
| 735 |
VerticalAlignment="Center" |
|
| 736 |
Source="/KCOM;component/Resources/Images/MenuImage/check.png" /> |
|
| 737 |
</telerik:RadRibbonToggleButton.Content> |
|
| 738 |
</telerik:RadRibbonToggleButton> |
|
| 731 |
<CheckBox telerik:StyleManager.Theme="Office_Black" Click="gridViewMarkupAllSelect_Click"/> |
|
| 739 | 732 |
</telerik:GridViewSelectColumn.Header> |
| 740 | 733 |
</telerik:GridViewSelectColumn> |
| 741 | 734 |
<telerik:GridViewDataColumn Width="Auto" |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 5525 | 5525 |
CommonLib.Common.WriteConfigString("SetThumbnail", "WIDTH", thumbnailPanel.Width.ToString());
|
| 5526 | 5526 |
} |
| 5527 | 5527 |
|
| 5528 |
private void gridViewMarkupAllSelect_Click(object sender, RoutedEventArgs e) |
|
| 5529 |
{
|
|
| 5530 |
var checkbox = (sender as CheckBox); |
|
| 5531 |
|
|
| 5532 |
if (checkbox != null) |
|
| 5533 |
{
|
|
| 5534 |
if (checkbox.IsChecked.GetValueOrDefault()) |
|
| 5535 |
{
|
|
| 5536 |
gridViewMarkup.SelectAll(); |
|
| 5537 |
} |
|
| 5538 |
else |
|
| 5539 |
{
|
|
| 5540 |
gridViewMarkup.UnselectAll(); |
|
| 5541 |
} |
|
| 5542 |
} |
|
| 5543 |
} |
|
| 5544 |
|
|
| 5528 | 5545 |
/* |
| 5529 | 5546 |
private void zoomAndPanControl_Drop(object sender, DragEventArgs e) |
| 5530 | 5547 |
{
|
내보내기 Unified diff
