개정판 c5519c44
- convert log 수정
- markus text font 변경시 저장 여부 메시지 나오도록 수정
-
Change-Id: I85fa01d063204c85eb5b70bf34a3773f5cb5fd8f
| 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> |
내보내기 Unified diff
