diff --git a/MTC_Adapter/MTC_Adapter/AdapterESA.cs b/MTC_Adapter/MTC_Adapter/AdapterESA.cs index 33ddee0..ac7bf52 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterESA.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterESA.cs @@ -26,7 +26,7 @@ namespace MTC_Adapter /// public AdapterESA(MainForm caller, AdapterConf adpConf) : base(caller, adpConf) { - string iniPath = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("adapterConfPath"), utils.CRS("defaultEsaFile")); + string iniPath = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("defaultEsaFile")); if (utils.CRB("verbose")) lg.Info("Start init Adapter ESA dal file {0}", iniPath); diff --git a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs index 4ad14a4..a528009 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterFanuc.cs @@ -1152,7 +1152,7 @@ namespace MTC_Adapter // carico dati x Maintenance if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore variabili manutenzione gestite"); int totRighe = 0; - string fileName = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("CmsMaintDataConfFilePath")); + string fileName = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("CounterListFilePath")); string linea; totRighe = File.ReadLines(fileName).Count(); // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs index 445debc..b5001bc 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs @@ -1122,7 +1122,7 @@ namespace MTC_Adapter { if (utils.CRB("verbose")) lg.Info("Inizio caricamento vettore allarmi"); int totRighe = 0; - string fileName = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("AlarmList")); + string fileName = string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("AlarmList")); string linea; totRighe = File.ReadLines(fileName).Count(); // creo un vettore della dimensione corretta... conta anche commenti tanto poi riduco... diff --git a/MTC_Adapter/MTC_Adapter/App.config b/MTC_Adapter/MTC_Adapter/App.config index 130fd0e..bcc5add 100644 --- a/MTC_Adapter/MTC_Adapter/App.config +++ b/MTC_Adapter/MTC_Adapter/App.config @@ -57,9 +57,9 @@ - + - + @@ -68,7 +68,7 @@ - + diff --git a/MTC_Adapter/MTC_Adapter/AlarmList.txt b/MTC_Adapter/MTC_Adapter/DATA/CONF/AlarmList.map similarity index 100% rename from MTC_Adapter/MTC_Adapter/AlarmList.txt rename to MTC_Adapter/MTC_Adapter/DATA/CONF/AlarmList.map diff --git a/MTC_Adapter/MTC_Adapter/CmsMaintDataConf.txt b/MTC_Adapter/MTC_Adapter/DATA/CONF/CounterList.map similarity index 100% rename from MTC_Adapter/MTC_Adapter/CmsMaintDataConf.txt rename to MTC_Adapter/MTC_Adapter/DATA/CONF/CounterList.map diff --git a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj index d1b5ea5..03044cc 100644 --- a/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj +++ b/MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj @@ -124,9 +124,9 @@ Always - + Always - + App.config @@ -146,7 +146,7 @@ Designer - + @@ -237,10 +237,10 @@ Always - + Always - - + + Always diff --git a/MTC_Adapter/MTC_Adapter/MainForm.cs b/MTC_Adapter/MTC_Adapter/MainForm.cs index 7ae0b31..b93662f 100644 --- a/MTC_Adapter/MTC_Adapter/MainForm.cs +++ b/MTC_Adapter/MTC_Adapter/MainForm.cs @@ -285,7 +285,7 @@ namespace MTC_Adapter { get { - return string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("adapterConfPath"), utils.CRS("defaultConfFile")); + return string.Format(@"{0}\{1}\{2}", Application.StartupPath, utils.CRS("baseConfPath"), utils.CRS("defaultConfFile")); } } protected string defPersLayerFile @@ -1025,7 +1025,7 @@ namespace MTC_Adapter /// protected string filePath(string fileName) { - return string.Format("{0}/{1}", utils.CRS("adapterConfPath"), fileName); + return string.Format("{0}/{1}", utils.CRS("baseConfPath"), fileName); } private void mLoadAdaptConf_Click(object sender, EventArgs e) { @@ -1033,7 +1033,7 @@ namespace MTC_Adapter OpenFileDialog openFileDial = new OpenFileDialog(); // directory iniziale - openFileDial.InitialDirectory = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("adapterConfPath")); + openFileDial.InitialDirectory = string.Format(@"{0}\{1}", Application.StartupPath, utils.CRS("baseConfPath")); // Set filter options and filter index. openFileDial.Filter = "XML Files (.xml)|*.xml|All Files (*.*)|*.*"; openFileDial.FilterIndex = 1; diff --git a/MTC_Adapter/MTC_Adapter/Resources/CMS/AlarmListFANUC.txt b/MTC_Adapter/MTC_Adapter/Resources/CMS/AlarmListFANUC.map similarity index 100% rename from MTC_Adapter/MTC_Adapter/Resources/CMS/AlarmListFANUC.txt rename to MTC_Adapter/MTC_Adapter/Resources/CMS/AlarmListFANUC.map diff --git a/MTC_Adapter/MTC_Adapter/Resources/SCM/AlarmListEsaGv.txt b/MTC_Adapter/MTC_Adapter/Resources/SCM/AlarmListEsaGv.map similarity index 100% rename from MTC_Adapter/MTC_Adapter/Resources/SCM/AlarmListEsaGv.txt rename to MTC_Adapter/MTC_Adapter/Resources/SCM/AlarmListEsaGv.map diff --git a/MTC_Adapter/MTC_Adapter/SetupAdapter.cs b/MTC_Adapter/MTC_Adapter/SetupAdapter.cs index dbcfb85..7a3264d 100644 --- a/MTC_Adapter/MTC_Adapter/SetupAdapter.cs +++ b/MTC_Adapter/MTC_Adapter/SetupAdapter.cs @@ -33,7 +33,7 @@ namespace MTC_Adapter { get { - return string.Format("{0}/{1}", utils.CRS("adapterConfPath"), txtFileName.Text); + return string.Format("{0}/{1}", utils.CRS("baseConfPath"), txtFileName.Text); } } diff --git a/MTC_Adapter/MTC_Adapter/setupTgt.bat b/MTC_Adapter/MTC_Adapter/setupTgt.bat index fc0f35d..c756ce6 100644 --- a/MTC_Adapter/MTC_Adapter/setupTgt.bat +++ b/MTC_Adapter/MTC_Adapter/setupTgt.bat @@ -25,7 +25,7 @@ del %2"MTCA.ico" del %2"AlarmList.txt" del %2"DATA\CONF\*" copy %2"Resources\CMS\CMS.ico" %2"MTCA.ico" -copy %2"Resources\CMS\AlarmListFANUC.txt" %2"AlarmList.txt" +copy %2"Resources\CMS\AlarmListFANUC.map" %2"DATA\CONF\AlarmList.map" copy %2"Resources\CMS\FANUC.xml" %2"DATA\CONF\Adapter_ItemList.xml" goto END @@ -35,7 +35,7 @@ del %2"MTCA.ico" del %2"AlarmList.txt" del %2"DATA\CONF\*" copy %2"Resources\SCM\SCM.ico" %2"MTCA.ico" -copy %2"Resources\SCM\AlarmListEsaGv.txt" %2"AlarmList.txt" +copy %2"Resources\SCM\AlarmListEsaGv.map" %2"DATA\CONF\AlarmList.map" copy %2"Resources\CMS\SCM_ESA.xml" %2"DATA\CONF\Adapter_ItemList.xml" copy %2"Resources\CMS\EsaKvara.ini" %2"DATA\CONF\EsaKvara.ini" goto END