개정판 d9cf7d6e
CompareRect internal address type bool -> string 변경. bool 로 전달 시 Object 로 변경되어 의도치 않게 false 로 전달받아서 수정
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 4645 | 4645 |
ViewerDataModel.Instance.PageNumber = 1; |
| 4646 | 4646 |
} |
| 4647 | 4647 |
|
| 4648 |
BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString(), userData.COMPANY != "EXT" ? true : false);
|
|
| 4648 |
BaseClient.GetCompareRectAsync(_ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, CurrentRev.DOCUMENT_ID, pageNavigator.CurrentPage.PageNumber.ToString(), ViewerDataModel.Instance.PageNumber.ToString(), userData.COMPANY != "EXT" ? "true" : "false");
|
|
| 4649 | 4649 |
} |
| 4650 | 4650 |
else |
| 4651 | 4651 |
{
|
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 173 | 173 |
|
| 174 | 174 |
|
| 175 | 175 |
[OperationContract] |
| 176 |
public List<Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo, bool isInternalAddress)
|
|
| 176 |
public List<Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo, string isInternalAddress)
|
|
| 177 | 177 |
{
|
| 178 | 178 |
//string originFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.cmp", projectNo, (Convert.ToInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo);
|
| 179 | 179 |
//string targetFile = String.Format(@"http://cloud.devdoftech.co.kr:5977/TileSource/{0}_Tile/{1}/{2}/{3}.cmp", projectNo, (Convert.ToInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo);
|
| ... | ... | |
| 181 | 181 |
string originFile = ""; |
| 182 | 182 |
string targetFile = ""; |
| 183 | 183 |
|
| 184 |
if (isInternalAddress)
|
|
| 184 |
if (Boolean.Parse(isInternalAddress))
|
|
| 185 | 185 |
{
|
| 186 | 186 |
originFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, (Convert.ToInt32(originDocItem_ID) / 100).ToString(), originDocItem_ID, originPageNo); |
| 187 | 187 |
targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath, projectNo, (Convert.ToInt32(targetDocItem_ID) / 100).ToString(), targetDocItem_ID, targetPageNo); |
내보내기 Unified diff
