개정판 84c48033
issue #000: daelim merged(settings =>ini) 내/외부 구분 하여 api url 을 리턴하도록 Commonlib 추가. daelim ini 추가
Change-Id: I2904309621897cda96f9537982fbd6e53874be29
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 538 | 538 |
string uri = ""; |
| 539 | 539 |
if (userData.COMPANY != "EXT") |
| 540 | 540 |
{
|
| 541 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 541 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 542 | 542 |
} |
| 543 | 543 |
else |
| 544 | 544 |
{
|
| 545 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 545 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber);
|
|
| 546 | 546 |
} |
| 547 | 547 |
|
| 548 | 548 |
var defaultBitmapImage = new BitmapImage(); |
| ... | ... | |
| 620 | 620 |
string uri2 = ""; |
| 621 | 621 |
if (userData.COMPANY != "EXT") |
| 622 | 622 |
{
|
| 623 |
uri2 = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 623 |
uri2 = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 624 | 624 |
} |
| 625 | 625 |
else |
| 626 | 626 |
{
|
| 627 |
uri2 = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 627 |
uri2 = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, BalancePoint);
|
|
| 628 | 628 |
} |
| 629 | 629 |
|
| 630 | 630 |
Logger.sendCheckLog("pageNavigator_PageChanging_defaultBitmapImage_Compare BitmapImage 설정", 1);
|
| ... | ... | |
| 2738 | 2738 |
string uri = ""; |
| 2739 | 2739 |
if (userData.COMPANY != "EXT") |
| 2740 | 2740 |
{
|
| 2741 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO,
|
|
| 2741 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO,
|
|
| 2742 | 2742 |
(Convert.ToInt32(_ViewInfo.DocumentItemID) / 100).ToString(), _ViewInfo.DocumentItemID, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber); |
| 2743 | 2743 |
} |
| 2744 | 2744 |
else |
| 2745 | 2745 |
{
|
| 2746 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID,
|
|
| 2746 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID,
|
|
| 2747 | 2747 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber); |
| 2748 | 2748 |
} |
| 2749 | 2749 |
|
| ... | ... | |
| 5361 | 5361 |
|
| 5362 | 5362 |
if (userData.COMPANY != "EXT") |
| 5363 | 5363 |
{
|
| 5364 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5364 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5365 | 5365 |
} |
| 5366 | 5366 |
else |
| 5367 | 5367 |
{
|
| 5368 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5368 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, ViewerDataModel.Instance.PageNumber);
|
|
| 5369 | 5369 |
} |
| 5370 | 5370 |
|
| 5371 | 5371 |
var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri)); |
| ... | ... | |
| 5462 | 5462 |
string uri = ""; |
| 5463 | 5463 |
if (userData.COMPANY != "EXT") |
| 5464 | 5464 |
{
|
| 5465 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5465 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5466 | 5466 |
} |
| 5467 | 5467 |
else |
| 5468 | 5468 |
{
|
| 5469 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5469 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5470 | 5470 |
} |
| 5471 | 5471 |
|
| 5472 | 5472 |
var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri)); |
| ... | ... | |
| 5524 | 5524 |
string uri = ""; |
| 5525 | 5525 |
if (userData.COMPANY != "EXT") |
| 5526 | 5526 |
{
|
| 5527 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5527 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5528 | 5528 |
} |
| 5529 | 5529 |
else |
| 5530 | 5530 |
{
|
| 5531 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5531 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5532 | 5532 |
} |
| 5533 | 5533 |
|
| 5534 | 5534 |
Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY); |
| ... | ... | |
| 5606 | 5606 |
string uri = ""; |
| 5607 | 5607 |
if (userData.COMPANY != "EXT") |
| 5608 | 5608 |
{
|
| 5609 |
uri = String.Format(Properties.Settings.Default.mainServerImageWebPath, _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5609 |
uri = String.Format(CommonLib.Common.GetConfigString("mainServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, (Convert.ToUInt32(CurrentRev.DOCUMENT_ID) / 100).ToString(), CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5610 | 5610 |
} |
| 5611 | 5611 |
else |
| 5612 | 5612 |
{
|
| 5613 |
uri = String.Format(Properties.Settings.Default.subServerImageWebPath, _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5613 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber);
|
|
| 5614 | 5614 |
} |
| 5615 | 5615 |
|
| 5616 | 5616 |
Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY); |
내보내기 Unified diff
