개정판 29010418
issue #000: daelim source compare 중
Change-Id: Icba4b84746c71502e895fde47f4c14f82b179230
| KCOM/Messenger/ConversationView.xaml.cs | ||
|---|---|---|
| 28 | 28 |
public ConversationView() |
| 29 | 29 |
{
|
| 30 | 30 |
InitializeComponent(); |
| 31 |
|
|
| 31 |
|
|
| 32 | 32 |
this.DataContext = this; |
| 33 | 33 |
this.Loaded += ConversationView_Loaded; |
| 34 | 34 |
btnMark.MouseLeftButtonDown += BtnMark_Click; |
| ... | ... | |
| 93 | 93 |
var instanceMain = this.ParentOfType<MainWindow>(); |
| 94 | 94 |
if (instanceMain.dzMainMenu.rotate.Angle == 90) |
| 95 | 95 |
{
|
| 96 |
rect = new Rect(new Point(finalItem.BorderSize.Top - 100, finalItem.BorderSize.Right + 100), new Point(finalItem.BorderSize.Bottom + 100, finalItem.BorderSize.Left - 100));
|
|
| 96 |
rect = new Rect(new Point(finalItem.BorderSize.Top - 100, finalItem.BorderSize.Right + 100), new Point(finalItem.BorderSize.Bottom + 100, finalItem.BorderSize.Left - 100)); |
|
| 97 | 97 |
double y = rect.Y; |
| 98 |
double x = rect.X;
|
|
| 98 |
double x = rect.X; |
|
| 99 | 99 |
rect.X = instanceMain.dzMainMenu.zoomAndPanCanvas.Width - x - rect.Width; |
| 100 | 100 |
rect.Y = y; |
| 101 | 101 |
} |
| 102 |
else if(instanceMain.dzMainMenu.rotate.Angle == 180) |
|
| 102 |
else if (instanceMain.dzMainMenu.rotate.Angle == 180)
|
|
| 103 | 103 |
{
|
| 104 | 104 |
rect = new Rect(new Point(finalItem.BorderSize.Right + 100, finalItem.BorderSize.Bottom + 100), new Point(finalItem.BorderSize.Left - 100, finalItem.BorderSize.Top - 100)); |
| 105 | 105 |
double y = rect.Y; |
| ... | ... | |
| 107 | 107 |
rect.X = instanceMain.dzMainMenu.zoomAndPanCanvas.Width - x - rect.Width; |
| 108 | 108 |
rect.Y = instanceMain.dzMainMenu.zoomAndPanCanvas.Height - y - rect.Height; |
| 109 | 109 |
} |
| 110 |
else if(instanceMain.dzMainMenu.rotate.Angle == 270) |
|
| 110 |
else if (instanceMain.dzMainMenu.rotate.Angle == 270)
|
|
| 111 | 111 |
{
|
| 112 | 112 |
rect = new Rect(new Point(finalItem.BorderSize.Bottom + 100, finalItem.BorderSize.Left - 100), new Point(finalItem.BorderSize.Top - 100, finalItem.BorderSize.Right + 100)); |
| 113 | 113 |
double y = rect.Y; |
| ... | ... | |
| 117 | 117 |
} |
| 118 | 118 |
|
| 119 | 119 |
// Load 시 페이지 이동 없이 TALK 작성 시 Page값이 0으로 들어감, TALK TABLE에 PAGENUMBER가 0일 경우 Angle이 적용되지 않음. |
| 120 |
if (Common.ViewerDataModel.Instance.PageNumber == 0)
|
|
| 120 |
if (Common.ViewerDataModel.Instance.PageNumber == 0) |
|
| 121 | 121 |
{
|
| 122 | 122 |
Common.ViewerDataModel.Instance.PageNumber = 1; |
| 123 | 123 |
} |
| ... | ... | |
| 140 | 140 |
}; |
| 141 | 141 |
|
| 142 | 142 |
Logger.sendReqLog("AddMessage: ", App.ViewInfo.ProjectNO + "," + message, 1);
|
| 143 |
Logger.sendResLog("AddMessage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMessage(App.ViewInfo.ProjectNO, message).ToString(), 1);
|
|
| 143 |
Logger.sendResLog("AddMessage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMessage(App.ViewInfo.ProjectNO, message).ToString(), 1);
|
|
| 144 | 144 |
//Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMessage(App.ViewInfo.ProjectNO, message); |
| 145 | 145 |
|
| 146 |
Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);
|
|
| 147 |
List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID);
|
|
| 148 |
if(messagelist.Count() > 0) |
|
| 146 |
Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);
|
|
| 147 |
List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID); |
|
| 148 |
if (messagelist.Count() > 0)
|
|
| 149 | 149 |
{
|
| 150 | 150 |
Logger.sendResLog("GetMessage", "TRUE", 1);
|
| 151 | 151 |
} |
| ... | ... | |
| 174 | 174 |
private void SaveAuthorization(object parameter) |
| 175 | 175 |
{
|
| 176 | 176 |
KCOMDataModel.DataModel.TALK instance = parameter as KCOMDataModel.DataModel.TALK; |
| 177 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.rotate.Angle = instance.ANGLE;
|
|
| 177 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.rotate.Angle = instance.ANGLE; |
|
| 178 | 178 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPageTALK(instance.PAGENUMBER.Value, instance.ANGLE); |
| 179 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanControl.ZoomToTalk(new Rect { X = instance.RECT_X.Value, Y = instance.RECT_Y.Value, Width = instance.RECT_WIDTH.Value, Height = instance.RECT_HEIGHT.Value } , instance.ANGLE);
|
|
| 179 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanControl.ZoomToTalk(new Rect { X = instance.RECT_X.Value, Y = instance.RECT_Y.Value, Width = instance.RECT_WIDTH.Value, Height = instance.RECT_HEIGHT.Value }, instance.ANGLE);
|
|
| 180 | 180 |
} |
| 181 | 181 |
|
| 182 | 182 |
public event PropertyChangedEventHandler PropertyChanged; |
| ... | ... | |
| 188 | 188 |
//sw.Start(); |
| 189 | 189 |
//InitializeComponent(); |
| 190 | 190 |
//System.Diagnostics.Debug.WriteLine("ConversationView() : " + sw.ElapsedMilliseconds.ToString() + "ms");
|
| 191 |
|
|
| 191 |
|
|
| 192 | 192 |
main = this.ParentOfType<MainWindow>(); |
| 193 | 193 |
if (App.ParameterMode) |
| 194 | 194 |
{
|
| 195 | 195 |
ClickAnchorCommand = new Telerik.Windows.Controls.DelegateCommand(SaveAuthorization); |
| 196 | 196 |
if (string.IsNullOrEmpty(App.UserName)) |
| 197 | 197 |
{
|
| 198 |
Logger.sendReqLog("GetMember: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID, 1);
|
|
| 198 |
Logger.sendReqLog("GetMember: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID, 1);
|
|
| 199 | 199 |
App.UserName = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMember(App.ViewInfo.ProjectNO, App.ViewInfo.UserID).NAME; |
| 200 |
if(App.UserName != null || App.UserName != "") |
|
| 200 |
if (App.UserName != null || App.UserName != "")
|
|
| 201 | 201 |
{
|
| 202 | 202 |
Logger.sendResLog("AddMessage", "TRUE", 1);
|
| 203 | 203 |
} |
| 204 | 204 |
else |
| 205 | 205 |
{
|
| 206 | 206 |
Logger.sendResLog("AddMessage", "FALSE", 1);
|
| 207 |
}
|
|
| 207 |
} |
|
| 208 | 208 |
} |
| 209 | 209 |
if (Common.ViewerDataModel.Instance.k_talkMessageSet.Count() == 0) |
| 210 | 210 |
{
|
| ... | ... | |
| 251 | 251 |
private void AddText() |
| 252 | 252 |
{
|
| 253 | 253 |
Common.ViewerDataModel.Instance.k_talkMessageSet.Clear(); |
| 254 |
|
|
| 254 |
|
|
| 255 | 255 |
KCOMDataModel.DataModel.TALK message = new KCOMDataModel.DataModel.TALK |
| 256 | 256 |
{
|
| 257 | 257 |
TEXT = tbContent.Text, |
| ... | ... | |
| 268 | 268 |
//Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMessage(App.ViewInfo.ProjectNO, message); |
| 269 | 269 |
|
| 270 | 270 |
Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);
|
| 271 |
List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID);
|
|
| 271 |
List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID); |
|
| 272 | 272 |
if (messagelist.Count() > 0) |
| 273 | 273 |
{
|
| 274 | 274 |
Logger.sendResLog("GetMessage", "TRUE", 1);
|
| ... | ... | |
| 283 | 283 |
Common.ViewerDataModel.Instance.k_talkMessageSet.Add(a); |
| 284 | 284 |
}); |
| 285 | 285 |
tbContent.Text = ""; |
| 286 |
tbContent.Focus();
|
|
| 286 |
tbContent.Focus(); |
|
| 287 | 287 |
(lstMessage.Parent as ScrollViewer).ScrollToEnd(); |
| 288 |
|
|
| 288 |
|
|
| 289 | 289 |
} |
| 290 | 290 |
} |
| 291 | 291 |
} |
내보내기 Unified diff
