프로젝트

일반

사용자정보

개정판 1c7f408a

ID1c7f408ad2bb4679a5dd52e4bc7b7388ffba0ad1
상위 2b83fdb9
하위 60f874fe

김태성이(가) 약 5년 전에 추가함

mainWindow를 RadWindow로 변경

Change-Id: I0ac468f572b53cd39e832aed20e7d350b5c03d42

차이점 보기:

KCOM/Controls/Symbol.xaml.cs
94 94
            //lstSymbolPublic.ItemsSource = null;
95 95

  
96 96
            Symbol_Custom Custom = new Symbol_Custom();
97
            List<Symbol_Custom> Custom_List = new List<Symbol_Custom>();           
98
            
99
            var symbol_Private = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolList(App.ViewInfo.UserID);
100
            foreach (var item in symbol_Private)
101
            {
102
                Custom.Name = item.NAME;
103
                Custom.ImageUri = CommonLib.Common.IPReplace(item.IMAGE_URL, App.isExternal);
104
                Custom.ID = item.ID;
105
                Custom_List.Add(Custom);
106
                Custom = new Symbol_Custom();
107
            }
108
            lstSymbolPrivate.ItemsSource = Custom_List;
109

  
110
            Custom = new Symbol_Custom();
111
            Custom_List = new List<Symbol_Custom>();
97
            List<Symbol_Custom> Custom_List = new List<Symbol_Custom>();
112 98

  
113
            deptlist.ItemsSource = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolDeptList();
99
            var mainwindow = (RadWindowManager.Current.GetWindows().Find(x => x is MainWindow) as MainWindow);
114 100

  
115
            List<SYMBOL_PUBLIC> symbol_Public;
101
            if (mainwindow.dzMainMenu.BaseClient != null)
102
            {
103
                var symbol_Private = mainwindow.dzMainMenu.BaseClient.GetSymbolList(App.ViewInfo.UserID);
116 104

  
105
                foreach (var item in symbol_Private)
106
                {
107
                    Custom.Name = item.NAME;
108
                    Custom.ImageUri = CommonLib.Common.IPReplace(item.IMAGE_URL, App.isExternal);
109
                    Custom.ID = item.ID;
110
                    Custom_List.Add(Custom);
111
                    Custom = new Symbol_Custom();
112
                }
113
                lstSymbolPrivate.ItemsSource = Custom_List;
117 114

  
118
            if (deptlist.SelectedValue != null)
119
            {
120
                symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(deptlist.SelectedValue.ToString());
121
            }
122
            else
123
            {
124
                symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(null);
125
            }
126
            foreach (var item in symbol_Public)
127
            {
128
                Custom.Name = item.NAME;
129
                Custom.ImageUri = CommonLib.Common.IPReplace(item.IMAGE_URL, App.isExternal);
130
                Custom.ID = item.ID;
131
                Custom_List.Add(Custom);
132 115
                Custom = new Symbol_Custom();
116
                Custom_List = new List<Symbol_Custom>();
117

  
118
                deptlist.ItemsSource = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolDeptList();
119

  
120
                List<SYMBOL_PUBLIC> symbol_Public;
121

  
122

  
123
                if (deptlist.SelectedValue != null)
124
                {
125
                    symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(deptlist.SelectedValue.ToString());
126
                }
127
                else
128
                {
129
                    symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(null);
130
                }
131
                foreach (var item in symbol_Public)
132
                {
133
                    Custom.Name = item.NAME;
134
                    Custom.ImageUri = CommonLib.Common.IPReplace(item.IMAGE_URL, App.isExternal);
135
                    Custom.ID = item.ID;
136
                    Custom_List.Add(Custom);
137
                    Custom = new Symbol_Custom();
138
                }
139
                lstSymbolPublic.ItemsSource = Custom_List;
133 140
            }
134
            lstSymbolPublic.ItemsSource = Custom_List;            
135 141
        }
136 142

  
137 143
        public PngBitmapEncoder symImage(string data)
......
864 870
            SyncInit();
865 871
            ViewerDataModel.Instance.SystemMain.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.ImgControl;
866 872
            //캡쳐 하기 전에 코멘트 저장
867
            if (Common.ViewerDataModel.Instance.MarkupControls_USER.Count > 0 || (Application.Current.MainWindow as MainWindow).dzMainMenu.SelectLayer.Children.Count > 0)
873
            var mainwindow = (RadWindowManager.Current.GetWindows().Find(x => x is MainWindow) as MainWindow);
874

  
875
            if (Common.ViewerDataModel.Instance.MarkupControls_USER.Count > 0 || mainwindow.dzMainMenu.SelectLayer.Children.Count > 0)
868 876
            {
869
                var menu = (Application.Current.MainWindow as MainWindow).dzMainMenu;
877
                var menu = mainwindow.dzMainMenu;
870 878
                SelectionSet.Instance.UnSelect(menu);
871 879
                if (menu.PreviewUserMarkupInfoItem != null && menu.PreviewUserMarkupInfoItem.IsPreviewUser == true)
872 880
                {
873
                    (Application.Current.MainWindow as MainWindow).dzTopMenu.SaveEventCallback(null, null);
881
                    mainwindow.dzTopMenu.SaveEventCallback(null, null);
874 882
                }
875 883
                else if (menu.gridViewMarkup.SelectedItems.Count == 0 || (menu.gridViewMarkup.SelectedItems.FirstOrDefault() as IKCOM.MarkupInfoItem).UserID != App.ViewInfo.UserID)
876 884
                {
......
878 886
                }
879 887
                else
880 888
                {
881
                    (Application.Current.MainWindow as MainWindow).dzTopMenu.SaveEventCallback(null, null);
889
                    mainwindow.dzTopMenu.SaveEventCallback(null, null);
882 890
                }
883 891
            }
884 892
            Application.Current.MainWindow.Focus();
885 893
            Common.ViewerDataModel.Instance.Capture_Opacity = 0.49;
886
            (Application.Current.MainWindow as MainWindow).dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Capture;
894
            mainwindow.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Capture;
887 895
        }
888 896

  
889 897

  

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)