Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aaa

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-05-25 16:50:24 +02:00
parent 202d1d8698
commit 5266971f3c
12 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Sim/MTC_Sim/AdapterConf.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using System.IO;
using System.Xml;
using System.Xml.Serialization;
namespace MTC_Sim
namespace MTC_Adapter
{
#region -- AdapterConf Class --
/// <summary>
MTC_Sim/MTC_Sim/AdapterDemo.cs
+2 -2
View File
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MTC_Sim
namespace MTC_Adapter
{
public class AdapterDemo : AdapterGeneric
{
@@ -17,7 +17,7 @@ namespace MTC_Sim
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public AdapterDemo(CMS_MachineSim caller, AdapterConf adpConf) : base(caller, adpConf)
public AdapterDemo(MainForm caller, AdapterConf adpConf) : base(caller, adpConf)
{
if (utils.CRB("verbose")) lg.Info("Start init Adapter DEMO");
// IMPLICITO: carica da metodo base tutte le specifiche del conf...
MTC_Sim/MTC_Sim/AdapterFanuc.cs
+2 -2
View File
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using CMSCncLib.CNC;
using System.Runtime.InteropServices;
namespace MTC_Sim
namespace MTC_Adapter
{
public class AdapterFanuc : AdapterGeneric
{
@@ -36,7 +36,7 @@ namespace MTC_Sim
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public AdapterFanuc(CMS_MachineSim caller, AdapterConf adpConf) : base(caller, adpConf)
public AdapterFanuc(MainForm caller, AdapterConf adpConf) : base(caller, adpConf)
{
if (utils.CRB("verbose")) lg.Info("Start init Adapter FANUC all'IP {0}", utils.CRS("ipFanuc"));
MTC_Sim/MTC_Sim/AdapterGeneric.cs
+3 -3
View File
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using NLog;
namespace MTC_Sim
namespace MTC_Adapter
{
using MTConnect;
using System.Configuration;
@@ -555,7 +555,7 @@ namespace MTC_Sim
/// <summary>
/// Form chiamante
/// </summary>
protected CMS_MachineSim parentForm;
protected MainForm parentForm;
/// <summary>
/// Conf adapter corrente
/// </summary>
@@ -782,7 +782,7 @@ namespace MTC_Sim
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public AdapterGeneric(CMS_MachineSim caller, AdapterConf adpConf)
public AdapterGeneric(MainForm caller, AdapterConf adpConf)
{
lg = LogManager.GetCurrentClassLogger();
lg.Info("Avvio AdapterGeneric");
MTC_Sim/MTC_Sim/App.config
+1 -2
View File
@@ -31,7 +31,7 @@
<add key="verbose" value="true"/>
<add key="autoLoadConf" value="true"/>
<add key="autoLoadConf" value="false"/>
<add key="defaultConfFile" value="CMS_FANUC.xml"/>
<add key="autoStartOnLoad" value="true"/>
<add key="openDumpOnStart" value="true"/>
@@ -48,7 +48,6 @@
<!--conf file-->
<add key="adapterConfPath" value="AdapterConf"/>
<add key ="adapterConfPathFull" value="C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\CMS-MTConn\MTC_Sim\MTC_Sim\AdapterConf"/>
<add key="AlarmList" value="AlarmList.txt"/>
<add key="SubMode" value="SubMode.txt"/>
MTC_Sim/MTC_Sim/BinaryFormatter.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using System.Globalization;
using System.Numerics;
namespace MTC_Sim
namespace MTC_Adapter
{
public class BinaryFormatter : IFormatProvider, ICustomFormatter
MTC_Sim/MTC_Sim/EnumExtensions.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MTC_Sim
namespace MTC_Adapter
{
public static class EnumerationExtensions
MTC_Sim/MTC_Sim/MTC-Adapter.csproj
+14 -7
View File
@@ -33,7 +33,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>CMS.ico</ApplicationIcon>
<ApplicationIcon>Resurces\CMS.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
@@ -59,15 +59,16 @@
<Link>AdapterVers.cs</Link>
</Compile>
<Compile Include="AdapterConf.cs" />
<Compile Include="AdapterESA.cs" />
<Compile Include="AdapterGeneric.cs" />
<Compile Include="AdapterDemo.cs" />
<Compile Include="AdapterFanuc.cs" />
<Compile Include="BinaryFormatter.cs" />
<Compile Include="CMS_MachineSim.cs">
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CMS_MachineSim.Designer.cs">
<DependentUpon>CMS_MachineSim.cs</DependentUpon>
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="EnumExtensions.cs" />
<Compile Include="Program.cs" />
@@ -79,8 +80,8 @@
<DependentUpon>SetupAdapter.cs</DependentUpon>
</Compile>
<Compile Include="utils.cs" />
<EmbeddedResource Include="CMS_MachineSim.resx">
<DependentUpon>CMS_MachineSim.cs</DependentUpon>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -96,13 +97,15 @@
<DependentUpon>SetupAdapter.cs</DependentUpon>
</EmbeddedResource>
<Content Include="Analisi tempi.txt" />
<Content Include="CMS.ico" />
<Content Include="Resurces\CMS.ico" />
<Content Include="dump\dump.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="logs\.placeholder.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Resurces\SCM.ico" />
<Content Include="MTCA.ico" />
<Content Include="SubMode.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -140,6 +143,10 @@
<Project>{2d769ffd-1122-4276-a115-29246e6d23c5}</Project>
<Name>CMSCncLib</Name>
</ProjectReference>
<ProjectReference Include="..\SCMCncLib\SCMCncLib.csproj">
<Project>{7a12fe26-9c58-4630-973d-d4872374dbaf}</Project>
<Name>SCMCncLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="AdapterConf\CMS_FANUC.xml">
MTC_Sim/MTC_Sim/Program.cs
+2 -2
View File
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace MTC_Sim
namespace MTC_Adapter
{
static class Program
{
@@ -24,7 +24,7 @@ namespace MTC_Sim
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new CMS_MachineSim());
Application.Run(new MainForm());
//FreeConsole();
}
MTC_Sim/MTC_Sim/utils.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MTC_Sim
namespace MTC_Adapter
{
public class utils
{
MTC_Sim/VersGen/AdapterVers.cs
+4 -4
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.1.85")]
[assembly: AssemblyFileVersion("1.0.1.85")]
[assembly: AssemblyCopyright("Steamware-CMS-SCM © 2016-2016")]
[assembly: AssemblyCompany("Steamware-CMS-SCM")]
[assembly: AssemblyVersion("1.0.2.86")]
[assembly: AssemblyFileVersion("1.0.2.86")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
MTC_Sim/VersGen/AdapterVers.tt
+4 -4
View File
@@ -6,10 +6,10 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.1.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.0.1.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware-CMS-SCM © 2016-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware-CMS-SCM")]
[assembly: AssemblyVersion("1.0.2.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.0.2.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware-SCM-CMS")]
<#+
int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2014,10,1)).TotalDays/7;
#>