From 061e3aaf68074ea5d1a66cb966b53acaaf9f18b0 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 4 Aug 2023 17:07:55 +0200 Subject: [PATCH 1/3] fix grafici x unificare le due pagine --- SMGen.Data/Services/SMGDataService.cs | 19 +- SMGen/Components/FilesList.razor | 2 +- SMGen/Pages/SMEvent2State.razor | 2 +- SMGen/Pages/SMIn2Event.razor | 32 +- .../Rules/PROCESSED/BIT/10049_LVF_FANUC.csv | 448 --- .../PROCESSED/BIT/10063_SEGHETTO_DANOBAT.csv | 3584 ----------------- .../PROCESSED/BIT/10066_FLUITEK_SEMAPHORE.csv | 80 - .../PROCESSED/BIT/10067_FLUITEK_FEMCO.csv | 192 - .../PROCESSED/BIT/10_Mitsubishi_simple.csv | 128 - SMGen/Temp/Rules/PROCESSED/BIT/11.csv | 1792 --------- .../PROCESSED/BIT/12_FAMIGLIA_JETCO_NEW.csv | 29 - SMGen/Temp/Rules/PROCESSED/BIT/15.csv | 2304 ----------- .../Rules/PROCESSED/BIT/15_FAMIGLIA_JETCO.csv | 1 + SMGen/Temp/Rules/PROCESSED/BIT/17.csv | 1536 ------- SMGen/Temp/Rules/PROCESSED/BIT/18.csv | 2304 ----------- SMGen/Temp/Rules/PROCESSED/BIT/19.csv | 2304 ----------- .../Rules/PROCESSED/BIT/1_Simple_Machine.csv | 160 - SMGen/Temp/Rules/PROCESSED/BIT/20_nikkei.csv | 288 -- SMGen/Temp/Rules/PROCESSED/BIT/21_DMG1035.csv | 768 ---- SMGen/Temp/Rules/PROCESSED/BIT/22_COSMAP.csv | 2304 ----------- .../Rules/PROCESSED/BIT/23_EMCO_LM600.csv | 384 -- .../Rules/PROCESSED/BIT/24_EMCO_MM500.csv | 192 - .../BIT/25_ABB_BTB_TECNOTRANSFER.csv | 448 --- .../PROCESSED/BIT/26_ABB_DOOSAN_main.csv | 448 --- .../PROCESSED/BIT/27_ABB_DOOSAN_pallet.csv | 2 - .../Rules/PROCESSED/BIT/28_ABB_RIELLO.csv | 448 --- .../Rules/PROCESSED/BIT/29_EMCO_LM1200.csv | 192 - SMGen/Temp/Rules/PROCESSED/BIT/2_Caber.csv | 192 - .../Rules/PROCESSED/BIT/30_SCATOLE_INTEC.csv | 192 - .../Temp/Rules/PROCESSED/BIT/46_OSAI_CMS.csv | 192 - .../Rules/PROCESSED/BIT/54_STD_base_6bit.csv | 448 --- .../Rules/PROCESSED/BIT/5_MoriSeiki_main.csv | 112 - .../Rules/PROCESSED/BIT/60_STD_MACHINE.csv | 2048 ---------- .../Rules/PROCESSED/BIT/61_STD_DP_MAIN.csv | 2048 ---------- .../Rules/PROCESSED/BIT/62_STD_DP_TAV.csv | 2 - .../PROCESSED/BIT/66_FLUITEK_SEMAPHORE.csv | 81 - .../Rules/PROCESSED/BIT/67_FLUITEK_FEMCO.csv | 193 - .../PROCESSED/BIT/6_MoriSeiki_pallet.csv | 2 - .../PROCESSED/BIT/7_MoriSeiki_simple.csv | 64 - .../Temp/Rules/PROCESSED/BIT/8_TAV_1_IMP.csv | 11 - .../Temp/Rules/PROCESSED/BIT/9_TAV_2_IMP.csv | 11 - 41 files changed, 29 insertions(+), 25958 deletions(-) diff --git a/SMGen.Data/Services/SMGDataService.cs b/SMGen.Data/Services/SMGDataService.cs index bd130c8..4cb9ac4 100644 --- a/SMGen.Data/Services/SMGDataService.cs +++ b/SMGen.Data/Services/SMGDataService.cs @@ -303,6 +303,10 @@ namespace SMGen.Data.Services case "$STATE": States.Add(sz_tokens[2].Trim().ToUpper()); + if (!StatesAll.ContainsKey(sz_tokens[2].Trim().ToUpper())) + { + StatesAll.Add(sz_tokens[2].Trim().ToUpper(), int.Parse(sz_tokens[1].Trim().ToUpper())); + } break; case "$EVENT": @@ -313,6 +317,10 @@ namespace SMGen.Data.Services Nome = sz_tokens[2].Trim().ToUpper() }; + + events2Add.Add(newEvent); +#if false + var listElement = events2Add.FirstOrDefault(x => x.IdxTipo == newEvent.IdxTipo); if (listElement != null && listElement.Nome != newEvent.Nome) @@ -320,10 +328,11 @@ namespace SMGen.Data.Services Log.Error($"L'evento '{newEvent.IdxTipo}: {newEvent.Nome}' non può essere importato perchè diverso da '{listElement.IdxTipo}: {listElement.Nome}' nel file {currFile.origFileName}.{Environment.NewLine}"); return null; } - else if(listElement == null) + else if (listElement == null) { events2Add.Add(newEvent); - } + } +#endif break; case "$RULES": @@ -353,13 +362,11 @@ namespace SMGen.Data.Services { var temp_rule = new RuleClass() { - id_state = StatesAll[sz_temp.Trim().ToUpper()], state = sz_temp.Trim().ToUpper(), - expression = sz_tokens[1].Trim().ToUpper(), next_state = sz_tokens[2].Trim().ToUpper(), - id_next_state = StatesAll[sz_temp.Trim().ToUpper()], event_to_send = sz_tokens[3].Trim().ToUpper(), - id_event_to_send = Events_to_send[sz_tokens[3].Trim().ToUpper()] + id_next_state = StatesAll[sz_tokens[2].Trim().ToUpper()], + id_event_to_send = Events_to_send[sz_tokens[3].Trim().ToUpper()] }; Rules.Add(temp_rule); diff --git a/SMGen/Components/FilesList.razor b/SMGen/Components/FilesList.razor index 556a984..4de78c1 100644 --- a/SMGen/Components/FilesList.razor +++ b/SMGen/Components/FilesList.razor @@ -7,7 +7,7 @@ @if(Files!=null && Files.Count>0) { - + } diff --git a/SMGen/Pages/SMEvent2State.razor b/SMGen/Pages/SMEvent2State.razor index b349134..dd07ee8 100644 --- a/SMGen/Pages/SMEvent2State.razor +++ b/SMGen/Pages/SMEvent2State.razor @@ -24,7 +24,7 @@
-
+