개정판 762737cd
issue #0000 comment없는 user가 export시 오류 발생에 대한 수정
Change-Id: I8c9bdc8619b63a615960575b8eab7b5f304dc21f
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 231 | 231 |
{
|
| 232 | 232 |
info.UserName = "Consolidation"; |
| 233 | 233 |
} |
| 234 |
info.MarkupList.ForEach(makup => |
|
| 235 |
{
|
|
| 236 |
var _pageMarkup = _PageMarkupList.Where(item => item.PageNumber == makup.PageNumber); |
|
| 237 |
var _SetMarkupItem = new SetColorMarkupItem { markupID = makup.ID, DisplayColor = info.DisplayColor };
|
|
| 238 | 234 |
|
| 239 |
if (_pageMarkup.Count() > 0) |
|
| 240 |
_pageMarkup.First().DisplayColorItems.Add(_SetMarkupItem); |
|
| 241 |
else |
|
| 242 |
_PageMarkupList.Add(new MarkupPageItem |
|
| 243 |
{
|
|
| 244 |
PageNumber = makup.PageNumber, |
|
| 245 |
DisplayColorItems = new List<SetColorMarkupItem> { _SetMarkupItem }
|
|
| 246 |
}); |
|
| 247 |
}); |
|
| 248 | 235 |
|
| 249 |
colorList.Add(new DisplayColorInfo |
|
| 250 |
{
|
|
| 251 |
UserID = info.UserID, |
|
| 252 |
DisplayColor = info.DisplayColor, |
|
| 253 |
Department = info.Depatment, |
|
| 254 |
UserName = info.UserName, |
|
| 255 |
}); |
|
| 236 |
if((info.MarkupList != null)) |
|
| 237 |
{
|
|
| 238 |
info.MarkupList.ForEach(makup => |
|
| 239 |
{
|
|
| 240 |
var _pageMarkup = _PageMarkupList.Where(item => item.PageNumber == makup.PageNumber); |
|
| 241 |
var _SetMarkupItem = new SetColorMarkupItem { markupID = makup.ID, DisplayColor = info.DisplayColor };
|
|
| 242 |
|
|
| 243 |
if (_pageMarkup.Count() > 0) |
|
| 244 |
_pageMarkup.First().DisplayColorItems.Add(_SetMarkupItem); |
|
| 245 |
else |
|
| 246 |
_PageMarkupList.Add(new MarkupPageItem |
|
| 247 |
{
|
|
| 248 |
PageNumber = makup.PageNumber, |
|
| 249 |
DisplayColorItems = new List<SetColorMarkupItem> { _SetMarkupItem }
|
|
| 250 |
}); |
|
| 251 |
}); |
|
| 252 |
|
|
| 253 |
colorList.Add(new DisplayColorInfo |
|
| 254 |
{
|
|
| 255 |
UserID = info.UserID, |
|
| 256 |
DisplayColor = info.DisplayColor, |
|
| 257 |
Department = info.Depatment, |
|
| 258 |
UserName = info.UserName, |
|
| 259 |
}); |
|
| 260 |
} |
|
| 256 | 261 |
} |
| 257 | 262 |
|
| 258 | 263 |
gridViewMarkup.ItemsSource = this._markupInfo; |
| ... | ... | |
| 504 | 509 |
printCanvas.Width = Convert.ToDouble(currentPage.PAGE_WIDTH); |
| 505 | 510 |
printCanvas.Height = Convert.ToDouble(currentPage.PAGE_HEIGHT); |
| 506 | 511 |
printCanvas.Background = new ImageBrush{ ImageSource = new BitmapImage(uri)};
|
| 507 |
printCanvas.SnapsToDevicePixels = false; |
|
| 508 |
printCanvas.UseLayoutRounding = false; |
|
| 509 |
printCanvas.CacheMode = new BitmapCache(50); |
|
| 512 |
//printCanvas.SnapsToDevicePixels = false;
|
|
| 513 |
//printCanvas.UseLayoutRounding = false;
|
|
| 514 |
//printCanvas.CacheMode = new BitmapCache(50);
|
|
| 510 | 515 |
RenderOptions.SetBitmapScalingMode(printCanvas, BitmapScalingMode.HighQuality); |
| 511 | 516 |
//printCanvas.RenderTransformOrigin = new Point(0.5, 0.5); |
| 512 | 517 |
//printCanvas.RenderTransform = new RotateTransform(currentPage.PAGE_ANGLE); |
| ... | ... | |
| 515 | 520 |
//printCanvas.Background = new SolidColorBrush(Colors.Transparent); |
| 516 | 521 |
|
| 517 | 522 |
Canvas canvas = new Canvas(); |
| 518 |
canvas.CacheMode = new BitmapCache(50); |
|
| 519 |
canvas.SnapsToDevicePixels = false; |
|
| 523 |
//canvas.CacheMode = new BitmapCache(50);
|
|
| 524 |
//canvas.SnapsToDevicePixels = false;
|
|
| 520 | 525 |
RenderOptions.SetBitmapScalingMode(canvas, BitmapScalingMode.HighQuality); |
| 521 | 526 |
//foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>()) |
| 522 | 527 |
//{
|
| KCOM/Events/Load.cs | ||
|---|---|---|
| 53 | 53 |
//Logger.sendReqLog("GetMarkupDataListperPage: ", App.ViewInfo.ProjectNO + "," + Markupinfoid + "," + Page_No, 1);
|
| 54 | 54 |
markupdata = await Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetMarkupDataListperPageAsync(App.ViewInfo.ProjectNO, Markupinfoid, Page_No); |
| 55 | 55 |
|
| 56 |
if (markupdata.Count() > 0) |
|
| 56 |
if (markupdata?.Count() > 0)
|
|
| 57 | 57 |
{
|
| 58 | 58 |
//Logger.sendResLog("GetMarkupDataListperPage", "TRUE", 1);
|
| 59 | 59 |
} |
| ... | ... | |
| 62 | 62 |
//Logger.sendResLog("GetMarkupDataListperPage", "FALSE", 1);
|
| 63 | 63 |
} |
| 64 | 64 |
|
| 65 |
foreach (string data in markupdata)
|
|
| 65 |
if (markupdata != null)
|
|
| 66 | 66 |
{
|
| 67 |
result = await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, printCanvas, pageAngle, DisplayColor, "",null, |
|
| 68 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 69 |
|
|
| 70 |
if(!result) |
|
| 67 |
foreach (string data in markupdata) |
|
| 71 | 68 |
{
|
| 72 |
break; |
|
| 69 |
result = await MarkupParser.ParseAsync(App.BaseAddress, App.ViewInfo.ProjectNO, data, printCanvas, pageAngle, DisplayColor, "", null, |
|
| 70 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 71 |
|
|
| 72 |
if (!result) |
|
| 73 |
{
|
|
| 74 |
break; |
|
| 75 |
} |
|
| 73 | 76 |
} |
| 74 | 77 |
} |
| 75 | 78 |
|
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 127 | 127 |
</PropertyGroup> |
| 128 | 128 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_Etech|x64'"> |
| 129 | 129 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
| 130 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDAwMDAxODAwOTQ1MjYiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
|
|
| 130 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MjRhZjVlODAwM2U2YWQiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjIwMjQwNDMwMDIiLCJVc2VySUQiOiJkb2Z0ZWNoIn0=</StartArguments>
|
|
| 131 | 131 |
</PropertyGroup> |
| 132 | 132 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_Etech|x86'"> |
| 133 | 133 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments> |
| KCOM/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
| 52 | 52 |
// 지정되도록 할 수 있습니다. |
| 53 | 53 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 54 |
[assembly: AssemblyVersion("5.6.12.0")]
|
|
| 55 |
[assembly: AssemblyFileVersion("5.6.12.0")]
|
|
| 54 |
[assembly: AssemblyVersion("5.6.2.0")]
|
|
| 55 |
[assembly: AssemblyFileVersion("5.6.2.0")]
|
|
| 56 | 56 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
내보내기 Unified diff
