This commit is contained in:
Nicola Carminati
2017-11-22 12:10:26 +00:00
parent 0b2c6eed5f
commit b46d20730a
16 changed files with 192 additions and 66 deletions
Binary file not shown.
Binary file not shown.
+18 -38
View File
@@ -1,13 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
<<<<<<< .mine
VisualStudioVersion = 15.0.27004.2006
||||||| .r6
VisualStudioVersion = 15.0.27004.2005
=======
VisualStudioVersion = 15.0.26730.16
>>>>>>> .r9
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS_CORE_Application", "CMS_CORE_Application\CMS_CORE_Application.csproj", "{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}"
ProjectSection(ProjectDependencies) = postProject
@@ -20,48 +14,34 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CMS_Core_Nc_Demo_Applicatio
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Debug2|Any CPU = Debug2|Any CPU
Debug2|x86 = Debug2|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x64.ActiveCfg = Debug|x64
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x64.Build.0 = Debug|x64
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x86.ActiveCfg = Debug|x86
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug|x86.Build.0 = Debug|x86
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|Any CPU.Build.0 = Debug|Any CPU
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|x86.ActiveCfg = Debug|x86
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Debug2|x86.Build.0 = Debug|x86
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|Any CPU.Build.0 = Release|Any CPU
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x64.ActiveCfg = Release|x64
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x64.Build.0 = Release|x64
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x86.ActiveCfg = Release|x86
{EEB0C188-6EFA-4ABB-9E6F-4D423006428C}.Release|x86.Build.0 = Release|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.ActiveCfg = Debug2|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.Build.0 = Debug2|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|Any CPU.ActiveCfg = Debug2|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|Any CPU.Build.0 = Debug2|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|x86.ActiveCfg = Debug2|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug2|x86.Build.0 = Debug2|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|Any CPU.Build.0 = Release|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.ActiveCfg = Release|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.Build.0 = Release|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.ActiveCfg = Debug|x64
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x64.Build.0 = Debug|x64
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.ActiveCfg = Debug|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Debug|x86.Build.0 = Debug|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.ActiveCfg = Release|x64
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x64.Build.0 = Release|x64
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.ActiveCfg = Release|x86
{4ABF8EEF-2B23-483E-ACDC-53214FE28681}.Release|x86.Build.0 = Release|x86
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x64.ActiveCfg = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x64.Build.0 = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x86.ActiveCfg = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug|x86.Build.0 = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|Any CPU.ActiveCfg = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|Any CPU.Build.0 = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|x86.ActiveCfg = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Debug2|x86.Build.0 = Debug|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|Any CPU.Build.0 = Release|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x64.ActiveCfg = Release|x64
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x64.Build.0 = Release|x64
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x86.ActiveCfg = Release|Any CPU
{23131777-64A6-41E7-A6DC-D531ACBA1BE4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
@@ -51,10 +51,27 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;FS30D</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="CMS_CORE_Library">
<HintPath>..\CMS_CORE_Library\bin\Debug2\CMS_CORE_Library.dll</HintPath>
</Reference>
<Reference Include="SKGL, Version=2.0.5.3, Culture=neutral, PublicKeyToken=c2850a745143a030, processorArchitecture=MSIL">
<HintPath>..\packages\SKGL.2.0.5.3\lib\SKGL.dll</HintPath>
</Reference>
@@ -93,7 +110,9 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -110,5 +129,11 @@
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CMS_CORE_Library\CMS_CORE_Library.csproj">
<Project>{4abf8eef-2b23-483e-acdc-53214fe28681}</Project>
<Name>CMS_CORE_Library</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
+76 -5
View File
@@ -40,12 +40,69 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Debug2\CMS_CORE_Library.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;FS30D</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;FS30D</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug2|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug2\</OutputPath>
<DefineConstants>TRACE;DEBUG;FS30D</DefineConstants>
<DocumentationFile>bin\Debug2\CMS_CORE_Library.xml</DocumentationFile>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;FS30D</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug2|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug2\</OutputPath>
<DefineConstants>TRACE;DEBUG;FS30D</DefineConstants>
<DocumentationFile>bin\Debug2\CMS_CORE_Library.xml</DocumentationFile>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="CndexLinkDotNet">
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\OSAI\WinNBI\UserLibrary\CndexLinkDotNet.dll</HintPath>
</Reference>
<Reference Include="SKGL, Version=2.0.5.3, Culture=neutral, PublicKeyToken=c2850a745143a030, processorArchitecture=MSIL">
<HintPath>..\packages\SKGL.2.0.5.3\lib\SKGL.dll</HintPath>
<Reference Include="Siemens.Sinumerik.Operate.Services, Version=4.7.4.0, Culture=neutral, PublicKeyToken=bdd90fa02fd1c4ee, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\Siemens\MotionControl\siemens\sinumerik\hmi\base\Siemens.Sinumerik.Operate.Services.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -86,7 +143,9 @@
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="Connected Services\OPENControl\CMS_CORE_Library.OPENControl.AxesRefResponse.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
@@ -784,7 +843,6 @@
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\OPENControl\OPENcontrol.wsdl" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<WCFMetadataStorage Include="Connected Services\OPENControl\" />
@@ -801,6 +859,19 @@
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="fwlib30i.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Fwlib32.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="fwlibe1.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Siemens.Sinumerik.Operate.Services.Wrapper.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
+2 -2
View File
@@ -132,7 +132,7 @@ namespace CMS_CORE.Fanuc
CheckConnection();
ReadStaticNCData();
Language = ConverToSTEPLanguage(FanucLanguage);
Language = ConvertToSTEPLanguage(FanucLanguage);
}
@@ -1394,7 +1394,7 @@ namespace CMS_CORE.Fanuc
//Convert to Step Language
private CultureInfo ConverToSTEPLanguage(byte language)
private CultureInfo ConvertToSTEPLanguage(byte language)
{
switch (language)
{
Binary file not shown.
+11 -13
View File
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="OPENcontrol" />
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding"
bindingConfiguration="OPENcontrol" contract="OPENControl.OPENcontrolPortType"
name="OPENcontrol" />
</client>
</system.serviceModel>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="OPENcontrol" />
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding" bindingConfiguration="OPENcontrol" contract="OPENControl.OPENcontrolPortType" name="OPENcontrol" />
</client>
</system.serviceModel>
</configuration>
Binary file not shown.
Binary file not shown.
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SKGL" version="2.0.5.3" targetFramework="net452" />
</packages>
@@ -34,6 +34,46 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
@@ -113,6 +153,9 @@
<EmbeddedResource Include="Views\StartupPanel.resx">
<DependentUpon>StartupPanel.cs</DependentUpon>
</EmbeddedResource>
<None Include="Nc_Demo_Db.db">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
@@ -3,4 +3,10 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>http://localhost:8080/hello</StartArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<StartArguments>http://localhost:8080/hello</StartArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<StartArguments>http://localhost:8080/hello</StartArguments>
</PropertyGroup>
</Project>
@@ -327,6 +327,13 @@ namespace Nc_Demo_Application
var stack = new Stack<TreeNode>();
var rootDirectory = new DirectoryInfo(path);
if (!rootDirectory.Exists)
{
if (MessageBox.Show("Part-Program Directory not found. Do you want to create it?", "Nc Demo Application", MessageBoxButtons.YesNo) == DialogResult.Yes)
rootDirectory.Create();
}
// Push
var node = new TreeNode(rootDirectory.Name) { Tag = rootDirectory };
stack.Push(node);