개정판 ef22793a
- MarkupToPDF.csproj nuget 수정
Change-Id: I3efa5258d803220355a67c09b0e5d1525a6a8c20
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.csproj | ||
---|---|---|
55 | 55 |
<Reference Include="itextsharp, Version=5.5.13.1, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL"> |
56 | 56 |
<HintPath>..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll</HintPath> |
57 | 57 |
</Reference> |
58 |
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> |
|
59 |
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath> |
|
60 |
</Reference> |
|
58 | 61 |
<Reference Include="PresentationCore" /> |
59 | 62 |
<Reference Include="PresentationFramework" /> |
60 | 63 |
<Reference Include="Rxx, Version=1.3.4451.33754, Culture=neutral, PublicKeyToken=09aedbbcd2ef4748, processorArchitecture=MSIL"> |
... | ... | |
146 | 149 |
<Compile Include="PropertiesType.cs" /> |
147 | 150 |
<Compile Include="Properties\AssemblyInfo.cs" /> |
148 | 151 |
<Compile Include="Serialize\Core\JsonSerializerHelper.cs" /> |
152 |
<Compile Include="Serialize\S_Control\Base\IntTodoubleJsonConvert.cs" /> |
|
153 |
<Compile Include="Serialize\S_Control\Base\PointJsonConvert.cs" /> |
|
149 | 154 |
<Compile Include="Serialize\S_Control\Base\S_BaseControl.cs" /> |
150 | 155 |
<Compile Include="Serialize\S_Control\Detail\S_ArcControl.cs" /> |
151 | 156 |
<Compile Include="Serialize\S_Control\Detail\S_ArrowControl.cs" /> |
FinalService/KCOM_FinalService/MarkupToPDF/Serialize/S_Control/Base/S_BaseControl.cs | ||
---|---|---|
31 | 31 |
[DataMember] |
32 | 32 |
public Point EndPoint { get; set; } //EndPoint |
33 | 33 |
|
34 |
[DataMember] |
|
35 |
public Point MidPoint { get; set; } //MidPoint |
|
34 |
//[DataMember]
|
|
35 |
//public Point MidPoint { get; set; } //MidPoint
|
|
36 | 36 |
|
37 | 37 |
[DataMember] |
38 | 38 |
public List<Point> PointSet { get; set; } |
FinalService/KCOM_FinalService/MarkupToPDF/packages.config | ||
---|---|---|
3 | 3 |
<package id="EntityFramework" version="5.0.0" targetFramework="net45" requireReinstallation="true" /> |
4 | 4 |
<package id="EntityFramework.ko" version="5.0.0" targetFramework="net45" requireReinstallation="true" /> |
5 | 5 |
<package id="iTextSharp" version="5.5.13.1" targetFramework="net40" /> |
6 |
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" /> |
|
6 | 7 |
<package id="Rx-Main" version="1.0.11226" targetFramework="net40" /> |
7 | 8 |
<package id="Rxx" version="1.3.4451.33754" targetFramework="net40" /> |
8 | 9 |
</packages> |
MarkupToPDF/Controls/Line/ArrowArcControl.cs | ||
---|---|---|
577 | 577 |
STemp.StartPoint = this.StartPoint; |
578 | 578 |
STemp.UserID = this.UserID; |
579 | 579 |
STemp.Opac = this.Opacity; |
580 |
STemp.MiddlePoint = this.MiddlePoint;
|
|
580 |
STemp.MidPoint = this.MiddlePoint; |
|
581 | 581 |
STemp.EndPoint = this.EndPoint; |
582 | 582 |
STemp.IsTransOn = this.isTransOn; |
583 | 583 |
STemp.DashSize = this.DashSize; |
... | ... | |
611 | 611 |
DashSize = s.DashSize, |
612 | 612 |
PointSet = s.PointSet, |
613 | 613 |
isTransOn = s.IsTransOn, |
614 |
MiddlePoint = s.MiddlePoint,
|
|
614 |
MiddlePoint = s.MidPoint, |
|
615 | 615 |
StrokeColor = brush, |
616 | 616 |
Opacity = s.Opac, |
617 | 617 |
|
MarkupToPDF/Serialize/S_Control/Detail/S_ArrowArcControl.cs | ||
---|---|---|
20 | 20 |
{ |
21 | 21 |
[DataMember] |
22 | 22 |
[JsonConverter(typeof(Core.PointJsonConvert))] |
23 |
public Point MiddlePoint { get; set; } // Mid Point
|
|
23 |
public Point MidPoint { get; set; } // Mid Point |
|
24 | 24 |
[DataMember] |
25 | 25 |
public string SizeSet { get; set; } // "LineSize|" |
26 | 26 |
[DataMember] |
내보내기 Unified diff