diff --git a/EgwProxy.Icoel/Compac/ComClient.cs b/EgwProxy.Icoel/Compac/ComClient.cs
index e4b0bd56..646d41af 100644
--- a/EgwProxy.Icoel/Compac/ComClient.cs
+++ b/EgwProxy.Icoel/Compac/ComClient.cs
@@ -5,6 +5,9 @@ using System.ServiceModel;
namespace EgwProxy.Icoel.Compac
{
+ ///
+ /// Classe di comunicazione x
+ ///
public class ComClient : IDisposable
{
#region Public Constructors
@@ -109,7 +112,7 @@ namespace EgwProxy.Icoel.Compac
/// Elenco dei layout attivi della varietà
///
/// Guid della varietà
- ///
+ /// Oggetto Lyout attivo
internal Layout GetActiveLayout(Guid VarietyId)
{
return SSClient.GetActiveLayout(VarietyId);
@@ -118,7 +121,7 @@ namespace EgwProxy.Icoel.Compac
///
/// Elenco varietà attive
///
- ///
+ /// Array Variety attive
internal Variety[] GetActiveVarieties()
{
return SSClient.GetActiveVarieties();
@@ -136,7 +139,7 @@ namespace EgwProxy.Icoel.Compac
///
/// Recupera il batch corrente (se monolinea)
///
- ///
+ /// Batch corrente (singolo)
internal Batch GetCurrentBatch()
{
return SSClient.GetCurrentBatch();
@@ -146,7 +149,7 @@ namespace EgwProxy.Icoel.Compac
/// Recupera il batch corrente data la linea
///
/// Numero della linea 1=sx/2=dx
- ///
+ /// Batch della linea selezionata
internal Batch GetCurrentBatchByLane(int lineNum)
{
return SSClient.GetCurrentBatchByLane(lineNum);
@@ -156,7 +159,7 @@ namespace EgwProxy.Icoel.Compac
/// Elenco dei layout della varietà
///
/// Guid della varietà
- ///
+ /// Layout della Variety
internal Layout[] GetLayouts(Guid VarietyId)
{
return SSClient.GetLayouts(VarietyId);
diff --git a/EgwProxy.Icoel/Connector.cs b/EgwProxy.Icoel/Connector.cs
index b00b7014..a9ca98ca 100644
--- a/EgwProxy.Icoel/Connector.cs
+++ b/EgwProxy.Icoel/Connector.cs
@@ -5,6 +5,9 @@ using System.Collections.Generic;
namespace EgwProxy.Icoel
{
+ ///
+ /// Connettore proxy x servizi rest di Icoel
+ ///
public class Connector
{
#region Public Constructors
@@ -12,8 +15,8 @@ namespace EgwProxy.Icoel
///
/// Inizializazzione classe con salvataggio ip/porta del webservice del sizer
///
- ///
- ///
+ /// Indirizzo IP del sizer
+ /// POrta del sizer (default 8001)
public Connector(string ipAddress, string tcpPort)
{
this.ipAddress = ipAddress;
@@ -27,7 +30,7 @@ namespace EgwProxy.Icoel
///
/// Verifica il fornitore e se non ci fosse crea
///
- ///
+ /// Struttura GrowerInfo del fornitore
public void CheckGrower(GrowerInfo GrowerData)
{
using (var Client = new ComClient(ipAddress, tcpPort))
@@ -51,9 +54,9 @@ namespace EgwProxy.Icoel
}
///
- /// Recupera elenco dei Batch correnti (su L1 SX e L2 DX)
+ /// Recupera elenco dei Batch correnti
///
- ///
+ /// Dizionario dei batch sulle due linee (1=SX, 2=DX)
public Dictionary GetCurrentBatch()
{
Dictionary outVal = new Dictionary();
@@ -72,8 +75,7 @@ namespace EgwProxy.Icoel
///
/// Restituisce un dictionary di varietà e relativi layout
///
- ///
- ///
+ /// Dizionario: key=Variety, value=Layout[] associati
public Dictionary GetLayoutAndVariety()
{
Dictionary outVal = new Dictionary();
@@ -95,7 +97,7 @@ namespace EgwProxy.Icoel
/// Restituisce un array di Layout validi data Guid della Variety
///
///
- ///
+ /// Array di Layout della varietà dato suo Guid
public Layout[] GetLayoutForVariety(Guid varGuid)
{
Layout[] outVal = new Layout[1];
@@ -112,8 +114,8 @@ namespace EgwProxy.Icoel
///
/// Restituisce un dictionary di layout validi x un array di varietà fornito
///
- ///
- ///
+ /// Array varietà di cui ottenere i layout
+ /// Dizionario: key=Variety, value=Layout[] associati
public Dictionary GetLayoutForVarietyList(Variety[] varietiesList)
{
Dictionary outVal = new Dictionary();
@@ -134,7 +136,7 @@ namespace EgwProxy.Icoel
/// Restituisce elenco delle Variety
///
/// Solo attive (true) o tutte (false)
- ///
+ /// Elenco delel Variety trovate
public Variety[] GetVarietyList(bool onlyActive = true)
{
Variety[] varietiesList;
@@ -177,7 +179,7 @@ namespace EgwProxy.Icoel
///
///
///
- ///
+ /// Oggetto Batch creato
private Batch CreateBatch(GrowerInfo GrowerData, Guid VarietyId, Guid LayoutId, string SizingProfileName)
{
var batch = new Batch();
diff --git a/EgwProxy.Icoel/GrowerInfo.cs b/EgwProxy.Icoel/GrowerInfo.cs
index b3fd979f..68566c7c 100644
--- a/EgwProxy.Icoel/GrowerInfo.cs
+++ b/EgwProxy.Icoel/GrowerInfo.cs
@@ -10,7 +10,7 @@ namespace EgwProxy.Icoel
#region Public Properties
///
- /// Riga commento 01
+ /// Lista di commenti
///
public List Comments { get; set; } = new List() { "Commento 01", "Commento 02", "Commento 01" };
diff --git a/EgwProxy.Icoel/INI/BatchDetails.cs b/EgwProxy.Icoel/INI/BatchDetails.cs
deleted file mode 100644
index 581f3fb5..00000000
--- a/EgwProxy.Icoel/INI/BatchDetails.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgwProxy.Icoel.INI
-{
- class BatchDetails
- {
- private const string NameFile = "batch.ini";
- private readonly IniFile _sett;
-
-
- public BatchDetails()
- {
- _sett = new IniFile();
- }
- public string GrowerCode
- {
- get { return _sett.GetKeyValue("Batch", "GrowerCode"); }
- set { _sett.SetKeyValue("Batch", "GrowerCode", value); }
- }
-
- public string GrowerName
- {
- get { return _sett.GetKeyValue("Batch", "GrowerName"); }
- set { _sett.SetKeyValue("Batch", "GrowerName", value); }
- }
- public string Comment1
- {
- get { return _sett.GetKeyValue("Batch", "Comment1"); }
- set { _sett.SetKeyValue("Batch", "Comment1", value); }
- }
- public string Comment2
- {
- get { return _sett.GetKeyValue("Batch", "Comment2"); }
- set { _sett.SetKeyValue("Batch", "Comment2", value); }
- }
- public string Comment3
- {
- get { return _sett.GetKeyValue("Batch", "Comment3"); }
- set { _sett.SetKeyValue("Batch", "Comment3", value); }
- }
-
- public void Load()
- {
- if (!File.Exists(NameFile))
- {
- var fs = File.Create(NameFile);
- fs.Close();
- }
- _sett.Load(NameFile, false);
- }
-
- public void Save()
- {
- _sett.Save(NameFile);
- }
- }
-}
diff --git a/EgwProxy.Icoel/INI/IniFileCs.cs b/EgwProxy.Icoel/INI/IniFileCs.cs
deleted file mode 100644
index 5726dc2a..00000000
--- a/EgwProxy.Icoel/INI/IniFileCs.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
-Date: 08\23\2010 - Ludvik Jerabek - Initial Release
-Version: 1.0
-Comment: Allow INI manipulation in .NET
-License: CPOL
-
-Revisions:
-
-08\23\2010 - Ludvik Jerabek - Initial Release
-11\12\2010 - Ludvik Jerabek - Fixed section regex matching on key values with brackets
-06\20\2015 - Ludvik Jerabek - Fixed key parsing regex to account for keys with spaces in names
-
-
-**DISCLAIMER**
-THIS MATERIAL IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING, BUT Not LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, OR NON-INFRINGEMENT. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT
-APPLY TO YOU. IN NO EVENT WILL I BE LIABLE TO ANY PARTY FOR ANY
-DIRECT, INDIRECT, SPECIAL OR OTHER CONSEQUENTIAL DAMAGES FOR ANY
-USE OF THIS MATERIAL INCLUDING, WITHOUT LIMITATION, ANY LOST
-PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
-YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
-EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-*/
-
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Diagnostics;
-using System;
-
-// IniFile class used to read and write ini files by loading the file into memory
-public class IniFile
-{
- // List of IniSection objects keeps track of all the sections in the INI file
- private Hashtable m_sections;
-
- // Public constructor
- public IniFile()
- {
- m_sections = new Hashtable(StringComparer.InvariantCultureIgnoreCase);
- }
-
- // Loads the Reads the data in the ini file into the IniFile object
- public void Load(string sFileName )
- {
- Load(sFileName, false);
- }
-
- // Loads the Reads the data in the ini file into the IniFile object
- public void Load(string sFileName, bool bMerge )
- {
- if (!bMerge)
- {
- RemoveAllSections();
- }
- // Clear the object...
- IniSection tempsection = null;
- StreamReader oReader = new StreamReader(sFileName);
- Regex regexcomment = new Regex("^([\\s]*#.*)", (RegexOptions.Singleline | RegexOptions.IgnoreCase));
- Regex regexsection = new Regex("^[\\s]*\\[[\\s]*([^\\[\\s].*[^\\s\\]])[\\s]*\\][\\s]*$", (RegexOptions.Singleline | RegexOptions.IgnoreCase));
- Regex regexkey = new Regex("^\\s*([^=]*[^\\s=])\\s*=(.*)", (RegexOptions.Singleline | RegexOptions.IgnoreCase));
-
- while (!oReader.EndOfStream)
- {
- string line = oReader.ReadLine();
- if (line != string.Empty)
- {
- Match m = null;
- if (regexcomment.Match(line).Success)
- {
- m = regexcomment.Match(line);
- Trace.WriteLine(string.Format("Skipping Comment: {0}", m.Groups[0].Value));
- }
- else if (regexsection.Match(line).Success)
- {
- m = regexsection.Match(line);
- Trace.WriteLine(string.Format("Adding section [{0}]", m.Groups[1].Value));
- tempsection = AddSection(m.Groups[1].Value);
- }
- else if ( regexkey.Match(line).Success && tempsection != null)
- {
- m = regexkey.Match(line);
- Trace.WriteLine(string.Format("Adding Key [{0}]=[{1}]", m.Groups[1].Value, m.Groups[2].Value));
- tempsection.AddKey(m.Groups[1].Value).Value = m.Groups[2].Value;
- }
- else if ( tempsection != null )
- {
- // Handle Key without Value
- Trace.WriteLine(string.Format("Adding Key [{0}]", line));
- tempsection.AddKey(line);
- }
- else
- {
- // This should not occur unless the tempsection is not created yet...
- Trace.WriteLine(string.Format("Skipping unknown type of data: {0}", line));
- }
- }
- }
- oReader.Close();
- }
-
- // Used to save the data back to the file or your choice
- public void Save(string sFileName)
- {
- StreamWriter oWriter = new StreamWriter(sFileName, false);
- foreach (IniSection s in Sections)
- {
- Trace.WriteLine(string.Format("Writing Section: [{0}]", s.Name));
- oWriter.WriteLine(string.Format("[{0}]", s.Name));
- foreach (IniSection.IniKey k in s.Keys)
- {
- if (k.Value != string.Empty)
- {
- Trace.WriteLine(string.Format("Writing Key: {0}={1}", k.Name, k.Value));
- oWriter.WriteLine(string.Format("{0}={1}", k.Name, k.Value));
- }
- else
- {
- Trace.WriteLine(string.Format("Writing Key: {0}", k.Name));
- oWriter.WriteLine(string.Format("{0}", k.Name));
- }
- }
- }
- oWriter.Close();
- }
-
- // Gets all the sections names
- public System.Collections.ICollection Sections
- {
- get
- {
- return m_sections.Values;
- }
- }
-
- // Adds a section to the IniFile object, returns a IniSection object to the new or existing object
- public IniSection AddSection(string sSection )
- {
- IniSection s = null;
- sSection = sSection.Trim();
- // Trim spaces
- if (m_sections.ContainsKey(sSection))
- {
- s = (IniSection)m_sections[sSection];
- }
- else
- {
- s = new IniSection(this, sSection);
- m_sections[sSection] = s;
- }
- return s;
- }
-
- // Removes a section by its name sSection, returns trus on success
- public bool RemoveSection(string sSection)
- {
- sSection = sSection.Trim();
- return RemoveSection(GetSection(sSection));
- }
-
- // Removes section by object, returns trus on success
- public bool RemoveSection(IniSection Section)
- {
- if (Section != null)
- {
- try
- {
- m_sections.Remove(Section.Name);
- return true;
- }
- catch( Exception ex )
- {
- Trace.WriteLine(ex.Message);
- }
- }
- return false;
- }
-
- // Removes all existing sections, returns trus on success
- public bool RemoveAllSections()
- {
- m_sections.Clear();
- return (m_sections.Count == 0);
- }
-
- // Returns an IniSection to the section by name, NULL if it was not found
- public IniSection GetSection(string sSection)
- {
- sSection = sSection.Trim();
- // Trim spaces
- if (m_sections.ContainsKey(sSection))
- {
- return (IniSection)m_sections[sSection];
- }
- return null;
- }
-
- // Returns a KeyValue in a certain section
- public string GetKeyValue(string sSection, string sKey)
- {
- IniSection s = GetSection(sSection);
- if (s != null)
- {
- IniSection.IniKey k = s.GetKey(sKey);
- if (k != null)
- {
- return k.Value;
- }
- }
- return string.Empty;
- }
-
- // Sets a KeyValuePair in a certain section
- public bool SetKeyValue(string sSection, string sKey, string sValue)
- {
- IniSection s = AddSection(sSection);
- if (s != null)
- {
- IniSection.IniKey k = s.AddKey(sKey);
- if (k != null)
- {
- k.Value = sValue;
- return true;
- }
- }
- return false;
- }
-
- // Renames an existing section returns true on success, false if the section didn't exist or there was another section with the same sNewSection
- public bool RenameSection(string sSection, string sNewSection)
- {
- // Note string trims are done in lower calls.
- bool bRval = false;
- IniSection s = GetSection(sSection);
- if (s != null)
- {
- bRval = s.SetName(sNewSection);
- }
- return bRval;
- }
-
- // Renames an existing key returns true on success, false if the key didn't exist or there was another section with the same sNewKey
- public bool RenameKey(string sSection, string sKey, string sNewKey)
- {
- // Note string trims are done in lower calls.
- IniSection s = GetSection(sSection);
- if (s != null)
- {
- IniSection.IniKey k = s.GetKey(sKey);
- if (k != null)
- {
- return k.SetName(sNewKey);
- }
- }
- return false;
- }
-
- // IniSection class
- public class IniSection
- {
- // IniFile IniFile object instance
- private IniFile m_pIniFile;
- // Name of the section
- private string m_sSection;
- // List of IniKeys in the section
- private Hashtable m_keys;
-
- // Constuctor so objects are internally managed
- protected internal IniSection(IniFile parent, string sSection)
- {
- m_pIniFile = parent;
- m_sSection = sSection;
- m_keys = new Hashtable(StringComparer.InvariantCultureIgnoreCase);
- }
-
- // Returns and hashtable of keys associated with the section
- public System.Collections.ICollection Keys
- {
- get
- {
- return m_keys.Values;
- }
- }
-
- // Returns the section name
- public string Name
- {
- get
- {
- return m_sSection;
- }
- }
-
- // Adds a key to the IniSection object, returns a IniKey object to the new or existing object
- public IniKey AddKey(string sKey)
- {
- sKey = sKey.Trim();
- IniSection.IniKey k = null;
- if (sKey.Length != 0)
- {
- if (m_keys.ContainsKey(sKey))
- {
- k = (IniKey)m_keys[sKey];
- }
- else
- {
- k = new IniSection.IniKey(this, sKey);
- m_keys[sKey] = k;
- }
- }
- return k;
- }
-
- // Removes a single key by string
- public bool RemoveKey(string sKey)
- {
- return RemoveKey(GetKey(sKey));
- }
-
- // Removes a single key by IniKey object
- public bool RemoveKey(IniKey Key)
- {
- if (Key != null)
- {
- try
- {
- m_keys.Remove(Key.Name);
- return true;
- }
- catch (Exception ex)
- {
- Trace.WriteLine(ex.Message);
- }
- }
- return false;
- }
-
- // Removes all the keys in the section
- public bool RemoveAllKeys()
- {
- m_keys.Clear();
- return (m_keys.Count == 0);
- }
-
- // Returns a IniKey object to the key by name, NULL if it was not found
- public IniKey GetKey(string sKey)
- {
- sKey = sKey.Trim();
- if (m_keys.ContainsKey(sKey))
- {
- return (IniKey)m_keys[sKey];
- }
- return null;
- }
-
- // Sets the section name, returns true on success, fails if the section
- // name sSection already exists
- public bool SetName(string sSection)
- {
- sSection = sSection.Trim();
- if (sSection.Length != 0)
- {
- // Get existing section if it even exists...
- IniSection s = m_pIniFile.GetSection(sSection);
- if (s != this && s != null) return false;
- try
- {
- // Remove the current section
- m_pIniFile.m_sections.Remove(m_sSection);
- // Set the new section name to this object
- m_pIniFile.m_sections[sSection] = this;
- // Set the new section name
- m_sSection = sSection;
- return true;
- }
- catch (Exception ex)
- {
- Trace.WriteLine(ex.Message);
- }
- }
- return false;
- }
-
- // Returns the section name
- public string GetName()
- {
- return m_sSection;
- }
-
- // IniKey class
- public class IniKey
- {
- // Name of the Key
- private string m_sKey;
- // Value associated
- private string m_sValue;
- // Pointer to the parent CIniSection
- private IniSection m_section;
-
- // Constuctor so objects are internally managed
- protected internal IniKey(IniSection parent, string sKey)
- {
- m_section = parent;
- m_sKey = sKey;
- }
-
- // Returns the name of the Key
- public string Name
- {
- get
- {
- return m_sKey;
- }
- }
-
- // Sets or Gets the Value of the key
- public string Value
- {
- get
- {
- return m_sValue;
- }
- set
- {
- m_sValue = value;
- }
- }
-
- // Sets the Value of the key
- public void SetValue(string sValue)
- {
- m_sValue = sValue;
- }
- // Returns the Value of the Key
- public string GetValue()
- {
- return m_sValue;
- }
-
- // Sets the key name
- // Returns true on success, fails if the section name sKey already exists
- public bool SetName(string sKey)
- {
- sKey = sKey.Trim();
- if (sKey.Length != 0)
- {
- IniKey k = m_section.GetKey(sKey);
- if (k != this && k != null) return false;
- try
- {
- // Remove the current key
- m_section.m_keys.Remove(m_sKey);
- // Set the new key name to this object
- m_section.m_keys[sKey] = this;
- // Set the new key name
- m_sKey = sKey;
- return true;
- }
- catch (Exception ex)
- {
- Trace.WriteLine(ex.Message);
- }
- }
- return false;
- }
-
- // Returns the name of the Key
- public string GetName()
- {
- return m_sKey;
- }
- } // End of IniKey class
- } // End of IniSection class
-} // End of IniFile class
-
-
diff --git a/EgwProxy.Icoel/INI/Settaggi.cs b/EgwProxy.Icoel/INI/Settaggi.cs
deleted file mode 100644
index b22d4760..00000000
--- a/EgwProxy.Icoel/INI/Settaggi.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.IO;
-
-namespace BinsTracker.INI
-{
- public class Settaggi
- {
-
- private const string NameFile = "conf.ini";
- private readonly IniFile _sett;
-
-
- public Settaggi()
- {
- _sett = new IniFile();
- }
- public string IndirizzoIpSizer
- {
- get { return _sett.GetKeyValue("Sizer", "IndirizzoIp"); }
- set { _sett.SetKeyValue("Sizer", "IndirizzoIp", value); }
- }
-
- public string SizerTcpPort
- {
- get { return _sett.GetKeyValue("Sizer", "TcpPort"); }
- set { _sett.SetKeyValue("Sizer", "TcpPort", value); }
- }
- public string IndirizzoIpSizerClient
- {
- get { return _sett.GetKeyValue("Sizer", "IndirizzoIpTracciabilità"); }
- set { _sett.SetKeyValue("Sizer", "IndirizzoIpTracciabilità", value); }
- }
- public string TcpPortSizerClient
- {
- get { return _sett.GetKeyValue("Sizer", "TcpPortTracciabilità"); }
- set { _sett.SetKeyValue("Sizer", "TcpPortTracciabilità", value); }
- }
-
- public void Load()
- {
- if (!File.Exists(NameFile))
- {
- var fs = File.Create(NameFile);
- fs.Close();
- }
- _sett.Load(NameFile, false);
- }
-
- public void Save()
- {
- _sett.Save(NameFile);
- }
- }
-}
\ No newline at end of file
diff --git a/EgwProxy.Icoel/batch.ini b/EgwProxy.Icoel/batch.ini
deleted file mode 100644
index a7e6ca86..00000000
--- a/EgwProxy.Icoel/batch.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Batch]
-GrowerCode=02
-GrowerName=Egalware
-Comment1=Prova Invio
-Comment2=Console app
-Comment3=Selezionato Variety e layout
\ No newline at end of file
diff --git a/EgwProxy.Icoel/conf.ini b/EgwProxy.Icoel/conf.ini
deleted file mode 100644
index ebbeb530..00000000
--- a/EgwProxy.Icoel/conf.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Sizer]
-IndirizzoIp=192.168.137.50
-TcpPort=8001
\ No newline at end of file