개정판 4538d5e7
issue #903 image, sign, date control save 후 reload시 move, delete가 불가능한 현상 수정
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 3297 | 3297 |
instance.ApplyTemplate(); |
| 3298 | 3298 |
instance.ImageData = new BitmapImage(new Uri(s.ImagePath)); |
| 3299 | 3299 |
instance.SetImage(); |
| 3300 |
|
|
| 3301 | 3300 |
} |
| 3302 | 3301 |
break; |
| 3303 | 3302 |
#endregion |
| ... | ... | |
| 4010 | 4009 |
}; |
| 4011 | 4010 |
|
| 4012 | 4011 |
instance.Memo = s.Memo; |
| 4012 |
instance.MarkupInfoID = markupInfoID; |
|
| 4013 | 4013 |
baseLayer.Add(instance); |
| 4014 | 4014 |
instance.ApplyTemplate(); |
| 4015 | 4015 |
instance.SetSymPath(); |
| ... | ... | |
| 4038 | 4038 |
}; |
| 4039 | 4039 |
//Layer.Children.Add(instance); |
| 4040 | 4040 |
instance.Memo = s.Memo; |
| 4041 |
baseLayer.Add(instance); |
|
| 4041 |
|
|
| 4042 | 4042 |
instance.MarkupInfoID = markupInfoID; |
| 4043 |
baseLayer.Add(instance); |
|
| 4043 | 4044 |
instance.ApplyTemplate(); |
| 4044 | 4045 |
instance.ImageData = new BitmapImage(new Uri(s.ImagePath)); |
| 4045 | 4046 |
instance.SetImage(); |
| ... | ... | |
| 4236 | 4237 |
}; |
| 4237 | 4238 |
|
| 4238 | 4239 |
//Layer.Children.Add(instance); |
| 4240 |
instance.CommentID = commentId; |
|
| 4239 | 4241 |
instance.MarkupInfoID = markupInfoID; |
| 4240 | 4242 |
baseLayer.Add(instance); |
| 4241 | 4243 |
instance.ApplyTemplate(); |
| 4242 | 4244 |
instance.SetArrowMultiPath(); |
| 4243 |
instance.Memo = s.Memo; |
|
| 4244 |
instance.CommentID = commentId; |
|
| 4245 |
instance.Memo = s.Memo; |
|
| 4245 | 4246 |
instance.SetValue(ToolTipService.ToolTipProperty, ToolTipMessage); |
| 4246 | 4247 |
|
| 4247 | 4248 |
} |
| ... | ... | |
| 4361 | 4362 |
//PointC = s.PointC, |
| 4362 | 4363 |
}; |
| 4363 | 4364 |
//Layer.Children.Add(instance); |
| 4365 |
instance.CommentID = commentId; |
|
| 4364 | 4366 |
instance.MarkupInfoID = markupInfoID; |
| 4365 | 4367 |
baseLayer.Add(instance); |
| 4366 |
instance.CommentID = commentId; |
|
| 4368 |
|
|
| 4367 | 4369 |
instance.Memo = s.Memo; |
| 4368 | 4370 |
instance.ApplyTemplate(); |
| 4369 | 4371 |
instance.SetPolyPath(); |
| ... | ... | |
| 4398 | 4400 |
//PointC = s.PointC, |
| 4399 | 4401 |
}; |
| 4400 | 4402 |
//Layer.Children.Add(instance); |
| 4403 |
instance.CommentID = commentId; |
|
| 4401 | 4404 |
instance.MarkupInfoID = markupInfoID; |
| 4402 | 4405 |
baseLayer.Add(instance); |
| 4403 |
instance.CommentID = commentId; |
|
| 4406 |
|
|
| 4404 | 4407 |
instance.Memo = s.Memo; |
| 4405 | 4408 |
instance.ApplyTemplate(); |
| 4406 | 4409 |
instance.SetPolyPath(); |
| ... | ... | |
| 4435 | 4438 |
}; |
| 4436 | 4439 |
instance.Memo = s.Memo; |
| 4437 | 4440 |
//Layer.Children.Add(instance); |
| 4441 |
instance.CommentID = commentId; |
|
| 4438 | 4442 |
instance.MarkupInfoID = markupInfoID; |
| 4439 | 4443 |
baseLayer.Add(instance); |
| 4440 |
instance.CommentID = commentId; |
|
| 4444 |
|
|
| 4441 | 4445 |
instance.PointSet = s.PointSet; |
| 4442 | 4446 |
instance.ApplyTemplate(); |
| 4443 | 4447 |
instance.ClosePath(); |
| ... | ... | |
| 4507 | 4511 |
if (instance.Text != null) |
| 4508 | 4512 |
{
|
| 4509 | 4513 |
//Layer.Children.Add(instance); |
| 4514 |
instance.CommentID = commentId; |
|
| 4510 | 4515 |
instance.MarkupInfoID = markupInfoID; |
| 4511 | 4516 |
baseLayer.Add(instance); |
| 4512 | 4517 |
System.Diagnostics.Debug.WriteLine(instance.Angle); |
| ... | ... | |
| 4524 | 4529 |
instance.Base_TextBox.Visibility = Visibility.Collapsed; |
| 4525 | 4530 |
instance.Base_TextBlock.Visibility = Visibility.Visible; |
| 4526 | 4531 |
|
| 4527 |
instance.CommentID = commentId; |
|
| 4532 |
|
|
| 4528 | 4533 |
instance.DrawingCloud(); |
| 4529 | 4534 |
instance.SetText(); |
| 4530 | 4535 |
} |
| ... | ... | |
| 4552 | 4557 |
}; |
| 4553 | 4558 |
instance.Memo = s.Memo; |
| 4554 | 4559 |
//Layer.Children.Add(instance); |
| 4560 |
instance.CommentID = commentId; |
|
| 4555 | 4561 |
instance.MarkupInfoID = markupInfoID; |
| 4556 | 4562 |
baseLayer.Add(instance); |
| 4557 |
instance.CommentID = commentId; |
|
| 4563 |
|
|
| 4558 | 4564 |
instance.ApplyTemplate(); |
| 4559 | 4565 |
instance.SetArcPath(); |
| 4560 | 4566 |
} |
| ... | ... | |
| 4581 | 4587 |
}; |
| 4582 | 4588 |
instance.Memo = s.Memo; |
| 4583 | 4589 |
//Layer.Children.Add(instance); |
| 4590 |
instance.CommentID = commentId; |
|
| 4584 | 4591 |
instance.MarkupInfoID = markupInfoID; |
| 4585 | 4592 |
baseLayer.Add(instance); |
| 4586 |
instance.CommentID = commentId; |
|
| 4593 |
|
|
| 4587 | 4594 |
instance.ApplyTemplate(); |
| 4588 | 4595 |
instance.SetArcPath(); |
| 4589 | 4596 |
} |
| ... | ... | |
| 4612 | 4619 |
}; |
| 4613 | 4620 |
instance.Memo = s.Memo; |
| 4614 | 4621 |
//Layer.Children.Add(instance); |
| 4622 |
instance.CommentID = commentId; |
|
| 4615 | 4623 |
instance.MarkupInfoID = markupInfoID; |
| 4616 | 4624 |
baseLayer.Add(instance); |
| 4617 |
instance.CommentID = commentId; |
|
| 4625 |
|
|
| 4618 | 4626 |
instance.ApplyTemplate(); |
| 4619 | 4627 |
instance.SetRectCloud(); |
| 4620 | 4628 |
} |
| ... | ... | |
| 4702 | 4710 |
}; |
| 4703 | 4711 |
instance.Memo = s.Memo; |
| 4704 | 4712 |
//Layer.Children.Add(instance); |
| 4705 |
baseLayer.Add(instance);
|
|
| 4713 |
instance.MarkupInfoID = markupInfoID;
|
|
| 4706 | 4714 |
instance.CommentID = commentId; |
| 4715 |
baseLayer.Add(instance); |
|
| 4716 |
|
|
| 4707 | 4717 |
instance.ApplyTemplate(); |
| 4708 | 4718 |
instance.SetDate(); |
| 4709 | 4719 |
} |
| ... | ... | |
| 4732 | 4742 |
}; |
| 4733 | 4743 |
|
| 4734 | 4744 |
instance.Memo = s.Memo; |
| 4735 |
baseLayer.Add(instance);
|
|
| 4745 |
instance.MarkupInfoID = markupInfoID;
|
|
| 4736 | 4746 |
instance.CommentID = commentId; |
| 4747 |
baseLayer.Add(instance); |
|
| 4737 | 4748 |
instance.ApplyTemplate(); |
| 4738 | 4749 |
instance.SetSymPath(); |
| 4739 | 4750 |
} |
| ... | ... | |
| 4757 | 4768 |
Opacity = s.Opac, |
| 4758 | 4769 |
FilePath = s.ImagePath, |
| 4759 | 4770 |
UserID = s.UserID, |
| 4760 |
ImageData = img.Source |
|
| 4771 |
// ImageData = img.Source |
|
| 4772 |
|
|
| 4761 | 4773 |
}; |
| 4762 | 4774 |
//Layer.Children.Add(instance); |
| 4763 | 4775 |
instance.Memo = s.Memo; |
| 4764 |
baseLayer.Add(instance); |
|
| 4776 |
|
|
| 4777 |
instance.MarkupInfoID = markupInfoID; |
|
| 4765 | 4778 |
instance.CommentID = commentId; |
| 4779 |
baseLayer.Add(instance); |
|
| 4780 |
|
|
| 4766 | 4781 |
instance.ApplyTemplate(); |
| 4767 | 4782 |
instance.ImageData = new BitmapImage(new Uri(s.ImagePath)); |
| 4768 | 4783 |
instance.SetImage(); |
| ... | ... | |
| 4786 | 4801 |
PathXathData = s.DBData, |
| 4787 | 4802 |
}; |
| 4788 | 4803 |
instance.Memo = s.Memo; |
| 4804 |
instance.CommentID = commentId; |
|
| 4789 | 4805 |
instance.MarkupInfoID = markupInfoID; |
| 4790 | 4806 |
baseLayer.Add(instance); |
| 4791 |
instance.CommentID = commentId; |
|
| 4807 |
|
|
| 4792 | 4808 |
instance.ApplyTemplate(); |
| 4793 | 4809 |
|
| 4794 | 4810 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(instance.PathXathData); |
| ... | ... | |
| 5568 | 5584 |
}; |
| 5569 | 5585 |
|
| 5570 | 5586 |
//Layer.Children.Add(instance); |
| 5587 |
instance.Memo = s.Memo; |
|
| 5588 |
instance.CommentID = commentId; |
|
| 5571 | 5589 |
instance.MarkupInfoID = markupInfoID; |
| 5572 | 5590 |
baseLayer.Add(instance); |
| 5573 | 5591 |
instance.ApplyTemplate(); |
| 5574 |
instance.SetArrowMultiPath(); |
|
| 5575 |
instance.Memo = s.Memo; |
|
| 5576 |
instance.CommentID = commentId; |
|
| 5592 |
instance.SetArrowMultiPath(); |
|
| 5577 | 5593 |
instance.SetValue(ToolTipService.ToolTipProperty, ToolTipMessage); |
| 5578 | 5594 |
|
| 5579 | 5595 |
return_control = instance; |
| ... | ... | |
| 5698 | 5714 |
//PointC = s.PointC, |
| 5699 | 5715 |
}; |
| 5700 | 5716 |
//Layer.Children.Add(instance); |
| 5717 |
instance.CommentID = commentId; |
|
| 5701 | 5718 |
instance.MarkupInfoID = markupInfoID; |
| 5702 | 5719 |
baseLayer.Add(instance); |
| 5703 |
instance.CommentID = commentId; |
|
| 5720 |
|
|
| 5704 | 5721 |
instance.Memo = s.Memo; |
| 5705 | 5722 |
instance.ApplyTemplate(); |
| 5706 | 5723 |
instance.SetPolyPath(); |
| ... | ... | |
| 5735 | 5752 |
//PointC = s.PointC, |
| 5736 | 5753 |
}; |
| 5737 | 5754 |
//Layer.Children.Add(instance); |
| 5755 |
instance.CommentID = commentId; |
|
| 5738 | 5756 |
instance.MarkupInfoID = markupInfoID; |
| 5739 | 5757 |
baseLayer.Add(instance); |
| 5740 |
instance.CommentID = commentId; |
|
| 5758 |
|
|
| 5741 | 5759 |
instance.Memo = s.Memo; |
| 5742 | 5760 |
instance.ApplyTemplate(); |
| 5743 | 5761 |
instance.SetPolyPath(); |
| ... | ... | |
| 5772 | 5790 |
}; |
| 5773 | 5791 |
instance.Memo = s.Memo; |
| 5774 | 5792 |
//Layer.Children.Add(instance); |
| 5793 |
instance.CommentID = commentId; |
|
| 5775 | 5794 |
instance.MarkupInfoID = markupInfoID; |
| 5776 | 5795 |
baseLayer.Add(instance); |
| 5777 |
instance.CommentID = commentId; |
|
| 5796 |
|
|
| 5778 | 5797 |
instance.PointSet = s.PointSet; |
| 5779 | 5798 |
instance.ApplyTemplate(); |
| 5780 | 5799 |
instance.ClosePath(); |
| ... | ... | |
| 5893 | 5912 |
instance.Memo = s.Memo; |
| 5894 | 5913 |
//Layer.Children.Add(instance); |
| 5895 | 5914 |
instance.MarkupInfoID = markupInfoID; |
| 5896 |
baseLayer.Add(instance); |
|
| 5897 | 5915 |
instance.CommentID = commentId; |
| 5916 |
baseLayer.Add(instance); |
|
| 5917 |
|
|
| 5898 | 5918 |
instance.ApplyTemplate(); |
| 5899 | 5919 |
instance.SetArcPath(); |
| 5900 | 5920 |
return_control = instance; |
| ... | ... | |
| 5923 | 5943 |
instance.Memo = s.Memo; |
| 5924 | 5944 |
//Layer.Children.Add(instance); |
| 5925 | 5945 |
instance.MarkupInfoID = markupInfoID; |
| 5926 |
baseLayer.Add(instance); |
|
| 5927 | 5946 |
instance.CommentID = commentId; |
| 5947 |
baseLayer.Add(instance); |
|
| 5948 |
|
|
| 5928 | 5949 |
instance.ApplyTemplate(); |
| 5929 | 5950 |
instance.SetArcPath(); |
| 5930 | 5951 |
return_control = instance; |
| ... | ... | |
| 5954 | 5975 |
instance.Memo = s.Memo; |
| 5955 | 5976 |
//Layer.Children.Add(instance); |
| 5956 | 5977 |
instance.MarkupInfoID = markupInfoID; |
| 5957 |
baseLayer.Add(instance); |
|
| 5958 | 5978 |
instance.CommentID = commentId; |
| 5979 |
baseLayer.Add(instance); |
|
| 5980 |
|
|
| 5959 | 5981 |
instance.ApplyTemplate(); |
| 5960 | 5982 |
instance.SetRectCloud(); |
| 5961 | 5983 |
return_control = instance; |
| ... | ... | |
| 6045 | 6067 |
}; |
| 6046 | 6068 |
instance.Memo = s.Memo; |
| 6047 | 6069 |
//Layer.Children.Add(instance); |
| 6048 |
baseLayer.Add(instance); |
|
| 6049 | 6070 |
instance.CommentID = commentId; |
| 6071 |
instance.MarkupInfoID = markupInfoID; |
|
| 6072 |
baseLayer.Add(instance); |
|
| 6073 |
|
|
| 6050 | 6074 |
instance.ApplyTemplate(); |
| 6051 | 6075 |
instance.SetDate(); |
| 6052 | 6076 |
return_control = instance; |
| ... | ... | |
| 6076 | 6100 |
}; |
| 6077 | 6101 |
|
| 6078 | 6102 |
instance.Memo = s.Memo; |
| 6079 |
baseLayer.Add(instance); |
|
| 6103 |
|
|
| 6080 | 6104 |
instance.CommentID = commentId; |
| 6105 |
instance.MarkupInfoID = markupInfoID; |
|
| 6106 |
baseLayer.Add(instance); |
|
| 6081 | 6107 |
instance.ApplyTemplate(); |
| 6082 | 6108 |
instance.SetSymPath(); |
| 6083 | 6109 |
return_control = instance; |
| ... | ... | |
| 6106 | 6132 |
}; |
| 6107 | 6133 |
//Layer.Children.Add(instance); |
| 6108 | 6134 |
instance.Memo = s.Memo; |
| 6109 |
baseLayer.Add(instance); |
|
| 6135 |
|
|
| 6110 | 6136 |
instance.CommentID = commentId; |
| 6137 |
instance.MarkupInfoID = markupInfoID; |
|
| 6138 |
baseLayer.Add(instance); |
|
| 6111 | 6139 |
instance.ApplyTemplate(); |
| 6112 | 6140 |
instance.ImageData = new BitmapImage(new Uri(s.ImagePath)); |
| 6113 | 6141 |
instance.SetImage(); |
| ... | ... | |
| 6131 | 6159 |
PathXathData = s.DBData, |
| 6132 | 6160 |
}; |
| 6133 | 6161 |
instance.Memo = s.Memo; |
| 6162 |
instance.CommentID = commentId; |
|
| 6134 | 6163 |
instance.MarkupInfoID = markupInfoID; |
| 6135 | 6164 |
baseLayer.Add(instance); |
| 6136 |
instance.CommentID = commentId; |
|
| 6165 |
|
|
| 6137 | 6166 |
instance.ApplyTemplate(); |
| 6138 | 6167 |
|
| 6139 | 6168 |
var xamlData = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString_NonPrefix(instance.PathXathData); |
내보내기 Unified diff
