개정판 24c5e56c
- final pdf Font 추가
- Markus navi 속도 최적화 Key input 최적화
Change-Id: I7f2cf1933e86017d7b1df9ef4bd3048a8e80a653
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 24 | 24 |
using Telerik.Windows.Data; |
| 25 | 25 |
using System.ComponentModel; |
| 26 | 26 |
using System.Web; |
| 27 |
using Markus.Fonts; |
|
| 27 | 28 |
|
| 28 | 29 |
namespace KCOM.Views |
| 29 | 30 |
{
|
| ... | ... | |
| 370 | 371 |
} |
| 371 | 372 |
} |
| 372 | 373 |
|
| 373 |
mainMenu.SetCommentPages(); |
|
| 374 |
mainMenu.SetCommentPages(null);
|
|
| 374 | 375 |
|
| 375 | 376 |
ViewerDataModel.Instance.UndoDataList.Clear(); |
| 376 | 377 |
} |
| ... | ... | |
| 1156 | 1157 |
//강인구 추가 |
| 1157 | 1158 |
private void RadRibbonComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) |
| 1158 | 1159 |
{
|
| 1159 |
if (this.ParentOfType<MainWindow>()?.dzMainMenu.SelectLayer.Children.Count > 0)
|
|
| 1160 |
if (comboFontFamily.SelectedItem != null)
|
|
| 1160 | 1161 |
{
|
| 1161 |
foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children) |
|
| 1162 |
var font = comboFontFamily.SelectedItem as Markus.Fonts.MarkusFont; |
|
| 1163 |
|
|
| 1164 |
if (this.ParentOfType<MainWindow>()?.dzMainMenu.SelectLayer.Children.Count > 0) |
|
| 1162 | 1165 |
{
|
| 1163 |
if (item.GetType().Name == "AdornerFinal")
|
|
| 1166 |
foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children)
|
|
| 1164 | 1167 |
{
|
| 1165 |
var adnoerFinal = (item as Controls.AdornerFinal); |
|
| 1168 |
if (item.GetType().Name == "AdornerFinal") |
|
| 1169 |
{
|
|
| 1170 |
var adnoerFinal = (item as Controls.AdornerFinal); |
|
| 1166 | 1171 |
|
| 1167 |
var adornerMembers = adnoerFinal.Members.Cast<Controls.AdornerMember>(); |
|
| 1172 |
var adornerMembers = adnoerFinal.Members.Cast<Controls.AdornerMember>();
|
|
| 1168 | 1173 |
|
| 1169 |
foreach (var InnerItem in adornerMembers) |
|
| 1170 |
{
|
|
| 1171 |
switch (InnerItem.DrawingData.GetType().Name) |
|
| 1174 |
foreach (var InnerItem in adornerMembers) |
|
| 1172 | 1175 |
{
|
| 1173 |
case ("TextControl"):
|
|
| 1174 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).SetFontFamily(new FontFamily(comboFontFamily.Text)); |
|
| 1176 |
switch (InnerItem.DrawingData.GetType().Name) |
|
| 1177 |
{
|
|
| 1178 |
case ("TextControl"):
|
|
| 1179 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.TextControl).SetFontFamily(font.FontFamily); |
|
| 1180 |
break; |
|
| 1181 |
case ("ArrowTextControl"):
|
|
| 1182 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).SetFontFamily(font.FontFamily); |
|
| 1175 | 1183 |
break; |
| 1176 |
case ("ArrowTextControl"):
|
|
| 1177 |
(InnerItem.DrawingData as MarkupToPDF.Controls.Text.ArrowTextControl).SetFontFamily(new FontFamily(comboFontFamily.Text)); |
|
| 1178 |
break; |
|
| 1184 |
} |
|
| 1179 | 1185 |
} |
| 1180 |
} |
|
| 1181 | 1186 |
|
| 1182 |
ChangeComment(adnoerFinal); |
|
| 1187 |
ChangeComment(adnoerFinal); |
|
| 1188 |
} |
|
| 1183 | 1189 |
} |
| 1184 | 1190 |
} |
| 1185 |
} |
|
| 1186 | 1191 |
|
| 1187 |
KCOM.Properties.Settings.Default.FontFamily = comboFontFamily.Text; |
|
| 1188 |
Properties.Settings.Default.Save(); |
|
| 1192 |
KCOM.Properties.Settings.Default.FontFamily = font.FontFamily.FontName(); |
|
| 1193 |
Properties.Settings.Default.Save(); |
|
| 1194 |
} |
|
| 1189 | 1195 |
} |
| 1190 | 1196 |
|
| 1191 | 1197 |
|
| ... | ... | |
| 2476 | 2482 |
data = new string[instance.Count]; |
| 2477 | 2483 |
foreach (var markup in instance) |
| 2478 | 2484 |
{
|
| 2479 |
data[cnt++] = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(markup.Data); |
|
| 2485 |
data[cnt++] = await MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressStringAsync(markup.Data,ViewerDataModel.Instance.CancellationToken());
|
|
| 2480 | 2486 |
} |
| 2481 | 2487 |
} |
| 2482 | 2488 |
} |
| ... | ... | |
| 2764 | 2770 |
{
|
| 2765 | 2771 |
if (parse != "") |
| 2766 | 2772 |
{
|
| 2767 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
|
| 2773 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(ViewerDataModel.Instance.CancellationToken(),App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty);
|
|
| 2768 | 2774 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
| 2769 | 2775 |
|
| 2770 | 2776 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
내보내기 Unified diff
