프로젝트

일반

사용자정보

개정판 907a99b3

ID907a99b36bd5d6a18c8221f73350db4267786be5
상위 d9c0cdb8
하위 8de55603

김태성이(가) 4년 이상 전에 추가함

finalPDF의 각 텍스트박스의 화살표뱡향 Angle따른 오류 수정

Change-Id: Id01382cf03f2e6089feaa1d9482c9ec04c2ad18d

차이점 보기:

FinalService/KCOM_FinalService/KCOM_FinalService.sln
27 27
EndProject
28 28
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markus.Fonts", "..\..\Markus.Fonts\Markus.Fonts.csproj", "{EB1DE04A-D86E-4BF7-B095-F72207923C3B}"
29 29
EndProject
30
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UploadFinal", "UploadFinal\UploadFinal.csproj", "{9CF3737A-E04D-4A55-924E-C88725DFBEC7}"
30
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UploadFinal_Daelim", "UploadFinal\UploadFinal_Daelim.csproj", "{9CF3737A-E04D-4A55-924E-C88725DFBEC7}"
31 31
EndProject
32 32
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FinalServiceInstall", "FinalServiceInstall\FinalServiceInstall.vdproj", "{DCF604E6-66A9-44A7-A308-3BA739FA18CD}"
33 33
EndProject
34 34
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KCOM_FinalServiceConsole", "KCOM_FinalServiceConsole\KCOM_FinalServiceConsole.csproj", "{824A4880-EDEA-4F50-9207-F8B9E3096375}"
35 35
EndProject
36
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UploadTest", "UploadTest\UploadTest.csproj", "{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}"
37
EndProject
36 38
Global
37 39
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
38 40
		Debug|Any CPU = Debug|Any CPU
......
191 193
		{824A4880-EDEA-4F50-9207-F8B9E3096375}.Release|x64.Build.0 = Release|Any CPU
192 194
		{824A4880-EDEA-4F50-9207-F8B9E3096375}.Release|x86.ActiveCfg = Release|Any CPU
193 195
		{824A4880-EDEA-4F50-9207-F8B9E3096375}.Release|x86.Build.0 = Release|Any CPU
196
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
197
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Debug|Any CPU.Build.0 = Debug|Any CPU
198
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Debug|x64.ActiveCfg = Debug|Any CPU
199
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Debug|x64.Build.0 = Debug|Any CPU
200
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Debug|x86.ActiveCfg = Debug|Any CPU
201
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Debug|x86.Build.0 = Debug|Any CPU
202
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Release|Any CPU.ActiveCfg = Release|Any CPU
203
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Release|Any CPU.Build.0 = Release|Any CPU
204
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Release|x64.ActiveCfg = Release|Any CPU
205
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Release|x64.Build.0 = Release|Any CPU
206
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Release|x86.ActiveCfg = Release|Any CPU
207
		{9F2A21D2-979E-4F9A-9BF1-F7460A80CF11}.Release|x86.Build.0 = Release|Any CPU
194 208
	EndGlobalSection
195 209
	GlobalSection(SolutionProperties) = preSolution
196 210
		HideSolutionNode = FALSE
FinalService/KCOM_FinalService/KCOM_FinalService/FinalService.cs
72 72

  
73 73
        protected override void OnStop()
74 74
        {
75
            _remotingFinal.Dispose();
76

  
75 77
            base.OnShutdown();
76 78
            _Timer.Stop();
77 79
        }
FinalService/KCOM_FinalService/KCOM_FinalService/KCOM_FinalService.csproj
13 13
    <TargetFrameworkProfile />
14 14
  </PropertyGroup>
15 15
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16
    <PlatformTarget>AnyCPU</PlatformTarget>
16
    <PlatformTarget>x64</PlatformTarget>
17 17
    <DebugSymbols>true</DebugSymbols>
18 18
    <DebugType>full</DebugType>
19 19
    <Optimize>false</Optimize>
FinalService/KCOM_FinalService/KCOM_FinalService/Program.cs
28 28
        public static MethodInfo UploadFinalPDFMethod { get; set; }
29 29
        public static object UploadFinalPDFInst { get; set; }
30 30

  
31
        static MarkusFinalService service;
31
        public static MarkusFinalService service;
32 32

  
33 33
        /// <summary>
34 34
        /// The main entry point for the application.
FinalService/KCOM_FinalService/KCOM_FinalService/Properties/Settings.Designer.cs
25 25
        
26 26
        [global::System.Configuration.UserScopedSettingAttribute()]
27 27
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
28
        [global::System.Configuration.DefaultSettingValueAttribute("9092")]
28
        [global::System.Configuration.DefaultSettingValueAttribute("9093")]
29 29
        public int RemotingPort {
30 30
            get {
31 31
                return ((int)(this["RemotingPort"]));
FinalService/KCOM_FinalService/KCOM_FinalService/Properties/Settings.settings
3 3
  <Profiles />
4 4
  <Settings>
5 5
    <Setting Name="RemotingPort" Type="System.Int32" Scope="User">
6
      <Value Profile="(Default)">9092</Value>
6
      <Value Profile="(Default)">9093</Value>
7 7
    </Setting>
8 8
    <Setting Name="MultipleFinalCount" Type="System.Int32" Scope="User">
9 9
      <Value Profile="(Default)">15</Value>
FinalService/KCOM_FinalService/KCOM_FinalService/Remoting/RemFinalPDFStation.cs
86 86

  
87 87
                string endpoint = "remFinalPDF";
88 88

  
89
                _Channel = new TcpChannel(Properties.Settings.Default.RemotingPort);
89
                string port = CommonLib.Common.GetConfigString("Remoting", "Port", "");
90

  
91
                if (string.IsNullOrEmpty(port))
92
                {
93
                    _Channel = new TcpChannel(Properties.Settings.Default.RemotingPort);
94
                }
95
                else
96
                {
97
                    _Channel = new TcpChannel(int.Parse(port));
98
                }
99

  
90 100
                System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(_Channel, false);
91 101
                System.Runtime.Remoting.RemotingConfiguration.RegisterWellKnownServiceType(typeof(RemFinalPDFObject), endpoint, System.Runtime.Remoting.WellKnownObjectMode.Singleton);
92 102

  
......
265 275
                try
266 276
                {
267 277
                    string soapurl = CommonLib.Common.GetConfigString("UpLoadServiceUrl", "URL", "");
268
                    //string finalpdfroot = CommonLib.Common.GetConfigString("FinalPDFRootUrl", "URL", "");
269
                    //string filename = Path.GetFileName(e.FinalPDFPath);
270
                    //string pdfpath = !string.IsNullOrEmpty(finalpdfroot) ? finalpdfroot + filename : filename;
278

  
279
                    string finalpdfroot = CommonLib.Common.GetConfigString("FinalPDFRootUrl", "URL", "");
280

  
281
                    string pdfpath = e.FinalPDFRemotePath;
282

  
283
                    if (!string.IsNullOrEmpty(finalpdfroot))
284
                    {
285
                        string filename = Path.GetFileName(e.FinalPDFPath);
286
                        pdfpath = !string.IsNullOrEmpty(finalpdfroot) ? finalpdfroot + filename : filename;
287
                    }
271 288

  
272 289
                    if (!string.IsNullOrEmpty(soapurl) && (Program.UploadFinalPDFInst != null) && (Program.UploadFinalPDFMethod != null))
273 290
                    {
274
                        object[] parameters = new object[] { e.FinalPDFRemotePath, e.OriginPDFName, e.FinalPDF, soapurl };
291
                        object[] parameters = new object[] { pdfpath, e.OriginPDFName, e.FinalPDF, soapurl };
275 292

  
276
                        _Logger.Write("Call Upload Final .." + e.FinalPDFRemotePath + ",pdfname:" + e.OriginPDFName + ",finalPDF ID : " + e.FinalPDF.ID + ",soapUri:" + soapurl,LogLevel.Info);
293
                        _Logger.Write("Call Upload Final .." + pdfpath + " finalPDFPath : " + e.FinalPDFPath + " FinalPDFRemotePath : " + e.FinalPDFRemotePath + ",CreateUser:" + e.FinalPDF.CREATE_USER_ID + ",CreateUser:" + e.FinalPDF.DOCUMENT_ID + ",pdfname:" + e.OriginPDFName + ",finalPDF ID : " + e.FinalPDF.ID + ",soapUri:" + soapurl,LogLevel.Info);
277 294

  
278 295
                        KeyValuePair<bool, string> result = (KeyValuePair<bool, string>)(Program.UploadFinalPDFMethod.Invoke(Program.UploadFinalPDFInst, parameters));
279 296

  
......
284 301
                        else
285 302
                        {
286 303
                            SetFinalState(_item.ID, FinalStatus.Error);
287
                            _Logger.Write("Upload error  .." + e.FinalPDFRemotePath + ",pdfname:" + e.OriginPDFName, LogLevel.Error);
304
                            _Logger.Write("Upload error  .." + pdfpath  + ",pdfname:" + e.OriginPDFName + " Msg : " + result.Value, LogLevel.Error);
288 305
                        }
289 306
                    }
290 307
                    else
FinalService/KCOM_FinalService/KCOM_FinalServiceConsole/App.config
1
<?xml version="1.0" encoding="utf-8" ?>
2
<configuration>
3
    <startup> 
4
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
5
    </startup>
6
</configuration>
FinalService/KCOM_FinalService/KCOM_FinalServiceConsole/KCOM_FinalServiceConsole.csproj
38 38
    </StartupObject>
39 39
  </PropertyGroup>
40 40
  <ItemGroup>
41
    <None Include="App.config" />
41
    <None Include="..\KCOM_FinalService\app.config">
42
      <Link>app.config</Link>
43
    </None>
42 44
    <None Include="packages.config" />
43 45
  </ItemGroup>
44 46
  <ItemGroup>
......
58 60
      <Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project>
59 61
      <Name>MarkupToPDF</Name>
60 62
    </ProjectReference>
61
    <ProjectReference Include="..\UploadFinal\UploadFinal.csproj">
63
    <ProjectReference Include="..\UploadFinal\UploadFinal_Daelim.csproj">
62 64
      <Project>{9cf3737a-e04d-4a55-924e-c88725dfbec7}</Project>
63
      <Name>UploadFinal</Name>
65
      <Name>UploadFinal_Daelim</Name>
64 66
    </ProjectReference>
65 67
  </ItemGroup>
66 68
  <ItemGroup>
FinalService/KCOM_FinalService/KCOM_FinalServiceConsole/Program.cs
7 7
using System.ServiceProcess;
8 8
using log4net;
9 9
using KCOM_FinalService.Common;
10
using System.Runtime.InteropServices;
10 11

  
11 12
namespace KCOM_FinalService.Console
12 13
{
13 14
    static class Program
14 15
    {
15
   
16
        // https://msdn.microsoft.com/en-us/library/windows/desktop/ms686016.aspx
17
        [DllImport("Kernel32")]
18
        private static extern bool SetConsoleCtrlHandler(SetConsoleCtrlEventHandler handler, bool add);
19

  
20
        // https://msdn.microsoft.com/en-us/library/windows/desktop/ms683242.aspx
21
        private delegate bool SetConsoleCtrlEventHandler(CtrlType sig);
22

  
23
        private enum CtrlType
24
        {
25
            CTRL_C_EVENT = 0,
26
            CTRL_BREAK_EVENT = 1,
27
            CTRL_CLOSE_EVENT = 2,
28
            CTRL_LOGOFF_EVENT = 5,
29
            CTRL_SHUTDOWN_EVENT = 6
30
        }
31

  
16 32
        static void Main(string[] args)
17 33
        {
34
            SetConsoleCtrlHandler(Handler, true);
35

  
18 36
            KCOM_FinalService.Program.Main(args);
19 37
        }
38

  
39

  
40
        private static bool Handler(CtrlType signal)
41
        {
42
            switch (signal)
43
            {
44
                case CtrlType.CTRL_BREAK_EVENT:
45
                case CtrlType.CTRL_C_EVENT:
46
                case CtrlType.CTRL_LOGOFF_EVENT:
47
                case CtrlType.CTRL_SHUTDOWN_EVENT:
48
                case CtrlType.CTRL_CLOSE_EVENT:
49

  
50
                    KCOM_FinalService.Program.service.Stop();
51

  
52
                    // TODO Cleanup resources
53
                    Environment.Exit(0);
54
                    return false;
55

  
56
                default:
57
                    return false;
58
            }
59
        }
20 60
    }
21 61
}
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/DrawSet_DrawString.cs
204 204
            
205 205
            DrawSet_Text.DrawString(sp, ep, lineSize, contentByte, color, PaintStyle, FontSize, fontFamilly, fontstyle, fontweight, isUnderline, text, size, opac, Angle);
206 206

  
207
            /// transform text border
208
            System.Drawing.PointF[] border = new System.Drawing.PointF[4]
209
            {
210
                new System.Drawing.PointF((float)points[0].X, (float)points[0].Y),
211
                new System.Drawing.PointF((float)points[1].X, (float)points[1].Y),
212
                new System.Drawing.PointF((float)points[2].X, (float)points[2].Y),
213
                new System.Drawing.PointF((float)points[3].X, (float)points[3].Y)
214
            };
215
            mat.TransformPoints(border);   /// transform if given angle is not 0
216
            var transformed = border.Select(param => new Point(param.X, param.Y)).ToList();
217

  
218 207
            if (Angle == 270 || Angle == 90)
219 208
            {
209
                /// transform text border
210
                System.Drawing.PointF[] border = new System.Drawing.PointF[4]
211
                {
212
                    new System.Drawing.PointF((float)points[0].X, (float)points[0].Y),
213
                    new System.Drawing.PointF((float)points[1].X, (float)points[1].Y),
214
                    new System.Drawing.PointF((float)points[2].X, (float)points[2].Y),
215
                    new System.Drawing.PointF((float)points[3].X, (float)points[3].Y)
216
                };
217
                mat.TransformPoints(border);   /// transform if given angle is not 0
218
                var transformed = border.Select(param => new Point(param.X, param.Y)).ToList();
219

  
220 220
                ptEnd = MathSet.getNearPoint(transformed, ptMid);
221 221
            }
222
            else
223
            {
224
                if (bIsFixed)
225
                {
226
                    ptEnd = MathSet.getNearPoint(points, ptMid);
227
                }
228
            }
222 229

  
223 230
            DrawLeaderLineNew(ptHead, ptMid, ptEnd, bIsFixed, lineSize, contentByte, color, opac);
224 231
        }
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
1226 1226
                    {
1227 1227
                        FinalPDFPath = new FileInfo(pdfFilePath);
1228 1228

  
1229
                        //  string pdfmovepath = CommonLib.Common.GetConfigString("PDFMovePath", "URL", "");
1229
                        /// 정리 필요함. DB로 변경
1230
                        string pdfmovepath = CommonLib.Common.GetConfigString("PDFMovePath", "URL", "");
1231

  
1232
                        if(!string.IsNullOrEmpty(pdfmovepath))
1233
                        {
1234
                            _FinalPDFStorgeLocal = pdfmovepath;
1235
                        }
1236

  
1230 1237
                        destfilepath = Path.Combine(_FinalPDFStorgeLocal, FinalPDFPath.Name.Replace(".tmp", ".pdf"));
1231 1238

  
1232 1239
                        if (File.Exists(destfilepath))
FinalService/KCOM_FinalService/UploadFinal/UploadFinal.csproj
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
  <PropertyGroup>
4
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6
    <ProductVersion>8.0.30703</ProductVersion>
7
    <SchemaVersion>2.0</SchemaVersion>
8
    <ProjectGuid>{9CF3737A-E04D-4A55-924E-C88725DFBEC7}</ProjectGuid>
9
    <OutputType>Library</OutputType>
10
    <AppDesignerFolder>Properties</AppDesignerFolder>
11
    <RootNamespace>UploadFinal</RootNamespace>
12
    <AssemblyName>UploadFinal</AssemblyName>
13
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
14
    <FileAlignment>512</FileAlignment>
15
    <TargetFrameworkProfile>
16
    </TargetFrameworkProfile>
17
  </PropertyGroup>
18
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19
    <DebugSymbols>true</DebugSymbols>
20
    <DebugType>full</DebugType>
21
    <Optimize>false</Optimize>
22
    <OutputPath>bin\Debug\</OutputPath>
23
    <DefineConstants>DEBUG;TRACE</DefineConstants>
24
    <ErrorReport>prompt</ErrorReport>
25
    <WarningLevel>4</WarningLevel>
26
    <Prefer32Bit>false</Prefer32Bit>
27
  </PropertyGroup>
28
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29
    <DebugType>pdbonly</DebugType>
30
    <Optimize>true</Optimize>
31
    <OutputPath>..\..\..\Setup\FinalService\</OutputPath>
32
    <DefineConstants>TRACE</DefineConstants>
33
    <ErrorReport>prompt</ErrorReport>
34
    <WarningLevel>4</WarningLevel>
35
    <Prefer32Bit>false</Prefer32Bit>
36
  </PropertyGroup>
37
  <PropertyGroup>
38
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
39
  </PropertyGroup>
40
  <ItemGroup>
41
    <Reference Include="System" />
42
    <Reference Include="System.Core" />
43
    <Reference Include="System.Data.Entity" />
44
    <Reference Include="System.Runtime.Serialization" />
45
    <Reference Include="System.ServiceModel" />
46
    <Reference Include="System.Web" />
47
    <Reference Include="System.Xml.Linq" />
48
    <Reference Include="System.Data.DataSetExtensions" />
49
    <Reference Include="Microsoft.CSharp" />
50
    <Reference Include="System.Data" />
51
    <Reference Include="System.Xml" />
52
  </ItemGroup>
53
  <ItemGroup>
54
    <Compile Include="UploadPDF.cs" />
55
    <None Include="app.config" />
56
    <Compile Include="Properties\AssemblyInfo.cs" />
57
  </ItemGroup>
58
  <ItemGroup>
59
    <WCFMetadata Include="Service References\" />
60
  </ItemGroup>
61
  <ItemGroup>
62
    <ProjectReference Include="..\CommonLib\CommonLib.csproj">
63
      <Project>{ee9aaabc-1678-43a4-878e-cedbb577cf01}</Project>
64
      <Name>CommonLib</Name>
65
    </ProjectReference>
66
    <ProjectReference Include="..\KCOMDataModel\KCOMDataModel.csproj">
67
      <Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project>
68
      <Name>KCOMDataModel</Name>
69
    </ProjectReference>
70
    <ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj">
71
      <Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project>
72
      <Name>MarkupToPDF</Name>
73
    </ProjectReference>
74
  </ItemGroup>
75
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76
  <!-- test
77
   To modify your build process, add your task inside one of the targets below and uncomment it. 
78
       Other similar extension points exist, see Microsoft.Common.targets.
79
  <Target Name="BeforeBuild">
80
  </Target>
81
  <Target Name="AfterBuild">
82
  </Target>
83
  -->
84
</Project>
FinalService/KCOM_FinalService/UploadFinal/UploadFinal.csproj.user
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
4
    <StartArguments>Test</StartArguments>
5
  </PropertyGroup>
6
</Project>
FinalService/KCOM_FinalService/UploadFinal/UploadPDF.cs
89 89
                                     + "<ProjectNo>" + FinalPDF.PROJECT_NO + "</ProjectNo>"
90 90
                                     + "<VendorItemID>" + _objid + "</VendorItemID>"
91 91
                                     + "<SlipNumber>" + _slipNO + "</SlipNumber>"
92
                                     + "<filePath>" + @"\\172.20.121.220\comment3\finalPDF\" + PdfFilePath + "</filePath>"
92
                                     + "<filePath>" + PdfFilePath + "</filePath>"
93 93
                                     + "<OriginFileName>" + OriginFileName + "</OriginFileName></UploadFinalPDF></soap12:Body></soap12:Envelope>";
94 94
                                       
95 95
                    //WriteLog(data);
......
134 134
                }
135 135
                else
136 136
                {
137
                    // 앙상블+는 파일명만 전달함
138
                    PdfFilePath = PdfFilePath.Split('/').Last();
139

  
137 140
                    data = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:ens=\"http://EnsemblePlus.Webservice\"> <soapenv:Header/> <soapenv:Body> <ens:fnFinalPDFCheckInService>"
138 141
                    + "<ens:ProjectNo>" + FinalPDF.PROJECT_NO + "</ens:ProjectNo>"
139 142
                    + "<ens:ObjectId>" + _objid + "</ens:ObjectId>"
......
157 160
                        }
158 161
                        else
159 162
                        {
160
                            return new KeyValuePair<bool, string>(false, "Fail");
163
                            return new KeyValuePair<bool, string>(false, "Fail - " + data);
161 164
                        }
162 165
                    }
163 166
                    else
KCOM/KCOM.csproj
1431 1431
)
1432 1432

  
1433 1433
if $(ConfigurationName) == Debug_Daelim (
1434
      xcopy /s "$(ProjectDir)..\INI\MARKUS_Daelim.ini" "$(TargetDir)MARKUS.*" /Y /F
1434
      xcopy /s "$(ProjectDir)..\INI\MARKUS_Daelim_REMOTE.ini" "$(TargetDir)MARKUS.*" /Y /F
1435 1435
)
1436 1436

  
1437 1437
if $(ConfigurationName) == Daelim_RemoteTest (
KCOM/KCOM.csproj.user
76 76
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
77 77
  </PropertyGroup>
78 78
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_Daelim|AnyCPU'">
79
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMzODA4LjYxOTI1LjUyNzM5LjI2MjYiLCJiUGFydG5lciI6ImZhbHNlIiwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjoiZmFsc2UiLCJOZXdDb21tZW50UGVybWlzc2lvbiI6InRydWUiLCJQcm9qZWN0Tk8iOiIxMzAzNTEiLCJVc2VySUQiOiJhZG1pbl9wbGF0Zm9ybSIsIk1vZGUiOiIwIn0=/</StartArguments>
79
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIxNDIyNjkzOTQiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjEzMDM1MSIsIlVzZXJJRCI6ImFkbWluIn0=</StartArguments>
80 80
  </PropertyGroup>
81 81
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_Daelim|x64'">
82 82
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
KCOM/Views/MainMenu.xaml.cs
3897 3897
                                {
3898 3898
                                    //if (IsDrawingEnable(canvasZoomPanningMouseDownPoint))
3899 3899
                                    //{
3900
                                    currentControl = new ArrowTextControl();
3900
                                    currentControl = new ArrowTextControl()
3901
                                    {
3902
                                        PageAngle = ViewerDataModel.Instance.PageAngle
3903
                                    };
3904

  
3901 3905
                                    currentControl.CommentID = Commons.shortGuid();
3902 3906
                                    currentControl.IsNew = true;
3903 3907
                                    currentControl.MarkupInfoID = App.Custom_ViewInfoId;
......
3949 3953
                                    //{
3950 3954
                                    currentControl = new ArrowTextControl()
3951 3955
                                    {
3952
                                        ControlType = ControlType.ArrowTransTextControl
3956
                                        ControlType = ControlType.ArrowTransTextControl,
3957
                                        PageAngle = ViewerDataModel.Instance.PageAngle
3953 3958
                                    };
3954 3959
                                    currentControl.CommentID = Commons.shortGuid();
3955 3960
                                    currentControl.IsNew = true;
......
3998 4003
                                    //{
3999 4004
                                    currentControl = new ArrowTextControl()
4000 4005
                                    {
4001
                                        ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect
4006
                                        ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect,
4007
                                        PageAngle = ViewerDataModel.Instance.PageAngle
4002 4008
                                    };
4003 4009
                                    currentControl.CommentID = Commons.shortGuid();
4004 4010
                                    currentControl.IsNew = true;
......
4052 4058
                                        ControlType = ControlType.ArrowTransTextBorderControl,
4053 4059
                                        PageAngle = ViewerDataModel.Instance.PageAngle
4054 4060
                                    };
4055

  
4056 4061
                                    
4057 4062
                                    currentControl.CommentID = Commons.shortGuid();
4058 4063
                                    currentControl.IsNew = true;
......
4106 4111
                                    //{
4107 4112
                                    currentControl = new ArrowTextControl()
4108 4113
                                    {
4109
                                        ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud
4114
                                        ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud,
4115
                                        PageAngle = ViewerDataModel.Instance.PageAngle
4110 4116
                                    };
4111 4117
                                    currentControl.CommentID = Commons.shortGuid();
4112 4118
                                    currentControl.IsNew = true;
......
4155 4161
                                    currentControl = new ArrowTextControl()
4156 4162
                                    {
4157 4163
                                        ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud,
4158
                                        ControlType = ControlType.ArrowTransTextCloudControl
4164
                                        ControlType = ControlType.ArrowTransTextCloudControl,
4165
                                        PageAngle = ViewerDataModel.Instance.PageAngle
4159 4166
                                    };
4160 4167
                                    currentControl.CommentID = Commons.shortGuid();
4161 4168
                                    currentControl.IsNew = true;
KCOM_API/Web.config
10 10
    </sectionGroup>
11 11
  </configSections>
12 12
  <connectionStrings>
13
    <!--효성 Connection String-->
14 13
    <add name="ConnectionString"
15
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"
14
      connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
16 15
      providerName="System.Data.EntityClient"/>
17 16
    <add name="CIConnectionString"
18
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework&quot;"
17
      connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string=&quot;data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework&quot;"
19 18
      providerName="System.Data.EntityClient"/>
20 19
  </connectionStrings>
21 20
  <!--
......
86 85
  <applicationSettings>
87 86
    <KCOM_API.Properties.Settings>
88 87
      <setting name="TileSoucePath" serializeAs="String">
89
        <value>http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
88
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
90 89
      </setting>
91 90
      <setting name="TileSoucePath_SUB" serializeAs="String">
92
        <value>http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
91
        <value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
93 92
      </setting>
94 93
      <setting name="IsProjectNoPass" serializeAs="String">
95 94
        <value>True</value>
MarkupToPDF/Controls/Text/ArrowTextControl.cs
54 54
            //    Application.Current.Resources.MergedDictionaries.Add(dictionary);
55 55
        }
56 56

  
57
        public ArrowTextControl()
57
        public ArrowTextControl() :base()
58 58
        {
59 59
            //this.DefaultStyleKey = typeof(ArrowTextControl);
60 60
        }
......
66 66
            Base_ArrowSubPath = GetTemplateChild(PART_ArrowSubPath) as Path;
67 67
            Base_TextBox = GetTemplateChild(PART_TextBox) as TextBox;
68 68
            BaseTextbox_Caret = GetTemplateChild(PART_BaseTextbox_Caret) as Border;
69
            Base_TextBox.Text = this.ArrowText;
70
           
71
            this.Base_TextBox.CaretIndex = this.Base_TextBox.Text.Length;
72
            this.Base_TextBox.CaretBrush = new SolidColorBrush(Colors.Transparent);
73
            this.Base_TextBox.ApplyTemplate();
74
            MoveCustomCaret();
75 69

  
76
            Base_TextBox.SizeChanged += new SizeChangedEventHandler(Base_TextBox_SizeChanged);
77
            Base_TextBox.GotFocus += new RoutedEventHandler(Base_TextBox_GotFocus);
78
            Base_TextBox.LostFocus += new RoutedEventHandler(Base_TextBox_LostFocus);
79
            Base_TextBox.SelectionChanged += (sender, e) => MoveCustomCaret();
80
            this.KeyDown += ArrowTextControl_KeyDown;
70
            if (Base_TextBox != null)
71
            {
72
                this.Base_TextBox.CaretIndex = this.Base_TextBox.Text.Length;
73
                this.Base_TextBox.CaretBrush = new SolidColorBrush(Colors.Transparent);
74
                this.Base_TextBox.ApplyTemplate();
75
                this.Base_TextBox.Text = this.ArrowText;
76

  
77
                MoveCustomCaret();
78

  
79
                Base_TextBox.SizeChanged += new SizeChangedEventHandler(Base_TextBox_SizeChanged);
80
                Base_TextBox.GotFocus += new RoutedEventHandler(Base_TextBox_GotFocus);
81
                Base_TextBox.LostFocus += new RoutedEventHandler(Base_TextBox_LostFocus);
82
                Base_TextBox.SelectionChanged += (sender, e) => MoveCustomCaret();
83
                this.KeyDown += ArrowTextControl_KeyDown;
81 84

  
82
            SetArrowTextPath(true);
85
                SetArrowTextPath(true);
83 86

  
84
            Base_TextBox.IsTabStop = true;
87
                Base_TextBox.IsTabStop = true;
88
            }
85 89
        }
86 90

  
87 91
        private void ArrowTextControl_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)

내보내기 Unified diff

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