개정판 0d97ab05
Fix: SVG,PNG 심볼 저장 오류 수정
Change-Id: Ief726d6e933a9fbc3ceb8e67805de83eb8986d84
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 106 | 106 |
|
| 107 | 107 |
private async Task DataBindAsync() |
| 108 | 108 |
{
|
| 109 |
//lstSymbolPrivate.ItemsSource = null; |
|
| 110 |
//lstSymbolPublic.ItemsSource = null; |
|
| 111 |
|
|
| 112 |
Symbol_Custom Custom = new Symbol_Custom(); |
|
| 113 |
List<Symbol_Custom> Custom_List = new List<Symbol_Custom>(); |
|
| 114 |
|
|
| 115 | 109 |
try |
| 116 | 110 |
{
|
| 111 |
List<Symbol_Custom> PrivateSymbolList = new List<Symbol_Custom>(); |
|
| 117 | 112 |
|
| 118 | 113 |
var symbol_Private = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetSymbolListAsync(App.ViewInfo.UserID); |
| 119 |
|
|
| 120 | 114 |
foreach (var item in symbol_Private) |
| 121 | 115 |
{
|
| 116 |
var Custom = new Symbol_Custom(); |
|
| 122 | 117 |
Custom.Name = item.NAME; |
| 123 | 118 |
Custom.ImageUri = CommonLib.Common.IPReplace(item.IMAGE_URL.Replace("//","/").Replace(":/", "://"), App.isExternal);
|
| 124 | 119 |
Custom.ID = item.ID; |
| 125 |
Custom_List.Add(Custom); |
|
| 126 |
Custom = new Symbol_Custom(); |
|
| 120 |
PrivateSymbolList.Add(Custom); |
|
| 127 | 121 |
} |
| 128 |
lstSymbolPrivate.ItemsSource = Custom_List;
|
|
| 122 |
lstSymbolPrivate.ItemsSource = PrivateSymbolList;
|
|
| 129 | 123 |
} |
| 130 | 124 |
catch (Exception ex) |
| 131 | 125 |
{
|
| 132 | 126 |
System.Diagnostics.Debug.WriteLine(ex.ToString()); |
| 133 | 127 |
} |
| 134 | 128 |
|
| 135 |
Custom = new Symbol_Custom(); |
|
| 136 |
Custom_List = new List<Symbol_Custom>(); |
|
| 137 |
|
|
| 138 | 129 |
deptlist.ItemsSource = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolDeptListAsync(); |
| 139 | 130 |
|
| 140 | 131 |
List<SYMBOL_PUBLIC> symbol_Public; |
| 141 |
|
|
| 142 |
|
|
| 143 | 132 |
if (deptlist.SelectedValue != null) |
| 144 | 133 |
{
|
| 145 | 134 |
symbol_Public = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolListAsync(deptlist.SelectedValue.ToString()); |
| ... | ... | |
| 151 | 140 |
|
| 152 | 141 |
if (symbol_Public != null) |
| 153 | 142 |
{
|
| 143 |
var PublicSymbolList = new List<Symbol_Custom>(); |
|
| 154 | 144 |
foreach (var item in symbol_Public) |
| 155 | 145 |
{
|
| 146 |
var Custom = new Symbol_Custom(); |
|
| 156 | 147 |
Custom.Name = item.NAME; |
| 157 | 148 |
Custom.ImageUri = CommonLib.Common.IPReplace(item.IMAGE_URL.Replace("//", "/").Replace(":/", "://"), App.isExternal);
|
| 158 | 149 |
Custom.ID = item.ID; |
| 159 |
Custom_List.Add(Custom); |
|
| 160 |
Custom = new Symbol_Custom(); |
|
| 150 |
PublicSymbolList.Add(Custom); |
|
| 161 | 151 |
} |
| 162 | 152 |
|
| 163 |
lstSymbolPublic.ItemsSource = Custom_List;
|
|
| 153 |
lstSymbolPublic.ItemsSource = PublicSymbolList;
|
|
| 164 | 154 |
} |
| 165 | 155 |
} |
| 166 | 156 |
|
| 167 | 157 |
public async Task<PngBitmapEncoder> symImageAsync_old(string data,double PageAngle) |
| 168 | 158 |
{
|
| 169 |
|
|
| 170 | 159 |
Canvas _canvas = new Canvas(); |
| 171 | 160 |
_canvas.Background = Brushes.White; |
| 172 | 161 |
_canvas.Width = finalItem.BorderSize.Width; |
내보내기 Unified diff
