From cd4eea2d33fafd565bb37c89f3cba37da67c1ca8 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Mon, 28 Nov 2022 08:39:46 -0600 Subject: [PATCH 001/112] Looks like no changes to the file --- .../Recipe/RecipeMgrUnitTest/testSuite.c | 220 +++++++++--------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c index 6829d9a0..b2cd1b6a 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c @@ -20,136 +20,136 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; - utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappRecipeFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/Recipe/Alarms"); - strcpy((char*)&TextID, "SaveFailed"); - strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); - - PV_xgetadr("RecipeMgr:MachineSettings", (void*)&pMachineSettings, &MachineSettingsSize); - PV_xgetadr("RecipeMgr:Parameters", (void*)&pParameters, &ParameterSize); - - LastSelectedIndex++; + Testsuite.Enable = 1; + utInit(&Testsuite); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappRecipeFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/Recipe/Alarms"); + strcpy((char*)&TextID, "SaveFailed"); + strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); + + PV_xgetadr("RecipeMgr:MachineSettings", (void*)&pMachineSettings, &MachineSettingsSize); + PV_xgetadr("RecipeMgr:Parameters", (void*)&pParameters, &ParameterSize); + + LastSelectedIndex++; } void _CYCLIC cyclicWithTest(void) { - utCyclic(&Testsuite); - if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) - strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); - if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) - strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); - if (Testsuite.Informational.LastKnownPassedLocation.File != 0) - strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); + utCyclic(&Testsuite); + if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) + strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); + if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) + strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); + if (Testsuite.Informational.LastKnownPassedLocation.File != 0) + strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); } void _EXIT exitTestSuite(void) { - utExit(&Testsuite); + utExit(&Testsuite); } bool RecipeExists(char* recipeName) { - for (USINT i = 0; i<(sizeof(MpRecipeUIConnect.Recipe.List.Names)/sizeof(MpRecipeUIConnect.Recipe.List.Names[0])); i++) - { - if (strcmp(recipeName, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) - { - return true; - } - } - return false; + for (USINT i = 0; i<(sizeof(MpRecipeUIConnect.Recipe.List.Names)/sizeof(MpRecipeUIConnect.Recipe.List.Names[0])); i++) + { + if (strcmp(recipeName, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) + { + return true; + } + } + return false; } bool SelectRecipe(char* wantedRecipe) { - if (((MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) && (MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_ERROR)) && - (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) != 0)) return false; + if (((MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) && (MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_ERROR)) && + (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) != 0)) return false; - for (USINT i=0; i <= MpRecipeUIConnect.Recipe.List.MaxSelection; i++) - { - if (strcmp(wantedRecipe, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) - MpRecipeUIConnect.Recipe.List.SelectedIndex = i; - } + for (USINT i=0; i <= MpRecipeUIConnect.Recipe.List.MaxSelection; i++) + { + if (strcmp(wantedRecipe, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) + MpRecipeUIConnect.Recipe.List.SelectedIndex = i; + } - return (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) == 0); + return (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) == 0); } testStatusEnum RemoveNonDefaultFiles(char* filter, char* selectFile, const char* category) { - switch (SetupState) - { - case 0: - DirInfo_UT.enable = true; - DirInfo_UT.pDevice = (UDINT)&"mappRecipeFiles"; - DirInfo_UT.pPath = (UDINT)&""; - DirInfo(&DirInfo_UT); - TEST_BUSY_CONDITION(DirInfo_UT.status == 65535); - TEST_ABORT_CONDITION(DirInfo_UT.status != 0); - NumberOfFiles = DirInfo_UT.filenum; - CurrentFile = 0; - SetupState = (NumberOfFiles == 0) ? 100 : 1; - break; - - case 1: - DirRead_UT.enable = true; - DirRead_UT.pDevice = DirInfo_UT.pDevice; - DirRead_UT.entry = CurrentFile; - DirRead_UT.option = fiFILE; - DirRead_UT.pData = (UDINT)&fileInfo; - DirRead_UT.data_len = sizeof(fileInfo); - DirRead(&DirRead_UT); - TEST_BUSY_CONDITION(DirRead_UT.status == 65535); - TEST_ABORT_CONDITION(DirRead_UT.status != 0); - SetupState = 2; - break; - - case 2: - if ((strcmp("Default.par", (char*)fileInfo.Filename) == 0) || - (strcmp("Machine.mcfg", (char*)fileInfo.Filename) == 0)) - { - CurrentFile++; - SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; - break; - } - FileDelete_UT.enable = true; - FileDelete_UT.pDevice = DirInfo_UT.pDevice; - FileDelete_UT.pName = (UDINT)&fileInfo.Filename; - FileDelete(&FileDelete_UT); - TEST_BUSY_CONDITION(FileDelete_UT.status == 65535); - TEST_ABORT_CONDITION(FileDelete_UT.status != 0); - - NumberOfFiles--; - SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; - break; - - case 10: - strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); - strcpy((char*)&MpRecipeUIConnect.Recipe.Filter, filter); - MpRecipeUIConnect.Recipe.Refresh = true; - strcpy((char*)&HmiRecipe.Parameters.Category, category); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_REFRESH) - MpRecipeUIConnect.Recipe.Refresh = false; - SetupState = 11; - break; - - case 11: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - TEST_BUSY_CONDITION(!RecipeExists(selectFile)); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT) - TEST_ABORT_CONDITION(pParameters == NULL); - SetupState = 100; - break; - - case 100: - cycleCount = 0; - TestState = TEST_ARRANGE; - SetupState = 0; - TEST_DONE; - } - TEST_BUSY; + switch (SetupState) + { + case 0: + DirInfo_UT.enable = true; + DirInfo_UT.pDevice = (UDINT)&"mappRecipeFiles"; + DirInfo_UT.pPath = (UDINT)&""; + DirInfo(&DirInfo_UT); + TEST_BUSY_CONDITION(DirInfo_UT.status == 65535); + TEST_ABORT_CONDITION(DirInfo_UT.status != 0); + NumberOfFiles = DirInfo_UT.filenum; + CurrentFile = 0; + SetupState = (NumberOfFiles == 0) ? 100 : 1; + break; + + case 1: + DirRead_UT.enable = true; + DirRead_UT.pDevice = DirInfo_UT.pDevice; + DirRead_UT.entry = CurrentFile; + DirRead_UT.option = fiFILE; + DirRead_UT.pData = (UDINT)&fileInfo; + DirRead_UT.data_len = sizeof(fileInfo); + DirRead(&DirRead_UT); + TEST_BUSY_CONDITION(DirRead_UT.status == 65535); + TEST_ABORT_CONDITION(DirRead_UT.status != 0); + SetupState = 2; + break; + + case 2: + if ((strcmp("Default.par", (char*)fileInfo.Filename) == 0) || + (strcmp("Machine.mcfg", (char*)fileInfo.Filename) == 0)) + { + CurrentFile++; + SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; + break; + } + FileDelete_UT.enable = true; + FileDelete_UT.pDevice = DirInfo_UT.pDevice; + FileDelete_UT.pName = (UDINT)&fileInfo.Filename; + FileDelete(&FileDelete_UT); + TEST_BUSY_CONDITION(FileDelete_UT.status == 65535); + TEST_ABORT_CONDITION(FileDelete_UT.status != 0); + + NumberOfFiles--; + SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; + break; + + case 10: + strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); + strcpy((char*)&MpRecipeUIConnect.Recipe.Filter, filter); + MpRecipeUIConnect.Recipe.Refresh = true; + strcpy((char*)&HmiRecipe.Parameters.Category, category); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_REFRESH) + MpRecipeUIConnect.Recipe.Refresh = false; + SetupState = 11; + break; + + case 11: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + TEST_BUSY_CONDITION(!RecipeExists(selectFile)); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT) + TEST_ABORT_CONDITION(pParameters == NULL); + SetupState = 100; + break; + + case 100: + cycleCount = 0; + TestState = TEST_ARRANGE; + SetupState = 0; + TEST_DONE; + } + TEST_BUSY; } \ No newline at end of file From 717e0c292fb489749b3a93e33e9dbc093cabf853 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Mon, 28 Nov 2022 16:14:08 -0500 Subject: [PATCH 002/112] Commit for tabs/spaces --- .../File/FileMgr/FIFOOperations.st | 18 +- .../Set_RecipeMachineSettings.c | 866 ++++++------ .../RecipeMgrUnitTest/Set_RecipeParameters.c | 1206 ++++++++--------- .../Recipe/RecipeMgrUnitTest/testSuite.c | 220 +-- 4 files changed, 1155 insertions(+), 1155 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st b/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st index 8fd4ae3f..80d1107a 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st @@ -229,15 +229,15 @@ ACTION FIFOOperation: END_IF FILE_CONFIRM_DELETE_WAIT: - IF ((MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_REFRESH) OR (MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_IDLE)) THEN - MpFileManagerUIConnect_FIFO.File.MultiSelect := FALSE; - IF (HmiFile.Parameters.Fifo.FifoType = FILE_FIFO_SIZE_OF_FOLDER) THEN - HmiFile.Status.DeleteStep := SEL((HmiFile.Status.FolderSize > (HmiFile.Parameters.Fifo.MaxFolderSize*1024)), FILE_RESET_SORT_BY, FILE_GO_TO_END); - ELSE - // if more files need to be deleted then go back to select the oldest files - HmiFile.Status.DeleteStep := SEL((MpFileManagerUIConnect_FIFO.File.PathInfo.FileCount > HmiFile.Parameters.Fifo.MaxNumberOfFiles), FILE_RESET_SORT_BY, FILE_GO_TO_END); - END_IF - END_IF + IF ((MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_REFRESH) OR (MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_IDLE)) THEN + MpFileManagerUIConnect_FIFO.File.MultiSelect := FALSE; + IF (HmiFile.Parameters.Fifo.FifoType = FILE_FIFO_SIZE_OF_FOLDER) THEN + HmiFile.Status.DeleteStep := SEL((HmiFile.Status.FolderSize > (HmiFile.Parameters.Fifo.MaxFolderSize*1024)), FILE_RESET_SORT_BY, FILE_GO_TO_END); + ELSE + // if more files need to be deleted then go back to select the oldest files + HmiFile.Status.DeleteStep := SEL((MpFileManagerUIConnect_FIFO.File.PathInfo.FileCount > HmiFile.Parameters.Fifo.MaxNumberOfFiles), FILE_RESET_SORT_BY, FILE_GO_TO_END); + END_IF + END_IF FILE_RESET_SORT_BY: // Restore old sort order diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c index 7072a100..e8243f7d 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c @@ -10,482 +10,482 @@ #include #include "testSuite.h" -#define TIMEOUT_TEST_CASE \ - if (cycleCount >= 254) \ - { \ - char abortMessage[80]; \ - char substate[10]; \ - memset(abortMessage, 0, sizeof(abortMessage)); \ - memset(substate, 0, sizeof(substate)); \ - itoa(ActSubState, substate, 10); \ - strcpy(abortMessage, "Timeout in ActSubState = "); \ - strcat(abortMessage, substate); \ - TEST_FAIL(abortMessage); \ - TEST_DONE; \ - } +#define TIMEOUT_TEST_CASE \ + if (cycleCount >= 254) \ + { \ + char abortMessage[80]; \ + char substate[10]; \ + memset(abortMessage, 0, sizeof(abortMessage)); \ + memset(substate, 0, sizeof(substate)); \ + itoa(ActSubState, substate, 10); \ + strcpy(abortMessage, "Timeout in ActSubState = "); \ + strcat(abortMessage, substate); \ + TEST_FAIL(abortMessage); \ + TEST_DONE; \ + } _SETUP_SET(void) { - return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); + return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); } _TEARDOWN_SET(void) { - SetupState = 0; - TEST_DONE; + SetupState = 0; + TEST_DONE; } _SETUP_TEST(void) { - ArrangeSubState = 0; - ActSubState = 0; - AssertSubState = 0; - return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); + ArrangeSubState = 0; + ActSubState = 0; + AssertSubState = 0; + return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); } _TEARDOWN_TEST(void) { - memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); - MpRecipeUIConnect.Recipe.Load = false; - TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); - - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - MpRecipeUIConnect.Recipe.Refresh = true; - } - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - MpRecipeUIConnect.Recipe.Refresh = false; - - TEST_DONE; + memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); + MpRecipeUIConnect.Recipe.Load = false; + TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); + + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + MpRecipeUIConnect.Recipe.Refresh = true; + } + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + MpRecipeUIConnect.Recipe.Refresh = false; + + TEST_DONE; } _CYCLIC_SET(void) { - cycleCount++; + cycleCount++; } _TEST DefaultValues(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - // set MachineSettings through the pointer - memset(pMachineSettings, 0, sizeof(*pMachineSettings)); - TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - HmiRecipe.Commands.LoadRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == true); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.LoadRecipe = false; - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - case 1: - TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == false); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); - TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); - TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); - TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); - TEST_DONE; - break; - } - TEST_BUSY; - - - TEST_DONE; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + // set MachineSettings through the pointer + memset(pMachineSettings, 0, sizeof(*pMachineSettings)); + TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + HmiRecipe.Commands.LoadRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == true); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.LoadRecipe = false; + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + case 1: + TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == false); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); + TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); + TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); + TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); + TEST_DONE; + break; + } + TEST_BUSY; + + + TEST_DONE; } _TEST CreateNew(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(RecipeExists("test.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(RecipeExists("test.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "Machine"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists("Machine.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "Machine"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists("Machine.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateNonExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test2"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(!RecipeExists("test2.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test2"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(!RecipeExists("test2.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedConfigRecipe, ".")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedConfigRecipe)); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedConfigRecipe, ".")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedConfigRecipe)); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Preview(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - MachineSettings.AddMachineSettingsHere1 = 157; - MachineSettings.AddMachineSettingsHere2 = 43956; - MachineSettings.AddMachineSettingsHere3 = true; - MachineSettings.AddMachineSettingsHere4 = 134.876; - MachineSettings.AddMachineSettingsHere5 = 4373; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); - TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); - TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); - TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + MachineSettings.AddMachineSettingsHere1 = 157; + MachineSettings.AddMachineSettingsHere2 = 43956; + MachineSettings.AddMachineSettingsHere3 = true; + MachineSettings.AddMachineSettingsHere4 = 134.876; + MachineSettings.AddMachineSettingsHere5 = 4373; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); + TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); + TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); + TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Delete(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) - { - case 0: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - ArrangeSubState = 1; - break; - - case 1: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ArrangeSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(!SelectRecipe("test.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Delete = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); - MpRecipeUIConnect.Recipe.Delete = false; - MpRecipeUIConnect.MessageBox.Confirm = true; - ActSubState = 1; - break; - - case 1: - MpRecipeUIConnect.MessageBox.Confirm = false; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!RecipeExists("test.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) + { + case 0: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + ArrangeSubState = 1; + break; + + case 1: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ArrangeSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(!SelectRecipe("test.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Delete = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); + MpRecipeUIConnect.Recipe.Delete = false; + MpRecipeUIConnect.MessageBox.Confirm = true; + ActSubState = 1; + break; + + case 1: + MpRecipeUIConnect.MessageBox.Confirm = false; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!RecipeExists("test.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Invalid(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) { - case 0: - FileCopy_UT.enable = true; - FileCopy_UT.pSrcDev = "mappRecipeFiles"; - FileCopy_UT.pSrc = "CSVformat\\Machine.mcfg"; - FileCopy_UT.pDestDev = "mappRecipeFiles"; - FileCopy_UT.pDest = "MachineInvalid.mcfg"; - FileCopy_UT.option= fiOVERWRITE; - FileCopy(&FileCopy_UT); - TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); - FileCopy_UT.enable = false; - FileCopy(&FileCopy_UT); - ArrangeSubState = 1; - break; - - case 1: - MpRecipeUIConnect.Recipe.Refresh = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - MpRecipeUIConnect.Recipe.Refresh = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(!SelectRecipe("MachineInvalid.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) { + case 0: + FileCopy_UT.enable = true; + FileCopy_UT.pSrcDev = "mappRecipeFiles"; + FileCopy_UT.pSrc = "CSVformat\\Machine.mcfg"; + FileCopy_UT.pDestDev = "mappRecipeFiles"; + FileCopy_UT.pDest = "MachineInvalid.mcfg"; + FileCopy_UT.option= fiOVERWRITE; + FileCopy(&FileCopy_UT); + TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); + FileCopy_UT.enable = false; + FileCopy(&FileCopy_UT); + ArrangeSubState = 1; + break; + + case 1: + MpRecipeUIConnect.Recipe.Refresh = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + MpRecipeUIConnect.Recipe.Refresh = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(!SelectRecipe("MachineInvalid.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); + TEST_DONE; + break; + } + TEST_BUSY; } /* @@ -497,14 +497,14 @@ By B+R UnitTest Helper Version: 2.0.1.59 */ UNITTEST_FIXTURES(fixtures) { - new_TestFixture("DefaultValues", DefaultValues), - new_TestFixture("CreateNew", CreateNew), - new_TestFixture("CreateExisting", CreateExisting), - new_TestFixture("CreateNonExisting", CreateNonExisting), - new_TestFixture("CreateActive", CreateActive), - new_TestFixture("Preview", Preview), - new_TestFixture("Delete", Delete), - new_TestFixture("Invalid", Invalid), + new_TestFixture("DefaultValues", DefaultValues), + new_TestFixture("CreateNew", CreateNew), + new_TestFixture("CreateExisting", CreateExisting), + new_TestFixture("CreateNonExisting", CreateNonExisting), + new_TestFixture("CreateActive", CreateActive), + new_TestFixture("Preview", Preview), + new_TestFixture("Delete", Delete), + new_TestFixture("Invalid", Invalid), }; UNITTEST_CALLER_COMPLETE_EXPLICIT(Set_RecipeMachineSettings, "Set_RecipeMachineSettings", setupTest, teardownTest, fixtures, setupSet, teardownSet, cyclicSetCaller); diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c index d8c38bdd..353b4308 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c @@ -10,658 +10,658 @@ #include #include "testSuite.h" -#define TIMEOUT_TEST_CASE \ - if (cycleCount >= 254) \ - { \ - char abortMessage[80]; \ - char substate[10]; \ - memset(abortMessage, 0, sizeof(abortMessage)); \ - memset(substate, 0, sizeof(substate)); \ - itoa(ActSubState, substate, 10); \ - strcpy(abortMessage, "Timeout in ActSubState = "); \ - strcat(abortMessage, substate); \ - TEST_FAIL(abortMessage); \ - TEST_DONE; \ - } +#define TIMEOUT_TEST_CASE \ + if (cycleCount >= 254) \ + { \ + char abortMessage[80]; \ + char substate[10]; \ + memset(abortMessage, 0, sizeof(abortMessage)); \ + memset(substate, 0, sizeof(substate)); \ + itoa(ActSubState, substate, 10); \ + strcpy(abortMessage, "Timeout in ActSubState = "); \ + strcat(abortMessage, substate); \ + TEST_FAIL(abortMessage); \ + TEST_DONE; \ + } _SETUP_SET(void) { - return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); + return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); } _TEARDOWN_SET(void) { - SetupState = 0; - TEST_DONE; + SetupState = 0; + TEST_DONE; } _SETUP_TEST(void) { - ArrangeSubState = 0; - ActSubState = 0; - AssertSubState = 0; - return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); + ArrangeSubState = 0; + ActSubState = 0; + AssertSubState = 0; + return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); } _TEARDOWN_TEST(void) { - memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); - MpRecipeUIConnect.Recipe.Load = false; - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - MpRecipeUIConnect.Recipe.Refresh = true; - } - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - MpRecipeUIConnect.Recipe.Refresh = false; - - TEST_DONE; + memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); + MpRecipeUIConnect.Recipe.Load = false; + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + MpRecipeUIConnect.Recipe.Refresh = true; + } + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + MpRecipeUIConnect.Recipe.Refresh = false; + + TEST_DONE; } _CYCLIC_SET(void) { - cycleCount++; + cycleCount++; } _TEST DefaultValues(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - // set MachineSettings through the pointer - memset(pParameters, 0, sizeof(*pParameters)); - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - HmiRecipe.Commands.LoadRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == true); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.LoadRecipe = false; - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + // set MachineSettings through the pointer + memset(pParameters, 0, sizeof(*pParameters)); + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + HmiRecipe.Commands.LoadRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == true); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.LoadRecipe = false; + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateNew(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(RecipeExists("test.par")); - TEST_DONE; - break; - } - - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(RecipeExists("test.par")); + TEST_DONE; + break; + } + + TEST_BUSY; } _TEST CreateExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "Default"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists("Default.par")); - TEST_DONE; - break; - } - - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "Default"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists("Default.par")); + TEST_DONE; + break; + } + + TEST_BUSY; } _TEST CreateNonExisting(void) { - TIMEOUT_TEST_CASE - - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test2"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(!RecipeExists("test2.par")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test2"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(!RecipeExists("test2.par")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedProductRecipe, ".")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedProductRecipe)); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedProductRecipe, ".")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedProductRecipe)); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST PreviewShouldNotAffectActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing preview"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - // check if preview affects the active parameters - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing preview"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + // check if preview affects the active parameters + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Preview(void) { - TIMEOUT_TEST_CASE - - switch (TestState) - { - case TEST_ARRANGE: - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing preview"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!ParametersPreview.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("testing preview", ParametersPreview.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 12.56, ParametersPreview.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 134.876, ParametersPreview.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 87.4567, ParametersPreview.AddParametersHere5); - - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + + switch (TestState) + { + case TEST_ARRANGE: + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing preview"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!ParametersPreview.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("testing preview", ParametersPreview.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 12.56, ParametersPreview.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 134.876, ParametersPreview.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 87.4567, ParametersPreview.AddParametersHere5); + + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Delete(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) - { - case 0: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - ArrangeSubState = 1; - break; - - case 1: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ArrangeSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(!SelectRecipe("test.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) { - case 0: - MpRecipeUIConnect.Recipe.Delete = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); - MpRecipeUIConnect.Recipe.Delete = false; - MpRecipeUIConnect.MessageBox.Confirm = true; - ActSubState = 1; - break; - - case 1: - MpRecipeUIConnect.MessageBox.Confirm = false; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!RecipeExists("test.par")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) + { + case 0: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + ArrangeSubState = 1; + break; + + case 1: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ArrangeSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(!SelectRecipe("test.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) { + case 0: + MpRecipeUIConnect.Recipe.Delete = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); + MpRecipeUIConnect.Recipe.Delete = false; + MpRecipeUIConnect.MessageBox.Confirm = true; + ActSubState = 1; + break; + + case 1: + MpRecipeUIConnect.MessageBox.Confirm = false; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!RecipeExists("test.par")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Invalid(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) { - case 0: - FileCopy_UT.enable = true; - FileCopy_UT.pSrcDev = "mappRecipeFiles"; - FileCopy_UT.pSrc = "CSVformat\\Default.par"; - FileCopy_UT.pDestDev = "mappRecipeFiles"; - FileCopy_UT.pDest = "Invalid.par"; - FileCopy_UT.option= fiOVERWRITE; - FileCopy(&FileCopy_UT); - TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); - FileCopy_UT.enable = false; - FileCopy(&FileCopy_UT); - ArrangeSubState = 1; - break; - - case 1: - MpRecipeUIConnect.Recipe.Refresh = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - MpRecipeUIConnect.Recipe.Refresh = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(!SelectRecipe("Invalid.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) { + case 0: + FileCopy_UT.enable = true; + FileCopy_UT.pSrcDev = "mappRecipeFiles"; + FileCopy_UT.pSrc = "CSVformat\\Default.par"; + FileCopy_UT.pDestDev = "mappRecipeFiles"; + FileCopy_UT.pDest = "Invalid.par"; + FileCopy_UT.option= fiOVERWRITE; + FileCopy(&FileCopy_UT); + TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); + FileCopy_UT.enable = false; + FileCopy(&FileCopy_UT); + ArrangeSubState = 1; + break; + + case 1: + MpRecipeUIConnect.Recipe.Refresh = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + MpRecipeUIConnect.Recipe.Refresh = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(!SelectRecipe("Invalid.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); + TEST_DONE; + break; + } + TEST_BUSY; } SKIP_TEST EditActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - LastSelectedIndex++; - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing editing active"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "editActive"); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - TEST_BUSY_CONDITION(!SelectRecipe("editActive.par")); - ActSubState = 4; - break; - - case 4: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ParametersEdit.AddParametersHere1 = true; - strcpy(ParametersEdit.AddParametersHere2, "edited active"); - ParametersEdit.AddParametersHere3 = 52.56; - ParametersEdit.AddParametersHere4 = 184.876; - ParametersEdit.AddParametersHere5 = 587.4567; - ActSubState = 6; - break; - - case 6: - HmiRecipe.Commands.SaveSelectedRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.SaveSelectedRecipe = false; - ActSubState = 7; - break; - - case 7: - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("edited active", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 52.56, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 184.876, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 587.4567, Parameters.AddParametersHere5); - - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + LastSelectedIndex++; + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing editing active"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "editActive"); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + TEST_BUSY_CONDITION(!SelectRecipe("editActive.par")); + ActSubState = 4; + break; + + case 4: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ParametersEdit.AddParametersHere1 = true; + strcpy(ParametersEdit.AddParametersHere2, "edited active"); + ParametersEdit.AddParametersHere3 = 52.56; + ParametersEdit.AddParametersHere4 = 184.876; + ParametersEdit.AddParametersHere5 = 587.4567; + ActSubState = 6; + break; + + case 6: + HmiRecipe.Commands.SaveSelectedRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.SaveSelectedRecipe = false; + ActSubState = 7; + break; + + case 7: + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("edited active", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 52.56, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 184.876, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 587.4567, Parameters.AddParametersHere5); + + TEST_DONE; + break; + } + TEST_BUSY; } @@ -674,16 +674,16 @@ By B+R UnitTest Helper Version: 2.0.1.59 */ UNITTEST_FIXTURES(fixtures) { - new_TestFixture("DefaultValues", DefaultValues), - new_TestFixture("CreateNew", CreateNew), - new_TestFixture("CreateExisting", CreateExisting), - new_TestFixture("CreateNonExisting", CreateNonExisting), - new_TestFixture("CreateActive", CreateActive), - new_TestFixture("PreviewShouldNotAffectActive", PreviewShouldNotAffectActive), - new_TestFixture("Preview", Preview), - new_TestFixture("Delete", Delete), - new_TestFixture("Invalid", Invalid), - skipTestFixture("EditActive", EditActive), + new_TestFixture("DefaultValues", DefaultValues), + new_TestFixture("CreateNew", CreateNew), + new_TestFixture("CreateExisting", CreateExisting), + new_TestFixture("CreateNonExisting", CreateNonExisting), + new_TestFixture("CreateActive", CreateActive), + new_TestFixture("PreviewShouldNotAffectActive", PreviewShouldNotAffectActive), + new_TestFixture("Preview", Preview), + new_TestFixture("Delete", Delete), + new_TestFixture("Invalid", Invalid), + skipTestFixture("EditActive", EditActive), }; UNITTEST_CALLER_COMPLETE_EXPLICIT(Set_RecipeParameters, "Set_RecipeParameters", setupTest, teardownTest, fixtures, setupSet, teardownSet, cyclicSetCaller); diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c index 6829d9a0..b2cd1b6a 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c @@ -20,136 +20,136 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; - utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappRecipeFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/Recipe/Alarms"); - strcpy((char*)&TextID, "SaveFailed"); - strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); - - PV_xgetadr("RecipeMgr:MachineSettings", (void*)&pMachineSettings, &MachineSettingsSize); - PV_xgetadr("RecipeMgr:Parameters", (void*)&pParameters, &ParameterSize); - - LastSelectedIndex++; + Testsuite.Enable = 1; + utInit(&Testsuite); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappRecipeFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/Recipe/Alarms"); + strcpy((char*)&TextID, "SaveFailed"); + strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); + + PV_xgetadr("RecipeMgr:MachineSettings", (void*)&pMachineSettings, &MachineSettingsSize); + PV_xgetadr("RecipeMgr:Parameters", (void*)&pParameters, &ParameterSize); + + LastSelectedIndex++; } void _CYCLIC cyclicWithTest(void) { - utCyclic(&Testsuite); - if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) - strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); - if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) - strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); - if (Testsuite.Informational.LastKnownPassedLocation.File != 0) - strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); + utCyclic(&Testsuite); + if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) + strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); + if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) + strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); + if (Testsuite.Informational.LastKnownPassedLocation.File != 0) + strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); } void _EXIT exitTestSuite(void) { - utExit(&Testsuite); + utExit(&Testsuite); } bool RecipeExists(char* recipeName) { - for (USINT i = 0; i<(sizeof(MpRecipeUIConnect.Recipe.List.Names)/sizeof(MpRecipeUIConnect.Recipe.List.Names[0])); i++) - { - if (strcmp(recipeName, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) - { - return true; - } - } - return false; + for (USINT i = 0; i<(sizeof(MpRecipeUIConnect.Recipe.List.Names)/sizeof(MpRecipeUIConnect.Recipe.List.Names[0])); i++) + { + if (strcmp(recipeName, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) + { + return true; + } + } + return false; } bool SelectRecipe(char* wantedRecipe) { - if (((MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) && (MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_ERROR)) && - (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) != 0)) return false; + if (((MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) && (MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_ERROR)) && + (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) != 0)) return false; - for (USINT i=0; i <= MpRecipeUIConnect.Recipe.List.MaxSelection; i++) - { - if (strcmp(wantedRecipe, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) - MpRecipeUIConnect.Recipe.List.SelectedIndex = i; - } + for (USINT i=0; i <= MpRecipeUIConnect.Recipe.List.MaxSelection; i++) + { + if (strcmp(wantedRecipe, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) + MpRecipeUIConnect.Recipe.List.SelectedIndex = i; + } - return (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) == 0); + return (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) == 0); } testStatusEnum RemoveNonDefaultFiles(char* filter, char* selectFile, const char* category) { - switch (SetupState) - { - case 0: - DirInfo_UT.enable = true; - DirInfo_UT.pDevice = (UDINT)&"mappRecipeFiles"; - DirInfo_UT.pPath = (UDINT)&""; - DirInfo(&DirInfo_UT); - TEST_BUSY_CONDITION(DirInfo_UT.status == 65535); - TEST_ABORT_CONDITION(DirInfo_UT.status != 0); - NumberOfFiles = DirInfo_UT.filenum; - CurrentFile = 0; - SetupState = (NumberOfFiles == 0) ? 100 : 1; - break; - - case 1: - DirRead_UT.enable = true; - DirRead_UT.pDevice = DirInfo_UT.pDevice; - DirRead_UT.entry = CurrentFile; - DirRead_UT.option = fiFILE; - DirRead_UT.pData = (UDINT)&fileInfo; - DirRead_UT.data_len = sizeof(fileInfo); - DirRead(&DirRead_UT); - TEST_BUSY_CONDITION(DirRead_UT.status == 65535); - TEST_ABORT_CONDITION(DirRead_UT.status != 0); - SetupState = 2; - break; - - case 2: - if ((strcmp("Default.par", (char*)fileInfo.Filename) == 0) || - (strcmp("Machine.mcfg", (char*)fileInfo.Filename) == 0)) - { - CurrentFile++; - SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; - break; - } - FileDelete_UT.enable = true; - FileDelete_UT.pDevice = DirInfo_UT.pDevice; - FileDelete_UT.pName = (UDINT)&fileInfo.Filename; - FileDelete(&FileDelete_UT); - TEST_BUSY_CONDITION(FileDelete_UT.status == 65535); - TEST_ABORT_CONDITION(FileDelete_UT.status != 0); - - NumberOfFiles--; - SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; - break; - - case 10: - strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); - strcpy((char*)&MpRecipeUIConnect.Recipe.Filter, filter); - MpRecipeUIConnect.Recipe.Refresh = true; - strcpy((char*)&HmiRecipe.Parameters.Category, category); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_REFRESH) - MpRecipeUIConnect.Recipe.Refresh = false; - SetupState = 11; - break; - - case 11: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - TEST_BUSY_CONDITION(!RecipeExists(selectFile)); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT) - TEST_ABORT_CONDITION(pParameters == NULL); - SetupState = 100; - break; - - case 100: - cycleCount = 0; - TestState = TEST_ARRANGE; - SetupState = 0; - TEST_DONE; - } - TEST_BUSY; + switch (SetupState) + { + case 0: + DirInfo_UT.enable = true; + DirInfo_UT.pDevice = (UDINT)&"mappRecipeFiles"; + DirInfo_UT.pPath = (UDINT)&""; + DirInfo(&DirInfo_UT); + TEST_BUSY_CONDITION(DirInfo_UT.status == 65535); + TEST_ABORT_CONDITION(DirInfo_UT.status != 0); + NumberOfFiles = DirInfo_UT.filenum; + CurrentFile = 0; + SetupState = (NumberOfFiles == 0) ? 100 : 1; + break; + + case 1: + DirRead_UT.enable = true; + DirRead_UT.pDevice = DirInfo_UT.pDevice; + DirRead_UT.entry = CurrentFile; + DirRead_UT.option = fiFILE; + DirRead_UT.pData = (UDINT)&fileInfo; + DirRead_UT.data_len = sizeof(fileInfo); + DirRead(&DirRead_UT); + TEST_BUSY_CONDITION(DirRead_UT.status == 65535); + TEST_ABORT_CONDITION(DirRead_UT.status != 0); + SetupState = 2; + break; + + case 2: + if ((strcmp("Default.par", (char*)fileInfo.Filename) == 0) || + (strcmp("Machine.mcfg", (char*)fileInfo.Filename) == 0)) + { + CurrentFile++; + SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; + break; + } + FileDelete_UT.enable = true; + FileDelete_UT.pDevice = DirInfo_UT.pDevice; + FileDelete_UT.pName = (UDINT)&fileInfo.Filename; + FileDelete(&FileDelete_UT); + TEST_BUSY_CONDITION(FileDelete_UT.status == 65535); + TEST_ABORT_CONDITION(FileDelete_UT.status != 0); + + NumberOfFiles--; + SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; + break; + + case 10: + strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); + strcpy((char*)&MpRecipeUIConnect.Recipe.Filter, filter); + MpRecipeUIConnect.Recipe.Refresh = true; + strcpy((char*)&HmiRecipe.Parameters.Category, category); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_REFRESH) + MpRecipeUIConnect.Recipe.Refresh = false; + SetupState = 11; + break; + + case 11: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + TEST_BUSY_CONDITION(!RecipeExists(selectFile)); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT) + TEST_ABORT_CONDITION(pParameters == NULL); + SetupState = 100; + break; + + case 100: + cycleCount = 0; + TestState = TEST_ARRANGE; + SetupState = 0; + TEST_DONE; + } + TEST_BUSY; } \ No newline at end of file From fe44492518eacccff3f553aaec67d909fdefe2ab Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Wed, 30 Nov 2022 15:34:28 -0500 Subject: [PATCH 003/112] AAZM-400 - AlarmX - added the Parameters structure and moved the InstanceID to it --- .../Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ | 7 +++++-- .../Logical/Infrastructure/AlarmX/AlarmMgr/HMIActions.st | 4 ++-- .../PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ index 0a57278e..81dd7fb9 100644 --- a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ +++ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ @@ -4,19 +4,22 @@ TYPE AlarmHmiInterfaceType : STRUCT (*Structure to hold commands and status from the HMI*) Commands : AlarmCommandsType; (*HMI commands*) Status : {REDUND_UNREPLICABLE} AlarmStatusType; (*HMI status*) + Parameters : AlarmParametersType; (*HMI parameters*) END_STRUCT; AlarmCommandsType : STRUCT (*Structure to hold the commands from the HMI*) ExportAlarms : BOOL; (*Triggers an alarm export of the alarm history. Connected to a button on the HMI. *) RunQuery : BOOL; (*Triggers the query to run. Connected to a button on the HMI. *) END_STRUCT; - AlarmStatusType : STRUCT (*Structure to hold status information from the mapp View HMI. (This structure is not compatible/relevant if you are using a VC4 visualization)*) + AlarmParametersType : STRUCT (*Structure to hold the parameters from the HMI*) + InstanceID : UINT; (*The instanceID of the alarm that was most recently clicked in the AlarmList. Set by an eventbinding in mapp View*) + END_STRUCT; + AlarmStatusType : STRUCT (*Structure to hold status information to the mapp View HMI. (This structure is not compatible/relevant if you are using a VC4 visualization)*) AlarmHistSortCfg : STRING[1000]; (*Sort configuration property for the AlarmHistory widget *) AlarmHistFilterCfg : STRING[1000]; (*Filter configuration property for the AlarmHistory widget*) AlarmSortCfg : STRING[1000]; (*Sort configuration for the AlarmList widget*) AlarmFilterCfg : STRING[1000]; (*Filter configuration for the AlarmList widget*) TableConfig : ARRAY[0..1]OF STRING[120]; (*Table configuration for the alarm query Table*) Query : AlarmQueryHMIType; (*Structure which rearranges the query data from AlarmQuery into a structure of arrays for easy connection to the Table widget*) - InstanceID : UINT; (*The instanceID of the alarm that was most recently clicked in the AlarmList. Set by an eventbinding in mapp View*) END_STRUCT; AlarmQueryType : STRUCT (*Structure for query results and status*) State : ActiveAlarmStateEnum; (*State variable for the query state machine*) diff --git a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/HMIActions.st index aa78ceb0..92464a6c 100644 --- a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/HMIActions.st @@ -5,11 +5,11 @@ ACTION GetBacktraceInformation: FOR i := 0 TO MaxIndex DO IF (MpAlarmXCore_0.PendingAlarms = 0) THEN // No pending alarms, reset instance id - HmiAlarmX.Status.InstanceID := 0; + HmiAlarmX.Parameters.InstanceID := 0; EXIT; END_IF - IF (MpAlarmXListUIConnect.AlarmList.InstanceID[i] = HmiAlarmX.Status.InstanceID) THEN + IF (MpAlarmXListUIConnect.AlarmList.InstanceID[i] = HmiAlarmX.Parameters.InstanceID) THEN // Found an alarm MpAlarmXListUIConnect.AlarmList.SelectedIndex := i; EXIT; diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding index c201c0ef..859f4846 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding @@ -25,7 +25,7 @@ - + From 0873460da3fcba1fa0785758141ceb8081d8f4a1 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Thu, 1 Dec 2022 10:05:11 -0500 Subject: [PATCH 004/112] space/tab commit --- .../File/FileMgr/FIFOOperations.st | 18 +- .../Set_RecipeMachineSettings.c | 866 ++++++------ .../RecipeMgrUnitTest/Set_RecipeParameters.c | 1206 ++++++++--------- .../Recipe/RecipeMgrUnitTest/testSuite.c | 220 +-- .../TestSet_Templates/Set_Complete.c | 2 +- .../UnitTest/UserX/UserXUnitTest/testSuite.c | 16 +- 6 files changed, 1164 insertions(+), 1164 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st b/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st index 8fd4ae3f..80d1107a 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st @@ -229,15 +229,15 @@ ACTION FIFOOperation: END_IF FILE_CONFIRM_DELETE_WAIT: - IF ((MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_REFRESH) OR (MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_IDLE)) THEN - MpFileManagerUIConnect_FIFO.File.MultiSelect := FALSE; - IF (HmiFile.Parameters.Fifo.FifoType = FILE_FIFO_SIZE_OF_FOLDER) THEN - HmiFile.Status.DeleteStep := SEL((HmiFile.Status.FolderSize > (HmiFile.Parameters.Fifo.MaxFolderSize*1024)), FILE_RESET_SORT_BY, FILE_GO_TO_END); - ELSE - // if more files need to be deleted then go back to select the oldest files - HmiFile.Status.DeleteStep := SEL((MpFileManagerUIConnect_FIFO.File.PathInfo.FileCount > HmiFile.Parameters.Fifo.MaxNumberOfFiles), FILE_RESET_SORT_BY, FILE_GO_TO_END); - END_IF - END_IF + IF ((MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_REFRESH) OR (MpFileManagerUIConnect_FIFO.Status = mpFILE_UI_STATUS_IDLE)) THEN + MpFileManagerUIConnect_FIFO.File.MultiSelect := FALSE; + IF (HmiFile.Parameters.Fifo.FifoType = FILE_FIFO_SIZE_OF_FOLDER) THEN + HmiFile.Status.DeleteStep := SEL((HmiFile.Status.FolderSize > (HmiFile.Parameters.Fifo.MaxFolderSize*1024)), FILE_RESET_SORT_BY, FILE_GO_TO_END); + ELSE + // if more files need to be deleted then go back to select the oldest files + HmiFile.Status.DeleteStep := SEL((MpFileManagerUIConnect_FIFO.File.PathInfo.FileCount > HmiFile.Parameters.Fifo.MaxNumberOfFiles), FILE_RESET_SORT_BY, FILE_GO_TO_END); + END_IF + END_IF FILE_RESET_SORT_BY: // Restore old sort order diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c index 7072a100..e8243f7d 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c @@ -10,482 +10,482 @@ #include #include "testSuite.h" -#define TIMEOUT_TEST_CASE \ - if (cycleCount >= 254) \ - { \ - char abortMessage[80]; \ - char substate[10]; \ - memset(abortMessage, 0, sizeof(abortMessage)); \ - memset(substate, 0, sizeof(substate)); \ - itoa(ActSubState, substate, 10); \ - strcpy(abortMessage, "Timeout in ActSubState = "); \ - strcat(abortMessage, substate); \ - TEST_FAIL(abortMessage); \ - TEST_DONE; \ - } +#define TIMEOUT_TEST_CASE \ + if (cycleCount >= 254) \ + { \ + char abortMessage[80]; \ + char substate[10]; \ + memset(abortMessage, 0, sizeof(abortMessage)); \ + memset(substate, 0, sizeof(substate)); \ + itoa(ActSubState, substate, 10); \ + strcpy(abortMessage, "Timeout in ActSubState = "); \ + strcat(abortMessage, substate); \ + TEST_FAIL(abortMessage); \ + TEST_DONE; \ + } _SETUP_SET(void) { - return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); + return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); } _TEARDOWN_SET(void) { - SetupState = 0; - TEST_DONE; + SetupState = 0; + TEST_DONE; } _SETUP_TEST(void) { - ArrangeSubState = 0; - ActSubState = 0; - AssertSubState = 0; - return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); + ArrangeSubState = 0; + ActSubState = 0; + AssertSubState = 0; + return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); } _TEARDOWN_TEST(void) { - memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); - MpRecipeUIConnect.Recipe.Load = false; - TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); - - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - MpRecipeUIConnect.Recipe.Refresh = true; - } - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - MpRecipeUIConnect.Recipe.Refresh = false; - - TEST_DONE; + memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); + MpRecipeUIConnect.Recipe.Load = false; + TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); + + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + MpRecipeUIConnect.Recipe.Refresh = true; + } + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + MpRecipeUIConnect.Recipe.Refresh = false; + + TEST_DONE; } _CYCLIC_SET(void) { - cycleCount++; + cycleCount++; } _TEST DefaultValues(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - // set MachineSettings through the pointer - memset(pMachineSettings, 0, sizeof(*pMachineSettings)); - TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - HmiRecipe.Commands.LoadRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == true); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.LoadRecipe = false; - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - case 1: - TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == false); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); - TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); - TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); - TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); - TEST_DONE; - break; - } - TEST_BUSY; - - - TEST_DONE; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + // set MachineSettings through the pointer + memset(pMachineSettings, 0, sizeof(*pMachineSettings)); + TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + HmiRecipe.Commands.LoadRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == true); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.LoadRecipe = false; + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + case 1: + TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == false); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); + TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); + TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); + TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); + TEST_DONE; + break; + } + TEST_BUSY; + + + TEST_DONE; } _TEST CreateNew(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(RecipeExists("test.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(RecipeExists("test.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "Machine"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists("Machine.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "Machine"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists("Machine.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateNonExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test2"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(!RecipeExists("test2.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test2"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(!RecipeExists("test2.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedConfigRecipe, ".")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedConfigRecipe)); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedConfigRecipe, ".")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedConfigRecipe)); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Preview(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - MachineSettings.AddMachineSettingsHere1 = 157; - MachineSettings.AddMachineSettingsHere2 = 43956; - MachineSettings.AddMachineSettingsHere3 = true; - MachineSettings.AddMachineSettingsHere4 = 134.876; - MachineSettings.AddMachineSettingsHere5 = 4373; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); - TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); - TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); - TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + MachineSettings.AddMachineSettingsHere1 = 157; + MachineSettings.AddMachineSettingsHere2 = 43956; + MachineSettings.AddMachineSettingsHere3 = true; + MachineSettings.AddMachineSettingsHere4 = 134.876; + MachineSettings.AddMachineSettingsHere5 = 4373; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); + TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); + TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); + TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Delete(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) - { - case 0: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - ArrangeSubState = 1; - break; - - case 1: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ArrangeSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(!SelectRecipe("test.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Delete = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); - MpRecipeUIConnect.Recipe.Delete = false; - MpRecipeUIConnect.MessageBox.Confirm = true; - ActSubState = 1; - break; - - case 1: - MpRecipeUIConnect.MessageBox.Confirm = false; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!RecipeExists("test.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) + { + case 0: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + ArrangeSubState = 1; + break; + + case 1: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ArrangeSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(!SelectRecipe("test.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Delete = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); + MpRecipeUIConnect.Recipe.Delete = false; + MpRecipeUIConnect.MessageBox.Confirm = true; + ActSubState = 1; + break; + + case 1: + MpRecipeUIConnect.MessageBox.Confirm = false; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!RecipeExists("test.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Invalid(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) { - case 0: - FileCopy_UT.enable = true; - FileCopy_UT.pSrcDev = "mappRecipeFiles"; - FileCopy_UT.pSrc = "CSVformat\\Machine.mcfg"; - FileCopy_UT.pDestDev = "mappRecipeFiles"; - FileCopy_UT.pDest = "MachineInvalid.mcfg"; - FileCopy_UT.option= fiOVERWRITE; - FileCopy(&FileCopy_UT); - TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); - FileCopy_UT.enable = false; - FileCopy(&FileCopy_UT); - ArrangeSubState = 1; - break; - - case 1: - MpRecipeUIConnect.Recipe.Refresh = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - MpRecipeUIConnect.Recipe.Refresh = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(!SelectRecipe("MachineInvalid.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) { + case 0: + FileCopy_UT.enable = true; + FileCopy_UT.pSrcDev = "mappRecipeFiles"; + FileCopy_UT.pSrc = "CSVformat\\Machine.mcfg"; + FileCopy_UT.pDestDev = "mappRecipeFiles"; + FileCopy_UT.pDest = "MachineInvalid.mcfg"; + FileCopy_UT.option= fiOVERWRITE; + FileCopy(&FileCopy_UT); + TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); + FileCopy_UT.enable = false; + FileCopy(&FileCopy_UT); + ArrangeSubState = 1; + break; + + case 1: + MpRecipeUIConnect.Recipe.Refresh = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + MpRecipeUIConnect.Recipe.Refresh = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(!SelectRecipe("MachineInvalid.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); + TEST_DONE; + break; + } + TEST_BUSY; } /* @@ -497,14 +497,14 @@ By B+R UnitTest Helper Version: 2.0.1.59 */ UNITTEST_FIXTURES(fixtures) { - new_TestFixture("DefaultValues", DefaultValues), - new_TestFixture("CreateNew", CreateNew), - new_TestFixture("CreateExisting", CreateExisting), - new_TestFixture("CreateNonExisting", CreateNonExisting), - new_TestFixture("CreateActive", CreateActive), - new_TestFixture("Preview", Preview), - new_TestFixture("Delete", Delete), - new_TestFixture("Invalid", Invalid), + new_TestFixture("DefaultValues", DefaultValues), + new_TestFixture("CreateNew", CreateNew), + new_TestFixture("CreateExisting", CreateExisting), + new_TestFixture("CreateNonExisting", CreateNonExisting), + new_TestFixture("CreateActive", CreateActive), + new_TestFixture("Preview", Preview), + new_TestFixture("Delete", Delete), + new_TestFixture("Invalid", Invalid), }; UNITTEST_CALLER_COMPLETE_EXPLICIT(Set_RecipeMachineSettings, "Set_RecipeMachineSettings", setupTest, teardownTest, fixtures, setupSet, teardownSet, cyclicSetCaller); diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c index d8c38bdd..353b4308 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c @@ -10,658 +10,658 @@ #include #include "testSuite.h" -#define TIMEOUT_TEST_CASE \ - if (cycleCount >= 254) \ - { \ - char abortMessage[80]; \ - char substate[10]; \ - memset(abortMessage, 0, sizeof(abortMessage)); \ - memset(substate, 0, sizeof(substate)); \ - itoa(ActSubState, substate, 10); \ - strcpy(abortMessage, "Timeout in ActSubState = "); \ - strcat(abortMessage, substate); \ - TEST_FAIL(abortMessage); \ - TEST_DONE; \ - } +#define TIMEOUT_TEST_CASE \ + if (cycleCount >= 254) \ + { \ + char abortMessage[80]; \ + char substate[10]; \ + memset(abortMessage, 0, sizeof(abortMessage)); \ + memset(substate, 0, sizeof(substate)); \ + itoa(ActSubState, substate, 10); \ + strcpy(abortMessage, "Timeout in ActSubState = "); \ + strcat(abortMessage, substate); \ + TEST_FAIL(abortMessage); \ + TEST_DONE; \ + } _SETUP_SET(void) { - return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); + return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); } _TEARDOWN_SET(void) { - SetupState = 0; - TEST_DONE; + SetupState = 0; + TEST_DONE; } _SETUP_TEST(void) { - ArrangeSubState = 0; - ActSubState = 0; - AssertSubState = 0; - return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); + ArrangeSubState = 0; + ActSubState = 0; + AssertSubState = 0; + return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); } _TEARDOWN_TEST(void) { - memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); - MpRecipeUIConnect.Recipe.Load = false; - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - MpRecipeUIConnect.Recipe.Refresh = true; - } - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - MpRecipeUIConnect.Recipe.Refresh = false; - - TEST_DONE; + memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); + MpRecipeUIConnect.Recipe.Load = false; + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + MpRecipeUIConnect.Recipe.Refresh = true; + } + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + MpRecipeUIConnect.Recipe.Refresh = false; + + TEST_DONE; } _CYCLIC_SET(void) { - cycleCount++; + cycleCount++; } _TEST DefaultValues(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - // set MachineSettings through the pointer - memset(pParameters, 0, sizeof(*pParameters)); - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - HmiRecipe.Commands.LoadRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == true); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.LoadRecipe = false; - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + // set MachineSettings through the pointer + memset(pParameters, 0, sizeof(*pParameters)); + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + HmiRecipe.Commands.LoadRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == true); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.LoadRecipe = false; + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateNew(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(RecipeExists("test.par")); - TEST_DONE; - break; - } - - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(RecipeExists("test.par")); + TEST_DONE; + break; + } + + TEST_BUSY; } _TEST CreateExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "Default"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists("Default.par")); - TEST_DONE; - break; - } - - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "Default"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists("Default.par")); + TEST_DONE; + break; + } + + TEST_BUSY; } _TEST CreateNonExisting(void) { - TIMEOUT_TEST_CASE - - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test2"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(!RecipeExists("test2.par")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test2"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(!RecipeExists("test2.par")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedProductRecipe, ".")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedProductRecipe)); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedProductRecipe, ".")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedProductRecipe)); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST PreviewShouldNotAffectActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing preview"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - // check if preview affects the active parameters - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing preview"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + // check if preview affects the active parameters + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Preview(void) { - TIMEOUT_TEST_CASE - - switch (TestState) - { - case TEST_ARRANGE: - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing preview"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!ParametersPreview.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("testing preview", ParametersPreview.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 12.56, ParametersPreview.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 134.876, ParametersPreview.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 87.4567, ParametersPreview.AddParametersHere5); - - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + + switch (TestState) + { + case TEST_ARRANGE: + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing preview"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!ParametersPreview.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("testing preview", ParametersPreview.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 12.56, ParametersPreview.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 134.876, ParametersPreview.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 87.4567, ParametersPreview.AddParametersHere5); + + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Delete(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) - { - case 0: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - ArrangeSubState = 1; - break; - - case 1: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ArrangeSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(!SelectRecipe("test.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) { - case 0: - MpRecipeUIConnect.Recipe.Delete = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); - MpRecipeUIConnect.Recipe.Delete = false; - MpRecipeUIConnect.MessageBox.Confirm = true; - ActSubState = 1; - break; - - case 1: - MpRecipeUIConnect.MessageBox.Confirm = false; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!RecipeExists("test.par")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) + { + case 0: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + ArrangeSubState = 1; + break; + + case 1: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ArrangeSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(!SelectRecipe("test.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) { + case 0: + MpRecipeUIConnect.Recipe.Delete = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); + MpRecipeUIConnect.Recipe.Delete = false; + MpRecipeUIConnect.MessageBox.Confirm = true; + ActSubState = 1; + break; + + case 1: + MpRecipeUIConnect.MessageBox.Confirm = false; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!RecipeExists("test.par")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Invalid(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) { - case 0: - FileCopy_UT.enable = true; - FileCopy_UT.pSrcDev = "mappRecipeFiles"; - FileCopy_UT.pSrc = "CSVformat\\Default.par"; - FileCopy_UT.pDestDev = "mappRecipeFiles"; - FileCopy_UT.pDest = "Invalid.par"; - FileCopy_UT.option= fiOVERWRITE; - FileCopy(&FileCopy_UT); - TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); - FileCopy_UT.enable = false; - FileCopy(&FileCopy_UT); - ArrangeSubState = 1; - break; - - case 1: - MpRecipeUIConnect.Recipe.Refresh = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - MpRecipeUIConnect.Recipe.Refresh = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(!SelectRecipe("Invalid.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) { + case 0: + FileCopy_UT.enable = true; + FileCopy_UT.pSrcDev = "mappRecipeFiles"; + FileCopy_UT.pSrc = "CSVformat\\Default.par"; + FileCopy_UT.pDestDev = "mappRecipeFiles"; + FileCopy_UT.pDest = "Invalid.par"; + FileCopy_UT.option= fiOVERWRITE; + FileCopy(&FileCopy_UT); + TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); + FileCopy_UT.enable = false; + FileCopy(&FileCopy_UT); + ArrangeSubState = 1; + break; + + case 1: + MpRecipeUIConnect.Recipe.Refresh = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + MpRecipeUIConnect.Recipe.Refresh = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(!SelectRecipe("Invalid.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); + TEST_DONE; + break; + } + TEST_BUSY; } SKIP_TEST EditActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - LastSelectedIndex++; - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing editing active"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "editActive"); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - TEST_BUSY_CONDITION(!SelectRecipe("editActive.par")); - ActSubState = 4; - break; - - case 4: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ParametersEdit.AddParametersHere1 = true; - strcpy(ParametersEdit.AddParametersHere2, "edited active"); - ParametersEdit.AddParametersHere3 = 52.56; - ParametersEdit.AddParametersHere4 = 184.876; - ParametersEdit.AddParametersHere5 = 587.4567; - ActSubState = 6; - break; - - case 6: - HmiRecipe.Commands.SaveSelectedRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.SaveSelectedRecipe = false; - ActSubState = 7; - break; - - case 7: - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("edited active", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 52.56, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 184.876, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 587.4567, Parameters.AddParametersHere5); - - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + LastSelectedIndex++; + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing editing active"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "editActive"); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + TEST_BUSY_CONDITION(!SelectRecipe("editActive.par")); + ActSubState = 4; + break; + + case 4: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ParametersEdit.AddParametersHere1 = true; + strcpy(ParametersEdit.AddParametersHere2, "edited active"); + ParametersEdit.AddParametersHere3 = 52.56; + ParametersEdit.AddParametersHere4 = 184.876; + ParametersEdit.AddParametersHere5 = 587.4567; + ActSubState = 6; + break; + + case 6: + HmiRecipe.Commands.SaveSelectedRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.SaveSelectedRecipe = false; + ActSubState = 7; + break; + + case 7: + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("edited active", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 52.56, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 184.876, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 587.4567, Parameters.AddParametersHere5); + + TEST_DONE; + break; + } + TEST_BUSY; } @@ -674,16 +674,16 @@ By B+R UnitTest Helper Version: 2.0.1.59 */ UNITTEST_FIXTURES(fixtures) { - new_TestFixture("DefaultValues", DefaultValues), - new_TestFixture("CreateNew", CreateNew), - new_TestFixture("CreateExisting", CreateExisting), - new_TestFixture("CreateNonExisting", CreateNonExisting), - new_TestFixture("CreateActive", CreateActive), - new_TestFixture("PreviewShouldNotAffectActive", PreviewShouldNotAffectActive), - new_TestFixture("Preview", Preview), - new_TestFixture("Delete", Delete), - new_TestFixture("Invalid", Invalid), - skipTestFixture("EditActive", EditActive), + new_TestFixture("DefaultValues", DefaultValues), + new_TestFixture("CreateNew", CreateNew), + new_TestFixture("CreateExisting", CreateExisting), + new_TestFixture("CreateNonExisting", CreateNonExisting), + new_TestFixture("CreateActive", CreateActive), + new_TestFixture("PreviewShouldNotAffectActive", PreviewShouldNotAffectActive), + new_TestFixture("Preview", Preview), + new_TestFixture("Delete", Delete), + new_TestFixture("Invalid", Invalid), + skipTestFixture("EditActive", EditActive), }; UNITTEST_CALLER_COMPLETE_EXPLICIT(Set_RecipeParameters, "Set_RecipeParameters", setupTest, teardownTest, fixtures, setupSet, teardownSet, cyclicSetCaller); diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c index 6829d9a0..b2cd1b6a 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/testSuite.c @@ -20,136 +20,136 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; - utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappRecipeFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/Recipe/Alarms"); - strcpy((char*)&TextID, "SaveFailed"); - strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); - - PV_xgetadr("RecipeMgr:MachineSettings", (void*)&pMachineSettings, &MachineSettingsSize); - PV_xgetadr("RecipeMgr:Parameters", (void*)&pParameters, &ParameterSize); - - LastSelectedIndex++; + Testsuite.Enable = 1; + utInit(&Testsuite); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappRecipeFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/Recipe/Alarms"); + strcpy((char*)&TextID, "SaveFailed"); + strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); + + PV_xgetadr("RecipeMgr:MachineSettings", (void*)&pMachineSettings, &MachineSettingsSize); + PV_xgetadr("RecipeMgr:Parameters", (void*)&pParameters, &ParameterSize); + + LastSelectedIndex++; } void _CYCLIC cyclicWithTest(void) { - utCyclic(&Testsuite); - if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) - strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); - if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) - strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); - if (Testsuite.Informational.LastKnownPassedLocation.File != 0) - strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); + utCyclic(&Testsuite); + if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) + strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); + if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) + strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); + if (Testsuite.Informational.LastKnownPassedLocation.File != 0) + strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); } void _EXIT exitTestSuite(void) { - utExit(&Testsuite); + utExit(&Testsuite); } bool RecipeExists(char* recipeName) { - for (USINT i = 0; i<(sizeof(MpRecipeUIConnect.Recipe.List.Names)/sizeof(MpRecipeUIConnect.Recipe.List.Names[0])); i++) - { - if (strcmp(recipeName, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) - { - return true; - } - } - return false; + for (USINT i = 0; i<(sizeof(MpRecipeUIConnect.Recipe.List.Names)/sizeof(MpRecipeUIConnect.Recipe.List.Names[0])); i++) + { + if (strcmp(recipeName, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) + { + return true; + } + } + return false; } bool SelectRecipe(char* wantedRecipe) { - if (((MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) && (MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_ERROR)) && - (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) != 0)) return false; + if (((MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) && (MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_ERROR)) && + (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) != 0)) return false; - for (USINT i=0; i <= MpRecipeUIConnect.Recipe.List.MaxSelection; i++) - { - if (strcmp(wantedRecipe, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) - MpRecipeUIConnect.Recipe.List.SelectedIndex = i; - } + for (USINT i=0; i <= MpRecipeUIConnect.Recipe.List.MaxSelection; i++) + { + if (strcmp(wantedRecipe, MpRecipeUIConnect.Recipe.List.Names[i]) == 0) + MpRecipeUIConnect.Recipe.List.SelectedIndex = i; + } - return (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) == 0); + return (strcmp(wantedRecipe, HmiRecipe.Status.SelectedRecipe) == 0); } testStatusEnum RemoveNonDefaultFiles(char* filter, char* selectFile, const char* category) { - switch (SetupState) - { - case 0: - DirInfo_UT.enable = true; - DirInfo_UT.pDevice = (UDINT)&"mappRecipeFiles"; - DirInfo_UT.pPath = (UDINT)&""; - DirInfo(&DirInfo_UT); - TEST_BUSY_CONDITION(DirInfo_UT.status == 65535); - TEST_ABORT_CONDITION(DirInfo_UT.status != 0); - NumberOfFiles = DirInfo_UT.filenum; - CurrentFile = 0; - SetupState = (NumberOfFiles == 0) ? 100 : 1; - break; - - case 1: - DirRead_UT.enable = true; - DirRead_UT.pDevice = DirInfo_UT.pDevice; - DirRead_UT.entry = CurrentFile; - DirRead_UT.option = fiFILE; - DirRead_UT.pData = (UDINT)&fileInfo; - DirRead_UT.data_len = sizeof(fileInfo); - DirRead(&DirRead_UT); - TEST_BUSY_CONDITION(DirRead_UT.status == 65535); - TEST_ABORT_CONDITION(DirRead_UT.status != 0); - SetupState = 2; - break; - - case 2: - if ((strcmp("Default.par", (char*)fileInfo.Filename) == 0) || - (strcmp("Machine.mcfg", (char*)fileInfo.Filename) == 0)) - { - CurrentFile++; - SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; - break; - } - FileDelete_UT.enable = true; - FileDelete_UT.pDevice = DirInfo_UT.pDevice; - FileDelete_UT.pName = (UDINT)&fileInfo.Filename; - FileDelete(&FileDelete_UT); - TEST_BUSY_CONDITION(FileDelete_UT.status == 65535); - TEST_ABORT_CONDITION(FileDelete_UT.status != 0); - - NumberOfFiles--; - SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; - break; - - case 10: - strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); - strcpy((char*)&MpRecipeUIConnect.Recipe.Filter, filter); - MpRecipeUIConnect.Recipe.Refresh = true; - strcpy((char*)&HmiRecipe.Parameters.Category, category); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_REFRESH) - MpRecipeUIConnect.Recipe.Refresh = false; - SetupState = 11; - break; - - case 11: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - TEST_BUSY_CONDITION(!RecipeExists(selectFile)); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT) - TEST_ABORT_CONDITION(pParameters == NULL); - SetupState = 100; - break; - - case 100: - cycleCount = 0; - TestState = TEST_ARRANGE; - SetupState = 0; - TEST_DONE; - } - TEST_BUSY; + switch (SetupState) + { + case 0: + DirInfo_UT.enable = true; + DirInfo_UT.pDevice = (UDINT)&"mappRecipeFiles"; + DirInfo_UT.pPath = (UDINT)&""; + DirInfo(&DirInfo_UT); + TEST_BUSY_CONDITION(DirInfo_UT.status == 65535); + TEST_ABORT_CONDITION(DirInfo_UT.status != 0); + NumberOfFiles = DirInfo_UT.filenum; + CurrentFile = 0; + SetupState = (NumberOfFiles == 0) ? 100 : 1; + break; + + case 1: + DirRead_UT.enable = true; + DirRead_UT.pDevice = DirInfo_UT.pDevice; + DirRead_UT.entry = CurrentFile; + DirRead_UT.option = fiFILE; + DirRead_UT.pData = (UDINT)&fileInfo; + DirRead_UT.data_len = sizeof(fileInfo); + DirRead(&DirRead_UT); + TEST_BUSY_CONDITION(DirRead_UT.status == 65535); + TEST_ABORT_CONDITION(DirRead_UT.status != 0); + SetupState = 2; + break; + + case 2: + if ((strcmp("Default.par", (char*)fileInfo.Filename) == 0) || + (strcmp("Machine.mcfg", (char*)fileInfo.Filename) == 0)) + { + CurrentFile++; + SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; + break; + } + FileDelete_UT.enable = true; + FileDelete_UT.pDevice = DirInfo_UT.pDevice; + FileDelete_UT.pName = (UDINT)&fileInfo.Filename; + FileDelete(&FileDelete_UT); + TEST_BUSY_CONDITION(FileDelete_UT.status == 65535); + TEST_ABORT_CONDITION(FileDelete_UT.status != 0); + + NumberOfFiles--; + SetupState = (CurrentFile >= NumberOfFiles) ? 10 : 1; + break; + + case 10: + strcpy((char*)&HmiRecipe.Parameters.DeviceName, "mappRecipeFiles"); + strcpy((char*)&MpRecipeUIConnect.Recipe.Filter, filter); + MpRecipeUIConnect.Recipe.Refresh = true; + strcpy((char*)&HmiRecipe.Parameters.Category, category); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_REFRESH) + MpRecipeUIConnect.Recipe.Refresh = false; + SetupState = 11; + break; + + case 11: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + TEST_BUSY_CONDITION(!RecipeExists(selectFile)); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT) + TEST_ABORT_CONDITION(pParameters == NULL); + SetupState = 100; + break; + + case 100: + cycleCount = 0; + TestState = TEST_ARRANGE; + SetupState = 0; + TEST_DONE; + } + TEST_BUSY; } \ No newline at end of file diff --git a/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c b/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c index c6779193..f70277ee 100644 --- a/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c +++ b/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c @@ -81,7 +81,7 @@ _TEST testcase2(void) UNITTEST_FIXTURES(fixtures) { new_TestFixture("testcase1",testcase1), - new_TestFixture("testcase2",testcase2), + new_TestFixture("testcase2",testcase2), }; #warning TODO: rename testset (Param 1 and 2) diff --git a/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c index 5b3805d2..e040d560 100644 --- a/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c @@ -19,15 +19,15 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappUserXFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/UserX/Alarms"); - strcpy((char*)&TextID, "UserLocked"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappUserXFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/UserX/Alarms"); + strcpy((char*)&TextID, "UserLocked"); } From 56f68598c31f2b1dd6e6d5ffd495f50a744d42e2 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Thu, 1 Dec 2022 11:40:05 -0600 Subject: [PATCH 005/112] AAZN-479 trigger file list refresh after auto backup --- .../Backup/BackupMgr/BackupMgr.st | 21 +++++++++++++++---- .../Backup/BackupMgr/BackupMgr.typ | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st index 7cab81f9..4f02ac82 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st @@ -60,6 +60,11 @@ PROGRAM _CYCLIC HmiBackup.Status.RestoreAllowed := FALSE; MpBackupCore_0.Name := ADR(HmiBackup.Parameters.Name); BackupState := BACKUP_CREATING; + ELSIF MpBackupCore_0.Info.Automatic.Backup.InProgress THEN + HmiBackup.Status.Busy := TRUE; + HmiBackup.Status.CreateAllowed := FALSE; + HmiBackup.Status.RestoreAllowed := FALSE; + BackupState := BACKUP_AUTOCREATE; ELSIF (HmiBackup.Commands.Restore = TRUE) THEN HmiBackup.Commands.Restore := FALSE; MpBackupCore_0.Install := TRUE; @@ -87,10 +92,8 @@ PROGRAM _CYCLIC MpBackupCoreConfig_0.Save := TRUE; ELSIF ((HmiBackup.Status.SelectedIndex <> HmiBackup.Status.LastSelectedIndex) AND (MpBackupCore_0.CommandBusy <> TRUE)) THEN HmiBackup.Status.LastSelectedIndex := HmiBackup.Status.SelectedIndex; - IF (brsstrlen(ADR(MpFileManagerUIConnect.File.List.Items[HmiBackup.Status.SelectedIndex].Name)) > 0) THEN - MpBackupCore_0.Name := ADR(MpFileManagerUIConnect.File.List.Items[HmiBackup.Status.SelectedIndex].Name); - MpBackupCore_0.RequestInfo := TRUE; - END_IF + MpBackupCore_0.Name := ADR(MpFileManagerUIConnect.File.List.Items[HmiBackup.Status.SelectedIndex].Name); + MpBackupCore_0.RequestInfo := TRUE; END_IF BACKUP_CREATING: @@ -103,6 +106,16 @@ PROGRAM _CYCLIC ELSIF (MpBackupCore_0.Error = TRUE) THEN BackupState := BACKUP_ERROR; END_IF + + BACKUP_AUTOCREATE: + IF ( MpBackupCore_0.Info.Automatic.Backup.InProgress = FALSE) THEN + MpBackupCore_0.Install := FALSE; + MpBackupCore_0.RequestInfo := FALSE; + MpFileManagerUIConnect.File.Refresh := TRUE; + BackupState := BACKUP_REFRESHING_LIST; + ELSIF (MpBackupCore_0.Error = TRUE) THEN + BackupState := BACKUP_ERROR; + END_IF BACKUP_REFRESHING_LIST: IF MpFileManagerUIConnect.Status = mpFILE_UI_STATUS_REFRESH THEN diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ index 973c7fd6..8f1f676e 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ @@ -71,6 +71,7 @@ TYPE ( (*States for backup state machine*) BACKUP_IDLE, (*Wait state*) BACKUP_CREATING, (*Creating a backup*) + BACKUP_AUTOCREATE, (*Autobackup in progress*) BACKUP_REFRESHING_LIST, (*Refreshing backup list*) BACKUP_RESTORING, (*Restoring a backup*) BACKUP_UPDATING, (*Installing a new version*) From 0bdb4fd3ae3cb12b6dda40c799aff2b37097a83f Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Thu, 1 Dec 2022 11:41:00 -0600 Subject: [PATCH 006/112] Some unit test differences --- .../Set_RecipeMachineSettings.c | 866 ++++++------ .../RecipeMgrUnitTest/Set_RecipeParameters.c | 1206 ++++++++--------- 2 files changed, 1036 insertions(+), 1036 deletions(-) diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c index 7072a100..e8243f7d 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeMachineSettings.c @@ -10,482 +10,482 @@ #include #include "testSuite.h" -#define TIMEOUT_TEST_CASE \ - if (cycleCount >= 254) \ - { \ - char abortMessage[80]; \ - char substate[10]; \ - memset(abortMessage, 0, sizeof(abortMessage)); \ - memset(substate, 0, sizeof(substate)); \ - itoa(ActSubState, substate, 10); \ - strcpy(abortMessage, "Timeout in ActSubState = "); \ - strcat(abortMessage, substate); \ - TEST_FAIL(abortMessage); \ - TEST_DONE; \ - } +#define TIMEOUT_TEST_CASE \ + if (cycleCount >= 254) \ + { \ + char abortMessage[80]; \ + char substate[10]; \ + memset(abortMessage, 0, sizeof(abortMessage)); \ + memset(substate, 0, sizeof(substate)); \ + itoa(ActSubState, substate, 10); \ + strcpy(abortMessage, "Timeout in ActSubState = "); \ + strcat(abortMessage, substate); \ + TEST_FAIL(abortMessage); \ + TEST_DONE; \ + } _SETUP_SET(void) { - return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); + return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); } _TEARDOWN_SET(void) { - SetupState = 0; - TEST_DONE; + SetupState = 0; + TEST_DONE; } _SETUP_TEST(void) { - ArrangeSubState = 0; - ActSubState = 0; - AssertSubState = 0; - return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); + ArrangeSubState = 0; + ActSubState = 0; + AssertSubState = 0; + return RemoveNonDefaultFiles("*.mcfg", "Machine.mcfg", MACHINE_CONFIGURATION_CATEGORY); } _TEARDOWN_TEST(void) { - memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); - MpRecipeUIConnect.Recipe.Load = false; - TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); - - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - MpRecipeUIConnect.Recipe.Refresh = true; - } - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - MpRecipeUIConnect.Recipe.Refresh = false; - - TEST_DONE; + memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); + MpRecipeUIConnect.Recipe.Load = false; + TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); + + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + MpRecipeUIConnect.Recipe.Refresh = true; + } + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + MpRecipeUIConnect.Recipe.Refresh = false; + + TEST_DONE; } _CYCLIC_SET(void) { - cycleCount++; + cycleCount++; } _TEST DefaultValues(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - // set MachineSettings through the pointer - memset(pMachineSettings, 0, sizeof(*pMachineSettings)); - TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - HmiRecipe.Commands.LoadRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == true); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.LoadRecipe = false; - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - case 1: - TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == false); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); - TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); - TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); - TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); - TEST_DONE; - break; - } - TEST_BUSY; - - - TEST_DONE; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + // set MachineSettings through the pointer + memset(pMachineSettings, 0, sizeof(*pMachineSettings)); + TEST_BUSY_CONDITION(!SelectRecipe("Machine.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + HmiRecipe.Commands.LoadRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == true); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.LoadRecipe = false; + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + case 1: + TEST_BUSY_CONDITION(HmiRecipe.Status.ConfigRecipeLoaded == false); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); + TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); + TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); + TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); + TEST_DONE; + break; + } + TEST_BUSY; + + + TEST_DONE; } _TEST CreateNew(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(RecipeExists("test.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(RecipeExists("test.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "Machine"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists("Machine.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "Machine"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists("Machine.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateNonExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test2"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(!RecipeExists("test2.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test2"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(!RecipeExists("test2.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedConfigRecipe, ".")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedConfigRecipe)); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedConfigRecipe, ".")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedConfigRecipe)); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Preview(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - MachineSettings.AddMachineSettingsHere1 = 157; - MachineSettings.AddMachineSettingsHere2 = 43956; - MachineSettings.AddMachineSettingsHere3 = true; - MachineSettings.AddMachineSettingsHere4 = 134.876; - MachineSettings.AddMachineSettingsHere5 = 4373; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); - TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); - TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); - TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + MachineSettings.AddMachineSettingsHere1 = 157; + MachineSettings.AddMachineSettingsHere2 = 43956; + MachineSettings.AddMachineSettingsHere3 = true; + MachineSettings.AddMachineSettingsHere4 = 134.876; + MachineSettings.AddMachineSettingsHere5 = 4373; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.mcfg")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(11, MachineSettings.AddMachineSettingsHere1); + TEST_ASSERT_EQUAL_INT(22, MachineSettings.AddMachineSettingsHere2); + TEST_ASSERT_EQUAL_INT(true, MachineSettings.AddMachineSettingsHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.2999999, MachineSettings.AddMachineSettingsHere4); + TEST_ASSERT_EQUAL_INT(44, MachineSettings.AddMachineSettingsHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Delete(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) - { - case 0: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - ArrangeSubState = 1; - break; - - case 1: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ArrangeSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(!SelectRecipe("test.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Delete = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); - MpRecipeUIConnect.Recipe.Delete = false; - MpRecipeUIConnect.MessageBox.Confirm = true; - ActSubState = 1; - break; - - case 1: - MpRecipeUIConnect.MessageBox.Confirm = false; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!RecipeExists("test.mcfg")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) + { + case 0: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + ArrangeSubState = 1; + break; + + case 1: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ArrangeSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(!SelectRecipe("test.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Delete = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); + MpRecipeUIConnect.Recipe.Delete = false; + MpRecipeUIConnect.MessageBox.Confirm = true; + ActSubState = 1; + break; + + case 1: + MpRecipeUIConnect.MessageBox.Confirm = false; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!RecipeExists("test.mcfg")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Invalid(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) { - case 0: - FileCopy_UT.enable = true; - FileCopy_UT.pSrcDev = "mappRecipeFiles"; - FileCopy_UT.pSrc = "CSVformat\\Machine.mcfg"; - FileCopy_UT.pDestDev = "mappRecipeFiles"; - FileCopy_UT.pDest = "MachineInvalid.mcfg"; - FileCopy_UT.option= fiOVERWRITE; - FileCopy(&FileCopy_UT); - TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); - FileCopy_UT.enable = false; - FileCopy(&FileCopy_UT); - ArrangeSubState = 1; - break; - - case 1: - MpRecipeUIConnect.Recipe.Refresh = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - MpRecipeUIConnect.Recipe.Refresh = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(!SelectRecipe("MachineInvalid.mcfg")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) { + case 0: + FileCopy_UT.enable = true; + FileCopy_UT.pSrcDev = "mappRecipeFiles"; + FileCopy_UT.pSrc = "CSVformat\\Machine.mcfg"; + FileCopy_UT.pDestDev = "mappRecipeFiles"; + FileCopy_UT.pDest = "MachineInvalid.mcfg"; + FileCopy_UT.option= fiOVERWRITE; + FileCopy(&FileCopy_UT); + TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); + FileCopy_UT.enable = false; + FileCopy(&FileCopy_UT); + ArrangeSubState = 1; + break; + + case 1: + MpRecipeUIConnect.Recipe.Refresh = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + MpRecipeUIConnect.Recipe.Refresh = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(!SelectRecipe("MachineInvalid.mcfg")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); + TEST_DONE; + break; + } + TEST_BUSY; } /* @@ -497,14 +497,14 @@ By B+R UnitTest Helper Version: 2.0.1.59 */ UNITTEST_FIXTURES(fixtures) { - new_TestFixture("DefaultValues", DefaultValues), - new_TestFixture("CreateNew", CreateNew), - new_TestFixture("CreateExisting", CreateExisting), - new_TestFixture("CreateNonExisting", CreateNonExisting), - new_TestFixture("CreateActive", CreateActive), - new_TestFixture("Preview", Preview), - new_TestFixture("Delete", Delete), - new_TestFixture("Invalid", Invalid), + new_TestFixture("DefaultValues", DefaultValues), + new_TestFixture("CreateNew", CreateNew), + new_TestFixture("CreateExisting", CreateExisting), + new_TestFixture("CreateNonExisting", CreateNonExisting), + new_TestFixture("CreateActive", CreateActive), + new_TestFixture("Preview", Preview), + new_TestFixture("Delete", Delete), + new_TestFixture("Invalid", Invalid), }; UNITTEST_CALLER_COMPLETE_EXPLICIT(Set_RecipeMachineSettings, "Set_RecipeMachineSettings", setupTest, teardownTest, fixtures, setupSet, teardownSet, cyclicSetCaller); diff --git a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c index d8c38bdd..353b4308 100644 --- a/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c +++ b/mappFramework/Logical/UnitTest/Recipe/RecipeMgrUnitTest/Set_RecipeParameters.c @@ -10,658 +10,658 @@ #include #include "testSuite.h" -#define TIMEOUT_TEST_CASE \ - if (cycleCount >= 254) \ - { \ - char abortMessage[80]; \ - char substate[10]; \ - memset(abortMessage, 0, sizeof(abortMessage)); \ - memset(substate, 0, sizeof(substate)); \ - itoa(ActSubState, substate, 10); \ - strcpy(abortMessage, "Timeout in ActSubState = "); \ - strcat(abortMessage, substate); \ - TEST_FAIL(abortMessage); \ - TEST_DONE; \ - } +#define TIMEOUT_TEST_CASE \ + if (cycleCount >= 254) \ + { \ + char abortMessage[80]; \ + char substate[10]; \ + memset(abortMessage, 0, sizeof(abortMessage)); \ + memset(substate, 0, sizeof(substate)); \ + itoa(ActSubState, substate, 10); \ + strcpy(abortMessage, "Timeout in ActSubState = "); \ + strcat(abortMessage, substate); \ + TEST_FAIL(abortMessage); \ + TEST_DONE; \ + } _SETUP_SET(void) { - return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); + return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); } _TEARDOWN_SET(void) { - SetupState = 0; - TEST_DONE; + SetupState = 0; + TEST_DONE; } _SETUP_TEST(void) { - ArrangeSubState = 0; - ActSubState = 0; - AssertSubState = 0; - return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); + ArrangeSubState = 0; + ActSubState = 0; + AssertSubState = 0; + return RemoveNonDefaultFiles("*.par", "Default.par", PARAMETERS_CATEGORY); } _TEARDOWN_TEST(void) { - memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); - MpRecipeUIConnect.Recipe.Load = false; - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - MpRecipeUIConnect.Recipe.Refresh = true; - } - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) - MpRecipeUIConnect.Recipe.Refresh = false; - - TEST_DONE; + memset(&HmiRecipe.Commands, 0, sizeof(HmiRecipe.Commands)); + MpRecipeUIConnect.Recipe.Load = false; + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + MpRecipeUIConnect.Recipe.Refresh = true; + } + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE) + MpRecipeUIConnect.Recipe.Refresh = false; + + TEST_DONE; } _CYCLIC_SET(void) { - cycleCount++; + cycleCount++; } _TEST DefaultValues(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - // set MachineSettings through the pointer - memset(pParameters, 0, sizeof(*pParameters)); - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - HmiRecipe.Commands.LoadRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == true); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.LoadRecipe = false; - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + // set MachineSettings through the pointer + memset(pParameters, 0, sizeof(*pParameters)); + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + HmiRecipe.Commands.LoadRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == true); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.LoadRecipe = false; + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateNew(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(RecipeExists("test.par")); - TEST_DONE; - break; - } - - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(RecipeExists("test.par")); + TEST_DONE; + break; + } + + TEST_BUSY; } _TEST CreateExisting(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "Default"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists("Default.par")); - TEST_DONE; - break; - } - - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "Default"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists("Default.par")); + TEST_DONE; + break; + } + + TEST_BUSY; } _TEST CreateNonExisting(void) { - TIMEOUT_TEST_CASE - - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, "test2"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(!RecipeExists("test2.par")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, "test2"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(!HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(!RecipeExists("test2.par")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedProductRecipe, ".")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - TestState = TEST_ASSERT; - break; - - case TEST_ASSERT: - HmiRecipe.Commands.CreateRecipe = false; - TEST_ASSERT(HmiRecipe.Status.FileDuplicate); - TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedProductRecipe)); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + strcpy(HmiRecipe.Parameters.FileName, strtok(HmiRecipe.Status.LastLoadedProductRecipe, ".")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + TestState = TEST_ASSERT; + break; + + case TEST_ASSERT: + HmiRecipe.Commands.CreateRecipe = false; + TEST_ASSERT(HmiRecipe.Status.FileDuplicate); + TEST_ASSERT(RecipeExists(HmiRecipe.Status.LastLoadedProductRecipe)); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST PreviewShouldNotAffectActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing preview"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - // check if preview affects the active parameters - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing preview"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + // check if preview affects the active parameters + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("two", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 3.3, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 4.4, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 5.5, Parameters.AddParametersHere5); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Preview(void) { - TIMEOUT_TEST_CASE - - switch (TestState) - { - case TEST_ARRANGE: - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing preview"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "preview"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!ParametersPreview.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("testing preview", ParametersPreview.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 12.56, ParametersPreview.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 134.876, ParametersPreview.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 87.4567, ParametersPreview.AddParametersHere5); - - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + + switch (TestState) + { + case TEST_ARRANGE: + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing preview"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "preview"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(!SelectRecipe("preview.par")); + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!ParametersPreview.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("testing preview", ParametersPreview.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 12.56, ParametersPreview.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 134.876, ParametersPreview.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 87.4567, ParametersPreview.AddParametersHere5); + + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Delete(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) - { - case 0: - strcpy(HmiRecipe.Parameters.FileName, "test"); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - ArrangeSubState = 1; - break; - - case 1: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ArrangeSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(!SelectRecipe("test.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) { - case 0: - MpRecipeUIConnect.Recipe.Delete = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); - MpRecipeUIConnect.Recipe.Delete = false; - MpRecipeUIConnect.MessageBox.Confirm = true; - ActSubState = 1; - break; - - case 1: - MpRecipeUIConnect.MessageBox.Confirm = false; - TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 4; - break; - - case 4: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(!RecipeExists("test.par")); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) + { + case 0: + strcpy(HmiRecipe.Parameters.FileName, "test"); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + ArrangeSubState = 1; + break; + + case 1: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ArrangeSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(!SelectRecipe("test.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) { + case 0: + MpRecipeUIConnect.Recipe.Delete = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus != 0); + MpRecipeUIConnect.Recipe.Delete = false; + MpRecipeUIConnect.MessageBox.Confirm = true; + ActSubState = 1; + break; + + case 1: + MpRecipeUIConnect.MessageBox.Confirm = false; + TEST_BUSY_CONDITION(MpRecipeUIConnect.MessageBox.LayerStatus == 0) + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 4; + break; + + case 4: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(!RecipeExists("test.par")); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST Invalid(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - switch (ArrangeSubState) { - case 0: - FileCopy_UT.enable = true; - FileCopy_UT.pSrcDev = "mappRecipeFiles"; - FileCopy_UT.pSrc = "CSVformat\\Default.par"; - FileCopy_UT.pDestDev = "mappRecipeFiles"; - FileCopy_UT.pDest = "Invalid.par"; - FileCopy_UT.option= fiOVERWRITE; - FileCopy(&FileCopy_UT); - TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); - FileCopy_UT.enable = false; - FileCopy(&FileCopy_UT); - ArrangeSubState = 1; - break; - - case 1: - MpRecipeUIConnect.Recipe.Refresh = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); - MpRecipeUIConnect.Recipe.Refresh = false; - ArrangeSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ArrangeSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(!SelectRecipe("Invalid.par")); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TestState = TEST_ACT; - break; - } - break; - - case TEST_ACT: - switch (ActSubState) - { - case 0: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + switch (ArrangeSubState) { + case 0: + FileCopy_UT.enable = true; + FileCopy_UT.pSrcDev = "mappRecipeFiles"; + FileCopy_UT.pSrc = "CSVformat\\Default.par"; + FileCopy_UT.pDestDev = "mappRecipeFiles"; + FileCopy_UT.pDest = "Invalid.par"; + FileCopy_UT.option= fiOVERWRITE; + FileCopy(&FileCopy_UT); + TEST_BUSY_CONDITION(FileCopy_UT.status == 65535); + FileCopy_UT.enable = false; + FileCopy(&FileCopy_UT); + ArrangeSubState = 1; + break; + + case 1: + MpRecipeUIConnect.Recipe.Refresh = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_IDLE); + MpRecipeUIConnect.Recipe.Refresh = false; + ArrangeSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ArrangeSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(!SelectRecipe("Invalid.par")); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TestState = TEST_ACT; + break; + } + break; + + case TEST_ACT: + switch (ActSubState) + { + case 0: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_LOAD); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT_EQUAL_INT(mpRECIPE_UI_STATUS_ERROR, MpRecipeUIConnect.Status); + TEST_DONE; + break; + } + TEST_BUSY; } SKIP_TEST EditActive(void) { - TIMEOUT_TEST_CASE - switch (TestState) - { - case TEST_ARRANGE: - TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); - LastSelectedIndex++; - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - - ParametersEdit.AddParametersHere1 = false; - strcpy(ParametersEdit.AddParametersHere2, "testing editing active"); - ParametersEdit.AddParametersHere3 = 12.56; - ParametersEdit.AddParametersHere4 = 134.876; - ParametersEdit.AddParametersHere5 = 87.4567; - strcpy(HmiRecipe.Parameters.FileName, "editActive"); - TestState = TEST_ACT; - break; - - case TEST_ACT: - if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) - { - TEST_FAIL("MpRecipeUIConnect in error state"); - TEST_DONE; - } - switch (ActSubState) - { - case 0: - HmiRecipe.Commands.CreateRecipe = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); - HmiRecipe.Commands.CreateRecipe = false; - ActSubState = 1; - break; - - case 1: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - ActSubState = 2; - break; - - case 2: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); - ActSubState = 3; - break; - - case 3: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); - TEST_BUSY_CONDITION(!SelectRecipe("editActive.par")); - ActSubState = 4; - break; - - case 4: - MpRecipeUIConnect.Recipe.Load = true; - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); - MpRecipeUIConnect.Recipe.Load = false; - ActSubState = 5; - break; - - case 5: - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - ParametersEdit.AddParametersHere1 = true; - strcpy(ParametersEdit.AddParametersHere2, "edited active"); - ParametersEdit.AddParametersHere3 = 52.56; - ParametersEdit.AddParametersHere4 = 184.876; - ParametersEdit.AddParametersHere5 = 587.4567; - ActSubState = 6; - break; - - case 6: - HmiRecipe.Commands.SaveSelectedRecipe = true; - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); - HmiRecipe.Commands.SaveSelectedRecipe = false; - ActSubState = 7; - break; - - case 7: - TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); - TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); - TestState = TEST_ASSERT; - break; - } - break; - - case TEST_ASSERT: - TEST_ASSERT(Parameters.AddParametersHere1); - TEST_ASSERT_EQUAL_STRING("edited active", Parameters.AddParametersHere2); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 52.56, Parameters.AddParametersHere3); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 184.876, Parameters.AddParametersHere4); - TEST_ASSERT_DOUBLE_WITHIN(0.0001, 587.4567, Parameters.AddParametersHere5); - - TEST_DONE; - break; - } - TEST_BUSY; + TIMEOUT_TEST_CASE + switch (TestState) + { + case TEST_ARRANGE: + TEST_BUSY_CONDITION(!SelectRecipe("Default.par")); + LastSelectedIndex++; + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + + ParametersEdit.AddParametersHere1 = false; + strcpy(ParametersEdit.AddParametersHere2, "testing editing active"); + ParametersEdit.AddParametersHere3 = 12.56; + ParametersEdit.AddParametersHere4 = 134.876; + ParametersEdit.AddParametersHere5 = 87.4567; + strcpy(HmiRecipe.Parameters.FileName, "editActive"); + TestState = TEST_ACT; + break; + + case TEST_ACT: + if (MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_ERROR) + { + TEST_FAIL("MpRecipeUIConnect in error state"); + TEST_DONE; + } + switch (ActSubState) + { + case 0: + HmiRecipe.Commands.CreateRecipe = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_CREATE); + HmiRecipe.Commands.CreateRecipe = false; + ActSubState = 1; + break; + + case 1: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + ActSubState = 2; + break; + + case 2: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status == mpRECIPE_UI_STATUS_REFRESH); + ActSubState = 3; + break; + + case 3: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TEST_BUSY_CONDITION(HmiRecipe.Status.ProductRecipeLoaded == false); + TEST_BUSY_CONDITION(!SelectRecipe("editActive.par")); + ActSubState = 4; + break; + + case 4: + MpRecipeUIConnect.Recipe.Load = true; + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_LOAD); + MpRecipeUIConnect.Recipe.Load = false; + ActSubState = 5; + break; + + case 5: + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + ParametersEdit.AddParametersHere1 = true; + strcpy(ParametersEdit.AddParametersHere2, "edited active"); + ParametersEdit.AddParametersHere3 = 52.56; + ParametersEdit.AddParametersHere4 = 184.876; + ParametersEdit.AddParametersHere5 = 587.4567; + ActSubState = 6; + break; + + case 6: + HmiRecipe.Commands.SaveSelectedRecipe = true; + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand == REC_HMI_WAIT); + HmiRecipe.Commands.SaveSelectedRecipe = false; + ActSubState = 7; + break; + + case 7: + TEST_BUSY_CONDITION(HmiRecipe.Status.HMIcommand != REC_HMI_WAIT); + TEST_BUSY_CONDITION(MpRecipeUIConnect.Status != mpRECIPE_UI_STATUS_IDLE); + TestState = TEST_ASSERT; + break; + } + break; + + case TEST_ASSERT: + TEST_ASSERT(Parameters.AddParametersHere1); + TEST_ASSERT_EQUAL_STRING("edited active", Parameters.AddParametersHere2); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 52.56, Parameters.AddParametersHere3); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 184.876, Parameters.AddParametersHere4); + TEST_ASSERT_DOUBLE_WITHIN(0.0001, 587.4567, Parameters.AddParametersHere5); + + TEST_DONE; + break; + } + TEST_BUSY; } @@ -674,16 +674,16 @@ By B+R UnitTest Helper Version: 2.0.1.59 */ UNITTEST_FIXTURES(fixtures) { - new_TestFixture("DefaultValues", DefaultValues), - new_TestFixture("CreateNew", CreateNew), - new_TestFixture("CreateExisting", CreateExisting), - new_TestFixture("CreateNonExisting", CreateNonExisting), - new_TestFixture("CreateActive", CreateActive), - new_TestFixture("PreviewShouldNotAffectActive", PreviewShouldNotAffectActive), - new_TestFixture("Preview", Preview), - new_TestFixture("Delete", Delete), - new_TestFixture("Invalid", Invalid), - skipTestFixture("EditActive", EditActive), + new_TestFixture("DefaultValues", DefaultValues), + new_TestFixture("CreateNew", CreateNew), + new_TestFixture("CreateExisting", CreateExisting), + new_TestFixture("CreateNonExisting", CreateNonExisting), + new_TestFixture("CreateActive", CreateActive), + new_TestFixture("PreviewShouldNotAffectActive", PreviewShouldNotAffectActive), + new_TestFixture("Preview", Preview), + new_TestFixture("Delete", Delete), + new_TestFixture("Invalid", Invalid), + skipTestFixture("EditActive", EditActive), }; UNITTEST_CALLER_COMPLETE_EXPLICIT(Set_RecipeParameters, "Set_RecipeParameters", setupTest, teardownTest, fixtures, setupSet, teardownSet, cyclicSetCaller); From bc4619d3e18ca4e6523167ba66381c1cab65e506 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Fri, 2 Dec 2022 08:17:05 -0600 Subject: [PATCH 007/112] AAZM-480 - some minor reorganization in categories for widget bindings --- .../Pages/FrameworkPackage/AxisContent/AxisManual.content | 2 +- .../AxisControlWidgetLib/AxisControl/Widget.compoundwidget | 4 ++-- .../Simulation/PC/mappView/Axis/AxisManual_content.binding | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisManual.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisManual.content index 5278576f..feb288e4 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisManual.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisManual.content @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget index 9e94154a..83210158 100644 --- a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget @@ -91,14 +91,14 @@ - + Label Text - + Axis Control diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.binding index dcc455b6..830a3fd8 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.binding @@ -3,7 +3,7 @@ - + From 43dd75ac56f1d0e9447b4f77ba1c828aeb87e8ea Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Fri, 2 Dec 2022 14:32:29 +0000 Subject: [PATCH 008/112] Spaces/tab commit --- .../TestSet_Templates/Set_Complete.c | 2 +- .../UnitTest/UserX/UserXUnitTest/testSuite.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c b/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c index c6779193..f70277ee 100644 --- a/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c +++ b/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c @@ -81,7 +81,7 @@ _TEST testcase2(void) UNITTEST_FIXTURES(fixtures) { new_TestFixture("testcase1",testcase1), - new_TestFixture("testcase2",testcase2), + new_TestFixture("testcase2",testcase2), }; #warning TODO: rename testset (Param 1 and 2) diff --git a/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c index 5b3805d2..e040d560 100644 --- a/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c @@ -19,15 +19,15 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappUserXFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/UserX/Alarms"); - strcpy((char*)&TextID, "UserLocked"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappUserXFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/UserX/Alarms"); + strcpy((char*)&TextID, "UserLocked"); } From d739e024fecb1ed7d5762e00ce2595231cd65034 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Fri, 2 Dec 2022 09:35:47 -0500 Subject: [PATCH 009/112] spaces/tabs commit --- .../UnitTest/File/FileUnitTest/testSuite.c | 26 +++---- .../Report/ReportUnitTest/Set_ReportMgr.c | 74 +++++++++---------- .../Report/ReportUnitTest/testSuite.c | 16 ++-- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c index e674dda4..72a0a690 100644 --- a/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c @@ -20,26 +20,26 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&TextNameSpace, "mappFramework/File/Alarms"); - strcpy((char*)&TextID, "DeviceNotFound"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&TextNameSpace, "mappFramework/File/Alarms"); + strcpy((char*)&TextID, "DeviceNotFound"); } void _CYCLIC cyclicWithTest(void) { utCyclic(&Testsuite); - if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) - strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); - if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) - strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); - if (Testsuite.Informational.LastKnownPassedLocation.File != 0) - strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); + if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) + strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); + if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) + strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); + if (Testsuite.Informational.LastKnownPassedLocation.File != 0) + strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); } diff --git a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c index ede657ec..8f2efc85 100644 --- a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c +++ b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c @@ -21,7 +21,7 @@ _TEARDOWN_SET(void) _SETUP_TEST(void) { - TEST_DONE; + TEST_DONE; } _TEARDOWN_TEST(void) @@ -31,60 +31,60 @@ _TEARDOWN_TEST(void) _TEST CreateAdvReport(void) { - switch (TestState) - { - case TEST_ARRANGE: - HmiReport_UT.Parameters.UseAdvancedFormat = true; + switch (TestState) + { + case TEST_ARRANGE: + HmiReport_UT.Parameters.UseAdvancedFormat = true; TEST_BUSY_CONDITION(CoreInfoActive == true); - TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); - TestState = TEST_ACT; - break; + TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); + TestState = TEST_ACT; + break; - case TEST_ACT: + case TEST_ACT: TEST_BUSY_CONDITION(CoreInfoActive == false); HmiReport_UT.Commands.Generate = true; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == false); - TestState = TEST_ASSERT; - break; + TestState = TEST_ASSERT; + break; - case TEST_ASSERT: - HmiReport_UT.Commands.Generate = false; + case TEST_ASSERT: + HmiReport_UT.Commands.Generate = false; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == true); - TEST_ASSERT(HmiReport_UT.Status.Error == false); - TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); - TEST_DONE; - break; - } - TEST_BUSY; + TEST_ASSERT(HmiReport_UT.Status.Error == false); + TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateSimpleReport(void) { - switch (TestState) - { - case TEST_ARRANGE: - HmiReport_UT.Parameters.UseAdvancedFormat = false; + switch (TestState) + { + case TEST_ARRANGE: + HmiReport_UT.Parameters.UseAdvancedFormat = false; TEST_BUSY_CONDITION(CoreInfoActive == true); - TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); - TestState = TEST_ACT; - break; + TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); + TestState = TEST_ACT; + break; - case TEST_ACT: + case TEST_ACT: TEST_BUSY_CONDITION(CoreInfoActive == false); HmiReport_UT.Commands.Generate = true; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == false); - TestState = TEST_ASSERT; - break; + TestState = TEST_ASSERT; + break; - case TEST_ASSERT: - HmiReport_UT.Commands.Generate = false; + case TEST_ASSERT: + HmiReport_UT.Commands.Generate = false; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == true); - TEST_ASSERT(HmiReport_UT.Status.Error == false); - TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); - TEST_DONE; - break; - } - TEST_BUSY; + TEST_ASSERT(HmiReport_UT.Status.Error == false); + TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); + TEST_DONE; + break; + } + TEST_BUSY; } diff --git a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c index 10b760a7..f8ad4db9 100644 --- a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c @@ -20,15 +20,15 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappReportFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/Report/Alarms"); - strcpy((char*)&TextID, "GenerateFailed"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappReportFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/Report/Alarms"); + strcpy((char*)&TextID, "GenerateFailed"); } From 04cc79f8e1c758786956bde8de7ee111b83001b2 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Fri, 2 Dec 2022 09:36:28 -0500 Subject: [PATCH 010/112] spaces/tabs --- .../UnitTest/File/FileUnitTest/testSuite.c | 26 +++---- .../Report/ReportUnitTest/Set_ReportMgr.c | 74 +++++++++---------- .../Report/ReportUnitTest/testSuite.c | 16 ++-- .../TestSet_Templates/Set_Complete.c | 2 +- .../UnitTest/UserX/UserXUnitTest/testSuite.c | 16 ++-- 5 files changed, 67 insertions(+), 67 deletions(-) diff --git a/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c index e674dda4..72a0a690 100644 --- a/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/File/FileUnitTest/testSuite.c @@ -20,26 +20,26 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&TextNameSpace, "mappFramework/File/Alarms"); - strcpy((char*)&TextID, "DeviceNotFound"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&TextNameSpace, "mappFramework/File/Alarms"); + strcpy((char*)&TextID, "DeviceNotFound"); } void _CYCLIC cyclicWithTest(void) { utCyclic(&Testsuite); - if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) - strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); - if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) - strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); - if (Testsuite.Informational.LastKnownPassedLocation.File != 0) - strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); + if (Testsuite.Informational.LastKnownPassedLocation.TestCaseName != 0) + strcpy((char*)&LastTestCase, (char*)Testsuite.Informational.LastKnownPassedLocation.TestCaseName); + if (Testsuite.Informational.LastKnownPassedLocation.TestSetName != 0) + strcpy((char*)&LastTestSet, (char*)Testsuite.Informational.LastKnownPassedLocation.TestSetName); + if (Testsuite.Informational.LastKnownPassedLocation.File != 0) + strcpy((char*)&LastTestFile, (char*)Testsuite.Informational.LastKnownPassedLocation.File); } diff --git a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c index ede657ec..8f2efc85 100644 --- a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c +++ b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/Set_ReportMgr.c @@ -21,7 +21,7 @@ _TEARDOWN_SET(void) _SETUP_TEST(void) { - TEST_DONE; + TEST_DONE; } _TEARDOWN_TEST(void) @@ -31,60 +31,60 @@ _TEARDOWN_TEST(void) _TEST CreateAdvReport(void) { - switch (TestState) - { - case TEST_ARRANGE: - HmiReport_UT.Parameters.UseAdvancedFormat = true; + switch (TestState) + { + case TEST_ARRANGE: + HmiReport_UT.Parameters.UseAdvancedFormat = true; TEST_BUSY_CONDITION(CoreInfoActive == true); - TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); - TestState = TEST_ACT; - break; + TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); + TestState = TEST_ACT; + break; - case TEST_ACT: + case TEST_ACT: TEST_BUSY_CONDITION(CoreInfoActive == false); HmiReport_UT.Commands.Generate = true; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == false); - TestState = TEST_ASSERT; - break; + TestState = TEST_ASSERT; + break; - case TEST_ASSERT: - HmiReport_UT.Commands.Generate = false; + case TEST_ASSERT: + HmiReport_UT.Commands.Generate = false; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == true); - TEST_ASSERT(HmiReport_UT.Status.Error == false); - TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); - TEST_DONE; - break; - } - TEST_BUSY; + TEST_ASSERT(HmiReport_UT.Status.Error == false); + TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); + TEST_DONE; + break; + } + TEST_BUSY; } _TEST CreateSimpleReport(void) { - switch (TestState) - { - case TEST_ARRANGE: - HmiReport_UT.Parameters.UseAdvancedFormat = false; + switch (TestState) + { + case TEST_ARRANGE: + HmiReport_UT.Parameters.UseAdvancedFormat = false; TEST_BUSY_CONDITION(CoreInfoActive == true); - TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); - TestState = TEST_ACT; - break; + TEST_ABORT_CONDITION(HmiReport_UT.Status.Error == true); + TestState = TEST_ACT; + break; - case TEST_ACT: + case TEST_ACT: TEST_BUSY_CONDITION(CoreInfoActive == false); HmiReport_UT.Commands.Generate = true; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == false); - TestState = TEST_ASSERT; - break; + TestState = TEST_ASSERT; + break; - case TEST_ASSERT: - HmiReport_UT.Commands.Generate = false; + case TEST_ASSERT: + HmiReport_UT.Commands.Generate = false; TEST_BUSY_CONDITION(HmiReport_UT.Status.Busy == true); - TEST_ASSERT(HmiReport_UT.Status.Error == false); - TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); - TEST_DONE; - break; - } - TEST_BUSY; + TEST_ASSERT(HmiReport_UT.Status.Error == false); + TEST_ASSERT_EQUAL_INT(1, CoreInfo_UT.NumberOfReports); + TEST_DONE; + break; + } + TEST_BUSY; } diff --git a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c index 10b760a7..f8ad4db9 100644 --- a/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/Report/ReportUnitTest/testSuite.c @@ -20,15 +20,15 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappReportFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/Report/Alarms"); - strcpy((char*)&TextID, "GenerateFailed"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappReportFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/Report/Alarms"); + strcpy((char*)&TextID, "GenerateFailed"); } diff --git a/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c b/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c index c6779193..f70277ee 100644 --- a/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c +++ b/mappFramework/Logical/UnitTest/Templates/NoToolSupport/TestSet_Templates/Set_Complete.c @@ -81,7 +81,7 @@ _TEST testcase2(void) UNITTEST_FIXTURES(fixtures) { new_TestFixture("testcase1",testcase1), - new_TestFixture("testcase2",testcase2), + new_TestFixture("testcase2",testcase2), }; #warning TODO: rename testset (Param 1 and 2) diff --git a/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c b/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c index 5b3805d2..e040d560 100644 --- a/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c +++ b/mappFramework/Logical/UnitTest/UserX/UserXUnitTest/testSuite.c @@ -19,15 +19,15 @@ void _INIT initTestSuite(void) { - Testsuite.Enable = 1; + Testsuite.Enable = 1; utInit(&Testsuite); - - CommonTestsuite.Enable = 1; - utInit(&CommonTestsuite); - - strcpy((char*)&FileDeviceName, "mappUserXFiles"); - strcpy((char*)&TextNameSpace, "mappFramework/UserX/Alarms"); - strcpy((char*)&TextID, "UserLocked"); + + CommonTestsuite.Enable = 1; + utInit(&CommonTestsuite); + + strcpy((char*)&FileDeviceName, "mappUserXFiles"); + strcpy((char*)&TextNameSpace, "mappFramework/UserX/Alarms"); + strcpy((char*)&TextID, "UserLocked"); } From 6c69a210aaa8b4c47c569adfd725e77b00c5b931 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Fri, 2 Dec 2022 08:57:19 -0600 Subject: [PATCH 011/112] AAZM-294 - added MpAuditTrailUI as standard for future use with VC4 --- .../Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st | 11 +++++++++++ .../Infrastructure/Audit/AuditMgr/AuditMgr.var | 3 +++ 2 files changed, 14 insertions(+) diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st index 4fd0fd32..1c061923 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st @@ -32,6 +32,13 @@ PROGRAM _INIT MpAuditTrail_CEvents.MpLink := ADR(gMpLinkCustomEvents); MpAuditTrail_CEvents(); + MpAuditTrailUI_0.MpLink := ADR(gMpLinkAuditTrail); + MpAuditTrailUI_0.UIConnect := ADR(MpAuditTrailUIConnect); + MpAuditTrailUI_0.UISetup.EventListSize := SIZEOF(MpAuditTrailUIConnect.Output.EventID) / SIZEOF(MpAuditTrailUIConnect.Output.EventID[0]); + MpAuditTrailUI_0.UISetup.ScrollWindow := 1; + MpAuditTrailUI_0.Enable := TRUE; + MpAuditTrailUI_0(); + // Initialize custom events CustomEvent[0].Type := "Custom Event Type"; CustomEvent[0].Msg := "Custom Event Message"; @@ -97,11 +104,13 @@ PROGRAM _CYCLIC MpAuditTrail_0.MpLink := ADR(gMpLinkAuditTrail); MpAuditTrailConfig_0.MpLink := ADR(gMpLinkAuditTrail); MpAuditTrail_CEvents.MpLink := ADR(gMpLinkCustomEvents); + MpAuditTrailUI_0.MpLink := ADR(gMpLinkAuditTrail); // Call function blocks MpAuditTrail_0(); MpAuditTrailConfig_0(); MpAuditTrail_CEvents(); + MpAuditTrailUI_0(); END_PROGRAM @@ -111,11 +120,13 @@ PROGRAM _EXIT MpAuditTrail_0.Enable := FALSE; MpAuditTrailConfig_0.Enable := FALSE; MpAuditTrail_CEvents.Enable := FALSE; + MpAuditTrailUI_0.Enable := FALSE; // Call function blocks MpAuditTrail_0(); MpAuditTrailConfig_0(); MpAuditTrail_CEvents(); + MpAuditTrailUI_0(); END_PROGRAM diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var index 6d3879b0..8d962ecd 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var @@ -5,6 +5,7 @@ VAR MpAuditTrailConfig_0 : MpAuditTrailConfig; (*AuditTrail configuration*) MpAuditTrail_CEvents : MpAuditTrail; (*AuditTrail for custom events*) QueryUserEvents_0 : {REDUND_UNREPLICABLE} MpAuditQuery; (*MpAlarmXQuery instance*) + MpAuditTrailUI_0 : MpAuditTrailUI; (*AuditTrail UI interface*) END_VAR (*Constants*) VAR CONSTANT @@ -19,6 +20,8 @@ VAR CustomEvent : ARRAY[0..MAX_CUSTOM_EVENTS] OF AuditCustomEventType; (*Custom events*) AuditQuery : {REDUND_UNREPLICABLE} AuditQueryType; (*Query results and status*) AuditTrailConfig : MpAuditTrailConfigType; (*Configuration structure for changing archiving setup*) + MpAuditTrailUIConnect : MpAuditTrailUIConnectType; (*MpAuditUI connection to the HMI*) + MpAuditTrailUISetup : MpAuditTrailUISetupType; (*MpAuditUI setup connection to the HMI*) END_VAR (*Variables*) VAR From 69e54e36d43840f326b732d82e21a47ecf2d892d Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Mon, 5 Dec 2022 08:44:33 +0000 Subject: [PATCH 012/112] AAZM-450 - The recipe category dropdown text should be localizable, now text is referenced. --- .../mappFrameworkTexts/RecipePageTexts.tmx | 22 +++++++++++++++++++ .../RecipeContent/Recipe.content | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx index 7094e3da..2afe36cc 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx @@ -609,5 +609,27 @@ Do you want to continue and overwrite the existing one? Yes + + + Parameters + + + 参数 + + + Parameters + + + + + Maschineneinstellungen + + + 机器设置 + + + Machine Settings + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index fb9da5ef..3e31bcb7 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -17,7 +17,7 @@ - + From 994e2036297903df564b655601983b39dae328db Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Mon, 5 Dec 2022 12:54:10 +0000 Subject: [PATCH 013/112] AAZM-352 - Add a confirmation pop-up when you delete a user --- .../mappView/Resources/Texts/UserList.tmx | 16 +++++++++++++ .../UserX/UserList_content.eventbinding | 23 +++++++++++++++---- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx index 447dd723..80fbcb7e 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx @@ -736,5 +736,21 @@ Användare + + + Möchten Sie den ausgewählten Benutzer wirklich löschen? + + + Do you really want to delete the selected user? + + + + + Einen Benutzer löschen + + + Delete a user + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index b5667726..cda6f577 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -24,11 +24,24 @@ - - - - - + + + + + + + + + + + + + + + + + + From b5791ae5ba0288388bbffde5e9ba3acb601d9467 Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Mon, 5 Dec 2022 13:36:12 +0000 Subject: [PATCH 014/112] AAZM-402 - Inform users that they can't delete the anonymous user --- .../mappView/Resources/Texts/UserList.tmx | 49 +++++++++++++++++++ .../UserX/UserList_content.eventbinding | 46 ++++++++++++++++- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx index 80fbcb7e..cc93ad57 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx @@ -752,5 +752,54 @@ Delete a user + + + Benutzer erfolgreich gelöscht + + + User successfully deleted + + + + + Benutzer kann nicht gelöscht werden, Sitzung ungültig + + + Cannot delete user, session not valid + + + + + Benutzer kann nicht gelöscht werden, Benutzer existiert nicht + + + Cannot delete user, user does not exist + + + + + +Benutzer kann nicht gelöscht werden, unzureichende Rechte + + + Cannot delete user, insufficient rights + + + + + Benutzer kann nicht gelöscht werden, derzeit angemeldeter Benutzer + + + Cannot delete user, currently logged-in user + + + + + Benutzer kann nicht gelöscht werden, anonym kann nicht gelöscht werden. + + + Cannot delete user, anonymous cannot be deleted. + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index cda6f577..a1881f3f 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -36,6 +36,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -199,4 +243,4 @@ - \ No newline at end of file + From b246515ed4c985c402f681d908fe28a34b698dab Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Mon, 5 Dec 2022 16:51:37 +0000 Subject: [PATCH 015/112] AAZM-324 - We should not allow the user to delete the default recipe, a message box is shown --- .../Recipe/RecipeMgr/HMIActions.st | 5 +- .../Recipe/RecipeMgr/RecipeMgr.typ | 1 + .../mappFrameworkTexts/RecipePageTexts.tmx | 8 ++++ .../Visualization/Variables/Recipe.svar | 3 +- .../PC/mappView/Recipe/Recipe_content.binding | 4 ++ .../Recipe/Recipe_content.eventbinding | 46 ++++++++++++------- 6 files changed, 47 insertions(+), 20 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st index 73cba0ee..5246cc89 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st @@ -215,9 +215,10 @@ ACTION RecipeHMIcommands: // Set whether the loading .gif should be shown on the HMI HmiRecipe.Status.LoadingRecipeList := (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_REFRESH); - + HmiRecipe.Status.DefaultRecipeSelected := (HmiRecipe.Status.SelectedRecipe = 'Default.par') OR (HmiRecipe.Status.SelectedRecipe = 'Machine.mcfg'); + // Update status information HmiRecipe.Status.LastStatus := MpRecipeUIConnect.Status; HmiRecipe.Status.SelectedRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - + END_ACTION diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ index 5c35ae12..e9f8635d 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ @@ -41,6 +41,7 @@ TYPE DeviceDataProvider : ARRAY[0..MAX_IDX_FILE_DEV]OF STRING[100]; (*File device data provider*) TableConfig : STRING[120]; (*Table configuration *) SelectedRecipe : STRING[255]; (*The name of the selected recipe*) + DefaultRecipeSelected : BOOL; (*The default recipe is selected*) END_STRUCT; ParametersType : STRUCT (*Demo / starter structure for machine parameters*) AddParametersHere1 : BOOL; (*Add your parameteres here *) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx index 2afe36cc..49cf6f77 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx @@ -631,5 +631,13 @@ Do you want to continue and overwrite the existing one? Machine Settings + + + Standarddateien können nicht gelöscht werden + + + Default files cannot be deleted + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Variables/Recipe.svar b/mappFramework/Logical/mappView/Visualization/Variables/Recipe.svar index ca808057..af3dbc89 100644 --- a/mappFramework/Logical/mappView/Visualization/Variables/Recipe.svar +++ b/mappFramework/Logical/mappView/Visualization/Variables/Recipe.svar @@ -31,5 +31,6 @@ - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding index 3e033541..de90a59e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding @@ -221,5 +221,9 @@ + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index cb5a3fb3..7d35fe32 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -8,13 +8,25 @@ + + + + + - + + + + + + + + @@ -182,13 +194,13 @@ - - - - - - - + + + + + + + @@ -225,7 +237,7 @@ - + @@ -248,14 +260,14 @@ - - - - - - - - + + + + + + + + From 4f52f802a3795e5cc1a2199f081bef1b5ce0f833 Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Wed, 7 Dec 2022 16:04:16 +0000 Subject: [PATCH 016/112] AAZM-324 - We should not allow the user to delete the default recipe, also added this functionality to the file page --- .../Infrastructure/File/FileMgr/FileMgr.typ | 1 + .../Infrastructure/File/FileMgr/HMIActions.st | 3 ++ .../Texts/mappFrameworkTexts/FileTexts.tmx | 8 ++++ .../Visualization/Variables/File.svar | 15 ++++++ .../Visualization/Variables/Package.pkg | 3 +- .../Physical/Simulation/PC/mappView/File.vis | 1 + .../PC/mappView/File/File_content.binding | 12 +++-- .../mappView/File/File_content.eventbinding | 27 +++++++++++ .../Recipe/Recipe_content.eventbinding | 46 ++++++++++--------- 9 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 mappFramework/Logical/mappView/Visualization/Variables/File.svar diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ b/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ index 62efb93f..4e461519 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ @@ -34,6 +34,7 @@ TYPE FolderSize : REAL; (*Size of currently selected folder*) SelectedIndex : USINT; (*Selected index in the file list*) FifoConfigEnable : BOOL; (*Disable FIFO access or change confirmation when FIFO is active*) + DefaultFileSelected : BOOL; (*The default recipe is selected*) END_STRUCT; FileHmiParaFifoType : STRUCT (*Parameters for the FIFO feature (first-in-first-out)*) Enable : BOOL; (*FIFO enable*) diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/File/FileMgr/HMIActions.st index 380af494..1857dbaa 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/HMIActions.st @@ -142,5 +142,8 @@ ACTION FileManager: END_IF HmiFile.Status.BackButton := (FolderDepthCount > 0); + HmiFile.Status.DefaultFileSelected := ((MpFileManagerUIConnect.File.List.Items[HmiFile.Status.SelectedIndex].Name = 'Default.par') OR + (MpFileManagerUIConnect.File.List.Items[HmiFile.Status.SelectedIndex].Name = 'Machine.mcfg')) AND + MpFileManagerUIConnect.DeviceList.SelectedIndex = 0; END_ACTION \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx index 5d98b779..52ec7165 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx @@ -551,5 +551,13 @@ Page Up + + + Standarddateien können nicht gelöscht werden + + + Default files cannot be deleted + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Variables/File.svar b/mappFramework/Logical/mappView/Visualization/Variables/File.svar new file mode 100644 index 00000000..27cab452 --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Variables/File.svar @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg b/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg index 03979172..a40efc18 100644 --- a/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg @@ -1,9 +1,10 @@  - + Recipe.svar UserX.svar Report.svar + File.svar \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/File.vis b/mappFramework/Physical/Simulation/PC/mappView/File.vis index d6a8d09b..70fd982d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File.vis +++ b/mappFramework/Physical/Simulation/PC/mappView/File.vis @@ -34,6 +34,7 @@ + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding index 411d0908..faa3b12e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding @@ -37,10 +37,6 @@ - - - - @@ -113,5 +109,13 @@ + + + + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding index 6fe302b5..54caadd7 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding @@ -137,5 +137,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index 7d35fe32..e2ac4133 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -13,32 +13,36 @@ - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + From bc05971045250cc4c608c46b965012b8098f1703 Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Thu, 8 Dec 2022 09:48:18 +0000 Subject: [PATCH 017/112] AAZM-402 - Added icons to the delete user messages --- .../UserX/UserList_content.eventbinding | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index a1881f3f..a4e0e762 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -28,7 +28,7 @@ - + @@ -36,50 +36,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,4 +243,4 @@ - + \ No newline at end of file From 2cdcee779ba39456b04b9489ffb755f2211a4ed3 Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Thu, 8 Dec 2022 11:26:04 +0000 Subject: [PATCH 018/112] AAZM-325 - More feedback in the File HMI, messages added for 8xxx errors with MpFileManagerUI_0.Info.Diag.StatusID.Code --- .../Texts/mappFrameworkTexts/FileTexts.tmx | 113 ++++++++++++ .../PC/Connectivity/OpcUA/FileMgr.uad | 7 + .../mappView/File/File_content.eventbinding | 161 +++++++++++++++++- 3 files changed, 280 insertions(+), 1 deletion(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx index 52ec7165..d521dc54 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx @@ -555,9 +555,122 @@ Standarddateien können nicht gelöscht werden + + 无法删除默认文件 + Default files cannot be deleted + + + NULL wurde an "UIConnect" angehängt + + + NULL 被附加到“UIConnect” + + + NULL was appended to "UIConnect" + + + + + Dieser Befehl ist im Mehrfachauswahlmodus nicht zulässig + + + 在多选模式下不允许使用此命令 + + + This command is not allowed in multi-select mode + + + + + Es wurde kein Element ausgewählt, das eingefügt werden kann + + + 没有选择可以粘贴的元素 + + + No element was selected that can be pasted + + + + + Es wurde nichts ausgewählt + + + 未选择任何内容 + + + Nothing was selected + + + + + Neuer Name ist bereits in Gebrauch + + + 新名称已被使用 + + + New name is already in use + + + + + Der ausgewählte Datenträger (Dateigerät) ist ungültig + + + 所选的数据存储介质（文件设备）无效 + + + The selected data storage medium (file device) is invalid + + + + + Der neue Name der Datei oder des Ordners ist leer + + + 文件或文件夹的新名称为空 + + + The new name of the file or folder is empty + + + + + Der Name der Datei oder des Ordners ist ungültig + + + 文件或文件夹的名称无效 + + + The name of the file or folder is invalid + + + + + Es ist nicht möglich, diesen Pfad einzufügen + + + 无法在此路径中粘贴 + + + It is not possible to paste in this path + + + + + Allgemeiner Fehler im Dateisystem. Weitere Informationen finden Sie unter Logger + + + 文件系统中的一般错误。 有关详细信息，请参阅记录器 + + + General error in file system. See Logger for more information + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad index 05c1c1a0..9ebb626d 100644 --- a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad +++ b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad @@ -28,6 +28,13 @@ + + + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding index 54caadd7..21eea62d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding @@ -137,7 +137,7 @@ - + @@ -164,5 +164,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c9bdc21fc79a7eb144734d4d09cd9429fbefcf1d Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Thu, 8 Dec 2022 14:27:18 +0000 Subject: [PATCH 019/112] AAZM-471 - Configure FIFO, default device selection --- .../FileDialog_FIFO_dialog_content.eventbinding | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding index 97e52ecf..ddcb3adc 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding @@ -88,5 +88,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file From 4713368ba22d9c75460be444d442148d5c611da7 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 8 Dec 2022 10:12:09 -0500 Subject: [PATCH 020/112] Fixed/added Chinese (simplified) translations on several .tmx files --- .../AppAxis_1/AppAxis_1_Info.tmx | 2 +- .../mappView/Resources/Texts/SystemDialog.tmx | 87 ++++++++- .../mappView/Resources/Texts/UserList.tmx | 180 ++++++++++++++++++ .../mappFrameworkTexts/AuditPageTexts.tmx | 4 +- .../Texts/mappFrameworkTexts/BackupTexts.tmx | 15 +- .../Texts/mappFrameworkTexts/FileTexts.tmx | 23 ++- .../mappFrameworkTexts/RecipePageTexts.tmx | 3 + 7 files changed, 304 insertions(+), 10 deletions(-) diff --git a/mappFramework/Logical/MachineControl/AppAxis_1/AppAxis_1_Info.tmx b/mappFramework/Logical/MachineControl/AppAxis_1/AppAxis_1_Info.tmx index 9329bc14..18d044f6 100644 --- a/mappFramework/Logical/MachineControl/AppAxis_1/AppAxis_1_Info.tmx +++ b/mappFramework/Logical/MachineControl/AppAxis_1/AppAxis_1_Info.tmx @@ -24,7 +24,7 @@ Steuert die AppAxis_1 - Controls the AppAxis_1 + 控制 AppAxis_1 Controls the AppAxis_1 diff --git a/mappFramework/Logical/mappView/Resources/Texts/SystemDialog.tmx b/mappFramework/Logical/mappView/Resources/Texts/SystemDialog.tmx index 89ae226d..06237de9 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/SystemDialog.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/SystemDialog.tmx @@ -1,7 +1,7 @@ 
- Don't change the namespace + Change the namespace to define where this text module should be located within the logical structure of your texts IAT/System/Dialog
@@ -9,6 +9,9 @@ Benutzer + + 用户名 + username @@ -17,6 +20,9 @@ altes Passwort + + 旧密码 + old password @@ -25,6 +31,9 @@ neues Passwort + + 新密码 + new password @@ -33,6 +42,9 @@ Passwort wiederholen + + 确认密码 + confirm password @@ -41,6 +53,9 @@ Passwort ändern + + 修改密码 + change password @@ -49,6 +64,9 @@ Abbruch + + 取消 + cancel @@ -57,6 +75,9 @@ ok + + 好的 + ok @@ -65,6 +86,9 @@ Passwort ändern + + 修改密码 + Change password @@ -73,6 +97,9 @@ Passwort ändern für {1} + + 更改 {1} 的密码 + Change password for {1} @@ -81,6 +108,9 @@ Passwortänderung erfolgreich! + + 密码修改成功！ + Password changed successfully! @@ -89,6 +119,9 @@ Passwortänderung fehlgeschlagen! + + 密码修改失败！ + Password change failed! @@ -97,6 +130,9 @@ Anmeldedaten (Benutzer und/oder altes Passwort) nicht korrekt. + + 无效凭证（用户名和/或旧密码）。 + Invalid credentials (username and/or old password). @@ -105,6 +141,9 @@ Passwort entspricht nicht den Kriterien. + + 密码不符合密码策略。 + Password does not meet the password policies. @@ -113,6 +152,9 @@ Passwortänderung nicht möglich. Verwenden Sie mpUserX anstatt RBAC zur Authentifizierung. + + 无法更改密码。 使用 mpUserX 而不是 RBAC 进行身份验证。 + Password change not possible. Use mpUserX instead of RBAC for authentication. @@ -121,6 +163,9 @@ Zeitüberschreitung. + + 超时。 + Timeout. @@ -129,16 +174,20 @@ Ein unbekannter Fehler ist aufgetreten. + + 发生未知错误。 + An unknown error has occurred. - - Benutzer darf nicht leer sein. + + 用户名不能为空。 + Username must not be empty. @@ -147,6 +196,9 @@ Altes Passwort darf nicht leer sein. + + 旧密码不能为空。 + Old password must not be empty. @@ -155,6 +207,9 @@ Neues Passwort darf nicht leer sein. + + 新密码不能为空。 + New password must not be empty. @@ -163,6 +218,9 @@ Neues Passwort muss sich vom alten Passwort unterscheiden. + + 新密码必须与旧密码不同。 + New password must be different from the old password. @@ -171,6 +229,9 @@ Passwortwiederholung stimmt nicht dem neuen Passwort überein. + + 密码确认与新密码不符。 + Password confirmation does not match the new password. @@ -179,6 +240,9 @@ Dialog wird in {1} Sekunden geschlossen. + + 对话框将在 {1} 秒后关闭。 + Dialog will be closed in {1} seconds. @@ -187,6 +251,9 @@ Das Passwort muss enthalten + + 您的密码必须有 + Your password must have @@ -195,6 +262,9 @@ Mindestens einen Buchstaben und eine Zahl + + 字母数字和数字字符 + Alphanumeric and numeric characters @@ -203,6 +273,9 @@ Groß- und Kleinbuchstaben + + 大小写字符 + Upper- and lowercase characters @@ -211,6 +284,9 @@ {1} oder mehr Zeichen + + {1} 个或更多字符 + {1} or more characters @@ -219,9 +295,12 @@ Mindestens ein Sonderzeichen (z.B. %$ö) + + 至少一个特殊字符（例如 $%ö） + At least one special character (e.g. $%ö) - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx index cc93ad57..29499827 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx @@ -9,6 +9,9 @@ Bestätigen + + 确认 + Confirm @@ -23,6 +26,9 @@ Benutzerkonto Anforderungen: + + 用户账号要求： + User account requirements: @@ -37,6 +43,9 @@ Name + + 姓名 + Name @@ -51,6 +60,9 @@ Passwort + + 密码 + Password @@ -65,6 +77,9 @@ Passwort darf nicht leer sein + + 密码不能为空 + Password cannot be empty @@ -79,6 +94,9 @@ Passwortwiederholung stimmt nicht dem neuen Passwort überein + + 确认密码不符 + Confirm password does not match @@ -93,6 +111,9 @@ Benutzername darf nicht leer sein + + 用户名不能为空 + Username must not be empty @@ -107,6 +128,9 @@ Passwort bestätigen + + 确认密码 + Confirm password @@ -121,6 +145,9 @@ Vollständiger Name + + 全名 + Full name @@ -135,6 +162,9 @@ Passwort + + 密码 + Password @@ -149,6 +179,9 @@ Benutzername + + 用户名 + Username @@ -163,6 +196,9 @@ Alphanumerische Zeichen sind im Passwort erforderlich + + 密码中必须包含字母数字字符 + Alphanumerical characters are necessary in the password @@ -177,6 +213,9 @@ {1} oder mehr Zeichen sind im Passwort erforderlich + + 密码中需要{1}个或更多字符 + {1} or more characters required in the password @@ -191,6 +230,9 @@ Groß- und Kleinbuchstaben sind im Passwort erforderlich + + 密码要求大小写字母 + Upper- and lowercase letters required in the password @@ -205,6 +247,9 @@ Mindestens ein Sonderzeichen (z.B. %$ö) ist erforderlich + + 密码中至少需要一个特殊字符（例如$£]） + At least one special character (e.g. $£]) required in the password @@ -220,6 +265,9 @@ Verfügbare Rollen + + 可用角色 + Available roles @@ -234,6 +282,9 @@ Benutzer hinzufügen + + 添加用户 + Add a user @@ -248,6 +299,9 @@ Benutzer + + 用户 + User @@ -262,6 +316,9 @@ {1} oder mehr Zeichen sind im Benutzernamen erforderlich + + 用户名中需要 {1} 个或更多字符 + {1} or more characters required in the username @@ -276,6 +333,9 @@ Erfolg + + 成功 + Success @@ -290,6 +350,9 @@ interner Fehler in MpUserX + + MpUserX 内部错误 + Internal error in MpUserX @@ -304,6 +367,9 @@ Nicht autorisierter Benutzer + + 非授权用户 + Non authorized user @@ -318,6 +384,9 @@ Session nicht gültig + + 会话无效 + Session not valid @@ -332,6 +401,9 @@ Passwort-Richtlinien nicht erfüllt + + 不符合密码策略 + Password policies not met @@ -346,6 +418,9 @@ Benutzer existiert nicht + + 用户不存在 + User doesn’t exist @@ -360,6 +435,9 @@ Benutzer existiert bereits + + 用户已经存在 + User already exists @@ -374,6 +452,9 @@ Ungenügende Rechte + + 权利不足 + Insufficient rights @@ -388,6 +469,9 @@ Rolle existiert nicht + + 角色不存在 + Role doesn’t exist @@ -402,6 +486,9 @@ Zu viele Rollen + + 角色太多 + Too many roles @@ -416,6 +503,9 @@ Benutzername leer + + 用户名为空 + Username empty @@ -430,6 +520,9 @@ Aktion nicht erlaubt (bei Aufruf im zentralen Modus/bei zentralen Benutzern) + + 不允许操作（在中央模式/中央用户上调用时） + Action not allowed (when called in central mode/on central users) @@ -444,6 +537,9 @@ Derzeit angemeldeter Benutzer + + 当前登录的用户 + User currently logged in @@ -458,6 +554,9 @@ Passwort leer + + 密码为空 + Password empty @@ -472,6 +571,9 @@ Benutzername ist zu kurz + + 用户名太短 + Username is too short @@ -486,6 +588,9 @@ Anonymous kann nicht gelöscht werden + + 匿名不能删除 + Anonymous cannot be deleted @@ -500,6 +605,9 @@ Passwort zurücksetzen + + 重置密码 + Reset password @@ -514,6 +622,9 @@ Benutzer gesperrt + + 用户锁定 + User locked @@ -528,6 +639,9 @@ Bestätigen + + 确认 + Confirm @@ -542,6 +656,9 @@ Benutzerkonto Anforderungen: + + 用户账号要求： + User account requirements: @@ -556,6 +673,9 @@ Name + + 姓名 + Name @@ -570,6 +690,9 @@ Passwort + + 密码 + Password @@ -584,6 +707,9 @@ Passwortwiederholung stimmt nicht dem neuen Passwort überein + + 确认密码不匹配 + Confirm password does not match @@ -598,6 +724,9 @@ Passwort bestätigen + + 确认密码 + Confirm password @@ -612,6 +741,9 @@ Vollständiger Name + + 全名 + Full name @@ -626,6 +758,9 @@ Passwort ändern + + 修改密码 + Change password @@ -640,6 +775,9 @@ Alphanumerische Zeichen sind im Passwort erforderlich + + 密码中必须包含字母数字字符 + Alphanumerical characters are necessary in the password @@ -655,6 +793,9 @@ {1} oder mehr Zeichen sind im Passwort erforderlich + + 密码中需要{1}个或更多字符 + {1} or more characters required in the password @@ -669,6 +810,9 @@ Groß- und Kleinbuchstaben sind im Passwort erforderlich + + 密码要求大小写字母 + Upper- and lowercase letters required in the password @@ -683,6 +827,9 @@ Mindestens ein Sonderzeichen (z.B. %$ö) ist erforderlich + + 密码中至少需要一个特殊字符（例如$£]） + At least one special character (e.g. $£]) required in the password @@ -698,6 +845,9 @@ Verfügbare Rollen + + 可用角色 + Available roles @@ -712,6 +862,9 @@ Einen Benutzer ändern + + 修改一个用户 + Modify a user @@ -726,6 +879,9 @@ Benutzer + + 用户 + User @@ -740,6 +896,9 @@ Möchten Sie den ausgewählten Benutzer wirklich löschen? + + 您真的要删除选定的用户吗？ + Do you really want to delete the selected user? @@ -748,6 +907,9 @@ Einen Benutzer löschen + + 删除一个用户 + Delete a user @@ -756,6 +918,9 @@ Benutzer erfolgreich gelöscht + + 用户删除成功 + User successfully deleted @@ -764,6 +929,9 @@ Benutzer kann nicht gelöscht werden, Sitzung ungültig + + 无法删除用户，会话无效 + Cannot delete user, session not valid @@ -772,6 +940,9 @@ Benutzer kann nicht gelöscht werden, Benutzer existiert nicht + + 无法删除用户，用户不存在 + Cannot delete user, user does not exist @@ -781,6 +952,9 @@ Benutzer kann nicht gelöscht werden, unzureichende Rechte + + 无法删除用户，权限不足 + Cannot delete user, insufficient rights @@ -789,6 +963,9 @@ Benutzer kann nicht gelöscht werden, unzureichende Rechte Benutzer kann nicht gelöscht werden, derzeit angemeldeter Benutzer + + 无法删除用户，当前登录的用户 + Cannot delete user, currently logged-in user @@ -797,6 +974,9 @@ Benutzer kann nicht gelöscht werden, unzureichende Rechte Benutzer kann nicht gelöscht werden, anonym kann nicht gelöscht werden. + + 无法删除用户，匿名用户无法删除。 + Cannot delete user, anonymous cannot be deleted. diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx index 6b9b6757..ba8d7a10 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx @@ -139,10 +139,10 @@ - Mo-Fr + Montag Freitag - Mo-Fr + 周一至周五 Mo-Fr diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/BackupTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/BackupTexts.tmx index 9b022809..09ae3650 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/BackupTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/BackupTexts.tmx @@ -79,7 +79,7 @@ Konfigurations-ID - Configuration ID + 配置编号 Configuration ID @@ -349,7 +349,18 @@ •Weitere Informationen finden Sie im Logger. - Backup Core错误,请检查以下原因... + 备份核心报错，请检查以下原因 + +•检查是否在输入参数“名称”上指定了备份。 + + +•检查指定的数据存储设备是否存在。 + + +•检查指定的数据存储设备是否存在写入权限。 + + +•有关其他信息，请参阅记录器。 diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx index 52ec7165..1e1e3a38 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx @@ -90,7 +90,7 @@ Konfigurations-ID - Configuration ID + 配置编号 Configuration ID @@ -496,6 +496,9 @@ Löschen bei Dateianzahl + + 按文件数删除 + Delete by number of files @@ -504,6 +507,9 @@ Löschen bei älter als + + 删除早于 + Delete older than @@ -512,6 +518,9 @@ FIFO Operation in Progress, bitte warten. + + FIFO 操作中，请稍候。 + FIFO operation in progress, please wait. @@ -520,6 +529,9 @@ Löschen bei maximale Ordergröße + + 删除最大文件夹大小 + Delete max folder size @@ -539,6 +551,9 @@ Seite nach oben + + 向下翻页 + Page Down @@ -547,6 +562,9 @@ Seite nach unten + + 向上翻页 + Page Up @@ -555,6 +573,9 @@ Standarddateien können nicht gelöscht werden + + 无法删除默认文件 + Default files cannot be deleted diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx index 49cf6f77..a710c97d 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx @@ -635,6 +635,9 @@ Do you want to continue and overwrite the existing one? Standarddateien können nicht gelöscht werden + + 无法删除默认文件 + Default files cannot be deleted From a90d76df34e0c2471c6cb28f90f87ed31aaa2f24 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 8 Dec 2022 14:20:15 -0500 Subject: [PATCH 021/112] Adjusted drpBoxSortOrder and txtInSeachKeyword widgets on File_content to fit German translations Adjusted ddFifoOption widget on FileDialog_FIFO_dialog_content to fit German translations --- .../Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content | 2 +- .../Pages/FrameworkPackage/FileContent/File.content | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content index d5c39ab1..08984d8b 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content @@ -10,7 +10,7 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index 5d56d241..1b7cddf8 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -26,11 +26,11 @@ - + - + From 6cd9158c86f5db68b55b10112d400c45f3702510 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 8 Dec 2022 14:30:24 -0500 Subject: [PATCH 022/112] Adjusted SortDialog and FilterDialog widgets on CustomEvents_content to fit German translations --- .../Pages/FrameworkPackage/AuditContent/CustomEvents.content | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content index 69dc8ea7..68b4bf0c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content @@ -1,8 +1,8 @@  - - + + From e6bf078df94b5a25f01b72b552e82b15b60dd710 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 8 Dec 2022 14:39:24 -0500 Subject: [PATCH 023/112] Adjusted PBtnHistoryAlarmSort and PBtnHistoryAlarmFilter widgets on AlarmXHistory_content to fit German translations --- .../FrameworkPackage/AlarmsContent/AlarmXHistory.content | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content index 585e40ea..84f2d2cd 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content @@ -10,7 +10,7 @@ - - + + \ No newline at end of file From a82717bf8e7038a1eefef648bfbeb95fb0ce9f8a Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 8 Dec 2022 15:24:39 -0500 Subject: [PATCH 024/112] Adjusted chkBxUser and chkBxUser1 on UsereXDialog_Import_content to fit German translations --- .../UserXDialogs/UserXImport/UserXDialog_Import.content | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content index 22c8f663..e44c60ef 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content @@ -4,8 +4,8 @@ - - + + From 98cadea38e6b2d511c1f870c30530dfd3d65672d Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Fri, 9 Dec 2022 13:11:21 +0000 Subject: [PATCH 025/112] AAZM-352 - Add a confirmation pop-up when you delete a user, made the user text dynamic --- .../mappView/Resources/Snippets/User.snippet | 1 + .../mappView/Resources/Texts/UserList.tmx | 4 ++-- .../mappView/Visualization/Variables/UserX.svar | 2 ++ .../UserX/UserList_content.eventbinding | 17 ++++++++++++++++- .../PC/mappView/UserX/UserX_content.binding | 14 +++++++++++++- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Snippets/User.snippet b/mappFramework/Logical/mappView/Resources/Snippets/User.snippet index a893616f..7cd8d156 100644 --- a/mappFramework/Logical/mappView/Resources/Snippets/User.snippet +++ b/mappFramework/Logical/mappView/Resources/Snippets/User.snippet @@ -6,5 +6,6 @@ + diff --git a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx index cc93ad57..ab9fa13a 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/UserList.tmx @@ -738,10 +738,10 @@ - Möchten Sie den ausgewählten Benutzer wirklich löschen? + Möchten Sie den Benutzer wirklich löschen "{@SnippetSelectedUsername}"? - Do you really want to delete the selected user? + Do you really want to delete user "{@SnippetSelectedUsername}"? diff --git a/mappFramework/Logical/mappView/Visualization/Variables/UserX.svar b/mappFramework/Logical/mappView/Visualization/Variables/UserX.svar index 6ac4d86c..a5b2bf3c 100644 --- a/mappFramework/Logical/mappView/Visualization/Variables/UserX.svar +++ b/mappFramework/Logical/mappView/Visualization/Variables/UserX.svar @@ -12,5 +12,7 @@ + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index a4e0e762..30250749 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -23,12 +23,17 @@ + + + + + - + @@ -242,5 +247,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding index 33f0ce6c..b38ae3e3 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding @@ -16,6 +16,18 @@ - + + + + + + + + + + + + + From 9c2c1141d1acef162b16e9ce7f3f63064e0c1e2f Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Fri, 9 Dec 2022 13:35:56 +0000 Subject: [PATCH 026/112] AAZM-324 - We should not allow the user to delete the default recipe, removed unused test code causing error in logbook --- .../Logical/mappView/Visualization/Variables/File.svar | 1 - .../Simulation/PC/mappView/File/File_content.binding | 4 ---- .../Simulation/PC/mappView/File/File_content.eventbinding | 5 ----- 3 files changed, 10 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Variables/File.svar b/mappFramework/Logical/mappView/Visualization/Variables/File.svar index 27cab452..a89e775e 100644 --- a/mappFramework/Logical/mappView/Visualization/Variables/File.svar +++ b/mappFramework/Logical/mappView/Visualization/Variables/File.svar @@ -9,7 +9,6 @@ --> - diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding index faa3b12e..769e3c3e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding @@ -113,9 +113,5 @@ - - - - diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding index 21eea62d..71591c2d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding @@ -139,11 +139,6 @@ - - - - - From d4a1eae962516690238dcb72faaab42fcf40d231 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Fri, 9 Dec 2022 11:43:32 -0500 Subject: [PATCH 027/112] Changed the text in the message box when there is no default machine settings recipe file to translate to German Create new report dialog "Report name:" label was not translated into German --- .../mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx | 2 +- .../Simulation/PC/mappView/Recipe/Recipe_content.eventbinding | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx index 4aad8ac2..89425fe8 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx @@ -292,7 +292,7 @@ Error on Report Core, please check the following causes - Reportname: + Berichtsname: 报告名称： diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index e2ac4133..5ddeb7ce 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -341,7 +341,7 @@ - + From f3ec8835541d2442ea84b633540de06d80a3bc39 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Mon, 12 Dec 2022 09:13:43 -0500 Subject: [PATCH 028/112] AAZM-501 and AAZM-503 - Refactored Recipe and File widgets to conform Widget Name Standards --- .../FileFIFO/FileDialog_FIFO.content | 26 ++++----- .../FileMessage/FileDialog_Message.content | 8 +-- .../RecipeDialog_EditButtons.content | 4 +- .../RecipeDialog_EditMachConfig.content | 12 ++-- .../EditRecipe/RecipeDialog_EditPars.content | 12 ++-- .../NewRecipe/RecipeDialog_NewButtons.content | 4 +- .../RecipeDialog_NewMachConfig.content | 18 +++--- .../NewRecipe/RecipeDialog_NewPars.content | 14 ++--- .../FrameworkPackage/FileContent/File.content | 56 +++++++++---------- .../RecipeContent/Recipe.content | 24 ++++---- .../RecipePreviewMachConfig.content | 30 +++++----- .../RecipeContent/RecipePreviewPars.content | 30 +++++----- ...AxisRecipeDialog_Edit_content.eventbinding | 6 +- .../AxisRecipeDialog_New_content.eventbinding | 4 +- .../Axis/AxisRecipe_content.eventbinding | 2 +- .../FileDialog_FIFO_dialog_content.binding | 14 ++--- ...ileDialog_FIFO_dialog_content.eventbinding | 28 +++++----- .../FileDialog_Message_dialog_content.binding | 4 +- ...Dialog_Message_dialog_content.eventbinding | 8 +-- .../PC/mappView/File/File_content.binding | 50 ++++++++--------- .../mappView/File/File_content.eventbinding | 30 +++++----- ...ecipeDialog_EditMachConfig_content.binding | 10 ++-- .../RecipeDialog_EditPars_content.binding | 10 ++-- .../RecipeDialog_Edit_content.eventbinding | 12 ++-- ...RecipeDialog_NewMachConfig_content.binding | 14 ++--- .../RecipeDialog_NewPars_content.binding | 18 +++--- .../RecipeDialog_New_content.eventbinding | 12 ++-- .../RecipePreviewMachConfig_content.binding | 24 ++++---- .../Recipe/RecipePreviewPars_content.binding | 24 ++++---- .../PC/mappView/Recipe/Recipe_content.binding | 30 +++++----- .../Recipe/Recipe_content.eventbinding | 28 +++++----- 31 files changed, 283 insertions(+), 283 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content index d5c39ab1..234bc82d 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content @@ -1,22 +1,22 @@  - - - - + + + + - - + + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content index dad05b10..ff34c2d8 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content @@ -1,11 +1,11 @@  - + - - - + + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content index 26c88b88..178a47fe 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content index e6326cae..fbbaedd8 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content @@ -1,16 +1,16 @@  - + - - - - - + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content index 77ba3036..309e190f 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content @@ -1,16 +1,16 @@  - + - - - - - + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content index ecf077eb..2e971f49 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content index 8b3ad6c1..c5f28f97 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content @@ -1,20 +1,20 @@  - - - - + + + + - - - - - + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content index 2c5b20d8..b23bb434 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content @@ -1,18 +1,18 @@  - - + + - - - - - + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index 5d56d241..1a012c57 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -1,41 +1,41 @@  - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index 3e31bcb7..ed08f2f0 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -4,30 +4,30 @@ - + - + - + - - + + - - + + - + - - + + - + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content index 50c87a55..5a21b59c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content @@ -1,8 +1,8 @@  - - + + @@ -13,26 +13,26 @@ - + - + - - - - - + + + + + - + - - - - - + + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content index 86397055..c70dfe8d 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content @@ -1,10 +1,10 @@  - + - + @@ -13,26 +13,26 @@ - + - + - - - - - + + + + + - + - - - - - + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_Edit_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_Edit_content.eventbinding index 13f548c8..a24edb59 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_Edit_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_Edit_content.eventbinding @@ -1,8 +1,8 @@ - + - + @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_New_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_New_content.eventbinding index cfcb9c8d..ad8cfa31 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_New_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipeDialog_New_content.eventbinding @@ -2,7 +2,7 @@ - + @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding index 9da61ba9..4f2d53ad 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding @@ -43,7 +43,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.binding b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.binding index ca0ecb34..cab632cb 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.binding @@ -3,23 +3,23 @@ - + - + - + - + - + @@ -28,11 +28,11 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding index ddcb3adc..41cc9bfb 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_FIFO_dialog_content.eventbinding @@ -2,7 +2,7 @@ - + @@ -12,33 +12,33 @@ - + - + - + - + - + @@ -49,28 +49,28 @@ - + - + - + - + @@ -79,10 +79,10 @@ - + - + @@ -97,11 +97,11 @@ - + - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.binding b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.binding index 969ccccb..113d8f08 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.binding @@ -3,11 +3,11 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.eventbinding index 974973bf..f3af84ff 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/FileDialog_Message_dialog_content.eventbinding @@ -10,21 +10,21 @@ - + - + - + @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding index 769e3c3e..3bcac423 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.binding @@ -3,15 +3,15 @@ - + - + - + @@ -19,71 +19,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -91,23 +91,23 @@ - + - + - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding index 71591c2d..475314f2 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/File_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + @@ -27,7 +27,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,26 +65,26 @@ - + - + - + - + @@ -100,19 +100,19 @@ - + - + - + @@ -138,7 +138,7 @@ - + @@ -319,4 +319,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditMachConfig_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditMachConfig_content.binding index 56ede11f..30629573 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditMachConfig_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditMachConfig_content.binding @@ -3,23 +3,23 @@ - + - + - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditPars_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditPars_content.binding index 0685e2ad..58b25943 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditPars_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_EditPars_content.binding @@ -3,23 +3,23 @@ - + - + - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_Edit_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_Edit_content.eventbinding index 335ae438..41e68897 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_Edit_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_Edit_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -11,8 +11,8 @@ - - + + @@ -68,7 +68,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewMachConfig_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewMachConfig_content.binding index cf4fc6b9..35db0502 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewMachConfig_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewMachConfig_content.binding @@ -3,24 +3,24 @@ - + - + - + - + - + @@ -28,11 +28,11 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewPars_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewPars_content.binding index 4baccca9..977dfeef 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewPars_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_NewPars_content.binding @@ -3,23 +3,23 @@ - + - + - + - + - + @@ -27,15 +27,15 @@ - - + + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding index fb20bf88..b6933752 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -18,8 +18,8 @@ - - + + @@ -75,7 +75,7 @@ - + @@ -95,4 +95,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewMachConfig_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewMachConfig_content.binding index 9436ba6a..3766a061 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewMachConfig_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewMachConfig_content.binding @@ -4,43 +4,43 @@ - + - + - + - + - + - + - + - + - + - + @@ -52,11 +52,11 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewPars_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewPars_content.binding index e76986dc..ef60c7d9 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewPars_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipePreviewPars_content.binding @@ -3,44 +3,44 @@ - + - + - + - + - + - + - + - + - + - + @@ -71,11 +71,11 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding index de90a59e..9978e931 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding @@ -7,16 +7,16 @@ - + - + - + @@ -80,7 +80,7 @@ - + @@ -108,15 +108,15 @@ - + - + - + @@ -129,11 +129,11 @@ - + - + @@ -179,7 +179,7 @@ - + @@ -192,11 +192,11 @@ - + - + @@ -204,7 +204,7 @@ - + @@ -213,13 +213,13 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index e2ac4133..3efb7c54 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -135,7 +135,7 @@ - + @@ -154,8 +154,8 @@ - - + + @@ -175,8 +175,8 @@ - - + + @@ -196,8 +196,8 @@ - - + + @@ -216,7 +216,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -260,21 +260,21 @@ - + - + - + @@ -367,4 +367,4 @@ - \ No newline at end of file + From a64cce25e2db716d0495439e3276d714c97fcd4d Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Mon, 12 Dec 2022 09:57:31 -0500 Subject: [PATCH 029/112] Removed ghost buttons from NewMachConfig.content (duplicate with NewButtons.content) --- .../RecipeDialog_NewMachConfig.content | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content index c5f28f97..9df26dab 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content @@ -1,20 +1,18 @@  - - - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file From 4276ee41587f9993c1ea98dc48275a686259abd7 Mon Sep 17 00:00:00 2001 From: Ben Thyer Date: Mon, 12 Dec 2022 15:08:59 +0000 Subject: [PATCH 030/112] AAZM-468 - If a backup is in progress, added progress wheel and messages when disabled buttons are pressed --- .../BackupContent/Backup.content | 2 ++ .../PC/Connectivity/OpcUA/BackupMgr.uad | 7 ++++ .../PC/mappView/Backup/Backup_content.binding | 9 ++++- .../Backup/Backup_content.eventbinding | 36 +++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index dfa4b5aa..1ccfa90a 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -32,5 +32,7 @@ + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad index 247855b3..d279170a 100644 --- a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad +++ b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad @@ -27,6 +27,13 @@ + + + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding index b343b677..2886b8bc 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding @@ -62,7 +62,14 @@ + + + + + + + + - diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding index 1e344c34..83d569d8 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding @@ -48,6 +48,11 @@ + + + + + @@ -55,6 +60,13 @@ + + + + + + + @@ -63,6 +75,11 @@ + + + + + @@ -70,6 +87,13 @@ + + + + + + + @@ -182,6 +206,11 @@ + + + + + @@ -189,6 +218,13 @@ + + + + + + + From 58e5fff556a842fa9d6cf44e7dc889e0cc10cf71 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Mon, 12 Dec 2022 13:00:36 -0500 Subject: [PATCH 031/112] Refactored widget names on AlarmX.content and AlarmXCurrent.content --- .../AlarmsContent/AlarmX.content | 20 ++++---- .../AlarmsContent/AlarmXCurrent.content | 40 ++++++++-------- .../AuditContent/Audit.content | 2 +- .../AlarmX/AlarmXCurrent_content.binding | 26 +++++----- .../AlarmX/AlarmXCurrent_content.eventbinding | 48 +++++++++---------- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content index 7e992b20..b6c9094e 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content @@ -1,24 +1,24 @@  - + - + - + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content index 492fa55c..3452e38c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content @@ -1,32 +1,32 @@  - + - - - - + + + + - - + + - + - - - - - - - - - - + + + + + + + + + + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content index ee677359..f2916eb1 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content @@ -1,7 +1,7 @@  - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.binding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.binding index 3ba1751f..6e202dbf 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.binding @@ -4,55 +4,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding index 859f4846..3022ec99 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXCurrent_content.eventbinding @@ -1,28 +1,28 @@  - - + + - + - - + + - + - - + + @@ -37,14 +37,14 @@ - + - + @@ -58,14 +58,14 @@ - + - + @@ -79,14 +79,14 @@ - + - + @@ -100,14 +100,14 @@ - + - + @@ -121,14 +121,14 @@ - + - + @@ -136,21 +136,21 @@ - - + + - + - - + + - + From 106017b93460632b07c447966f9351dbc80020e9 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Mon, 12 Dec 2022 13:13:12 -0500 Subject: [PATCH 032/112] Refactored widget names in AlarmXHistory.content --- .../AlarmsContent/AlarmXHistory.content | 16 ++++++++-------- .../AlarmX/AlarmXHistory_content.binding | 6 +++--- .../AlarmX/AlarmXHistory_content.eventbinding | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content index 84f2d2cd..2161f9c7 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content @@ -1,16 +1,16 @@  - + - - - - + + + + - - - + + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.binding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.binding index b91b09f2..db628438 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.binding @@ -3,15 +3,15 @@ - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.eventbinding index 5eda5086..cc521f61 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXHistory_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,21 +11,21 @@ - - + + - + - - + + - + From b4689b32c9ad7b7772127b2df3e73e286c363a15 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Mon, 12 Dec 2022 13:32:26 -0500 Subject: [PATCH 033/112] Refactored widget names in AlarmXQuery.content --- .../FrameworkPackage/AlarmsContent/AlarmXQuery.content | 6 +++--- .../PC/mappView/AlarmX/AlarmXQuery_content.binding | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index 6f0ef8ec..ce697622 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -1,10 +1,10 @@  - + - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding index f62a51bf..440043c7 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding @@ -8,20 +8,20 @@ - + - + - + - + From e9b01d684b0e05687c0d67549e912b55d7d512c8 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Mon, 12 Dec 2022 14:26:55 -0500 Subject: [PATCH 034/112] Finished refactoring widget names in AlarmX contents --- .../Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index ce697622..5ff178ba 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -5,7 +5,7 @@ - + From 496d145f82158e64b29d39c8e33c87f209259326 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 09:24:44 -0500 Subject: [PATCH 035/112] Refactored widget names in UserX.content --- .../Pages/FrameworkPackage/UserXContent/UserX.content | 2 +- .../PC/mappView/UserX/UserList_content.eventbinding | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content index 89963408..7f103f42 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index 30250749..c3cf6abc 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -232,14 +232,14 @@ - + - + From fae52674f84cd8a09fce0298bd8b74f85909ee88 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 10:27:50 -0500 Subject: [PATCH 036/112] Refactored widget names in UserList.content --- .../UserXLogin/UserXDialog_Login.content | 2 +- .../UserXContent/UserList.content | 18 ++++++++--------- .../UserX/UserList_content.eventbinding | 20 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content index e6e78b66..f3b497f8 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content index b02aedd7..7cc02ed4 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content @@ -8,18 +8,18 @@ - - - - - - + + + + + + - + - - + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index c3cf6abc..98826237 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + @@ -21,8 +21,8 @@ - - + + @@ -93,8 +93,8 @@ - - + + @@ -110,8 +110,8 @@ - - + + From 59890f7d31f7d4c16bf4558935146ba8bf34080c Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 10:56:13 -0500 Subject: [PATCH 037/112] Refactored widget names in UserX dialogs --- .../UserXDuplicate/UserXDuplicate.content | 6 +++--- .../UserXError/UserXDialog_Error.content | 4 ++-- .../UserXExport/UserXDialog_Export.content | 8 ++++---- .../UserXImport/UserXDialog_Import.content | 16 +++++++-------- .../UserXDialog_Duplicate_content.binding | 4 ++-- ...UserXDialog_Duplicate_content.eventbinding | 8 ++++---- .../UserX/UserXDialog_Error_content.binding | 2 +- .../UserX/UserXDialog_Export_content.binding | 6 +++--- .../UserXDialog_Export_content.eventbinding | 8 ++++---- .../UserX/UserXDialog_Import_content.binding | 20 +++++++++---------- .../UserXDialog_Import_content.eventbinding | 8 ++++---- .../PC/mappView/UserX/UserX_content.binding | 2 +- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content index d58b3898..370beebb 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content @@ -1,9 +1,9 @@  - + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content index cf95c501..9d59be36 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content @@ -1,8 +1,8 @@  - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content index aa735e70..0af0c1ef 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content @@ -1,9 +1,9 @@  - - - - + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content index e44c60ef..41e0bb3b 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content @@ -1,16 +1,16 @@  - - - - - - + + + + + + - + - + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding index 4f46aa5b..aedff3eb 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding @@ -3,7 +3,7 @@ - + - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.eventbinding index c5d987d4..0f43d686 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Error_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Error_content.binding index 09fc8d8c..adc99613 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Error_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Error_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding index 703b8fa0..e852377e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding @@ -4,15 +4,15 @@ - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.eventbinding index 816b0bcc..e821489f 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.binding index 82047a71..97606c5c 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.binding @@ -3,33 +3,33 @@ - + - + - + - + - + - + - - - + + + @@ -37,7 +37,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.eventbinding index b4155ccb..26cfb053 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Import_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding index b38ae3e3..9a0d4c0b 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserX_content.binding @@ -7,7 +7,7 @@ - + From 15bbb7cde00b1274f99711f16f1a9ae72f5e9bc8 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 11:35:59 -0500 Subject: [PATCH 038/112] Refactored widget names in Audit.content --- .../Pages/FrameworkPackage/AuditContent/Audit.content | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content index f2916eb1..f5ebf97c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content @@ -1,21 +1,21 @@  - + - + - + - + From df479ae2ebdc9d8845ab5cbd2835947b5b12fa82 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 12:49:05 -0500 Subject: [PATCH 039/112] Refactored widget names in AuditTrail.content --- .../AuditContent/AuditTrail.content | 18 +++++++++--------- .../AuditContent/CustomEvents.content | 2 +- .../mappView/Audit/AuditTrail_content.binding | 12 ++++++------ .../Audit/AuditTrail_content.eventbinding | 16 ++++++++-------- .../Audit/CustomEvents_content.binding | 6 +++--- .../Audit/CustomEvents_content.eventbinding | 4 ++-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content index 90c620a9..6a76611b 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content @@ -1,18 +1,18 @@  - + - - - + + + - - - + + + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content index 68b4bf0c..362d5c4f 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.binding index 9d8e4df9..10f71e16 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.binding @@ -3,19 +3,19 @@ - + - + - + - + @@ -23,7 +23,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.eventbinding index 305e7a0e..361f200a 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditTrail_content.eventbinding @@ -1,28 +1,28 @@  - - + + - + - - + + - + - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.binding index 8d979993..d251943c 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.binding @@ -3,17 +3,17 @@ - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding index e7d0523c..800f1604 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding @@ -5,7 +5,7 @@ - + @@ -15,7 +15,7 @@ - + From d78d02f747fb629987680ffbf619e6e687ef69e0 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 12:55:49 -0500 Subject: [PATCH 040/112] Refactored widget names in CustomEvents.content --- .../FrameworkPackage/AuditContent/CustomEvents.content | 8 ++++---- .../PC/mappView/Audit/CustomEvents_content.eventbinding | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content index 362d5c4f..fae4a618 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content @@ -1,12 +1,12 @@  - - + + - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding index 800f1604..b4cd8a7d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/CustomEvents_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + From 7f1bd56312257748151b666d74332cf1ec36c515 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 13:05:28 -0500 Subject: [PATCH 041/112] Refactored AuditQuery.content widget names and adjusted an AlarmXQuery.content widget name for clarification --- .../AlarmsContent/AlarmXQuery.content | 2 +- .../AuditContent/AuditQuery.content | 12 ++++++------ .../PC/mappView/AlarmX/AlarmXQuery_content.binding | 2 +- .../PC/mappView/Audit/AuditQuery_content.binding | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index 5ff178ba..6cc6aa3d 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content index 04569660..bc334e52 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content @@ -1,14 +1,14 @@  - + - - - + + + - - + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding index 440043c7..080e30b8 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding @@ -4,7 +4,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditQuery_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditQuery_content.binding index 4c036c6c..27992af2 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditQuery_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditQuery_content.binding @@ -3,33 +3,33 @@ - + - + - + - + - + - + - + From c9f7b13f03e0baea181058d713c4eca156e41c3a Mon Sep 17 00:00:00 2001 From: austin_justin Date: Tue, 13 Dec 2022 13:52:28 -0500 Subject: [PATCH 042/112] Refactored widget names in AuditDialog_ArchiveSettings.content --- .../AuditDialog_ArchiveSettings.content | 20 +++++++++---------- ...uditDialog_ArchiveSettings_content.binding | 2 +- ...ialog_ArchiveSettings_content.eventbinding | 12 +++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content index a488b967..458f8db4 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content @@ -1,27 +1,27 @@  - - + + - + - - + + - - - + + + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.binding index 4ffbf7af..dc9706a9 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.binding @@ -24,7 +24,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.eventbinding index e7c18c04..e4932917 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/AuditDialog_ArchiveSettings_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -11,8 +11,8 @@ - - + + @@ -32,14 +32,14 @@ - + - + From 03693f96cdf694e43c62b8c16bdbdff977158841 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Wed, 14 Dec 2022 10:59:51 -0600 Subject: [PATCH 043/112] AAZM-510 - update the navigation bar to indicate which content / framework is active --- .../Visualization/Pages/DemoPage/Demo.page | 2 +- .../Pages/DemoPage/Navigation.content | 20 +++++++++---------- .../AlarmX/Navigation_content.binding | 2 +- .../AlarmX/Navigation_content.eventbinding | 12 +++++------ .../mappView/Audit/Navigation_content.binding | 2 +- .../Audit/Navigation_content.eventbinding | 4 ++-- .../mappView/Axis/Navigation_content.binding | 2 +- .../Axis/Navigation_content.eventbinding | 4 ++-- .../Backup/Navigation_content.binding | 2 +- .../Backup/Navigation_content.eventbinding | 4 ++-- .../DemoPage/Navigation_content.eventbinding | 4 ++-- .../mappView/File/Navigation_content.binding | 2 +- .../File/Navigation_content.eventbinding | 6 +++--- .../Recipe/Navigation_content.binding | 2 +- .../Recipe/Navigation_content.eventbinding | 4 ++-- .../Report/Navigation_content.binding | 2 +- .../Report/Navigation_content.eventbinding | 4 ++-- .../mappView/UserX/Navigation_content.binding | 2 +- .../UserX/Navigation_content.eventbinding | 4 ++-- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Demo.page b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Demo.page index 37f50bde..09fe073a 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Demo.page +++ b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Demo.page @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content index ea8f9980..8998467a 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content @@ -1,17 +1,17 @@  - + - - - - - - - - - + + + + + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.binding index 74676421..5abd543d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding index ec7eb937..2955f42d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -15,15 +15,15 @@ - - + + - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.binding index 6f46e40f..c7dfe581 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.eventbinding index fc410ebd..fb0595bd 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Audit/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.binding index c09e7011..af6625c3 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.eventbinding index e0750667..4b11073a 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.binding index 2380db31..d7c00322 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.eventbinding index 55f76e37..def5b7b5 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/DemoPage/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/DemoPage/Navigation_content.eventbinding index 95472cd4..ba3bff22 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/DemoPage/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/DemoPage/Navigation_content.eventbinding @@ -2,7 +2,7 @@ - + @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.binding index 9d2751e8..4aadb17e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.eventbinding index 1cfac43c..ca5e36b3 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/File/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.binding index 1fd4bb6c..5ffe9438 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.eventbinding index 8fcf6cf4..cb68a7a6 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.binding index 8eea2d3c..91cc5a71 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.eventbinding index f48ff24b..5681397e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.binding index 24a9012f..da882361 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.binding @@ -3,7 +3,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.eventbinding index b5b073dd..fd133a1d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/Navigation_content.eventbinding @@ -1,8 +1,8 @@  - - + + From ba59e027d8c8a40432323b75cb60527864f1e859 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Wed, 14 Dec 2022 13:01:12 -0500 Subject: [PATCH 044/112] Redo of commit a90d76df34e0c2471c6cb28f90f87ed31aaa2f24 [a90d76d] due to an error using SourceTree Adjusted drpBoxSortOrder and txtInSeachKeyword widgets on File_content to fit German translations Adjusted ddFifoOption widget on FileDialog_FIFO_dialog_content to fit German translations --- .../Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content | 2 +- .../Pages/FrameworkPackage/FileContent/File.content | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content index 234bc82d..c3693b4a 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content @@ -10,7 +10,7 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index 1a012c57..b916c534 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -26,11 +26,11 @@ - + - + From b306e9f95ee55e3262ba4c39b3e492fa3f8d6bd4 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Wed, 14 Dec 2022 14:13:17 -0600 Subject: [PATCH 045/112] File - icons for File and FileSelected slightly different document size making the image "move" --- .../Media/SymbolLib/File/FileSelected.svg | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileSelected.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileSelected.svg index 7ade40fa..15eb324f 100644 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileSelected.svg +++ b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileSelected.svg @@ -1,23 +1,23 @@ image/svg+xml + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> @@ -56,4 +59,4 @@ + d="M 3.9570313,0 C 3.5920313,0 3.25,0.4191094 3.25,0.7871094 V 31.283203 C 3.25,31.650203 3.5920313,32 3.9570313,32 H 27.822266 C 28.190266,32 28.75,31.650203 28.75,31.283203 V 7.9999999 h -7.546875 c -0.368,0 -0.453125,-0.224797 -0.453125,-0.591797 V 0 Z M 22.101563,0.035156 v 5.9589846 c 0,0.365 0.201406,0.61914 0.566406,0.61914 h 5.958984 z m 0.253906,13.109375 c 0.101425,0 0.208586,0.04062 0.287109,0.119141 l 2.63086,2.595703 c 0.158681,0.153774 0.158681,0.410996 0,0.566406 L 13.621094,28.076172 c -0.07852,0.08179 -0.182095,0.119141 -0.285156,0.119141 -0.103061,0 -0.205316,-0.03735 -0.28711,-0.119141 L 10.439453,25.466797 C 10.279136,25.30648 10.025869,25.052846 9.8671879,24.902344 l -3.140625,-3.148438 c -0.158681,-0.160317 -0.158681,-0.413584 0,-0.572265 l 2.609375,-2.609375 c 0.0818,-0.08179 0.184048,-0.119141 0.287109,-0.119141 0.103061,0 0.206317,0.03735 0.283203,0.119141 l 3.1406251,3.140625 c 0.08179,0.07852 0.186319,0.117187 0.291016,0.117187 0.101425,0 0.20468,-0.0403 0.283203,-0.117187 l 8.449219,-8.449219 c 0.08179,-0.07852 0.183731,-0.119141 0.285156,-0.119141 z" /> From e2007a7974fddea35aa2a3a72f88a06fcdb97880 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Mon, 19 Dec 2022 15:02:41 -0500 Subject: [PATCH 046/112] AAZM-505: Refactored widget names in Axis framework --- .../FrameworkPackage/AxisContent/Axis.content | 8 ++++---- .../AxisContent/AxisAuto.content | 18 +++++++++--------- .../PC/mappView/Axis/AxisAuto_content.binding | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content index 975838f9..81488f54 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content @@ -1,16 +1,16 @@ - + - + - + - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content index 7f800fa4..473b3a20 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content @@ -1,17 +1,17 @@  - - - + + + - - + + - - - - + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding index 89757dba..81904330 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding @@ -1,10 +1,10 @@ - + - + @@ -17,11 +17,11 @@ - + - + From 44437075db2be5dcca6af6ef71f10b2632841621 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 10:49:58 -0500 Subject: [PATCH 047/112] AAZM-400 - updated UserX structures --- .../UserX/UserXMgr/HMIAction.st | 33 +++++++++---------- .../UserX/UserXMgr/UserXMgr.typ | 28 +++++++++++----- .../UserX/UserXMgr/UserXMgr.var | 9 ++--- .../UserX/UserList_content.eventbinding | 4 +-- .../UserXDialog_Duplicate_content.binding | 4 +-- .../UserX/UserXDialog_Export_content.binding | 4 +-- 6 files changed, 45 insertions(+), 37 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/HMIAction.st b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/HMIAction.st index 586bba43..5129d787 100644 --- a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/HMIAction.st +++ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/HMIAction.st @@ -1,58 +1,57 @@ ACTION HMIAction: - // Check if the file name has already been used - CASE UserXCheckState OF + CASE HmiUserX.Status.UserXHmiState OF USERX_START: IF NOT UserXMgrUIConnect.Import.ShowDialog THEN UserXMgrUIConnect.Import.ShowDialog := TRUE; ELSE - UserXCheckState := USERX_WAIT_FOR_DIALOG; + HmiUserX.Status.UserXHmiState := USERX_WAIT_FOR_DIALOG; END_IF USERX_WAIT_FOR_DIALOG: UserXMgrUIConnect.Import.ShowDialog := FALSE; - UserXCheckState := USERX_SET_RESPONSE; + HmiUserX.Status.UserXHmiState := USERX_SET_RESPONSE; USERX_SET_RESPONSE: IF NOT(UserXMgrUIConnect.Status = mpUSERX_UI_STATUS_IDLE) THEN UserXMgrUIConnect.Import.Dialog.Cancel := TRUE; ELSE UserXMgrUIConnect.Import.Dialog.Cancel := FALSE; - UserXCheckState := USERX_CONFIRM_RESPONSE; + HmiUserX.Status.UserXHmiState := USERX_CONFIRM_RESPONSE; END_IF USERX_CONFIRM_RESPONSE: IF UserXMgrUIConnect.Status = mpUSERX_UI_STATUS_WAIT_DLG THEN - UserXCheckState := USERX_START; + HmiUserX.Status.UserXHmiState := USERX_START; ELSE - UserXCheckState := USERX_FINISH; + HmiUserX.Status.UserXHmiState := USERX_FINISH; END_IF USERX_NEW_EXPORT: IF NOT UserXMgrUIConnect.Export.ShowDialog AND UserXMgrUIConnect.Status = mpUSERX_UI_STATUS_IDLE THEN - UserXCheckState := USERX_START; + HmiUserX.Status.UserXHmiState := USERX_START; END_IF USERX_FINISH: END_CASE // If new updates are made via export execute a check IF UserXMgrUIConnect.Export.ShowDialog THEN - UserXCheckState := USERX_NEW_EXPORT; + HmiUserX.Status.UserXHmiState := USERX_NEW_EXPORT; END_IF //Duplicate file checks - HmiUserX.FileDuplicate := FALSE; + HmiUserX.Status.FileDuplicate := FALSE; FOR i := 0 TO ((SIZEOF(UserXMgrUIConnect.Import.Dialog.List.FileNames) / SIZEOF(UserXMgrUIConnect.Import.Dialog.List.FileNames[0])) - 1) DO temp := UserXMgrUIConnect.Export.Dialog.FileName; brsstrcat(ADR(temp),ADR('.usr')); - IF (temp = UserXMgrUIConnect.Import.Dialog.List.FileNames[i]) AND HmiUserX.Export THEN - HmiUserX.FileDuplicate := TRUE; + IF (temp = UserXMgrUIConnect.Import.Dialog.List.FileNames[i]) AND HmiUserX.Commands.Export THEN + HmiUserX.Status.FileDuplicate := TRUE; END_IF END_FOR - IF HmiUserX.FileDuplicate AND (HmiUserX.ConfirmOverwrite) THEN + IF HmiUserX.Status.FileDuplicate AND (HmiUserX.Commands.ConfirmOverwrite) THEN UserXMgrUIConnect.Export.Dialog.Confirm := TRUE; - HmiUserX.Export := FALSE; - HmiUserX.ConfirmOverwrite := FALSE; - ELSIF NOT HmiUserX.FileDuplicate AND HmiUserX.Export THEN + HmiUserX.Commands.Export := FALSE; + HmiUserX.Commands.ConfirmOverwrite := FALSE; + ELSIF NOT HmiUserX.Status.FileDuplicate AND HmiUserX.Commands.Export THEN UserXMgrUIConnect.Export.Dialog.Confirm := TRUE; - HmiUserX.Export := FALSE; + HmiUserX.Commands.Export := FALSE; END_IF END_ACTION diff --git a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.typ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.typ index 38f3310f..150ac161 100644 --- a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.typ +++ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.typ @@ -1,7 +1,25 @@ +(*Structure types*) TYPE - enumCheckState : - ( + UserXHmiInterfaceType : STRUCT (*Structure to hold commands and status from the HMI*) + Commands : UserXCommandsType; (*Structure to hold the commands from the HMI*) + Status : UserXStatusType; (*Structure to hold status information to the HMI*) + END_STRUCT; + UserXCommandsType : STRUCT (*Structure to hold the commands from the HMI*) + Export : BOOL; (*Export a user list*) + ConfirmOverwrite : BOOL; (*Confirm you want to overwrite an existing user export with the same filenmae*) + END_STRUCT; + UserXStatusType : STRUCT (*Structure to hold status information to the HMI*) + FileDuplicate : BOOL; (*Flag that a user export file already exists with the specified name*) + UserXHmiState : HmiStateEnum; (*State variable for HMI interaction*) + END_STRUCT; +END_TYPE + +(*Enumerations*) + +TYPE + HmiStateEnum : + ( (*State enumeration for HMI interaction*) USERX_START := 0, USERX_WAIT_FOR_DIALOG := 1, USERX_SET_RESPONSE := 2, @@ -9,10 +27,4 @@ TYPE USERX_NEW_EXPORT := 4, USERX_FINISH := 5 ); - HMIUser_Typ : STRUCT - NewFileName : STRING[255]; - Export : BOOL; - ConfirmOverwrite : BOOL; - FileDuplicate : BOOL; - END_STRUCT; END_TYPE diff --git a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var index be11019b..12d8f363 100644 --- a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var +++ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var @@ -16,14 +16,11 @@ END_VAR VAR UserXMgrUIConnect : MpUserXMgrUIConnectType; (*UserX manager connection to the HMI*) UserXLoginUIConnect : MpUserXLoginUIConnectType; (*UserL login connection to the HMI*) - i : USINT; - HmiUserX : HMIUser_Typ; -END_VAR -(*Enumerations*) -VAR - UserXCheckState : enumCheckState; (*Used by the HMI Action to check for duplicate files*) + HmiUserX : UserXHmiInterfaceType; (*HMI interface structure *) END_VAR (*Variables*) VAR temp : STRING[255]; (*Temporary string holder for checking file names*) + i : USINT; (*Index*) END_VAR +(*Enumerations*) diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index 98826237..ce06909f 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -210,7 +210,7 @@ - + @@ -258,4 +258,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding index aedff3eb..e86613f3 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Duplicate_content.binding @@ -1,8 +1,8 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding index e852377e..46daccb1 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Export_content.binding @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + From 388bc3f9aa611831a3c017509e52f85bcb2c74f2 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 10:51:47 -0500 Subject: [PATCH 048/112] AAZM-400 - Backup - Removed unused structure elements (PageUp, PageDown, Size) --- .../Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ | 3 --- .../Logical/Infrastructure/Backup/BackupMgr/HMIActions.st | 1 - .../BackupDialogs/BackupCreate/BackupDialog_Create.content | 2 +- .../Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad | 3 +-- .../PC/mappView/Backup/BackupDialog_Create_content.binding | 4 ++-- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ index 8f1f676e..39c16866 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.typ @@ -13,8 +13,6 @@ TYPE Delete : BOOL; (*Delete a backup*) SaveConfig : BOOL; (*Save automatic backup configuration settings*) Reset : BOOL; (*Error reset*) - PageDown : BOOL; (*Page Down*) - PageUp : BOOL; (*Page Up*) END_STRUCT; BackupHmiParametersType : STRUCT (*Structure to hold the parameters for the HMI*) Name : STRING[80] := 'myBackup'; (*Name of the backup*) @@ -28,7 +26,6 @@ TYPE BackupCtrlEnabled : BOOL; (*Disable control panel for Backup with in Sim*) FileNames : ARRAY[0..49]OF STRING[80]; (*Existing backup file names*) TimeStamps : ARRAY[0..49]OF DATE_AND_TIME; (*Time stamps for existing backups*) - Size : {REDUND_UNREPLICABLE} ARRAY[0..49]OF UDINT; (*Sizes of existing backup files*) Info : MpBackupProjectInfoRequestType; (*Project information (name, configuration ID, configuration version)*) DeviceDataProvider : ARRAY[0..MAX_IDX_FILE_DEV]OF STRING[100]; (*Data provider for file device dropdown on automatic backup configuration pop-up*) TableConfig : ARRAY[0..1]OF STRING[120]; (*Table configuration for the list of available backups*) diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/HMIActions.st index 58583cc4..72a20dcb 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/HMIActions.st @@ -113,7 +113,6 @@ ACTION FileManager: FOR i := 0 TO ((SIZEOF(HmiBackup.Status.FileNames)/SIZEOF(HmiBackup.Status.FileNames[0])) - 1) DO HmiBackup.Status.FileNames[i] := MpFileManagerUIConnect.File.List.Items[i].Name; HmiBackup.Status.TimeStamps[i] := MpFileManagerUIConnect.File.List.Items[i].LastModified; - HmiBackup.Status.Size[i] := MpFileManagerUIConnect.File.List.Items[i].Size; END_FOR IF ((MpFileManagerUIConnect.DeviceList.SelectedIndex <> HmiBackup.Status.LastSelectedDeviceIndex) AND (MpFileManagerUIConnect.Status = mpFILE_UI_STATUS_IDLE)) THEN diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content index c04caf76..b60fe36a 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content @@ -7,7 +7,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad index d279170a..58ef7a3c 100644 --- a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad +++ b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/BackupMgr.uad @@ -1,6 +1,6 @@  - + @@ -46,7 +46,6 @@ - diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding index d0106d63..e693b8db 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding @@ -3,7 +3,7 @@ - + - \ No newline at end of file + From 28bde000528a231e0fda0a668419b4a4dbd22cd9 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 10:52:10 -0500 Subject: [PATCH 049/112] AAZM-400 - minor changes in Audit, File, Recipe --- .../Audit/AuditMgr/AuditMgr.typ | 20 +++++++++++-------- .../Infrastructure/File/FileMgr/FileMgr.typ | 2 +- .../Recipe/RecipeMgr/RecipeMgr.typ | 2 -- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.typ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.typ index 0d8bdf5c..574829f2 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.typ +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.typ @@ -1,3 +1,4 @@ +(*Structure types*) TYPE AuditQueryHMIType : STRUCT (*Datatype for the structure which rearranges the query data from AuditQuery into a structure of arrays for easy connection to the Table widget in mapp View*) @@ -9,12 +10,6 @@ TYPE Name : STRING[80]; (*Name of the query to be executed*) Option : USINT; (*Index value of the selected query type in the dropdown on the query tab*) END_STRUCT; - ActiveAuditStateEnum : - ( (*Enumeration for the state for the query state machine*) - ACTIVE_AUDIT_WAIT, (*Wait state*) - ACTIVE_AUDIT_QUERY, (*State to query the Audit data*) - ACTIVE_AUDIT_NEXT (*State to check if more Audits meet the query criteria and need to be queried*) - ); AuditCustomEventType : STRUCT (*Structure for custom events handling*) Set : BOOL; (*Trigger the assigned function*) Type : WSTRING[100]; (*Entered when creating the entry under %typ*) @@ -31,7 +26,7 @@ TYPE END_STRUCT; AuditHmiInterfaceType : STRUCT (*Structure to hold commands and status from the HMI*) Commands : AuditCommandsType; (*HMI commands*) - Parameters : AuditParType; (*HMI parameters*) + Parameters : AuditParametersType; (*HMI parameters*) Status : {REDUND_UNREPLICABLE} AuditStatusType; (*HMI status*) END_STRUCT; AuditCommandsType : STRUCT (*Structure to hold the commands from the HMI*) @@ -50,7 +45,7 @@ TYPE NumberOfArchives : UINT; (*How many archives are available for export*) DeviceDataProvider : ARRAY[0..1]OF STRING[100]; (*Data provider for the file device selector*) END_STRUCT; - AuditParType : STRUCT (*Structure to hold parameter data for the HMI*) + AuditParametersType : STRUCT (*Structure to hold parameter data for the HMI*) ArchiveSettings : AuditArchiveParType; (*Parameter for archive configuration*) QuerySelection : ARRAY[0..MAX_QUERIES]OF STRING[10]; (*The selection in the query dropdown on the query tab of the Audit content*) END_STRUCT; @@ -71,3 +66,12 @@ TYPE END_TYPE (*Enumerations*) + +TYPE + ActiveAuditStateEnum : + ( (*Enumeration for the state for the query state machine*) + ACTIVE_AUDIT_WAIT, (*Wait state*) + ACTIVE_AUDIT_QUERY, (*State to query the Audit data*) + ACTIVE_AUDIT_NEXT (*State to check if more Audits meet the query criteria and need to be queried*) + ); +END_TYPE diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ b/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ index 4e461519..0dbdd7c6 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.typ @@ -30,7 +30,7 @@ TYPE IsFolder : BOOL; (*Flag for whether the item is a folder (versus a file)*) BackButton : BOOL; (*Flag for whether the back button should be shown*) DeleteStep : FileDeleteStepEnum; (*Enumeration for automatic file deletion steps*) - AutoDeleteSelected : USINT; (*Number of selected items*) + AutoDeleteSelected : USINT; (*Index for automatic file deletion*) FolderSize : REAL; (*Size of currently selected folder*) SelectedIndex : USINT; (*Selected index in the file list*) FifoConfigEnable : BOOL; (*Disable FIFO access or change confirmation when FIFO is active*) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ index e9f8635d..c304b187 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ @@ -10,8 +10,6 @@ TYPE LoadRecipe : BOOL; (*Load recipe*) SaveSelectedRecipe : BOOL; (*Save the selected recipe (which is not necessarily the active recipe)*) CreateRecipe : BOOL; (*Create recipe*) - ImportFromUSB : BOOL; (*Import from USB device*) - ExportToUSB : BOOL; (*Export to USB device*) ResetPreview : BOOL; (*Reset the preview to empty/zeros in the event of an invalid recipe*) END_STRUCT; RecipeParametersType : STRUCT (*Structure to hold the parameters for the HMI*) From 4cac25b45c34045d6ec914d8c9891dc69c1bb8de Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 11:49:09 -0500 Subject: [PATCH 050/112] AAZM-20 - Remove full symbol library --- .../mappView/Resources/Media/Package.pkg | 8 +- .../Resources/Media/SymbolLib/Alarm/green.png | Bin 12363 -> 0 bytes .../Resources/Media/SymbolLib/Alarm/red.png | Bin 6962 -> 0 bytes .../Media/SymbolLib/Arrow/ArrowDown.svg | 12 - .../Media/SymbolLib/Arrow/ArrowUp.svg | 12 - .../Resources/Media/SymbolLib/Arrow/Back.svg | 13 - .../Resources/Media/SymbolLib/Arrow/Down1.svg | 12 - .../Resources/Media/SymbolLib/Arrow/Down2.svg | 11 - .../Resources/Media/SymbolLib/Arrow/Down3.svg | 13 - .../Media/SymbolLib/Arrow/Forward.svg | 13 - .../Media/SymbolLib/Arrow/Package.pkg | 18 - .../Resources/Media/SymbolLib/Arrow/Up1.svg | 13 - .../Resources/Media/SymbolLib/Arrow/Up2.svg | 11 - .../Resources/Media/SymbolLib/Arrow/Up3.svg | 12 - .../Media/SymbolLib/AxisControl/Off.svg | 63 - .../Media/SymbolLib/AxisControl/On.svg | 65 - .../Media/SymbolLib/AxisControl/Reset.svg | 75 - .../Media/SymbolLib/AxisControl/Stop.svg | 63 - .../Communication/ConnectionFail.svg | 48 - .../SymbolLib/Communication/ConnectionOK.svg | 19 - .../Media/SymbolLib/Communication/Network.svg | 20 - .../Media/SymbolLib/Communication/Package.pkg | 9 - .../Media/SymbolLib/DateTime/Calendar.svg | 16 - .../Media/SymbolLib/DateTime/Clock.svg | 14 - .../Media/SymbolLib/DateTime/Date.svg | 13 - .../Media/SymbolLib/DateTime/Package.pkg | 9 - .../SymbolLib/Diagnostic/Diagnostics.svg | 25 - .../SymbolLib/DisplayAndTouch/Calibrate.svg | 16 - .../SymbolLib/DisplayAndTouch/Contrast.svg | 11 - .../SymbolLib/DisplayAndTouch/Lightness.svg | 15 - .../Resources/Media/SymbolLib/Edit/Add.svg | 14 - .../Media/SymbolLib/Edit/Character.svg | 16 - .../Resources/Media/SymbolLib/Edit/Close.svg | 13 - .../Resources/Media/SymbolLib/Edit/Copy.svg | 23 - .../Resources/Media/SymbolLib/Edit/Cut.svg | 52 - .../Resources/Media/SymbolLib/Edit/Export.svg | 77 - .../Media/SymbolLib/Edit/Favorite.svg | 14 - .../Media/SymbolLib/Edit/Information.svg | 14 - .../Resources/Media/SymbolLib/Edit/Insert.svg | 19 - .../Media/SymbolLib/Edit/Maximize.svg | 15 - .../Media/SymbolLib/Edit/Minimize.svg | 15 - .../Resources/Media/SymbolLib/Edit/New.svg | 17 - .../Resources/Media/SymbolLib/Edit/Number.svg | 12 - .../Resources/Media/SymbolLib/Edit/Open.svg | 13 - .../Media/SymbolLib/Edit/Package.pkg | 33 - .../Resources/Media/SymbolLib/Edit/Pin.svg | 23 - .../Resources/Media/SymbolLib/Edit/Pin2.svg | 13 - .../Resources/Media/SymbolLib/Edit/Redo.svg | 12 - .../Resources/Media/SymbolLib/Edit/Undo.svg | 12 - .../Resources/Media/SymbolLib/Edit/ZoomIn.svg | 16 - .../Media/SymbolLib/Edit/ZoomOut.svg | 15 - .../SymbolLib/Icons/04_Home_Manual_help.svg | 1 - .../Icons/04_Home_Manual_settings.svg | 1 - .../Media/SymbolLib/Icons/1_help.svg | 1 - .../Media/SymbolLib/Icons/1_settings.svg | 1 - .../Media/SymbolLib/Icons/Add-08.svg | 1 - .../Media/SymbolLib/Icons/Alarm-03.svg | 1 - .../Media/SymbolLib/Icons/Alarm-1-14.svg | 1 - .../Media/SymbolLib/Icons/AlarmActive.svg | 1 - .../Media/SymbolLib/Icons/Alarm_red.svg | 1 - .../Media/SymbolLib/Icons/Audit-18.svg | 1 - .../Media/SymbolLib/Icons/AxisGear.svg | 1 - .../Media/SymbolLib/Icons/CurrentUser.svg | 1 - .../Media/SymbolLib/Icons/Data-22.svg | 1 - .../Media/SymbolLib/Icons/Delete-09.svg | 1 - .../Media/SymbolLib/Icons/Diagnose-19.svg | 1 - .../Media/SymbolLib/Icons/Exit-07.svg | 1 - .../Media/SymbolLib/Icons/Exit-1.svg | 1 - .../Resources/Media/SymbolLib/Icons/Exit.svg | 1 - .../Resources/Media/SymbolLib/Icons/Help.svg | 5 - .../Media/SymbolLib/Icons/Home-11.svg | 1 - .../Media/SymbolLib/Icons/Home_Background.svg | 1 - .../Media/SymbolLib/Icons/Language-05.svg | 1 - .../Resources/Media/SymbolLib/Icons/Login.svg | 1 - .../Media/SymbolLib/Icons/Package.pkg | 43 - .../Media/SymbolLib/Icons/Parameter-12.svg | 1 - .../Media/SymbolLib/Icons/Password-02.svg | 1 - .../Media/SymbolLib/Icons/Recipe-13.svg | 1 - .../Media/SymbolLib/Icons/Report-17.svg | 1 - .../Media/SymbolLib/Icons/SetLanguage.svg | 1 - .../Media/SymbolLib/Icons/Settings.svg | 1 - .../Media/SymbolLib/Icons/Trend-15.svg | 1 - .../Media/SymbolLib/Icons/Untitled-1-20.svg | 1 - .../Media/SymbolLib/Icons/Untitled-1-21.svg | 1 - .../Media/SymbolLib/Icons/User-06.svg | 1 - .../Media/SymbolLib/Icons/User-1-04.svg | 1 - .../SymbolLib/Icons/UserInformation-10.svg | 1 - .../SymbolLib/Icons/UserManagement-01.svg | 1 - .../Media/SymbolLib/Localize/Browser.svg | 20 - .../Media/SymbolLib/Localize/China.svg | 40 - .../Media/SymbolLib/Localize/Flag.svg | 12 - .../Media/SymbolLib/Localize/France.svg | 32 - .../Media/SymbolLib/Localize/Germany.svg | 23 - .../Media/SymbolLib/Localize/GreatBritain.svg | 46 - .../Media/SymbolLib/Localize/Italy.svg | 24 - .../Media/SymbolLib/Localize/Language.svg | 28 - .../Media/SymbolLib/Localize/Package.pkg | 19 - .../Media/SymbolLib/Localize/Portugal.svg | 841 ------- .../Media/SymbolLib/Localize/Russia.svg | 23 - .../Media/SymbolLib/Localize/Spain.svg | 1999 ----------------- .../Resources/Media/SymbolLib/Localize/UK.svg | 46 - .../Media/SymbolLib/Localize/USA.svg | 143 -- .../Media/SymbolLib/Media/FastForward.svg | 11 - .../Media/SymbolLib/Media/FastForwardStop.svg | 12 - .../Media/SymbolLib/Media/FastRewind.svg | 11 - .../Media/SymbolLib/Media/FastRewindStop.svg | 12 - .../Media/SymbolLib/Media/ForwardStop.svg | 11 - .../Media/SymbolLib/Media/Package.pkg | 16 - .../Resources/Media/SymbolLib/Media/Pause.svg | 11 - .../Resources/Media/SymbolLib/Media/Play.svg | 10 - .../Media/SymbolLib/Media/RewindStop.svg | 11 - .../Resources/Media/SymbolLib/Media/Stop.svg | 11 - .../Resources/Media/SymbolLib/Media/Video.svg | 11 - .../Media/SymbolLib/Needle/Needle1long.svg | 12 - .../Media/SymbolLib/Needle/Needle1short.svg | 12 - .../Media/SymbolLib/Needle/Needle2long.svg | 20 - .../Media/SymbolLib/Needle/Needle2short.svg | 20 - .../Media/SymbolLib/Needle/Needle3long.svg | 14 - .../Media/SymbolLib/Needle/Needle3short.svg | 23 - .../Media/SymbolLib/Needle/Needle4long.svg | 13 - .../Media/SymbolLib/Needle/Needle4short.svg | 13 - .../Media/SymbolLib/Needle/Package.pkg | 14 - .../Resources/Media/SymbolLib/Package.pkg | 21 - .../Media/SymbolLib/Symbols/Accept.svg | 12 - .../Media/SymbolLib/Symbols/Button.svg | 16 - .../Media/SymbolLib/Symbols/Cold Restart.png | Bin 2561 -> 0 bytes .../Media/SymbolLib/Symbols/Conveyor.svg | 12 - .../Media/SymbolLib/Symbols/Download.svg | 12 - .../Media/SymbolLib/Symbols/Energy.svg | 12 - .../Media/SymbolLib/Symbols/Engine.svg | 14 - .../SymbolLib/Symbols/EngineReference.svg | 20 - .../Media/SymbolLib/Symbols/Graph.svg | 30 - .../Media/SymbolLib/Symbols/Hide.svg | 15 - .../Media/SymbolLib/Symbols/Home.svg | 11 - .../Media/SymbolLib/Symbols/InProgress.svg | 48 - .../Media/SymbolLib/Symbols/Mail.svg | 10 - .../Resources/Media/SymbolLib/Symbols/Max.svg | 19 - .../Media/SymbolLib/Symbols/Menu.svg | 76 - .../Resources/Media/SymbolLib/Symbols/Min.svg | 19 - .../Media/SymbolLib/Symbols/Mode.svg | 12 - .../Resources/Media/SymbolLib/Symbols/Off.svg | 13 - .../Resources/Media/SymbolLib/Symbols/On.svg | 13 - .../Resources/Media/SymbolLib/Symbols/PDF.svg | 23 - .../Media/SymbolLib/Symbols/Package.pkg | 60 - .../Media/SymbolLib/Symbols/Remote1.svg | 14 - .../Media/SymbolLib/Symbols/Remote2.svg | 20 - .../Media/SymbolLib/Symbols/Remote3.svg | 28 - .../Media/SymbolLib/Symbols/Remote4.svg | 21 - .../Media/SymbolLib/Symbols/Reset.svg | 13 - .../Media/SymbolLib/Symbols/Restart.svg | 16 - .../Media/SymbolLib/Symbols/Robot.svg | 21 - .../Media/SymbolLib/Symbols/Safety.svg | 13 - .../Media/SymbolLib/Symbols/Service.svg | 16 - .../Media/SymbolLib/Symbols/Slider_Symbol.svg | 11 - .../Media/SymbolLib/Symbols/Sync.png | Bin 1196 -> 0 bytes .../Media/SymbolLib/Symbols/SyncOff.png | Bin 1548 -> 0 bytes .../SymbolLib/Symbols/SystemSettings.svg | 14 - .../Media/SymbolLib/Symbols/Temperature.svg | 14 - .../Media/SymbolLib/Symbols/Tool.svg | 14 - .../Media/SymbolLib/Symbols/TouchMe.svg | 18 - .../Resources/Media/SymbolLib/Symbols/USB.svg | 18 - .../Media/SymbolLib/Symbols/UnHide.svg | 15 - .../Media/SymbolLib/Symbols/Upload.svg | 12 - .../Media/SymbolLib/Symbols/Wait.svg | 15 - .../Media/SymbolLib/Symbols/WarmRestart.png | Bin 2360 -> 0 bytes .../Media/SymbolLib/Symbols/Webcam.svg | 14 - .../Media/SymbolLib/Symbols/exit.png | Bin 2360 -> 0 bytes .../SymbolLib/Symbols/warningwhite_l.svg | 1 - .../Resources/Media/SymbolLib/User/Lock.svg | 13 - .../Resources/Media/SymbolLib/User/Login.svg | 16 - .../Resources/Media/SymbolLib/User/Logout.svg | 16 - .../Media/SymbolLib/User/NoAccessRights.svg | 15 - .../Media/SymbolLib/User/Package.pkg | 19 - .../Resources/Media/SymbolLib/User/Unlock.svg | 13 - .../Resources/Media/SymbolLib/User/User.svg | 12 - .../Media/SymbolLib/User/UserGroup.svg | 18 - .../Media/SymbolLib/User/UserNew.svg | 1 - .../Alarm/Acknowledge.svg | 0 .../Alarm/Alarm.svg | 0 .../Alarm/AlarmActive.svg | 0 .../Alarm/AlarmHistory.svg | 0 .../Alarm/AlarmInactive.svg | 0 .../Alarm/Error.png | Bin .../Alarm/Error.svg | 0 .../Alarm/Information.png | Bin .../Alarm/Package.pkg | 8 +- .../Alarm/Warning.png | Bin .../Arrow/ArrowLeft.svg | 0 .../Arrow/ArrowRight.svg | 0 .../Arrow}/Package.pkg | 5 +- .../Edit/Delete.svg | 0 .../Edit/Edit.svg | 0 .../Edit/ExportArchive.svg | 0 .../Edit/Filter.svg | 0 .../mappFrameworkSymbols/Edit/Package.pkg | 12 + .../Edit/Save.svg | 0 .../Edit/Sort.svg} | 0 .../File/Empty.svg | 0 .../File/File.svg | 0 .../File/FileExporer.svg | 0 .../File/FileScan.svg | 0 .../File/FileSelected.svg | 0 .../File/Files.svg | 0 .../File/Folder.svg | 0 .../File/PDF.svg | 0 .../File/Package.pkg | 12 +- .../File/Package.svg | 0 .../File/Recipe.svg | 0 .../File/Search.svg | 0 .../File/TXT.svg | 0 .../File/XML.svg | 0 .../Icons/Export.svg | 0 .../Icons}/Package.pkg | 4 +- .../mappFrameworkSymbols/Navigation/Alarm.svg | 6 + .../Navigation}/Audit.svg | 0 .../Navigation}/EngineMove.svg | 0 .../Navigation/FileExporer.svg | 111 + .../Navigation}/Help.svg | 0 .../Navigation/Package.pkg | 15 + .../Navigation}/Recipe.svg | 0 .../Navigation}/Report.svg | 0 .../Navigation}/Server.svg | 0 .../Navigation}/UserGroup.svg | 0 .../Media/mappFrameworkSymbols/Package.pkg | 16 + .../Symbols}/Package.pkg | 6 +- .../Symbols/Settings.svg | 0 .../Symbols/Start.svg | 0 .../Symbols/Stop.svg | 0 .../Symbols/WarningRed.svg} | 0 .../User/AddUser.svg | 0 .../User/DeleteUser.svg | 0 .../User/EditUser.svg | 0 .../mappFrameworkSymbols/User/Package.pkg | 11 + .../User/UserExport.svg | 0 .../User/UserImport.svg | 0 .../AuditDialog_ArchiveSettings.content | 8 +- .../FileFIFO/FileDialog_FIFO.content | 4 +- .../UserXDuplicate/UserXDuplicate.content | 4 +- .../UserXError/UserXDialog_Error.content | 4 +- .../Pages/DemoPage/Navigation.content | 20 +- .../AlarmsContent/AlarmXCurrent.content | 12 +- .../AlarmsContent/AlarmXHistory.content | 10 +- .../AuditContent/AuditTrail.content | 8 +- .../AuditContent/CustomEvents.content | 6 +- .../AxisContent/AxisAuto.content | 10 +- .../FrameworkPackage/FileContent/File.content | 12 +- .../RecipeContent/Recipe.content | 10 +- .../UserXContent/UserList.content | 14 +- .../AlarmX/Navigation_content.eventbinding | 6 +- 249 files changed, 253 insertions(+), 5694 deletions(-) delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/green.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/red.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowDown.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowUp.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Back.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down1.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down2.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down3.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Forward.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up1.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up2.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up3.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Off.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/On.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Reset.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Stop.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionFail.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionOK.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Network.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Calendar.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Clock.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Date.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Diagnostics.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Calibrate.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Contrast.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Lightness.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Add.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Character.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Close.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Copy.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Cut.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Export.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Favorite.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Information.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Insert.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Maximize.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Minimize.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/New.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Number.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Open.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin2.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Redo.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Undo.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomIn.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomOut.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_help.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_settings.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_help.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_settings.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Add-08.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-03.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-1-14.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AlarmActive.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm_red.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Audit-18.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AxisGear.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/CurrentUser.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Data-22.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Delete-09.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Diagnose-19.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-07.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-1.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Help.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home-11.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home_Background.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Language-05.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Login.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Parameter-12.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Password-02.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Recipe-13.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Report-17.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/SetLanguage.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Settings.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Trend-15.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-20.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-21.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-06.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-1-04.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserInformation-10.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserManagement-01.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Browser.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/China.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Flag.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/France.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Germany.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/GreatBritain.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Italy.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Language.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Portugal.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Russia.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Spain.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/UK.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/USA.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForward.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForwardStop.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewind.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewindStop.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/ForwardStop.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Pause.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Play.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/RewindStop.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Stop.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Video.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1long.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1short.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2long.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2short.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3long.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3short.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4long.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4short.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Accept.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Button.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Cold Restart.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Conveyor.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Download.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Energy.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Engine.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/EngineReference.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Graph.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Hide.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Home.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/InProgress.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mail.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Max.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Menu.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Min.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mode.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Off.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/On.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/PDF.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote1.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote2.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote3.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote4.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Reset.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Restart.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Robot.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Safety.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Service.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Slider_Symbol.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Sync.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/SyncOff.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/SystemSettings.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Temperature.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Tool.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/TouchMe.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/USB.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/UnHide.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Upload.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Wait.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/WarmRestart.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Webcam.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/exit.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/warningwhite_l.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Lock.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Login.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Logout.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/NoAccessRights.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Package.pkg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Unlock.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/User.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserGroup.svg delete mode 100644 mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserNew.svg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Acknowledge.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Alarm.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/AlarmActive.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/AlarmHistory.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/AlarmInactive.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Error.png (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Error.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Information.png (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Package.pkg (87%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Alarm/Warning.png (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Arrow/ArrowLeft.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Arrow/ArrowRight.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/DisplayAndTouch => mappFrameworkSymbols/Arrow}/Package.pkg (55%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Edit/Delete.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Edit/Edit.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Edit/ExportArchive.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Edit/Filter.svg (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Edit/Save.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Edit/sort.svg => mappFrameworkSymbols/Edit/Sort.svg} (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Empty.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/File.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/FileExporer.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/FileScan.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/FileSelected.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Files.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Folder.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/PDF.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Package.pkg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Package.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Recipe.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/Search.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/TXT.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/File/XML.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Icons/Export.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Diagnostic => mappFrameworkSymbols/Icons}/Package.pkg (60%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Alarm.svg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols => mappFrameworkSymbols/Navigation}/Audit.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols => mappFrameworkSymbols/Navigation}/EngineMove.svg (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/FileExporer.svg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Edit => mappFrameworkSymbols/Navigation}/Help.svg (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols => mappFrameworkSymbols/Navigation}/Recipe.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols => mappFrameworkSymbols/Navigation}/Report.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols => mappFrameworkSymbols/Navigation}/Server.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols => mappFrameworkSymbols/Navigation}/UserGroup.svg (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/AxisControl => mappFrameworkSymbols/Symbols}/Package.pkg (60%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Symbols/Settings.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Symbols/Start.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/Symbols/Stop.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib/Symbols/warningred_l.svg => mappFrameworkSymbols/Symbols/WarningRed.svg} (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/User/AddUser.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/User/DeleteUser.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/User/EditUser.svg (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/User/UserExport.svg (100%) rename mappFramework/Logical/mappView/Resources/Media/{SymbolLib => mappFrameworkSymbols}/User/UserImport.svg (100%) diff --git a/mappFramework/Logical/mappView/Resources/Media/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/Package.pkg index 829eaee8..4f29d12f 100644 --- a/mappFramework/Logical/mappView/Resources/Media/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/Package.pkg @@ -1,12 +1,8 @@  - + - SymbolLib Documents - InProgress.gif - InProgressGray.gif - BnR_Logo.svg - BnR_Logo.ico + mappFrameworkSymbols \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/green.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/green.png deleted file mode 100644 index 4f8c5c59cd2d89e65a5b1c96988ee7814aef6ed7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12363 zcmaKS2{e@b_xOx4WLK6Xl#p%6WGz&ZGTAbghAd-*7tz?I(u|5ysIl+88f0x`$=*on z&H837QPZM@Vj@v*%l|&p`~9BpIlpuMo#XV(^L#${bN72c_uh+#><@?u%L}7WC^3Td zJ|YUmM?(JA2*8_8|C}lKk3V8B!Fdh*JGJKM1^6vQwRVd@p(0k1KlHvY-zMSZhDa+? zq|+MjrD+9SaQjBXTn}Dx7-E zZ}ZXPk;gkOr=w7tQG|UK&anj_r_ZoFT~4ojS~<9e&M%2o;No*g&exJv8c6x6G|Td! zy39?f4c6F3d#jxzXhx+b`HuMtRGiLSir;|=UlxXGfWYT@}cKm`SXD#Q&qVM8_1SYLCXKUrpU;Bu= zu_9T_+;ehYuvw@}bj*{^J$651mGsmddav4{(r%r8pZ7g%H%p$BNr^LY+E38&>0<1= z;B!2AvEitC@ycK6)pbQo+!3eK_V}6s8C#-0iN!2hgU6wMN}7n8WR#eN=o~uv)@Ga# z{KU1{6&-`#EfAkaaWBSaGxK0+s^*GCM^1@#2W9x}?rR-=F`jtz_jRj6Rxc*MeLXz? zi_zMXpw>ugF`kt<=FRjH$NiOSQ{SZ2oc{6Bgu~RFT4OfWCg`GMw=TPiRyy+_nD#5v zFysD5WA+L?bLPQE&9Z?LDg^m+u;_+lcZ9~l(eb^@K?SzU({Y@nW7;0i9q{Hw#tdc! zpppn!`y9!2KUk+cZSIse$j^0ZlBvzqEOP-6d?HyHb{Bl`Tmep$^!ZuZ<*-pji9;DR z3n*h|j_cbLmF0A-O(o%i&n~WeGI3de!)d=bDiwn<&e-(a1|QO2a9|erY_Nak*7Nbb zQKBrp<6D-ec5=4%-kk|AG1w)GtJph}F{{y(S(!a!r)oE+)MR(Nb1u@RG8Jnh?|4FX z>>@i~qs+N;#37`ih|;O{*f>O1u$Q znW1zM7tYDO;k#L$3 z_g5xkZE6lH)p7SHQ=%fD88G%!^{H#Qc4={kp29|V<;1USO|~G-QvbnK=fXDHC3-N? zc4I`+)kL2z;@mm8B9V5%)dS>T{b8ypLuc79=gfkc42mO|nyunHT!dlx>B z1t|8sC@m)7Yv5Q!UsKjoV%4a+)GeVN+24+duoO&o_e36;*Bg$+k%FovyZ>ZA&`fsu zOW^=9LN&Q0$}9PO?UWCq$D=07iP?N_(dw_dt}&uR`A7n%%z8dA!N-TN^Ky9F*aMnV znC78jP7}(TZ`TVY9mDfjnSn-6f>0h`8&t;r{q;kmy&WF$Ert8+OZs87TmI;O@Iqr62Ik!o6$Fp~^H?Ze(Us=!Aim^-CSk1B|_&=4ng4R+@HZ-G5^kQTQ9Z|cf_Q`>6^P6XP ziDcc^x<}>bx{(9taSUg7q4sS(k-_jq7rtz{$J$NZMU_`tr&V!c9aV-Jn*6@2-)+=F z7U!aMPj6G~Zthxg8qg8A)q$^=@26o;13pGBDhX?oDTFUTdGO;N7Fsd<17)bu$?sdI zEJnp-aVgd98$`Oyw-2C$A>&DuoCm@8qU}&dXrCAP<#l^m!CD_cxskCh4Yt4 ztcF6#?ojDpeqYe!?Djy_icdzE^%#85XXkmnAaRkbBH;VF)$Lryl$&aWUp%^9rzg^8 zeshq3NLJH)Z{gc5F9nXx%WW? zD-L&$sznvd(k4_66FI4ihOXu_{8dSNMNeX~(duspw-6L>i^e)62ZqdVuFS?(1?&|) zfcEB-oq;drbpj@aJ)ftiESxuqxH^C%a6H!eT~b%fhB&>ICPIfGWi%sx{Zl=8dC!Fx zer!Yb+Ln52;?T5k0fW-29wV8Ooqjo01pnQW$u_J# z!Wn~7ZMwc0x-%a~Qk15|u4O5dyD~;2Z}X{_<;?df?i&lg$nxDQ`hfWTY@-K(xTJ`l za_@|;vV`U9D64v09da?SiGX=3xa#^TL?d>DqPv)a?`r9)v`i(9J&*& zzyMXLaNUjh31+GlBPn*@oTS5(DjGO3d)<<@DPw}Kk%q0p0%;gy%+Qd66(eJ4iJspV zoFG4#Fh*5QT)|B6wIMR<4UOSUE>2z(h>&o#%v_NEj^jQ zaJ?XgQLSK_F>t(JaUa&W#dzO^7en++QmrbX{`MM@o0rWf3JzI=FW47Gd*=mmX1E7$ z<7}KUw90j3Z3iJM_9T8e!FzvPiB;X+q@g0>3U+e_Rf~A;Eri+B7PiZb;r?6_Yr7Es z6slQt4YGQtIx0JJLf((u)w}r~Rf+02ufSjqw%urdbHiV0*X%f01J zwwrntOB`?{Lm@mrXNkQ50TB0|$my5v;7)WUxSU<=OgM}>j%d|r@L|lt=bz_a1$4;+ z5HpTEM+aHXe@ezgt*1dV=8A4TImHoD0;{;_`HTM6B?MJT#2qP|UDdrS zoMAlj`B?&kscT}|6B#xy83LF)UU;#I))x-sSL|IN;7=>ZTrdK(H{avNuw7^iomW(& z2z>T7_#Y?dH;4Fj$rCTUP$h5Rd{qW8lY9jQlvbmdD@M1-V#@cpZ`sB)o`4MY=hN=k z;(x@z9^bCKQpxTl0&x5`$#t-&jxzDtraK$i)I?wIzSJ)if$ zrWZR%7*IE6GrkOAhw&wv%uM4U42vvwt$ppA?Hrz_^}eQ(bB&XfE@OlBic6d4npFv> zqZN7#9ran{0U#ir)6o)P%@~zj(7BnCmzY0Q4(6fMEPLsODk0qtrCyp-JEX|0z>!Q5 zvuWP&*gQfS~KIocq6V%AoeNP zgo(L4G$#R9gxHHyJ5&ilby7~Y6EotE_+@dRqIy&jRscjj)yBtC?5mn(Z4rVGYgTN| zA$i(d9jJ^!B|P*62j5)oB%=?b1>YiY4=C7%g?w!ES`W!V5?zWXQD1wFn{^#yPt8fn ziN5sX=*}8v26Hw9?Nv-^#m8Jxh;w6see#83zwpo%Kgn;hr6swoq@*o%vkPqjO=Nf6uDwpapNr4AhOIC--4Fjo5>cZL0)$7=oZ>~uI?n7R;M+k1nu62mg z?FQFM9Kn?|?~ic}5OKZm!kP0LVeoK$f*r|fQ8-d_1u}o$!X0(Ah(4*Jf#ea_hb=0+DuEG5ILxTHtQm!G3g-! zS!Fq)4;7hOg_@+9!qzjQ?W*AU83w_3u9>vHsF<>-{JT``?gda|W>cI{Ph-2(PJEXz zzFoK(n=PP52&x}IWDHSzgUg&cX~tAS_W?r1(~o=}&(6olG=YdWp~Qz2_cBynUQ&~T zPgXU?UDUfrmF&6yWg1aSLgte_buWHAo3cn8`yw>H9?_6d!!{?6S4XNE5#iW#a(GN2 zDL8q}9jVAfDEL7yMxR6+KjXf?4%Hg+rzs2nsv4>4Az#qvin%Xk&2Mho&j|w$V>$Pb z?L-}W+|3^~!<7gRBWP{3^{@ z`EEbzBx(>C`;E~GaCK3Mxnj{!QGF^gdInfMmTUP4>;9+Ad9`~~K58VmW>w9q>wWfr z$EJ915ykhHn=Azp5K(Kkxkv~2hV&~Q-5HWY?%0ILNelPqJAst(cS5cwDF1AunIjRD zkn%~D%h+1XefC*s{3{Y&hQEBd_HIqe*kd6eW)0^I?F!;-f(rP*hb6xspRy<$el0W} zfN+gjflaRc+d2gYXs6Rl5shZ%th{fQ z9D3Dd9AQT(+mk(Y4Ah%AaSSbPhyP)Am^LLhfsuqL)OB{<;_C!0L^-8BfoDszw-I4f)e#x??<|F5H$ico$*LEIzyBssl`AqV3Ag%DvnInQFcE}PVuS|{_!NL84u9$x&7SAzM2~W+|;2=Y; ze)Vv+fLxdWhNn7Hx7%ucg_Vv}HC$8Y`Nb9gNhdH=?LO*qW;9dpd>=LJic>)_%$WF7 zy71_SSuIk)#Ah>rHBwQUe)%+*8}|VF*X3n`DuE%e@<6j}Q_7OiYz}!x2duH%{v~uf zf~^mpx~*tR7ea`y2=!2M;Bs>j8JM|30gECGY|k#aetFhCbyT(2~Q zBaPi6nyoga_Z?YN2*#7l#d+d;M90sN#aK3e62Nf-uY9@{-0`a7*p=#}avy|>kGDju zk}7Qdc#Mn}S8#ra0bpZqy*QA(t*xXp=aJK*;HER}uj(R=%N7LhlYMzAWWPIj53?l7 z3F?I7S%74CZ$!H9T$;o`sO$EuXP0@q`f8;W1OB)!`+L{=l+mz6FJzZQtYnVyK@?bk zz$E{NVoF?O&L$)DP~Ktu_|>8UbX4Y<@o);q8k6{(>M|U7|D-X$sI!i?K;lk`qS$G z-K>*g$$?|n?wn|n!j&WZO!FV3^A_vpy9mn1USydSy;w_rA^9h0-sCYw*3h*FhW-8t z%kDhx7lS$dN$)Qsx0r#u{&tL`d$bD~A7A@nPRt+3JZD$$fCBw!kd%t5k&_{LgGMednXg*s6B(LA1&PcoB35(;I3~W3l!3 z&ZgYDjczOe;r}23Sm0c@q3uz_TktqV7_;6F$Av-DM_r`YOHemi_+Z@cT;Qe8UO?cc z?~qmuoP4gQh=`m~6f&90LpHA?&~(^-1pq{&l>}ukD+9X3{2IZcbjqaJ*e{c5{y7)K zcQDFs(Mq)K0$USi7Oz2!82s3v&BG&6-?=OA%f}=j-2C=Pt-;LJ70K>Sw&g2Z*ffg% zr!+_D*{6Kdd~ye+-v?f`l6wb#v*}s2@VJk!D8$538K>y2>WGlK^Ka>!2dAIB;3LlE zSK5wPRr)f!NVDwX!{-G-3Ck3O@r1J=m#*+%VE)6LqOrms4&OS}eu0T^=l*u=tQbOQ+;Hi3Jidk8@(TW&mAu2{HT%;RxE>!7ko;S|5XXyLjMW*B}~FVMw(qEWd>D@Yl&+1Nx=) zW*yiJvFA%J=0le0d3a3vU?iAR{QI%L81o_T-?u^k3+^{|A7{750181Z4?Pjgbk_n7 zaI-_y9lt^bSLo7jjwp*v#Kl9%g8!wdX|7-ji4(2<;@rr2Nkk5d4Ll0n|99D!&kAJU zd1>VHtw%y2OJbwP7SN2!f4MRLn>8m9OZyKkJjWnY{~H0jc?5x{CW5hAF~WeX_=zBK zuJvz-i+?F_UQB7i)}60?5Je$2Dn;{9b^n(ZwY{+AUnzXyDsb@REis5g63;;?<)>5f zP)Y-Zi1WfI+2QT_HP5`*4%{4mrzF7Qo&MYO@jTEy|BKeKwuGoN_csG-o?*L>X_Kn{ z)rB!u4Y{T_+Y&(PyQ0r!tOI>ghx~6VtPHACcd|Wsw@FC0*%sWGLGsv=_xDo)4~JvRVPF8Z?=+%o`rw#$AW9+sta>Ynr%JhE zUM$EyF?TiuE5PpPf9#&*7WoALHVbK*mqF_5KQw6D9cH_(3u~5c*raxkdxS&N z0)>McGe)y)egEftfm|}(34DX997{^fozt z#HN)}v@#){(q#@&tHT?g?seDk?3Jf60df7pY`|Hv;=KmiuV=SHnS2M03In^_6V zp5z~ryCKCMHJa0G9jfkcC7YqFWvj427D+O6eXj{bxvwEWs{30A}mG9LcyAiSJD9BkRF!}pePr%V-llvY;C2o%d z?97FyOg;<&y@rod{3bT^YDnRzx!{PRMywSBMiZ6|Iq%nQLQIWNRQArqa$^M$SM}fSOVw|11ePH(n$5b}W+#K4yF)A2ibW`%Dk^zrq_Uv}_7ssXwAmuZ{4M5p zdjmn{KgU?A6_!;dH1d(WANc|=W>`ffBbTcgi0M7Ja6AB%qxVCwU-UJ)h1$XfT+;gMN%(R~ZcJ2uK<^ygsKz8}Z&?=_Fc?L05 zZ1b(z2gptDtajf#u_DZtbuHHT#l0M*BfuSDsmt&A&w-*ykDO+wyox;rXeLjQqO*Ea zf)lWz(Qwv)QB&>q!Gz^vwx#c>Q}Er#eBUFN`;=n{J_gj~W+iWkY5a$?J^gU^cXaVJ z^WQiX0M9{4fU=O1JU_T+kT;hHw%20xbBp zmb%njd;nmfjI*bYR>Mt&XAGmFjggF2;c;VnTTmQi{mhCft4DGmI z9?^`tD!`d4#wDi=fkrlrot5@v$~MXXZTmS9QRc<4PPJIO%~}VpSZEJ{>Z-3hAo0Fa zbN$`s#)?KnK`^y9mXLP~o{rIQM>Fr@TNQn_3ve3q6|q{m;qnn-s4&TEWeN1v%iSwF z&3z_^j4qHET{I$q5gfS)cST(rpm>^xyMb3<-=Jfg2k5{O?c(L3Z4eWK6H0=QUaf)S z=J~Q_;^JXjU|(LORFIC@KU%hxNSsSSZ6AHP_|*phvoS9ox3VSSKHd2|ELH=v&3VJS0T z{!Tn)xEaJXi7H4pO#+v7KB9O2Zw=+r4AX9C2K`!3%HzGRhQ9UgK1GUFNZJvdwmUC$(cW8{)#^gx;?t4N~6`{x?v{(GvW()I|$3prsu$L*N$UB@`%Y zc0D`|4Yf;jQ(6bF-ZS#moZAbnZ74gA_Xx?(Y;x8N)PH)!1O_s@Zpvy+Z_=fx|ynKvkz znDsMmY!*(VKkfQhv6n4zZ&$c{fPibap{s@bW~o|t+N zjy2aoG-V?_?G5NC@xbYZ_VF*oZP{zop`$5ik1&`i-lE$RNtu`2u^gRX_%M(?%`0%P zjdAigafeT#XZ~9dLxPDuY8Y+;#&T$zK{JO#+{WO z!L*!hIB#>V{?N~!I2Ge2BlRtR*2D9VX8RPQX+3Qt`-{0V3%x9lTz=+mnrl0a5_4)eNd>Lg!D=m~rmSRed?@UgTt)@o^|w6~PgR>DAYo zv8gjbwy-{fGP$N;4?ZDNwL+-#AiiZX$J9F8jdj2J`^~d=x>6Px%G0mx#oEVMo;06&?WHfFlBw#)Q7$ozNN}lN+!l*OpwW$w!d-T&lVF5v z7s?|8h_4tK{PHZ}1av`#@!v5$d9lcJ!lV**y4Z~+4-Kew+%v!Xca-Ce(!?uy0gZcIq>E=xr6PzO zoDx%jew!(@=!ewqW@-OID+#T7?_i9^PoNLD*G>)zxh8?^L{F{D$p?W4x;CLUK_woh zF)9(%TSwy_WM@I(h<*6k0jGI!-&ixrDcnW@}VKwh@J@Ir%Q!!7}?RH%=m z%FA*(^Gz?zzT&S6=sm+pa#WbvOpw3n$M(sp`Wcom=Bu3O1d}o+k?8@&rIXN5AIT0E zbX591St8IWiu-r6gxkamUm0mO=gbdxq7<;FL?0Izr$D0RpFA;q9d|f9p)}x}Tq-li zzXOqBP_FkO+ZyP=?Hl0m+YD)V%ZX!j*@0QAVif(J;5R;5+IDaFZJc-=Hw6o)_s}L_l2_jr70$BR<}@XL5vws?AUF< z;y2JzG{Ykz1%;H>EisafXR$W*>nM+lUs8vqAQ@oh;mS=6K0|M9 zR7n;m20bn_t4DDb0M20Rol*_giMQesZlm%5*zcqk=(GbG8q)&QqY zk_SW01eyJJEGZLdph-5uNER~6w5Lue9XI`3@L3$0yhdtJ&-`RwFhRp&fJ zMxZ1ei0%H0lonzpj2Yp2V>T8^6bPJyk)Zc($mmq;(piVqm!Il4SQoY2$t7|93Y{@qReE0V z*`2(xv~Vz>rvVdXmwr!_U5i~AY@>fgX2w!eq>XRQ23FFmU#e1vtJD3_X7Ri!VLE@wwRZGtp`C5lvUB`t;SUKgR z$|6_Lp{I=<#Ms~OrmB6M;%AAj#zOMn(ruj%GkZ|Rwxp+F)L;6PGMWhNa1K=5J>i>E z9l7FDZ$6>e#<9U;XU4Z+5v#hL&-3wB?_p{#B|L51jcxi#L8roD9DNv79F~?jc{ibS zTnKNrK30O8#{LOJ$QKLJhtSz@`RP;KpC=}g<*p6GXeQWI6!j0_Pi4e6*G`Fg@SoDR+GZaF1nz{I#sO)oIn^o2ZH-;B9CuEM^hjEG z($z{Bm{f=Gj9I`w6aSE{e~GDS&hH`S0eM2OJRZDT4X`eDBH zEOUS@3~hzmkmGKDdo{?fi+Jp901GmKM4g;t0P!f`H03)zS1fg`OOQdp)M z^f=EAuoJ53%xE`>Qz;bpsQLpqYgycTx4ohwnpxt{h1=1ObzofeY7t*3s*|tU8eh`~ z)27leB%31HUBvcw%&578iXOcV=?nGMrtN* z)ld}+jIYMM3~jQj=zN=Tuo5N_dsXkTa!UT_5GM&MT*0TdzCx4LxQfY|W3%mH%=lYm zf|#SOx^Cg;Pf6^8>OV&#rPvOd!ea-?rG4?d8S6x?q3JlWr@|9epA?f%-&R^xekwe+ zVxE04Xsbxp=sIXJ(hk?vP&))xz1=JWr{XcEibKxNevuw|(++{;E;3YoLSRC>H?6yO zXxjtA;iuJt^ZfCA-43knQD*A)Lktwhckp}#XeUK&lKd&BT} zxIntI4jd(=oQRd)_*McVj?K#0bcx=vq&CNFWCxL5zJ{&0y810JIq>v-4@M9S3G?R0 zOB(+>H-7X8J#HLqe$t~$)ev0g@a5hPuOofqbatod*I1>Go{0r0C9Kl3hYx;asP%R@ zGW-FEb8h&riHIkiksts6gYHc-We>e~i<-UJr9p7{`pbV+dxB5pdp6AUqX<^^`)c=+ G6aF6xzDY6w diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/red.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/red.png deleted file mode 100644 index 46ccc784b21deee0fe715f844f374eab23d81d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6962 zcmZ{Jc{r3`*#C?%_HFD-ga%o&4U&=!8Is7Du`gM&?`xJBg&~x&C!~~Sv6WphSt4tT zeI2qCSrbCMU;rR^|Fi(%y9X1ejbQ#7;|;$EzID(; zjlLFaZ;}%UM80z#>23OmhE-?=yzdk=ctHhslBcrhB{1S(xTi_Uj?1MQHD8aD{o|#b z{PvKgzP`VO%X^oW{~1f)N4pozZtVPBIMiufj*JDpu1xz_4|D=5qoYNc&amk4q3OV;77sa`SgWe{quwnZ-l5E5*eSQRYC(dc-7)Q1*~M|i z=i@y&s&GsN?U*uPFIL~CWtVZ+IU11tFWfC_3s^5YMo;$rYXdq0@5@7?CNcKM2J4)$ z1DD-H26YD*cR@Ko`G=J+9&TLc9{wtBE;YQk@!`C=Cp%<#3`Fsww#*-TIf+)~Grga% z%bWPVY#sdRv7dxW)+GilAuVPt2pXs$-9|v^ZkS7U)X{N*!U6T5IQn&|#2ho~<2SoU zM_$r|XZ+m5-()*S5fo<12l!Q3P(AGJG#qo8ZVEv^=G!@{ElK$WfPG&^f<7I6i-m(j z83LpO-nZW+T`o;$+hA%!RU6i6y0tN1mt|Ne>9{m~A`IJvHkyQ|y_( zlJ+(&Z@GzKUuBCvNPa9bXtOBXTy?<~sKeO+(0YhAU-vNgebK>kB!VGf9U&&?&!~oF z>@~R}U@#^fo(NfUQ&Cfeb<2NjJP(nTz*zbttf1jUiSg1uMFh8{3GO0c6tK)C-}ipw zy>k{iFivz+(PhB<+&(b3^KioXQ_pWV3M&@H(+lBW_A4;1%|?rD`BFVPwwX{P;dy&+ z_3_WNxg#!a8oOMJ(Oa)0kixile$Rqqul@>GZ_w^I)G|Tb6219gD1oAe`xN@8vXD}Y zA>lTonC^Rzyo*!Iq8~1y$YVx%?)_zxdl|-kPpB0bU97d-OMN1-F{v(<`Lj26%2O$s5!^ecmmM%YmtD1%CZ1THU#CWcU5z5Fi(u=M1 zQwhIqGq-1MhzlJnf|clI*mOiUa(h%*j)eAA1Ee4>$8H6fy;6f9j^T02%g*p+!Vr6V zhu2>--r38!q=dZ}k1df&K!4E8gLd7;YO#HmP4N8M)v%%XJ*+!=P2b13B}*%}hv#zk zH>LSA6=qxo20<|bO1zSv^3xQ zZzRe2W@-5!w^Igxes3&qXi5-Lq$0C#{-}APYI( zoz)VkAA0Rzh;am*m2k-Vf?BORSh9IoWdncuDnK@nE!7gm$;Gpc0!|*hJhyigTIXZc zk~&8I^-yexwGL81sC;IoaeHs)kCbz$+@^{P)7VC30Lp*dlnpX_-G{jT^XBy1(HtG{ zJ4{4VQ1rS6LaOOu#6%42@)2*fOeKkl^baS4*`VX-o0cZ9Y5AH?sq%8+!b0Cq5g&BBKGn zv6^&_P=`t>&qp3yG2hcDM@>mqzNC%?qr8X7z8Z(iewmie1-LaG((5gASglVu#Ogjp zigFKIwm_4B;ux=RMDq(0?<`l^7tlT(+q)$6oka~1Ld+zt)~1-gZbT8_H9X_0_rtAY zwT^#@hS4|UsuXCBf1;>dZfZ+|(AnL57v!x+`#`X|`w_KciXD`Ic5^8D>)a zt24Bn^CIH+fnFA#$XIKARgX|1b88_h3y(gTgCRG{ytYE*>kua?GtjJlpY=tyENyS# zm--nHo7LqSIT7?HZITJD412T6WD#w&Q*DBYA)c|xW+S_T4?8=w<#Uyc7H!}=wGRoK zDf>NOt2dgPl2qLQ^VdU)W)cTe29_Zk&M(E-pqfAE=3&#l!S#q0eQ!)Xq%7A;4l4I8 zC+D0?3(J{;W>br^%}Ha*_JkLnaw<@ti_sgm1+6Uny0~Muv;;@5za_$*_^h~O5~7N- zE!jP|V}cCU6H`Blp+Cv(azeU7**h(UF#9Tgu+&MJ znkvaw6vwm132pi}q}UUQVEEY>p@qW19@W3I+lEV|^U}Le3!8N))WI$q!W&Y1r zVzwn`7bHew5*j@UBE7EoSOtIB^{L_~m@{Mfrgqd{7gYB<=$6qVx zt$L$K0wKTYq_UU5A(1gwKe5?%-GA>0jK1{Fw5+I>T!{WLa6tBBXGU=^|2i}Da#n_L zi9_;Wx5w}3jRlBgGzF%#(v^jNkB5d%d&18;-U`b`+BiwE$4OKR5ah0}7_E?j&mXmN z^@s}RT!!kLY2Y1eU6?&5Tlp`!B{m|zwKR)jT*T7Cr}e&%^|7T;8Ba`0O6oICf*h*yb6aqWb>{VSoy zLWWA5Fl(vo6+X6PmEq1;`7Y+1$(uvqIrt-Qma(RkO*3l~cST-9|q(R@zx87WT0@vTJ0rcr$N$ImND% zax6`LC$m|rPM=h*QH=4MKGf7HlmcO7K>UrX4RRzzo~%cOQRb&m@`Mq79&6R|e_h|$ z$sWMvg%%6M<+(GGwc!nT25U!iVW3r4DtQVeO^_)x zC}8~}!%kl4e0_m|qbCN5kNTYgs3RGHpJcLWvV9b&|S^m`(Z7gLLVA(@}_+ zMI-5pALbC)Yz6)p4Gu=B&{6S>%REYw)3yn<^k#h7SzSWE7WWt4gGW>-)s41_gbSj* z4*aA?tmIPqOCT-raFW!Ym!R{85#{Y|$#UcbN`8k<4m5NUkfFzFd-5om&RZzJYn|U@ z#k)-P192~zZk1Qsno$B_AHbAh@Le4wFCH+i~uRjjkdA~IDeXL`DbBt7r-RA-U5$P5Uv*^0l$C5$$$Z7%NC$ zeDyx#Mnh#s{dXf`jsY(g)>Fjd%@Gi?o`d*GpDwLR6him&W|pRSrXPQ#^LEr}wYPwY zB3v!isyNy~hfw4L4QjMKhsYEZCsaWR zD^K`nfN5@!iG{s_=dClTQV70!e-Qd{Gar5^5zKD)Rh%HU1PjP+E{)3bPmm%gk*lD? ziF`Sw6L}s^2;#%YwDA)*#7a7YGQJr?gFsG4N>#_qO_e_`)nK!AMi5!$6%e(~G^~c9 zFeUxJ_Fs1awn6pR@Do)pfj)iHEC{c5!&9J-58%NN}S~`3920vZ`XYrbL)X#C8eOxX#*tFEqw+R1Wk3Xe|1rK}}tFs!D)tz}297 zL%eh~hoCSk8TMZ(ma?~iyzI&9c+!a zgz5ihvdRW#8w=Rwo2Ry{18^?*WkXG=z?A!jG^>bIX@`@bo^+(-R4;}RC2Gr5Ilh#6 z>bfg$8us$Zn|v3%C8Yn$Ea0A;LP}gCEPNFzTb=FNB*#t;rL_OI&XN$j+GW^Up@ws( z!a&9hQ_4O?n89!GblFYa45Hixxu}vhujAD-OH(y?@`w6f8}^=U5I`38BVkRr|GPiqQ5C+|~SvsTr~A{PAPP14NIf zqJh&(X%?C)<&C!Tgv#k2`U_q8=c|eUe$W}W3y5hAW7p3-7og5+FavG&*8s) zwedYQY28okL77J-1UUta?O3m*5@O}?y<~E}Ut6@+AC^6Z`bM?ba z7B)NU?kI3?@xPP)ill9xmlo3+3Jr(@SMHntRcfzL@VUNpm<7R9ni(6iSXTQpZhmLhXDL9OP2hW-+sK z+3J@x&41nY3)f=$R#_#UuJlhsDe$qnT01<^=jnQ!R{5z{6P~d9A%##pHmaWX*B<8U zBe&6^LD7%2`t|S=wGX?~VQPOLm5HJelE;7s`MqHiVsr_O@byJG~P!)>B)_rBLn@#9D|fRhfzeS!SA^!+%(we$X|8|R?8 z@m9{MoI^h&V$CFuoEI1heoNC*Ln#&{_$lT(6#11Y1LEr+G*e&=w(8|+*L7`?#S?#W z_RW8CBJ%L@cRWc!?teuhzOzHdm0yIS%H3&Nx;UgQyCH-(Y$Qe8?d|oJY1UMvEMxu% z`O%^eYctojoSXkB>GW3krzecjWxbjP7OQX+HJ!m~dwy6R>zEtoNIN?#liBjNJ70f88YX~M z#&?;i8LFr8Q{;mmhc9)aS0iX4(18e*)G-+b{nIiHFFs)p@q2z5X`Fym50Tk4pf0J# zCYAOy=KuJ8sh3IqyuXpwlEibJDa-ARjI2@V=assaOBZAntMCv02?gFAy_+u}DO+Iv z{Lu+pj}S|`Y;BvIa0_VPpPHi@ms{%NCvmW!uG-GhbCx^Znmw8~qQ<1v%pzRJcxP>R zdf)9Oqg5~IgVkKT1p)O7da#q~Fb?CfCsg6f5=ofi@bBTqa?^vdDUbag@P*J6algC? zao-wYLu3c&e#vc)(l!~TlSfbsux4}4aTfOMkeGe<9|N}nZlL7JIqwr4+mV|V)4!w- z{ABNe%f7D7GO7!>mIGSop60$_$Gb1sP)#ZA7u(KxI02us*n!XFz7WN~TJ)n{qgr+I zh)oxTlr3KK2VVi`49Vror;kWmHywH6R?F<$I$v19R z|FNF!KtvF{!gyldl2*%irS~=%Kbp41K_UXzca6Lbm^ZCdP2bcLuZes`?0?6}Bze$i z8`KY4#5BV`%=A#M1}G?C;{hq-7yDn@!x(Wc0Awk1{>^~%OT0)BC_q*;sAI#4nA3cF4Qjd?waivMw^ z7+i;fk)O3;!Tq0w>8>zGbD-Ky3hVCwuq~!fB%ZOlwMB_{zv~OG0JOl__@w%0l)sc! z0P3tRlL1RhepfFsV9dwZ>>Q3r^#InOdJ|%`C>(9i;ZvcH*85XrbCZa+YdRYsw8`P* ze9BaJ=vCO>#S16!4JlMT6S8@T-2-gU@h{To?YT)D^RAgirn3{#Zw>sU1jb}X_f8+Z z_xBm5242imvF~eF%LK6R#3rr(S@o8S_l5*WZ0#&`Px<2A=YaE``$$S%?9c9hL4{Y< zY8WuzlGk*WxqsWyLLV-D$|Ha#=*7RG^v*3Onz`>`LM)T1RQIovvz!umWBzC`xiA$Y4BS8FTu1q#E9&brWQ~< zFoz|rmwa^{@7)fv?El;G;K-BmbZX7QaS}Xr?FQLVKkdo+4zCT>2wcjstaGMDJtsC5T`3|>h-`Gxfw9tq~sOyA4+&K%5U1BxSaGvX~R?` zg=%y44A(vfRcBsG@aqkB;3#+HWD{`A+2iSxz1OCnlmi{->2VK}O@{~kJ+%{)O?ybV zOujmdXtn)JnWxwIjekKdYJU(7o!2u(fPOL>@+X)p$fNu^afClP3LJx-WZ(1HH5dC-~Qqc>MuuXZYvs2kw zyS<1?H5&cy?C3Z$!4X#lqxB4jeL(9{M8a7fo)y~<1DW^tblyt7TjILMYX&MZ>x(S! zSkrA}1Co+25*)dgEy@|g#+|pfk5NXdt~z-U<{!}!qS!fPodi{nmbLDuoYPt$@#;QI zF&Ez}0`7ii+yEi9) z+PaQ=A6*Zs=W|@e$WS-;zrZYyCPBJ{eFv;o%E-K~;e^!<+8(W&$Cck6| z=K}t@{ycu-Dt(sxp!dLFWfzohEZT*sF*Rbo0gom(;m0;201y|}*Mqb7&0Q*IxT@QZ zXuEMHrgLu?{--7%J!M_Mdi&my&LLctvks^AU{jgu+0p2bR1>{s_HNhbiprMmqwSN5 zRBjK$G%n}2g?YS=liRfn`>b0U`HCIdvdhH>4~m0}O%k(MaVg%91#QHP$rQ(HmUn*c zNx^?8insa1_U=`;vwZ^?w{D2Hx!>9P6VbcZg$sV6!8JT|Yim}kbT#;dQ?<8N$LXiW zI_(P5Vxe8?6GUDyyg{Dr+dJYFetOX)9}Lt6o&3-IbM-Tu^TR55U*o z)zdxl{}0&J-5932oDce^7Qi#zT+I=rsN;wQLwHfOzQ+d7~F(c ITyu*5A970lmH+?% diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowDown.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowDown.svg deleted file mode 100644 index b2d1b618..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowDown.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowUp.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowUp.svg deleted file mode 100644 index 66e22bc0..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowUp.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Back.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Back.svg deleted file mode 100644 index 6bafc58e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Back.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down1.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down1.svg deleted file mode 100644 index 151da15f..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down1.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down2.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down2.svg deleted file mode 100644 index 341eae88..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down2.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down3.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down3.svg deleted file mode 100644 index c9ecf554..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Down3.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Forward.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Forward.svg deleted file mode 100644 index b5fb7294..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Forward.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Package.pkg deleted file mode 100644 index ad0c4f74..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Package.pkg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - ArrowDown.svg - ArrowLeft.svg - ArrowRight.svg - ArrowUp.svg - Back.svg - Down2.svg - Down1.svg - Down3.svg - Forward.svg - Up1.svg - Up2.svg - Up3.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up1.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up1.svg deleted file mode 100644 index 8d7c90b2..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up1.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up2.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up2.svg deleted file mode 100644 index c9bd419a..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up2.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up3.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up3.svg deleted file mode 100644 index ebbaabda..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/Up3.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Off.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Off.svg deleted file mode 100644 index 86d9b23e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Off.svg +++ /dev/null @@ -1,63 +0,0 @@ - -image/svg+xml - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/On.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/On.svg deleted file mode 100644 index 60381b9d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/On.svg +++ /dev/null @@ -1,65 +0,0 @@ - -image/svg+xml - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Reset.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Reset.svg deleted file mode 100644 index 920e7f31..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Reset.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Stop.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Stop.svg deleted file mode 100644 index d8f7edd6..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Stop.svg +++ /dev/null @@ -1,63 +0,0 @@ - -image/svg+xml - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionFail.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionFail.svg deleted file mode 100644 index 2976234c..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionFail.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionOK.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionOK.svg deleted file mode 100644 index 96270f8d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/ConnectionOK.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Network.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Network.svg deleted file mode 100644 index e4c1c88d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Network.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Package.pkg deleted file mode 100644 index f31c93db..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Communication/Package.pkg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - ConnectionFail.svg - ConnectionOK.svg - Network.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Calendar.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Calendar.svg deleted file mode 100644 index 22271374..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Calendar.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Clock.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Clock.svg deleted file mode 100644 index a8a9df74..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Clock.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Date.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Date.svg deleted file mode 100644 index 464c8a5e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Date.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Package.pkg deleted file mode 100644 index ecf9a618..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DateTime/Package.pkg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Calendar.svg - Clock.svg - Date.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Diagnostics.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Diagnostics.svg deleted file mode 100644 index 3f9dbfde..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Diagnostics.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Calibrate.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Calibrate.svg deleted file mode 100644 index 69dfa674..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Calibrate.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Contrast.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Contrast.svg deleted file mode 100644 index 76e50192..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Contrast.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Lightness.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Lightness.svg deleted file mode 100644 index 1c2aff73..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Lightness.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Add.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Add.svg deleted file mode 100644 index 78b093c2..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Add.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Character.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Character.svg deleted file mode 100644 index 2b3fe701..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Character.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Close.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Close.svg deleted file mode 100644 index 2aff986d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Close.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Copy.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Copy.svg deleted file mode 100644 index 42500f6a..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Copy.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Cut.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Cut.svg deleted file mode 100644 index 5f97d206..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Cut.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Export.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Export.svg deleted file mode 100644 index 4f012499..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Export.svg +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - Layer 1 - - - Export - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Favorite.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Favorite.svg deleted file mode 100644 index 6727b156..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Favorite.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Information.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Information.svg deleted file mode 100644 index 91d4c623..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Information.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Insert.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Insert.svg deleted file mode 100644 index a4f97442..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Insert.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Maximize.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Maximize.svg deleted file mode 100644 index 2dc68d9d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Maximize.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Minimize.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Minimize.svg deleted file mode 100644 index 0b86de54..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Minimize.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/New.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/New.svg deleted file mode 100644 index ba075865..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/New.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Number.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Number.svg deleted file mode 100644 index 9da8c1a1..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Number.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Open.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Open.svg deleted file mode 100644 index c4d731ea..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Open.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Package.pkg deleted file mode 100644 index 460cf8dd..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Package.pkg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Add.svg - Character.svg - Close.svg - Copy.svg - Cut.svg - Delete.svg - Edit.svg - Export.svg - ExportArchive.svg - Favorite.svg - Help.svg - Information.svg - Insert.svg - Maximize.svg - Minimize.svg - New.svg - Number.svg - Open.svg - Pin.svg - Pin2.svg - Redo.svg - Save.svg - Undo.svg - ZoomIn.svg - ZoomOut.svg - Sort.svg - Filter.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin.svg deleted file mode 100644 index 1a2bdef7..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin2.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin2.svg deleted file mode 100644 index 0220bdec..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Pin2.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Redo.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Redo.svg deleted file mode 100644 index eb82d4df..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Redo.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Undo.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Undo.svg deleted file mode 100644 index afc6c6ba..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Undo.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomIn.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomIn.svg deleted file mode 100644 index 5a3a89b3..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomIn.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomOut.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomOut.svg deleted file mode 100644 index 0c6107b5..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ZoomOut.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_help.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_help.svg deleted file mode 100644 index 141eb0a9..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_help.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_settings.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_settings.svg deleted file mode 100644 index 4827dfaa..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/04_Home_Manual_settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_help.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_help.svg deleted file mode 100644 index 3eaecf0b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_help.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_settings.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_settings.svg deleted file mode 100644 index 78301d08..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/1_settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Add-08.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Add-08.svg deleted file mode 100644 index 9f923d3c..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Add-08.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-03.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-03.svg deleted file mode 100644 index abcc86c2..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-03.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-1-14.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-1-14.svg deleted file mode 100644 index fde65b4e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm-1-14.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AlarmActive.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AlarmActive.svg deleted file mode 100644 index 60a6e221..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AlarmActive.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm_red.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm_red.svg deleted file mode 100644 index 33d47968..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Alarm_red.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Audit-18.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Audit-18.svg deleted file mode 100644 index 858e607d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Audit-18.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AxisGear.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AxisGear.svg deleted file mode 100644 index a7409a5b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/AxisGear.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/CurrentUser.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/CurrentUser.svg deleted file mode 100644 index 7470e25a..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/CurrentUser.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Data-22.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Data-22.svg deleted file mode 100644 index f486594d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Data-22.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Delete-09.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Delete-09.svg deleted file mode 100644 index 571c8fca..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Delete-09.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Diagnose-19.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Diagnose-19.svg deleted file mode 100644 index f4d2fa2a..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Diagnose-19.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-07.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-07.svg deleted file mode 100644 index 3ddcdbdc..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-07.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-1.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-1.svg deleted file mode 100644 index 3ddcdbdc..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit-1.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit.svg deleted file mode 100644 index 4c103220..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Exit.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Help.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Help.svg deleted file mode 100644 index f31cdc1d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Help.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home-11.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home-11.svg deleted file mode 100644 index 798e8f92..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home-11.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home_Background.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home_Background.svg deleted file mode 100644 index bc052cf1..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Home_Background.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Language-05.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Language-05.svg deleted file mode 100644 index 48f49a30..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Language-05.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Login.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Login.svg deleted file mode 100644 index ac1564ca..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Login.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Package.pkg deleted file mode 100644 index b2021c71..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Package.pkg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Add-08.svg - Alarm-03.svg - Alarm-1-14.svg - Audit-18.svg - Data-22.svg - Delete-09.svg - Diagnose-19.svg - Exit-07.svg - Home-11.svg - Language-05.svg - Parameter-12.svg - Password-02.svg - Recipe-13.svg - Report-17.svg - Trend-15.svg - Untitled-1-20.svg - Untitled-1-21.svg - User-06.svg - User-1-04.svg - UserInformation-10.svg - UserManagement-01.svg - Settings.svg - Help.svg - 1_settings.svg - 1_help.svg - 04_Home_Manual_settings.svg - 04_Home_Manual_help.svg - Exit.svg - CurrentUser.svg - Exit-1.svg - Home_Background.svg - Alarm_red.svg - Export.svg - Login.svg - SetLanguage.svg - AlarmActive.svg - AxisGear.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Parameter-12.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Parameter-12.svg deleted file mode 100644 index 583000f0..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Parameter-12.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Password-02.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Password-02.svg deleted file mode 100644 index 724c33a4..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Password-02.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Recipe-13.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Recipe-13.svg deleted file mode 100644 index 50b624f8..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Recipe-13.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Report-17.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Report-17.svg deleted file mode 100644 index ec6f6cbb..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Report-17.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/SetLanguage.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/SetLanguage.svg deleted file mode 100644 index 89a50e71..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/SetLanguage.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Settings.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Settings.svg deleted file mode 100644 index f5332692..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Trend-15.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Trend-15.svg deleted file mode 100644 index aeb20e0b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Trend-15.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-20.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-20.svg deleted file mode 100644 index 8b4304e4..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-20.svg +++ /dev/null @@ -1 +0,0 @@ -Language \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-21.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-21.svg deleted file mode 100644 index 6f2d3654..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Untitled-1-21.svg +++ /dev/null @@ -1 +0,0 @@ -Admin \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-06.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-06.svg deleted file mode 100644 index cce36ae7..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-06.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-1-04.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-1-04.svg deleted file mode 100644 index 7470e25a..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/User-1-04.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserInformation-10.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserInformation-10.svg deleted file mode 100644 index ea621530..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserInformation-10.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserManagement-01.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserManagement-01.svg deleted file mode 100644 index fd1f99ba..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/UserManagement-01.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Browser.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Browser.svg deleted file mode 100644 index 5e9ab729..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Browser.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/China.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/China.svg deleted file mode 100644 index 064bf28b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/China.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Flag.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Flag.svg deleted file mode 100644 index 87eb42ed..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Flag.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/France.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/France.svg deleted file mode 100644 index 5af52bf6..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/France.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Germany.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Germany.svg deleted file mode 100644 index 15c2d860..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Germany.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/GreatBritain.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/GreatBritain.svg deleted file mode 100644 index bfd5be8d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/GreatBritain.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Italy.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Italy.svg deleted file mode 100644 index c607d902..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Italy.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Language.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Language.svg deleted file mode 100644 index 5e87685e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Language.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Package.pkg deleted file mode 100644 index 765a33a4..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Package.pkg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Browser.svg - China.svg - Flag.svg - France.svg - Germany.svg - GreatBritain.svg - Italy.svg - Language.svg - Portugal.svg - Russia.svg - Spain.svg - UK.svg - USA.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Portugal.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Portugal.svg deleted file mode 100644 index 968941f8..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Portugal.svg +++ /dev/null @@ -1,841 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Russia.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Russia.svg deleted file mode 100644 index 31c97650..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Russia.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Spain.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Spain.svg deleted file mode 100644 index 5964ea07..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/Spain.svg +++ /dev/null @@ -1,1999 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/UK.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/UK.svg deleted file mode 100644 index c5608d0b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/UK.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/USA.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/USA.svg deleted file mode 100644 index 8f1388dd..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Localize/USA.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForward.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForward.svg deleted file mode 100644 index a169291c..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForward.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForwardStop.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForwardStop.svg deleted file mode 100644 index 72ba417c..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastForwardStop.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewind.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewind.svg deleted file mode 100644 index 582135fe..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewind.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewindStop.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewindStop.svg deleted file mode 100644 index b0a29d90..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/FastRewindStop.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/ForwardStop.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/ForwardStop.svg deleted file mode 100644 index f55cb28f..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/ForwardStop.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Package.pkg deleted file mode 100644 index 9f83f8b6..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Package.pkg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - FastForward.svg - FastForwardStop.svg - FastRewind.svg - FastRewindStop.svg - ForwardStop.svg - Pause.svg - Play.svg - RewindStop.svg - Stop.svg - Video.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Pause.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Pause.svg deleted file mode 100644 index fc5ce7be..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Pause.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Play.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Play.svg deleted file mode 100644 index 274d471b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Play.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/RewindStop.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/RewindStop.svg deleted file mode 100644 index 0dce7e63..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/RewindStop.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Stop.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Stop.svg deleted file mode 100644 index a4e45c31..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Stop.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Video.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Video.svg deleted file mode 100644 index 0d3a9099..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Media/Video.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1long.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1long.svg deleted file mode 100644 index 1033f845..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1long.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1short.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1short.svg deleted file mode 100644 index bbf93133..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle1short.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2long.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2long.svg deleted file mode 100644 index 54b9214b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2long.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2short.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2short.svg deleted file mode 100644 index bde4951b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle2short.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3long.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3long.svg deleted file mode 100644 index 117e8186..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3long.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3short.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3short.svg deleted file mode 100644 index f1a6a2e8..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle3short.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4long.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4long.svg deleted file mode 100644 index 9676652f..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4long.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4short.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4short.svg deleted file mode 100644 index f66a8cdb..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Needle4short.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Package.pkg deleted file mode 100644 index ca531131..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Needle/Package.pkg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Needle1long.svg - Needle1short.svg - Needle2long.svg - Needle2short.svg - Needle3long.svg - Needle3short.svg - Needle4long.svg - Needle4short.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Package.pkg deleted file mode 100644 index 6d40d353..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Package.pkg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Alarm - Arrow - Communication - DateTime - Diagnostic - DisplayAndTouch - Edit - File - Localize - Media - Needle - Symbols - User - AxisControl - Icons - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Accept.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Accept.svg deleted file mode 100644 index 8fd49c9d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Accept.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Button.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Button.svg deleted file mode 100644 index 3b5dc60e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Button.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Cold Restart.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Cold Restart.png deleted file mode 100644 index de80d6e1fbda5ad4540d0763c28fc7061861ee3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2561 zcmV+c3jXzpP)iFZRl7rVQ>xUtO~Uc76`s*#P$Rt_y1%w=Mx5eJ}VJLG4|?elNurzc;(c+{TG zkE^Z50VmvF`F{~G#O}D8O79uoaN}n;-|?Xj-1?zqEFbE^)IpI~_Ju$YK+Op`H)-+H zBWHR3*`u#cA3wEMYuHcJ!>5|>nLt9^`+?M&wcq^6?j4(V-S&P4dsJK(+HM5KTW;dY zkCYJ8K-C~W*JAA1U-F}WdiGG`%#ysg*@%FJ zSilnz0oRZAYfAKAN0AUT4dMwn{#udm?0Y6Z`IDc0qS^lY1Mf&65!ViF8~XK5QJe!5P~8Ft`8~wisq>VlemVwyw{5(ykqtwL9q$%Z>_-}KVt&t4MwW19-MY^w#qRx$aKEJjNV99lvKwz)S+^>bFPA#t zK?sJf^0~X0vvN@afYDV66daoE6rcm(G~29REa);K?SFq$nr!XO}- zHdu1~4J+qPp4_^)mjAAiPLrRSprK@QJS+;iVJBj{T2r zA7W82%ogXdEGs%xagK&v$6Pc#YRHfENs&m5Bzgx1%kw45r4rR@m1?z0*{ZPp!#Tvl z`*-SWiLd>`NxW7ayH?}qsmmRpW2Z0EYTC@qmigk>e!)cE1|X(M?)t49^Chbjw_;h8 zN+n{M-keCpM^q)19Fp;*TCdL2Y_(CO1R*f=7#r92cR;@X<2NW*>SW9~Qo{GfU*pnD z6$BhQl1CCELbxUyu=tWldf zfm5;3l6?edEb2EI=#7fZ^#YEaoS`I(E4poh+y4Ch6TMb;# zLy-#v1ZWGL$Maku>Uy5%Q>r+$+CG{pQ5A_ILz;~`ifG|A=JD#1WGV)#Ce$$SODHka zWFJU{pg9k=Md3n=X0wHs($NzNs#l;gU7(RNQ4|fKs0bk!)DR1=T0pzeBtDQsPeeVU z)pD6ScLZnZ0%2H#);zLjG59wT3d*YQHfKQivDAPfG?Ortpv5T8);KpY!}>MLQKaOK zTSoY==a1le-5^vD3J6K(drSzS52Xs5|9CBmjO^zoX2@SWOBgs1x*#<)a}d;oAGqyl z>ACImZrds7-6N=p9*{9mb^J!a*nwl6B7E?^+gY)G1=!8#^C$wqzxJusS$_R658k)A z<2QETD8B81s)G_o#L^@(BLrSh@V)j0>C8S_bV`L|iQc8eGs7S>ka0+w?0fP*D9%>_ z$o80wJ@HxIf5S?s2GEq?tI^W}Djut^U(VR$575_R0#KZ<@$Dyn0!cH9DKxZXmSo=w zTDEnpQFvrl0@Ml<l@XvVoEB7!udL7yR zKC%N@Mn8BR4?lD_hoAWZH>@7&?ElPP{D8uxDkO|ZS((7dE=Nlb(3s1Q!@@j}82Que z$Zvn-m?C2%6UWA=&*woiK*XRC@W7vJAAgd)`wm0OjAEc7v?N_aYe^1_P`-5L@0u6BJ_lFL z1GQpdpEdK^-P!kTxVhP|nY(zJFjS)4r8N$|_$EJn`El;ryo#M$RNZp$Ld42x!x8K6OW+Y4A_~rF0Zr%Bu z2$I?S>HnlOb%79xP-93T@PiQC5H+dO-GOCk2dOCNdJ@w#Nu^T6 zVsR8zMIfRE)NaveG^o{T*tU)5xkxpJnH{8m#TwLOzhTprHpz5%lQz@nNu5|M7L9D4hvPWdwoSEC!KzenQAiIg zp?m2{0$HEC^vVnO*IxMI_^)F9+KY+4>8l%t*Z$@=GX1MR>{>O1Jxe@jp~p0gq=At% zh{xkdDQLScj?W%^ct|=fNhMUSk9jZt zdHvU6ysOKpy5n!MW^eAUo`I#i`m#eC`ZJkakEzRaQbPbW$7Qb82xd!GVRmljcxiTG z%r0I2q4(o2%)L|WcSYdpCI4`5PE90NsBvRZs+s{1_-@^8HfH=*<6Q9crwi{C - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Download.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Download.svg deleted file mode 100644 index e9fa2fd0..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Download.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Energy.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Energy.svg deleted file mode 100644 index 04e5f76d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Energy.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Engine.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Engine.svg deleted file mode 100644 index 8ca90c58..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Engine.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/EngineReference.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/EngineReference.svg deleted file mode 100644 index 2e5a5a55..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/EngineReference.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Graph.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Graph.svg deleted file mode 100644 index ecae5993..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Graph.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Hide.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Hide.svg deleted file mode 100644 index 742afb30..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Hide.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Home.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Home.svg deleted file mode 100644 index 228e91b4..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Home.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/InProgress.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/InProgress.svg deleted file mode 100644 index 18c4bf99..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/InProgress.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mail.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mail.svg deleted file mode 100644 index 646c7e42..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mail.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Max.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Max.svg deleted file mode 100644 index 0c5fe363..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Max.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Menu.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Menu.svg deleted file mode 100644 index 4aa0a02e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Menu.svg +++ /dev/null @@ -1,76 +0,0 @@ - -image/svg+xml \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Min.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Min.svg deleted file mode 100644 index 2c4a57e1..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Min.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mode.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mode.svg deleted file mode 100644 index c3474107..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Mode.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Off.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Off.svg deleted file mode 100644 index 95a6ddfc..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Off.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/On.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/On.svg deleted file mode 100644 index dcd28f99..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/On.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/PDF.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/PDF.svg deleted file mode 100644 index 3e8b1b66..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/PDF.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Package.pkg deleted file mode 100644 index 0cfc2fa5..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Package.pkg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - Accept.svg - Button.svg - Conveyor.svg - Download.svg - Energy.svg - Engine.svg - EngineMove.svg - EngineReference.svg - Graph.svg - Hide.svg - Home.svg - InProgress.svg - Mail.svg - Max.svg - Min.svg - Mode.svg - Off.svg - On.svg - PDF.svg - Remote1.svg - Remote2.svg - Remote3.svg - Remote4.svg - Reset.svg - Restart.svg - Robot.svg - Safety.svg - Server.svg - Service.svg - Settings.svg - Slider_Symbol.svg - Start.svg - Stop.svg - SystemSettings.svg - Temperature.svg - Tool.svg - TouchMe.svg - UnHide.svg - Upload.svg - USB.svg - Wait.svg - Webcam.svg - warningwhite_l.svg - warningred_l.svg - SyncOff.png - WarmRestart.png - Cold Restart.png - exit.png - Sync.png - Menu.svg - Recipe.svg - UserGroup.svg - Audit.svg - Report.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote1.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote1.svg deleted file mode 100644 index 72ed28d0..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote1.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote2.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote2.svg deleted file mode 100644 index f22cbb9b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote2.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote3.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote3.svg deleted file mode 100644 index aa80e699..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote3.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote4.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote4.svg deleted file mode 100644 index 9f8db5b7..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Remote4.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Reset.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Reset.svg deleted file mode 100644 index 60dfd630..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Reset.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Restart.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Restart.svg deleted file mode 100644 index 59ff0fb9..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Restart.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Robot.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Robot.svg deleted file mode 100644 index 2b30b2c5..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Robot.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Safety.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Safety.svg deleted file mode 100644 index aab6a7bd..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Safety.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Service.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Service.svg deleted file mode 100644 index a88977fe..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Service.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Slider_Symbol.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Slider_Symbol.svg deleted file mode 100644 index d47e92bd..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Slider_Symbol.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Sync.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Sync.png deleted file mode 100644 index fb49da7d7df17da0b2fcafac576fe28012cc807b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1196 zcmV;d1XKHoP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&1VKqeK~z{rwb)50 zZhsgD@Rvv#%A7J4uB%>U-pT(83kyYtGGq)9Rw67A*_bk9SeUJ3A&C_mMG+fQSx6y~ zqKJE4y#L4feb0M;=RM~gIxnBpeb4XtdhXM4##i(E&mYr2uYdpQbULjzJT&y@kI>Nn ze*L0NS~iFo{7`^mW}Tm(YeY#&Nmw;UgMUrh*w{d0!NbD?3RY`xZ%0!BR?V>}S65eu zu7b(QNffLW9UYCPg3ZlM6ihN4x~ZvYZf*`6B7c8>bQPqhr=uWhZEc;InZbq;VPRpz z!^7ARp`)m=u@MDPL`1~Y)D$*ElA#L=3)wFR2M6EZ-_y$e{(fd=CR^l{mzQ5$Tu|WX z=*ZF0ku44k3B9_*2NfvlxVeDd{Pn@7l#%~=$JuHNkKt@#>U15 zTQae+v1nt2t*tGhGIn-$_@u<(5+;Y7lAN5J?;6^{!2zF?l$MsFg%QXp`5gM24v(0a z7!z~T69`%;+1c4aPDy8Hr}`7Ixw#o34u2w&$Hzyytz=|mpv>9c-ews&`T5}N>`edN z*47paNcN?{(=GG*s_+hSe0+>D$HXPi)zuXt&dbXS%AET8dXzc*(-M&kZQ;$u;B`aK z#BF?hd>kPu`dfc|e6Y;n;i2MRo3MbMY}>eRx{aGvTwIJ6BFWGzD=P@9Vq#Ah6%`?* z%G1*m8VMvrBchhKw>KI|U0+`#p%%TWp_ky_(0O@zh*+Vww-@a=rmw0Nnw_0RJAUZe z+FH~_U-i0GRaJ$uz~0{8*aL~)=N&|fe;$+^9{LyCpr9c3V!OAur}$z^_hEJfpPZcN zcO*R?32hXVl$5YcLqh{wxxKxW?2_4W0kAQ~MVy}P@^hRASeMc?;jO=@Z?nhNx{QqwFNdVPHzT?OpO`4VGe zV`wVCsyUYCA|oT|k$})Sgr%?W{QOK;t*or9?Cfk4-}Ol7bpHbeB6RFn9i{mI0000< KMNUMnLSTYIb}di< diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/SyncOff.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/SyncOff.png deleted file mode 100644 index 335f46cecaa1d40961aacde0dec0f22c2ca81d8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1548 zcmV+n2J`ueP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&1))hqK~!i%&6!(B zR9hIw_juPyEO0RGYG#JFOu-=vjW|(M=tD&qlt|_U5yS|6)W^=#U{H}mJxFu;CK<@5O>Y_{0g*av?;C@m@R`PS$Wifv&#HYO$_B7(La+g|UQ&1Rz&3iPeN zf8h1&*Q=|mkx`L$yS=5Q)sdXMv9Uo9BW#BWn+4djXAdj>2e3~8PMWW zld(D7$cVC)Ya9o6vVG7BB7_JhZTa5kdQDnHHC-YzI{XC_U+rOP*7iA z4+pQ;yS~0YIy%ayeujsKMP>6qilYAiXLfcL4}bpriB~^+_KX#BcJJQ(?%lhYnHf<5 zp2v?LXPtkr#OFK6hU5D6>vWXhbUKrgl4$61`0(NE>}(nm8X6k-0uwYhH&aeRV`JmV zlP78Da^uF0%aKSAxoL)YjIrg$B8~xqtY{%F5y+ z4IVvuL{W=4fBrnBHNbcw71+CXFKulG1_mf9L1j2}z5w!3L}TQ6qUYM$+Vu2vOG^u@ z6~x8GiJn%Gn3zau1vhWr#K!UU>(}po78Vv@rlqB^S^*XTMI{6eM_E}J-4)P713D>a zZEdB8X)qrts(>D9^!E1BNx_>pZ|D@j_T|f$PoF;FJHLPb9$WPI_&9y#z?CHpRFguH zqM{;9@>8cy;T%y|Sctry6`??{@P(m_#OK3@56_=JXN4RbQsU#|X{dp$4}#q|#d#Y;bI#0oJu@ zYNLX3QmKN#$p*U6+W>5!3zA@Z>vHejJvPt=Ii!(;cIcHN65dhTB8=S?2+`5eEa`)l z6Y@^s;>C;N80(XtpU(yw#Kgp0xNw2q2GH3@c4%vBqqi>7qly;DP=6ip5k3*FR#sLJ zO*=a~St$n_s(zHgg1U6+5)C;xS)4t47K<|@BO_$0A_cvgoSek5@a@~T{r&w2tE`ZK zZ@IO#MMHy+A3v6ql+cia0FN+_V2`0ME-nsU$#?JGrK5u79E*#K$Vu43G)YNG)U^WaTsVVL+B68R)RhoC9Q3smN}Gmq)`9p+ z=>W36BKXtMQk+gFUtod*2M$oqQrg?w`2s((9HyzMi6se$Mh0)mu3WiNQBgrdLV0;P zOC~^2U`Ya!CWAL1IXO9p4jrPQ1BWHR#KZ(E1mWt{s|e2Ga}-{_e8~zqQBhHSeSJtw zc0AEb)(OInf_Ypn7exi(;K75UGPawMk&$cHuCYSF{rmUfiMWH4-q6qxpZdW+D=P1x zzOc1!H&rk1Rqs(iO-&6;)`3W`wRu-oR|sLHGx^d50RrxvU)k0000 - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Temperature.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Temperature.svg deleted file mode 100644 index 1c497a7b..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Temperature.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Tool.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Tool.svg deleted file mode 100644 index f6e31f8f..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Tool.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/TouchMe.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/TouchMe.svg deleted file mode 100644 index 69cc59f1..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/TouchMe.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/USB.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/USB.svg deleted file mode 100644 index 40d6ec18..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/USB.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/UnHide.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/UnHide.svg deleted file mode 100644 index 5bae1efb..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/UnHide.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Upload.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Upload.svg deleted file mode 100644 index 07cdc72d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Upload.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Wait.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Wait.svg deleted file mode 100644 index fb543925..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Wait.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/WarmRestart.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/WarmRestart.png deleted file mode 100644 index 1c7d8fb0ff606f3b5f8e78a7cdcbe530b2b842fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2360 zcmV-83CH${P)Z zd$3hy8ODF#`qpLN_dYi`=WH&e0nmp zwL`7|h5-l&Jg{moI6$y(KX1JL?xA(B9)4lNK=bNq{QSG0n80-Pi;EsQqjLX6=S(Rx zelirBpfrkn0a9rYfa5@|2GvRea|F8IW9!!41Gn!;uYA=j|1yr(edOm+KFTP?;>>l$ z*-viz{J_%}ozhw+lu)-J2tg>IYLH4LFh-%ONwDuHzM;yT)7slMom*XdbJL#ns#w%? zLIf1CIJKD#b)GZ6kvalToD+;-3Y}dm5UAbMrL&wcPUMv{@ zgR%SXk3*Nb?c#YJj^iZ3RTIB50+~#*$ojgWUOz&>wxFjQl!RE&+fA)frCzUNSr(q> z;rRhx;B!msKksZ2SD$*^49rV)-Ed0UZ0k2&0HP?uvMkg%M$hLd-2OwDF$;RSVD-(`1s zi>sD{@B0KnKoA7ft0r~dr|HKJqs^KPQo@9jh#ea$l_La3Mxdz~G!3#jQj3>RSbi7g z@Gw@bMi_e!<&Os1hkJz+*=N7VO&1lpz zAAf|(j%@^C(69wUP=Co;JgNbX~xi8 z892DE*KqVKkJRLGO#Ifj8%Ym6{wRH`eu`<^c;S(A#a9F)AH2^8H!NcK#f=U7oP^4TUrs^Y~u{;+yjBvvcCk%1@nDXUUpyu)b)b{LR--AD* z9>r8`hoP4@5!Gr$w#Cq<7co7bYSm=-cW}?LXq+{3#of?k~0i(qlmg6GD!}f zp{Yw$ManqUrdS=8A7TPkz>Pr)7<1vpjnVWzvkq%u0Lyi$`9A$Gzr^lK=dtIKdGu}k z1GON)_I+x72RZQgFB);3mtICB!HmHq!AJxp>SGNVmQ-COk5|thh+<5j2pBP>@;bRG zQyYn_J-g5{8H5l-VTdmT{{H;{#8MK6AwmfBY=-(fXXOD1g!)JRYCEkW_pTlmIM?8=l}vd)4}fTZX`-inoR6_D2jrjC`c)hQlhGA z<6TOL2m-Q`rZnQbp~IM!I;MbX42L2ZjG-2*^+2kY;;Wi7q!ju(1e63c320ITsR)L* zZfPXySa>aZE{6h0DUTr`W%4cnsj0LtT-1m=yk#@e3CT&w3n-4(v6S2)M>8r)G`K3> zua14QU4>?#0HjnEBd0OA@%O}@2S9$tOeWsC0zL3aX&UKtnp7%9DwV=Wr7<)O)peM# z>^7RtyC7K`QN+RDt|wy%3PMm635hb$qmFsY8(8ft06VqLt*V};O%bFN1y$3~vsv7| zyE*imXB(p#yL1`lJ64j)7f6Kx86ZPUDhx^3HBg;7P68n>)vt^dazQ=-0crWYlnG7NMnNfq);d3pnx>1Q_*hrK<7Z@h-+ z?uIxfE|*cxnu$7LV#CMY^)|b|aXI$kLHsDjbsQ|$B_hVunul*LEcmS1wdO!Wl6|G~ zOZVTWy>`cd6C$N-kkEj1TN@qsJV56B3ptU;dgZTlE&o3C-X44uT-U*MT^z@uS&ezr znDf|%gPU)HqpssWr%!!sZ`^WdOd*3jYGrHLEQ(`OyL$!E+Evi|U&QXgKB6brQd@B= zRI6y&+>r&UD3me=2lX-LOSx%lJ`8DWbbJ59-DiEOfB7@=m8VKMffq&z2}MCqrzy6y zplsg;)he8RCXAm5g#sXwtGT-icI`yj_YS4DHrzNSG|k42NgFz8Vphx9_m1paz4ybq z$4Ihm?>)QjKL5-$t%gc2n?Z#>#@klftBP|L ze6Kp`2^m92A&YJpi5}Ec&~-=|kj^IkK}!o{b4ib&8=&c+s%W}KTP{sj5j^0Xyy1c7 zdGq7#_f-C~-beNY@!#*V*6rGO!#sQD!YzYww_!*qhj z3|(QnDF?nDpL^5Vw(}Omudh6=IGjLhrp>)~;(UMq(j}e2HD5SmVyAKH$;kq2X@z_d z6b0%g93F(O_X&3I<@KHK_5Z3{ys%!Iy2jbE@{_k_$2eZ};F!~*;kk42-uY*@XQxdV zQ|u@eGARL~Qg@uL{!0J0gSEG}R@KcrmFB-hFR$o5p}e1@JqHk1t}YM<5)cR(Ak - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/exit.png b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/exit.png deleted file mode 100644 index 1c7d8fb0ff606f3b5f8e78a7cdcbe530b2b842fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2360 zcmV-83CH${P)Z zd$3hy8ODF#`qpLN_dYi`=WH&e0nmp zwL`7|h5-l&Jg{moI6$y(KX1JL?xA(B9)4lNK=bNq{QSG0n80-Pi;EsQqjLX6=S(Rx zelirBpfrkn0a9rYfa5@|2GvRea|F8IW9!!41Gn!;uYA=j|1yr(edOm+KFTP?;>>l$ z*-viz{J_%}ozhw+lu)-J2tg>IYLH4LFh-%ONwDuHzM;yT)7slMom*XdbJL#ns#w%? zLIf1CIJKD#b)GZ6kvalToD+;-3Y}dm5UAbMrL&wcPUMv{@ zgR%SXk3*Nb?c#YJj^iZ3RTIB50+~#*$ojgWUOz&>wxFjQl!RE&+fA)frCzUNSr(q> z;rRhx;B!msKksZ2SD$*^49rV)-Ed0UZ0k2&0HP?uvMkg%M$hLd-2OwDF$;RSVD-(`1s zi>sD{@B0KnKoA7ft0r~dr|HKJqs^KPQo@9jh#ea$l_La3Mxdz~G!3#jQj3>RSbi7g z@Gw@bMi_e!<&Os1hkJz+*=N7VO&1lpz zAAf|(j%@^C(69wUP=Co;JgNbX~xi8 z892DE*KqVKkJRLGO#Ifj8%Ym6{wRH`eu`<^c;S(A#a9F)AH2^8H!NcK#f=U7oP^4TUrs^Y~u{;+yjBvvcCk%1@nDXUUpyu)b)b{LR--AD* z9>r8`hoP4@5!Gr$w#Cq<7co7bYSm=-cW}?LXq+{3#of?k~0i(qlmg6GD!}f zp{Yw$ManqUrdS=8A7TPkz>Pr)7<1vpjnVWzvkq%u0Lyi$`9A$Gzr^lK=dtIKdGu}k z1GON)_I+x72RZQgFB);3mtICB!HmHq!AJxp>SGNVmQ-COk5|thh+<5j2pBP>@;bRG zQyYn_J-g5{8H5l-VTdmT{{H;{#8MK6AwmfBY=-(fXXOD1g!)JRYCEkW_pTlmIM?8=l}vd)4}fTZX`-inoR6_D2jrjC`c)hQlhGA z<6TOL2m-Q`rZnQbp~IM!I;MbX42L2ZjG-2*^+2kY;;Wi7q!ju(1e63c320ITsR)L* zZfPXySa>aZE{6h0DUTr`W%4cnsj0LtT-1m=yk#@e3CT&w3n-4(v6S2)M>8r)G`K3> zua14QU4>?#0HjnEBd0OA@%O}@2S9$tOeWsC0zL3aX&UKtnp7%9DwV=Wr7<)O)peM# z>^7RtyC7K`QN+RDt|wy%3PMm635hb$qmFsY8(8ft06VqLt*V};O%bFN1y$3~vsv7| zyE*imXB(p#yL1`lJ64j)7f6Kx86ZPUDhx^3HBg;7P68n>)vt^dazQ=-0crWYlnG7NMnNfq);d3pnx>1Q_*hrK<7Z@h-+ z?uIxfE|*cxnu$7LV#CMY^)|b|aXI$kLHsDjbsQ|$B_hVunul*LEcmS1wdO!Wl6|G~ zOZVTWy>`cd6C$N-kkEj1TN@qsJV56B3ptU;dgZTlE&o3C-X44uT-U*MT^z@uS&ezr znDf|%gPU)HqpssWr%!!sZ`^WdOd*3jYGrHLEQ(`OyL$!E+Evi|U&QXgKB6brQd@B= zRI6y&+>r&UD3me=2lX-LOSx%lJ`8DWbbJ59-DiEOfB7@=m8VKMffq&z2}MCqrzy6y zplsg;)he8RCXAm5g#sXwtGT-icI`yj_YS4DHrzNSG|k42NgFz8Vphx9_m1paz4ybq z$4Ihm?>)QjKL5-$t%gc2n?Z#>#@klftBP|L ze6Kp`2^m92A&YJpi5}Ec&~-=|kj^IkK}!o{b4ib&8=&c+s%W}KTP{sj5j^0Xyy1c7 zdGq7#_f-C~-beNY@!#*V*6rGO!#sQD!YzYww_!*qhj z3|(QnDF?nDpL^5Vw(}Omudh6=IGjLhrp>)~;(UMq(j}e2HD5SmVyAKH$;kq2X@z_d z6b0%g93F(O_X&3I<@KHK_5Z3{ys%!Iy2jbE@{_k_$2eZ};F!~*;kk42-uY*@XQxdV zQ|u@eGARL~Qg@uL{!0J0gSEG}R@KcrmFB-hFR$o5p}e1@JqHk1t}YM<5)cR(Ak \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Lock.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Lock.svg deleted file mode 100644 index 239ab71e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Lock.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Login.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Login.svg deleted file mode 100644 index 5f82db6d..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Login.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Logout.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Logout.svg deleted file mode 100644 index e43a8f8e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Logout.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/NoAccessRights.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/NoAccessRights.svg deleted file mode 100644 index 7db42fdc..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/NoAccessRights.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Package.pkg deleted file mode 100644 index ecf6a2df..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Package.pkg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - AddUser.svg - DeleteUser.svg - Lock.svg - Login.svg - Logout.svg - NoAccessRights.svg - Unlock.svg - User.svg - UserGroup.svg - UserNew.svg - UserExport.svg - UserImport.svg - EditUser.svg - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Unlock.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Unlock.svg deleted file mode 100644 index cf6a2202..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/Unlock.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/User.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/User.svg deleted file mode 100644 index 032afde9..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/User.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserGroup.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserGroup.svg deleted file mode 100644 index 938d4b2e..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserGroup.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserNew.svg b/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserNew.svg deleted file mode 100644 index 7d8e62e4..00000000 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserNew.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Acknowledge.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Acknowledge.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Acknowledge.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Acknowledge.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Alarm.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Alarm.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Alarm.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Alarm.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/AlarmActive.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmActive.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/AlarmActive.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmActive.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/AlarmHistory.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmHistory.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/AlarmHistory.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmHistory.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/AlarmInactive.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmInactive.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/AlarmInactive.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmInactive.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Error.png b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.png similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Error.png rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.png diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Error.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Error.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Information.png b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Information.png similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Information.png rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Information.png diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg similarity index 87% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Package.pkg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg index b2b718c6..26b93102 100644 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg @@ -4,14 +4,12 @@ Acknowledge.svg Alarm.svg - AlarmHistory.svg - Error.svg AlarmActive.svg + AlarmHistory.svg AlarmInactive.svg - Warning.png + Error.svg Error.png Information.png - red.png - green.png + Warning.png \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Warning.png b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Warning.png similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Alarm/Warning.png rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Warning.png diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowLeft.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/ArrowLeft.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowLeft.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/ArrowLeft.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowRight.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/ArrowRight.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Arrow/ArrowRight.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/ArrowRight.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/Package.pkg similarity index 55% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Package.pkg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/Package.pkg index f560cac5..9fd881ba 100644 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/DisplayAndTouch/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Arrow/Package.pkg @@ -2,8 +2,7 @@ - Calibrate.svg - Contrast.svg - Lightness.svg + ArrowLeft.svg + ArrowRight.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Delete.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Delete.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Delete.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Delete.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Edit.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Edit.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Edit.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Edit.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ExportArchive.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/ExportArchive.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/ExportArchive.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/ExportArchive.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Filter.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Filter.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Filter.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Filter.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg new file mode 100644 index 00000000..ddec13cf --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg @@ -0,0 +1,12 @@ + + + + + Delete.svg + Edit.svg + ExportArchive.svg + Filter.svg + Save.svg + Sort.svg + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Save.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Save.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Save.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Save.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/sort.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Sort.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/sort.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Sort.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Empty.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Empty.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Empty.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Empty.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/File.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/File.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/File.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/File.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileExporer.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/FileExporer.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileExporer.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/FileExporer.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileScan.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/FileScan.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileScan.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/FileScan.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileSelected.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/FileSelected.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/FileSelected.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/FileSelected.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Files.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Files.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Files.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Files.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Folder.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Folder.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Folder.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Folder.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/PDF.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/PDF.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/PDF.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/PDF.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Package.pkg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index 916603d9..0b35a9b9 100644 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -2,18 +2,18 @@ + Empty.svg File.svg - Files.svg - Package.svg - Recipe.svg - Search.svg FileExporer.svg + Files.svg + FileScan.svg FileSelected.svg Folder.svg + Package.svg PDF.svg + Recipe.svg + Search.svg TXT.svg XML.svg - FileScan.svg - Empty.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Package.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Package.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Recipe.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Recipe.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Recipe.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Recipe.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Search.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Search.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/Search.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Search.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/TXT.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/TXT.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/TXT.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/TXT.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/XML.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/XML.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/File/XML.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/XML.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Export.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Icons/Export.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Icons/Export.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Icons/Export.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Icons/Package.pkg similarity index 60% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Package.pkg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Icons/Package.pkg index 413665ac..eb825980 100644 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Diagnostic/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Icons/Package.pkg @@ -1,7 +1,7 @@  - + - Diagnostics.svg + Export.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Alarm.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Alarm.svg new file mode 100644 index 00000000..db9112c2 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Alarm.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Audit.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Audit.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Audit.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Audit.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/EngineMove.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/EngineMove.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/EngineMove.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/EngineMove.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/FileExporer.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/FileExporer.svg new file mode 100644 index 00000000..89f44cc8 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/FileExporer.svg @@ -0,0 +1,111 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Help.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Help.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Edit/Help.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Help.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg new file mode 100644 index 00000000..f0cd8837 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg @@ -0,0 +1,15 @@ + + + + + Alarm.svg + Audit.svg + EngineMove.svg + FileExporer.svg + Help.svg + Recipe.svg + Report.svg + Server.svg + UserGroup.svg + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Recipe.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Recipe.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Recipe.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Recipe.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Report.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Report.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Report.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Report.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Server.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Server.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Server.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Server.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/UserGroup.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/UserGroup.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/UserGroup.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/UserGroup.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg new file mode 100644 index 00000000..556de064 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg @@ -0,0 +1,16 @@ + + + + + Alarm + Edit + Icons + Symbols + File + Arrow + User + Navigation + Logos + Gifs + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Package.pkg similarity index 60% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Package.pkg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Package.pkg index 2dc290b7..dd30adf5 100644 --- a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/AxisControl/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Package.pkg @@ -2,9 +2,9 @@ - Off.svg - On.svg - Reset.svg + Settings.svg + Start.svg Stop.svg + WarningRed.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Settings.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Settings.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Settings.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Settings.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Start.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Start.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Start.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Start.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Stop.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Stop.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/Stop.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/Stop.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/warningred_l.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/WarningRed.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/Symbols/warningred_l.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Symbols/WarningRed.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/AddUser.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/AddUser.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/AddUser.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/AddUser.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/DeleteUser.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/DeleteUser.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/DeleteUser.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/DeleteUser.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/EditUser.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/EditUser.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/EditUser.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/EditUser.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg new file mode 100644 index 00000000..77f8b5ce --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg @@ -0,0 +1,11 @@ + + + + + AddUser.svg + DeleteUser.svg + EditUser.svg + UserExport.svg + UserImport.svg + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserExport.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserExport.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserExport.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserExport.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserImport.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserImport.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/SymbolLib/User/UserImport.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserImport.svg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content index 458f8db4..c523ef7a 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content @@ -11,9 +11,9 @@ - - - + + + @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content index c3693b4a..4d6f9a8e 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content @@ -1,7 +1,7 @@  - + @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content index 370beebb..818d28ab 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content @@ -2,8 +2,8 @@ - + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content index 9d59be36..ed7de5a7 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content @@ -2,7 +2,7 @@ - + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content index 8998467a..2647a611 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content @@ -3,16 +3,16 @@ - - - - - - - - - + + + + + + + + + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content index 3452e38c..04035e0d 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content @@ -1,7 +1,7 @@  - + @@ -9,8 +9,8 @@ - - + + @@ -26,7 +26,7 @@ - - + + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content index 2161f9c7..79739d30 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content @@ -1,7 +1,7 @@  - + @@ -9,8 +9,8 @@ - - - + + + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content index 6a76611b..e8e1b4f3 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content @@ -8,11 +8,11 @@ - - - + + + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content index fae4a618..2004c396 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content @@ -1,8 +1,8 @@  - - + + @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content index 473b3a20..509aead7 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content @@ -1,7 +1,7 @@  - + @@ -11,8 +11,8 @@ - - - + + + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index b916c534..e2329139 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -28,14 +28,14 @@ - - + + - + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index ed08f2f0..4cc22e63 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -1,9 +1,9 @@  - - - + + + @@ -11,7 +11,7 @@ - + @@ -28,6 +28,6 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content index 7cc02ed4..cd2d7171 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content @@ -8,12 +8,12 @@ - - - - - - + + + + + + @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding index 2955f42d..7c884a50 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/Navigation_content.eventbinding @@ -16,17 +16,17 @@ - + - + - \ No newline at end of file + From 6ed12ec5abfc877f747cf8d05907497dc92b0efd Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 11:50:23 -0500 Subject: [PATCH 051/112] AAZM-20 - Separate out symbols and re-reference them throughout the application --- .../{ => mappFrameworkSymbols/Gifs}/InProgress.gif | Bin .../Gifs}/InProgressGray.gif | Bin .../Media/mappFrameworkSymbols/Gifs/Package.pkg | 8 ++++++++ .../{ => mappFrameworkSymbols/Logos}/BnR_Logo.ico | Bin .../{ => mappFrameworkSymbols/Logos}/BnR_Logo.svg | 0 .../Media/mappFrameworkSymbols/Logos/Package.pkg | 8 ++++++++ .../BackupCreate/BackupDialog_Create.content | 4 ++-- .../BackupRestore/BackupDialog_Restore.content | 4 ++-- .../BackupUpdate/BackupDialog_Update.content | 4 ++-- .../FrameworkPackage/BackupContent/Backup.content | 4 ++-- .../Simulation/PC/mappView/Visualization.vis | 4 ++-- 11 files changed, 26 insertions(+), 10 deletions(-) rename mappFramework/Logical/mappView/Resources/Media/{ => mappFrameworkSymbols/Gifs}/InProgress.gif (100%) rename mappFramework/Logical/mappView/Resources/Media/{ => mappFrameworkSymbols/Gifs}/InProgressGray.gif (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/Package.pkg rename mappFramework/Logical/mappView/Resources/Media/{ => mappFrameworkSymbols/Logos}/BnR_Logo.ico (100%) rename mappFramework/Logical/mappView/Resources/Media/{ => mappFrameworkSymbols/Logos}/BnR_Logo.svg (100%) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/Package.pkg diff --git a/mappFramework/Logical/mappView/Resources/Media/InProgress.gif b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/InProgress.gif similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/InProgress.gif rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/InProgress.gif diff --git a/mappFramework/Logical/mappView/Resources/Media/InProgressGray.gif b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/InProgressGray.gif similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/InProgressGray.gif rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/InProgressGray.gif diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/Package.pkg new file mode 100644 index 00000000..03872642 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Gifs/Package.pkg @@ -0,0 +1,8 @@ + + + + + InProgress.gif + InProgressGray.gif + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/BnR_Logo.ico b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/BnR_Logo.ico similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/BnR_Logo.ico rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/BnR_Logo.ico diff --git a/mappFramework/Logical/mappView/Resources/Media/BnR_Logo.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/BnR_Logo.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/BnR_Logo.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/BnR_Logo.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/Package.pkg new file mode 100644 index 00000000..2c33aabe --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Logos/Package.pkg @@ -0,0 +1,8 @@ + + + + + BnR_Logo.ico + BnR_Logo.svg + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content index b60fe36a..55ab4bfe 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content @@ -1,7 +1,7 @@  - + @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content index b12538d5..60878803 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content @@ -8,7 +8,7 @@ - + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content index 6cb51f80..3b637c42 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content @@ -1,7 +1,7 @@  - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index 1ccfa90a..3b2d28dc 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -33,6 +33,6 @@ - + - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis b/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis index 9300a1c1..2fb5c885 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis +++ b/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis @@ -177,9 +177,9 @@ --> - + - + From 85d8a0cc88f6171b9751753f7fb8d8eec4a71a85 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 13:01:39 -0500 Subject: [PATCH 052/112] AAZM-23 - Got rid of unused PNG files. Now all are SVG --- .../Media/mappFrameworkSymbols/Alarm/Error.png | Bin 2623 -> 0 bytes .../mappFrameworkSymbols/Alarm/Information.png | Bin 2518 -> 0 bytes .../Media/mappFrameworkSymbols/Alarm/Package.pkg | 3 --- .../Media/mappFrameworkSymbols/Alarm/Warning.png | Bin 1915 -> 0 bytes .../AlarmsContent/AlarmXCurrent.content | 4 ++-- 5 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Information.png delete mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Warning.png diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.png b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Error.png deleted file mode 100644 index 8993afceaebe742657fac5c0c233b303f6812327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2623 zcmV-F3c&S=P)f@YCQL#|fzUu{$aG5iOj|xJp{4B< zLP<-*r^(=yekKfLIuiy+nqf!@475;UW0L^+5c08|*l{d>Wy`W`{iT&w+TGrjWRFRK zrtNg9nKvtG-`;!fx#!;d7WhAZ*njX0w`(C0#4&V00CzsVMX0qo_I|aY zVcp26o3-!RjSY*dF@IhKq;Lod;%3f0vR9S|SmLP?Kut;HCHM;1*AM$6n#1c@|XjW%G^hqekbBk#W+&o zAQssTaCdaUS5(F>t*NUmEw2n8KG@bdQxh`*uuV-(btNTLyYtN^UF6l>SUcYVG2n;3 zzyarvp8#hRAe}v#&6}LcMV|ws=^++E;rj2P_`44wcC-aauLlb(I&^mQz}~Q&ar(R~ z!l6j(P+#w;W+4;tOg79$^OowGYQve=_F-LRK181vI%@$O_ilnh`4zt00L!&E1Caor z0$6X%0ZLFM&ONOTHCX{e|IXR;vGek98TMbBbkSl8bT zWBpY~i!s_OXXKr~q!E#~{!HQ&!I3tibq(MJ^Zc=qp|?H5!y_6CQw(r6r|s6VvQplA zs0|A(Bvo<-YBVGJb^!(7c`i;^aj;7tO~{q|9)Ck|yrOLib7Fw5Hqv(bQp z66cj<%&IXz1wd~vDqbYfW{0O2vR2a?09pdiVC+1M?rjfKG&-cCA;_e1DddN6%`Gs} zN=Cv|5R@X?&kH7;y!U4Cdv?GOnE*%5IiiG2qj2yn6l&W=rL$|vr)dfRyLQ6{2X8Q1 zrFb0Xpf}Uu*i?B@jq7_)gMaZkbUb()^o5R0YE+^%LHSP7(!Oi|=?V(b`QW!eKSrDAN7i*gX6FxYf$c~etR`(hWvw#;r-UY{@?$W_A`~$}Y$!~y z+00V_m=v9q6A{{AHfQM7qUNZvq|dcyfN;5{ZJ|^yxb_Chb%dIboQZsD$q5k)RWKdB%-RKq)cm|=Uh)P;-8cSy94o*3XUR5yIq-PlQE(h zqrqz1vK_+8o1l`~aRCD=m7=g_JuI8IX7)}$XEK4KamvV6g3}ZICTb%=iAs?og`(|K zhr7GQNuPI6BE#u9)lk9{L|J^=2qS|9k2Qf`wgzG-FkO=IJ#_M5un6R#yuma z$h^jYI#q^gzi+IiySodz)i=W*(Ha9qK!sr4L^I%uRaE=A$TjEWaDbf8I{qPwkG5ez z13_(fN)L2CgHB`OCr@W9fbu^{0F2k&0?miJzfYTrp-%xg*3!~)zPoEQOyZlkZUc#s zq9<;Y%K3;#W7EcUg-#4?xgXABZOA9J+h`SicmM-WK0wXHnPrHmOVA-jEw9Q{5(|r% zyyMjpb~1p=Jzj`ziD#vq3!t5~X7JSNDJ?&5STT4EOy4?;U8ysH^wo zbULj~LrG&`<~UY8g9F26Tfqv!EXPAO6m zroIu5MBx;}m>`mU&%BCuD($^5?e@2yI{pAvzxNMBEn^~A@QeX z9330So)=$=_4jmb9vvQTB_HEj%0KT&rh!OJc)ea7&vo^5bvK4&)l~b`PK+}%VuxE` z4~D?vLGZ~aIBKt2i&eE&>krdaL|=--$X&mLLI;wUUwH*@yuN>Yu+O#GJvi7*wzb?R zXC6#H>r|}$XP{MNcRK4T%PStTIqX;8@b#P6n(MDe`qXilPqu+~(b3N5$v#nBhV&&1 z5nsF#+``59``_NeJ8!+IPEJm=4)^yz9}0y|&@OFrBGZ*FaE8wTp}lt$(3&-8?%b+jK=(?rg(@~@0v>_^+n<-qW{?^DmK hIY;u0rCyBDe*l$v3&275?sf^JevU#`}slZ15HwDiT6~BoK$D7D^K}iK5VSQ5)2#^jFo0N>L=} zk3= z$B*w!Bof~$$}ikiT2fqOG8&nRRAv(a(O68KpLe@w=Vs3=dfdP5eEs!qnhO871lZxD zZ*CPu9BOK;zu#gqvANk31>b0T4{*mFK zpBz1W_#EvM{kI9+w`r5~!gpUfxTdoFN7WT&;;B=oFydT7RYNPP8=6pDQi6n%LP91> zCNbw)fO~2TE6y>rtt~}I$5${h<&>{nzWR%wcfNKg91btsHGyv)JYZ_E7reXqfd`)O zIH%aju0FJF-G%D44G4xK|paRLK$ zl7RMms_-b;m)4fRV$@@F-j7sDMIanQ1bP(Lx1q0p0CpB-o40OjEUKt1`{d)({R9xW z69M68$6nmu()Qp!$Ix|lekO|b_dNn{fV9LYSWG}lWq7f@1^MJDV=3r#0%{6#QCX0K zfk_X^l0oJ~B5~xD)M9wtff6as8d^5AlvP#*&i9_XzFHH)>U8Yy>}<`kSHCL6qwLJ^ zA}U)pV}-zF0!@;|WngWY9TIU#$TE@yBvaTUi6mMo^I$aSks^{RZL8Agr)U_f+HmUP z6pTz^^-WDLZ*PD6Ucxfmj(}(}S`IWftuwrTb^ztATd>T*Q%obk$0T_dO(+xv5MRubTB5P ztyB-yY-?DUo9UW&I_GGqk|iMS`r1=3wKg~J=pDEMrJ#{QtPq~48PhxxC=G(cY?EQS(LxtoP%nkz~#78#^5FFv^DAwkNR^C{$!ihQ$x96gVss+GUfmu@_T zWfd(nn0e|s0ruFl&lczm#@t9WhCqTLmv?t9zaoWC#P~u4F#`Q`#0i-a+*)0vi81@6 zNGm+|f=(i-s02=_Qe+}a4iVe(TnTznfIFlhnT$g+n~I9c%5psO^O~}#u~@7rRc7%R zc_$h*B`XA;B+zTF5d3jks4#s0#31&*eU%6Wv?iLahIB=6jfj#2ky0g!IwF%EwQ?l( zF(NJtdc>(@RaIdoyWPT7twkUaT2`V|a^})v@=S)2cT4)8Sd3~L2-=1c>}A!kP-Ik{ z3EX8h(^NI@$wQr_r^qSkrlow|bS)+kfoPm6AqkVof>#gy_G*SZ>`qfj88g1|@81(UR8ywvy(nyKj{nUV0g=Ne&J!`GS(JSseuJfSI= zO$G$Lz66zGM9UuM>AZ0xy6kaJCnHf*6k6enQ+Fe^Yn8yuP$MCwHpr9TzgqlTX-GWx}*`7K`(9S7-r`fSPT^ z@``7nduVI|k2Mz|_Dfwj)ZKeNodW&$h}dTxwLG(>$R9`NDu zmQq|F8^^5UGkz-iZy|7@ySsbz#)vB!38B4Sf}+VIeFAb(shMTu6}y|w2>MqrHas*vc%lDN_E^42AP@+wEX~aw>*_v- zeUH>a2`;9mSvp5WW*z?gof`b=nNkvz0)83ImLU&up-IKN&sCsjZ!HN=Oh<_RmLt?v zgKq5IUX72=_QEwe@wP0>E}Bm8S61H#)cNTtr^Rl6h?H9T^n>g1;gAnTqxoh?JJwm~ zbc=yEHxos|Ko=8(j%iKCKwMMQNeLUj9}MtXhbNGLcX)_7Dcot^CifWSm5D$?bOQL}BE{jj?S?EMh+R{B{Uo z4+bVY2nbfHX(}szF-@w7(rFiHk4}bh%aoX|OE3?zn zXJ~Jp`}pdM>FsXCEOTWl%r7p!r>b(z%XtO)4?oe-!8*R&jzOm%SC<$ZK7Mkh9VxQt zP-_!#Z!tr2c`p9cbs8UbeWWfeFZDPbj-!6R|8Ml#JXtJLIJgsm?Du*y8(C>hUERZG zlj#MM$-Jq#aXo8kT94YA8sz2KwU<}CJ~$i>3=NN9WOPCe$07rMzwdYRvvYkkJwxWp zh%R+IAl!ijPZ6Cw$RjH#D9Ep~T5~svqS#DLY7LDV1Nx2Vr4w;BnMjP1x0k7;Co;MA zWjdaWFZ>?38v?7};r-W$^d%xEGwN4qNXdA}`+Fz@8p{Bu{?+Dp`|x*#3>h)=IlErX g04b|Xy_-${4k8I<2dVxAC;$Ke07*qoM6N<$f|xLossI20 diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg index 26b93102..101ea36a 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg @@ -8,8 +8,5 @@ AlarmHistory.svg AlarmInactive.svg Error.svg - Error.png - Information.png - Warning.png \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Warning.png b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Warning.png deleted file mode 100644 index b1fc9e95c505b440cc4b6f4c3b571e1be7e831da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1915 zcmV->2ZZ>EP)2(_T7JhVdXQ!5aXfrlzor41w@PH@wU>+8n1tnJ;Mof-Z!GtLFI zU^hg(aCVRO%sK!0&-Z`-<;(*AZ~x=QKF*$FPqcr*?=zk(E7KF1X=V7m5A>%`{QTTg zv^KR;WztFy|K?X#A6nI-KK0rChsxU4_Op&V>cdv?(p?o=(E9URlYb?dgBO_f|c{TdJww>D{(oGguTw zeHx4xVCpl-8#21PlK#!>Vvmtr^j0vyzI>pyvo)oh=(+bXo?n~+tObN(?Z{^@5{Nly zS{Y_%-%abf^2UX?XD`v7!he$ixlH57`}%fB`CI{(ISap54d|~SP@1IYMHq&G?oCN{ z$L%FwmlaemSNC!lU{4%w`%LF2!bjTHeU24!li(7AzeEAdDM)mht`}ewX5jM&2vnw0 zlKf+*&rY4Cy^A-^K>y}cNGmBG+uF02S)7IJD}gLe5_c5nvPlvqF){(K)(FeWK~ntK zvQdllb=MrA{gpT6f`j{-8WVB;%U!zH>E3;O*V% z2H)Ps=5FZu2{2|LP!c4c=U^0z@OUK*4PC^GFPy~W_ywAuMz}l)MUC2OD=WsZc9rL@ zJv$ouXd<*C0Er|#0iSXFo_jvY@(aTd!R!mi3D&s1uBtLlo_rny0|WMRdAUjeycC%4 zp|oxr2gt2Ekf2qaYD+PfmXGPTvmi(a;)nZM{`5qaC17;Oah+& z1b`(g?7?R1I2n3V((&62xuf6E9>#{&V7^f=9qcC!32na)E z8Tjx>sQ%PjlfNUO>3?N_9XZf?UrRc;J&|s+uUHX8YA8(BzfQ|u$GRm8JuP_nk)Prx zKmGwe{lHOTr_EiLuE~(s)Y1*$N+~gEp|)Wb9j$!br*;Gyb8b~a$F97geTeL53>}YHbR|LstIWojU=|n7;S8hDqRw^UeXi*j<9O_sQ zn>NwqWL_t8Ri4AEwm|Zx$tV+Lu|;%s8nyRsyzM~}h%5n6fdfrIQd`lIb#Y$#^1-K!N>8^Z@!1j*a?I~qTH*lyxYZ?iEa@KkJ^>gAQrkd z&!HyfdBCj;He975q^H$z0#`DER)*~5mnaSfo#Mh7>EQM+Eap7ZhvOA&>tIxw={^|Y zwzZ5pY*|UfsWT^RWWoq?JIldWQiP@!qHa{%0Qkf-|3`KvlahTg=nEI1Xa7V?iv7~g z9G+c;^feqD7IP}&)p=&W9nkO6z>RKOmeUnZP$(_0OnNXjEsLDCUt9$M^ZZcmN6$U; z?Vs)c{833&CCJi(vtOi=CFCr(8^S0WF5Rw%lWvw+Gi`ZJV@v3E=ea#L?W~%fSitkY z_E~2Jr=Fz^m*L_R2^`ybclC~@xbKmwsJvQ+DTxKslxzvpH0dC2{|ddP*lAt+Ps2o^ zWR`;w4pxDQ*|L_+0&T_EW$D7{!I@tToEm$Xq}~>F-X+lXM}^x1SlR3Pa+|=Nb1fI8 zQ~ZH3m&{ - + @@ -29,4 +29,4 @@ - + \ No newline at end of file From 796413e35b11303798c92ae36b97f70dc06eed51 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 13:02:03 -0500 Subject: [PATCH 053/112] AAZM-24 - Cleaned up symbol names --- .../Navigation/{EngineMove.svg => Axis.svg} | 0 .../Navigation/{Server.svg => Backup.svg} | 0 .../Media/mappFrameworkSymbols/Navigation/Package.pkg | 4 ++-- .../User/{UserExport.svg => ExportUser.svg} | 0 .../User/{UserImport.svg => ImportUser.svg} | 0 .../Resources/Media/mappFrameworkSymbols/User/Package.pkg | 4 ++-- .../Visualization/Pages/DemoPage/Navigation.content | 4 ++-- .../Pages/FrameworkPackage/UserXContent/UserList.content | 6 +++--- 8 files changed, 9 insertions(+), 9 deletions(-) rename mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/{EngineMove.svg => Axis.svg} (100%) rename mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/{Server.svg => Backup.svg} (100%) rename mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/{UserExport.svg => ExportUser.svg} (100%) rename mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/{UserImport.svg => ImportUser.svg} (100%) diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/EngineMove.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Axis.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/EngineMove.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Axis.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Server.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Backup.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Server.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Backup.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg index f0cd8837..c0054e0e 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg @@ -4,12 +4,12 @@ Alarm.svg Audit.svg - EngineMove.svg + Axis.svg + Backup.svg FileExporer.svg Help.svg Recipe.svg Report.svg - Server.svg UserGroup.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserExport.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/ExportUser.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserExport.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/ExportUser.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserImport.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/ImportUser.svg similarity index 100% rename from mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/UserImport.svg rename to mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/ImportUser.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg index 77f8b5ce..11ad9d87 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/User/Package.pkg @@ -5,7 +5,7 @@ AddUser.svg DeleteUser.svg EditUser.svg - UserExport.svg - UserImport.svg + ExportUser.svg + ImportUser.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content index 2647a611..3ef557fc 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/DemoPage/Navigation.content @@ -7,9 +7,9 @@ - + - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content index cd2d7171..94c61e32 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content @@ -11,8 +11,8 @@ - - + + @@ -22,4 +22,4 @@ - + \ No newline at end of file From 13bab9aedc312dd6aa36e5e230aeaffa390c3da8 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 27 Dec 2022 13:47:28 -0500 Subject: [PATCH 054/112] A few fixes regarding mapp View widget name refactoring/standardization --- .../AuditContent/Audit.content | 8 +-- .../AxisContent/AxisAuto.content | 17 ++--- .../RecipePreviewMachConfig.content | 4 +- .../RecipeContent/RecipePreviewPars.content | 4 +- .../AxisControl/Widget.compoundwidget | 64 +++++++++---------- .../PC/mappView/Axis/AxisAuto_content.binding | 6 +- 6 files changed, 50 insertions(+), 53 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content index f5ebf97c..dac5834f 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content @@ -3,17 +3,17 @@ - + - + - + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content index 509aead7..2b6c2a04 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content @@ -4,15 +4,12 @@ - - - - - - + + + + + + - - - - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content index 5a21b59c..15084558 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content @@ -4,7 +4,7 @@ - + @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content index c70dfe8d..85dbc3a7 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content @@ -2,7 +2,7 @@ - + @@ -38,4 +38,4 @@ - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget index 83210158..f4795169 100644 --- a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget @@ -1,40 +1,40 @@  - - - + + - - - + + + - + - + - + - + - + - - - - + + + + - - - - + + + + @@ -94,7 +94,7 @@ Label Text - + @@ -107,18 +107,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding index 81904330..e1e93e0d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding @@ -4,16 +4,16 @@ - + - + - + From d8d109706a1156f996f941b5198793bc3c347cd8 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Thu, 29 Dec 2022 11:11:17 -0500 Subject: [PATCH 055/112] AAZM-512: Labeled each framework content (note: some widgets moved to accomodate labels) --- .../mappFrameworkTexts/AlarmPageTexts.tmx | 11 ++++++++++ .../mappFrameworkTexts/AuditPageTexts.tmx | 11 ++++++++++ .../mappFrameworkTexts/AxisPageTexts.tmx | 11 ++++++++++ .../mappFrameworkTexts/RecipePageTexts.tmx | 11 ++++++++++ .../AlarmsContent/AlarmX.content | 3 ++- .../AlarmsContent/AlarmXCurrent.content | 4 ++-- .../AuditContent/Audit.content | 3 ++- .../FrameworkPackage/AxisContent/Axis.content | 5 +++-- .../BackupContent/Backup.content | 7 +++--- .../FrameworkPackage/FileContent/File.content | 3 ++- .../RecipeContent/Recipe.content | 13 ++++++----- .../ReportContent/Report.content | 1 + .../UserXContent/UserList.content | 22 +++++++++---------- .../UserXContent/UserX.content | 3 ++- 14 files changed, 80 insertions(+), 28 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AlarmPageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AlarmPageTexts.tmx index 2667b5e3..04b11461 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AlarmPageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AlarmPageTexts.tmx @@ -226,5 +226,16 @@ Time Stamp + + + Alarm + + + 报警 + + + Alarm + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx index ba8d7a10..cffdac1b 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AuditPageTexts.tmx @@ -291,5 +291,16 @@ Timestamp + + + Audit + + + 审计 + + + Audit + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AxisPageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AxisPageTexts.tmx index 751a10ce..4b6d1df4 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AxisPageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/AxisPageTexts.tmx @@ -779,5 +779,16 @@ Vel Factor + + + Achse + + + 轴 + + + Axis + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx index a710c97d..2001f9ac 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/RecipePageTexts.tmx @@ -642,5 +642,16 @@ Do you want to continue and overwrite the existing one? Default files cannot be deleted + + + Rezept + + + 配方 + + + Recipe + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content index b6c9094e..cce9f47d 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content @@ -1,7 +1,7 @@  - + @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content index 0e015bf3..9db7b85e 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content @@ -9,8 +9,8 @@ - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content index dac5834f..328e6c3a 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content @@ -20,5 +20,6 @@ + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content index 81488f54..dc62cf41 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content @@ -1,7 +1,7 @@ - + - + @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index 3b2d28dc..97419300 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -32,7 +32,8 @@ - - + + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index e2329139..f4d92cfb 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -37,5 +37,6 @@ + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index 4cc22e63..0f6cb656 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -1,9 +1,9 @@  - - - + + + @@ -11,14 +11,14 @@ - + - + @@ -29,5 +29,6 @@ + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content index 4cd92c9f..1f61b3f6 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content index 94c61e32..426a8c71 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content @@ -1,25 +1,25 @@  - + - - - - - - + + + + + + - - + + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content index 7f103f42..6637497b 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content @@ -4,7 +4,8 @@ + - + \ No newline at end of file From 05ed22202a85c112fda5ce99ce54e58e5f75ef10 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Thu, 29 Dec 2022 11:53:17 -0500 Subject: [PATCH 056/112] AAZM-516: Standardize Audit columns (operator column query was present, moved to end to match Audit Trail list. Changed default in AuditMgr to User Credential Query to display operator column by default.) --- .../Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st | 2 +- .../Pages/FrameworkPackage/AuditContent/AuditQuery.content | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st index 1c061923..4fa926e5 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st @@ -53,7 +53,7 @@ PROGRAM _INIT CustomEvent[2].Comment := "Result can be seen in the Query tab"; HmiAudit.Status.Query.Name := 'UserEvents'; - HmiAudit.Status.Query.Option := 1; + HmiAudit.Status.Query.Option := 0; // Configuring the query selection, reading the available components HmiAudit.Parameters.QuerySelection[0] := 'UserXMgr'; diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content index bc334e52..a951561b 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content @@ -4,8 +4,8 @@ - - + + From 2312e2d4975bb1f3ddf82d558ca5918e2e4fddaf Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 3 Jan 2023 10:25:39 -0500 Subject: [PATCH 057/112] Retyped the user passwords --- .../PC/AccessAndSecurity/UserRoleSystem/User.user | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mappFramework/Physical/Simulation/PC/AccessAndSecurity/UserRoleSystem/User.user b/mappFramework/Physical/Simulation/PC/AccessAndSecurity/UserRoleSystem/User.user index edbfcaed..e24519ef 100644 --- a/mappFramework/Physical/Simulation/PC/AccessAndSecurity/UserRoleSystem/User.user +++ b/mappFramework/Physical/Simulation/PC/AccessAndSecurity/UserRoleSystem/User.user @@ -9,21 +9,21 @@ - + - + - + From e4623b17e53c7b227efdaf8dbef76ced7b1c87ba Mon Sep 17 00:00:00 2001 From: Will_Marberry Date: Tue, 3 Jan 2023 11:34:12 -0500 Subject: [PATCH 058/112] AAZM-506: Refactor the widget names in the Report framework --- .../BackupDialog_AutoSettings.content | 4 ++-- .../BackupCreate/BackupDialog_Create.content | 6 ++--- .../BackupDelete/BackupDialog_Delete.content | 6 ++--- .../BackupDialog_Restore.content | 4 ++-- .../BackupUpdate/BackupDialog_Update.content | 6 ++--- .../ReportCreate/ReportDialog_Create.content | 16 +++++++------- .../ReportDelete/ReportDialog_Delete.content | 6 ++--- .../ReportView/ReportDialog_View.content | 4 ++-- .../BackupContent/Backup.content | 4 ++-- .../ReportContent/Report.content | 17 +++++++------- ...upDialog_AutoSettings_content.eventbinding | 6 ++--- .../BackupDialog_Create_content.eventbinding | 10 ++++----- .../BackupDialog_Delete_content.eventbinding | 10 ++++----- .../BackupDialog_Restore_content.eventbinding | 6 ++--- .../BackupDialog_Update_content.eventbinding | 10 ++++----- .../PC/mappView/Backup/Backup_content.binding | 4 ++-- .../ReportDialog_Create_content.binding | 6 ++--- .../ReportDialog_Create_content.eventbinding | 10 ++++----- .../ReportDialog_Delete_content.eventbinding | 10 ++++----- .../ReportDialog_View_content.eventbinding | 6 ++--- .../PC/mappView/Report/Report_content.binding | 14 ++++++------ .../Report/Report_content.eventbinding | 22 +++++++++---------- 22 files changed, 93 insertions(+), 94 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content index 7051c03f..07e1ba31 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content @@ -1,8 +1,8 @@ - + - + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content index 55ab4bfe..64ce94b3 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content @@ -1,11 +1,11 @@ - + - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content index bcddc8d3..141d4104 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content @@ -1,8 +1,8 @@ - + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content index 60878803..ed6864c5 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content @@ -1,11 +1,11 @@ - + - + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content index 3b637c42..8a6293ef 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content @@ -1,11 +1,11 @@ - + - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content index fc38d584..a65cff34 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content @@ -1,19 +1,19 @@ - + - - + + - + - - + + - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content index 5e5de805..cfdbfca3 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content @@ -1,8 +1,8 @@ - + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportDialog_View.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportDialog_View.content index 885005ca..98c735f1 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportDialog_View.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportDialog_View.content @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index 97419300..57364947 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content index 1f61b3f6..931cd42e 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content @@ -9,14 +9,13 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding index db7b40c0..1ce99c10 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding @@ -1,4 +1,4 @@ - + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding index b43ea4d5..449b3899 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding index 761b9b0e..eff097b4 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding index d0dfdf5f..44af1c73 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding @@ -1,4 +1,4 @@ - + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding index b8933197..11ec64fa 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -11,8 +11,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding index 2886b8bc..64ca01a0 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.binding index b731f19f..4e5d84af 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.binding @@ -1,13 +1,13 @@ - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.eventbinding index 2059d97d..d7edba09 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Create_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -29,8 +29,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Delete_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Delete_content.eventbinding index 469f5adf..854b0687 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Delete_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_Delete_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_View_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_View_content.eventbinding index f60e21c1..f9699f4f 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_View_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/ReportDialog_View_content.eventbinding @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding index 0a2ba6c2..b64f4835 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -38,19 +38,19 @@ - + - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.eventbinding index 22b88cb7..48a27d59 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -27,8 +27,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + @@ -77,8 +77,8 @@ - - + + @@ -105,8 +105,8 @@ - - + + From f2915574fb1607e94a9b181849825a86a2413d31 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Tue, 3 Jan 2023 11:50:10 -0500 Subject: [PATCH 059/112] AAZM515: Standardize AlarmX columns --- .../AlarmX/AlarmMgr/AlarmMgr.typ | 9 +++++++++ .../AlarmX/AlarmMgr/ExecuteQuery.st | 11 +++++++++++ .../Alarm/AlarmStateActiveAck.svg | 19 +++++++++++++++++++ .../Alarm/AlarmStateActiveNotAck.svg | 11 +++++++++++ .../Alarm/AlarmStateInactiveAck.svg | 11 +++++++++++ .../Alarm/AlarmStateInactiveNotAck.svg | 7 +++++++ .../mappFrameworkSymbols/Alarm/Package.pkg | 4 ++++ .../AlarmsContent/AlarmXCurrent.content | 2 +- .../AlarmsContent/AlarmXHistory.content | 7 ++++--- .../AlarmsContent/AlarmXQuery.content | 9 +++++---- .../AlarmX/AlarmXQuery_content.binding | 5 +++++ 11 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg diff --git a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ index 81dd7fb9..b41db339 100644 --- a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ +++ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.typ @@ -38,6 +38,7 @@ TYPE TimeStamp : ARRAY[0..MAX_QUERY_RESULTS]OF DATE_AND_TIME; (*TimeStamp array*) Code : ARRAY[0..MAX_QUERY_RESULTS]OF UDINT; (*Code array*) Severity : ARRAY[0..MAX_QUERY_RESULTS]OF UDINT; (*Severity array*) + State : ARRAY[0..MAX_QUERY_RESULTS]OF CurrentAlarmStateEnum; (*State message array*) QueryCount : USINT; (*Count of query results for building the query table configuration string*) END_STRUCT; AlarmType : STRUCT (*Structure to hold the alarm data for the query results*) @@ -50,6 +51,7 @@ TYPE TimeStamp : DATE_AND_TIME; (*ActiveAlarms query, TimeStamp column*) Code : UDINT; (*ActiveAlarms query, Code column*) Severity : UDINT; (*ActiveAlarms query, Severity column*) + State : CurrentAlarmStateEnum; (*ActiveAlarms query, State column*) END_STRUCT; MachineDigitalInputsType : STRUCT (*Safety related digital inputs *) EmergencyStop : ARRAY[0..MAX_ESTOP]OF BOOL; (*Emergency stop input signals*) @@ -75,4 +77,11 @@ TYPE ACTIVE_ALARM_QUERY, (*State to query the alarm data*) ACTIVE_ALARM_NEXT (*State to check if more alarms meet the query criteria and need to be queried*) ); + CurrentAlarmStateEnum : + ( (*Enumeration for the state of a particular alarm*) + INACTIVE_NOT_ACKNOWLEDGED := 0, (*Alarm inactive and not acknowledged*) + ACTIVE_NOT_ACKNOWLEDGED := 1, (*Alarm active and not acknowledged*) + ACTIVE_ACKNOWLEDGED := 2, (*Alarm active and acknowledged*) + INACTIVE_ACKNOWLEDGED := 3 (*Alarm inactive and acknowledged*) + ); END_TYPE diff --git a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/ExecuteQuery.st b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/ExecuteQuery.st index 8ab58b32..f08e9835 100644 --- a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/ExecuteQuery.st +++ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/ExecuteQuery.st @@ -56,6 +56,17 @@ ACTION ExecuteQuery: HmiAlarmX.Status.Query.AdditionalInfo[i] := AlarmQuery.Alarms[i].AdditionalInfo; HmiAlarmX.Status.Query.TimeStamp[i] := AlarmQuery.Alarms[i].TimeStamp; HmiAlarmX.Status.Query.Severity[i] := AlarmQuery.Alarms[i].Severity; + + IF HmiAlarmX.Status.Query.Active[i] AND NOT HmiAlarmX.Status.Query.Acknowledged[i] THEN + HmiAlarmX.Status.Query.State[i] := ACTIVE_NOT_ACKNOWLEDGED; + ELSIF HmiAlarmX.Status.Query.Active[i] AND HmiAlarmX.Status.Query.Acknowledged[i] THEN + HmiAlarmX.Status.Query.State[i] := ACTIVE_ACKNOWLEDGED; + ELSIF NOT HmiAlarmX.Status.Query.Active[i] AND NOT HmiAlarmX.Status.Query.Acknowledged[i] THEN + HmiAlarmX.Status.Query.State[i] := INACTIVE_NOT_ACKNOWLEDGED; + ELSIF NOT HmiAlarmX.Status.Query.Active[i] AND HmiAlarmX.Status.Query.Acknowledged[i] THEN + HmiAlarmX.Status.Query.State[i] := INACTIVE_ACKNOWLEDGED; + END_IF + END_FOR diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg new file mode 100644 index 00000000..099b8449 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg new file mode 100644 index 00000000..6f721b3a --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg new file mode 100644 index 00000000..477cf743 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg new file mode 100644 index 00000000..467e074c --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg index 101ea36a..cc05b575 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/Package.pkg @@ -8,5 +8,9 @@ AlarmHistory.svg AlarmInactive.svg Error.svg +AlarmStateInactiveNotAck.svg +AlarmStateInactiveAck.svg +AlarmStateActiveAck.svg +AlarmStateActiveNotAck.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content index 9db7b85e..c74e73c1 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content @@ -6,7 +6,7 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content index 79739d30..80a6bc8c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content @@ -1,16 +1,17 @@  - + - + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index 6cc6aa3d..579ecb36 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -1,11 +1,12 @@  - + - - - + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding index 080e30b8..2ef5f803 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/AlarmX/AlarmXQuery_content.binding @@ -22,6 +22,11 @@ + + + + + From a59258051140e004b6a3ed9bb19b1d116062dbe7 Mon Sep 17 00:00:00 2001 From: Will_Marberry Date: Tue, 3 Jan 2023 13:02:22 -0500 Subject: [PATCH 060/112] AAZM-504: Refactor the widget names in Backup content --- .../BackupContent/Backup.content | 36 ++++++------- .../PC/mappView/Backup/Backup_content.binding | 26 +++++----- .../Backup/Backup_content.eventbinding | 50 +++++++++---------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index 57364947..5c1465b4 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -1,39 +1,39 @@ - + - + - + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - \ No newline at end of file + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding index 64ca01a0..476283b3 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.binding @@ -3,7 +3,7 @@ - + @@ -16,52 +16,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding index 83d569d8..f5bd15c3 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/Backup_content.eventbinding @@ -1,8 +1,8 @@ - + - - + + @@ -11,8 +11,8 @@ - - + + @@ -21,8 +21,8 @@ - - + + @@ -31,8 +31,8 @@ - - + + @@ -41,8 +41,8 @@ - - + + @@ -68,8 +68,8 @@ - - + + @@ -114,20 +114,20 @@ - - + + - + - + @@ -142,20 +142,20 @@ - - + + - + - + @@ -199,8 +199,8 @@ - - + + @@ -235,14 +235,14 @@ - + - + From cf06fe4c40917b7d46652c1814f9d2a61f996f19 Mon Sep 17 00:00:00 2001 From: Will_Marberry Date: Tue, 3 Jan 2023 13:28:09 -0500 Subject: [PATCH 061/112] AAZM-504: Refactor the widget names in Backup Dialogs --- .../BackupDialog_AutoSettings.content | 14 +++++++------- .../BackupCreate/BackupDialog_Create.content | 12 ++++++------ .../BackupDelete/BackupDialog_Delete.content | 10 +++++----- .../BackupRestore/BackupDialog_Restore.content | 8 ++++---- .../BackupUpdate/BackupDialog_Update.content | 6 +++--- .../BackupDialog_AutoSettings_content.binding | 18 +++++++++--------- ...kupDialog_AutoSettings_content.eventbinding | 8 ++++---- .../Backup/BackupDialog_Create_content.binding | 4 ++-- .../BackupDialog_Create_content.eventbinding | 8 ++++---- .../BackupDialog_Delete_content.eventbinding | 8 ++++---- .../BackupDialog_Restore_content.eventbinding | 8 ++++---- .../BackupDialog_Update_content.eventbinding | 8 ++++---- 12 files changed, 56 insertions(+), 56 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content index 07e1ba31..ff733b29 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content @@ -1,21 +1,21 @@ - + - - + + - - + + - + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content index 64ce94b3..6f92540d 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content @@ -1,15 +1,15 @@ - + - - - - + + + + - + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content index 141d4104..6f276319 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content @@ -1,8 +1,8 @@ - + - - - + + + - \ No newline at end of file + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content index ed6864c5..2a0b0fbe 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content index 8a6293ef..f624c20b 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content @@ -4,8 +4,8 @@ - - + + @@ -14,6 +14,6 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.binding index 466611e0..16e07bd6 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.binding @@ -1,4 +1,4 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -40,16 +40,16 @@ - + - + - + @@ -65,11 +65,11 @@ - + - + @@ -94,7 +94,7 @@ - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding index 1ce99c10..0dba3464 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_AutoSettings_content.eventbinding @@ -1,8 +1,8 @@ - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding index e693b8db..3bd8525f 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.binding @@ -1,9 +1,9 @@ - + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding index 449b3899..52082698 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Create_content.eventbinding @@ -1,8 +1,8 @@ - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding index eff097b4..b29ee090 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Delete_content.eventbinding @@ -1,8 +1,8 @@ - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding index 44af1c73..12365137 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Restore_content.eventbinding @@ -1,8 +1,8 @@ - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding index 11ec64fa..0ada7748 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Backup/BackupDialog_Update_content.eventbinding @@ -1,8 +1,8 @@ - - + + @@ -11,8 +11,8 @@ - - + + From e5a601154000f795f1bd23107ce95e4d1769dabd Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Tue, 3 Jan 2023 14:14:53 -0500 Subject: [PATCH 062/112] AAZM518: Added popup to tell user they can't click disabled buttons due to insufficient user rights --- .../Dialogs/UserXDialogs/Package.pkg | 3 ++- .../UserXDialogs/UserXDisabled/Package.pkg | 8 ++++++ .../UserXDisabled/UserXDisabled.content | 8 ++++++ .../UserXDisabled/UserXDisabled.dialog | 6 +++++ .../Physical/Simulation/PC/mappView/UserX.vis | 9 ++++--- .../Simulation/PC/mappView/UserX/Package.pkg | 1 + .../UserXDialog_Disabled_content.eventbinding | 25 +++++++++++++++++++ .../Simulation/PC/mappView/Visualization.vis | 3 +++ 8 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/Package.pkg create mode 100644 mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content create mode 100644 mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog create mode 100644 mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/Package.pkg index 0e76d193..b66ef048 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/Package.pkg @@ -6,6 +6,7 @@ UserXError UserXExport UserXImport - UserXDuplicate + UserXDuplicate + UserXDisabled \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/Package.pkg new file mode 100644 index 00000000..2a4c8079 --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/Package.pkg @@ -0,0 +1,8 @@ + + + + + UserXDisabled.dialog + UserXDisabled.content + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content new file mode 100644 index 00000000..21fd93f7 --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog new file mode 100644 index 00000000..6d73e23f --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX.vis b/mappFramework/Physical/Simulation/PC/mappView/UserX.vis index 5b1715c6..6d5b46d4 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX.vis +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX.vis @@ -14,21 +14,23 @@ - + + - + + @@ -38,11 +40,12 @@ + - + diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/Package.pkg b/mappFramework/Physical/Simulation/PC/mappView/UserX/Package.pkg index 6adc1446..65ace658 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/Package.pkg +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/Package.pkg @@ -13,5 +13,6 @@ Navigation_content.binding UserXDialog_Duplicate_content.binding UserXDialog_Duplicate_content.eventbinding + UserXDialog_Disabled_content.eventbinding \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding new file mode 100644 index 00000000..31f0ca97 --- /dev/null +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis b/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis index 2fb5c885..f50e1aae 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis +++ b/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis @@ -82,6 +82,7 @@ + @@ -109,6 +110,7 @@ + @@ -139,6 +141,7 @@ + From 429f6f072e27729c5abe5d8a9e68c1c1c80da946 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Wed, 4 Jan 2023 09:03:16 -0500 Subject: [PATCH 063/112] Added FTP server credentials for BaseProject (not part of the export/import) --- mappFramework/Physical/Simulation/Hardware.hw | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mappFramework/Physical/Simulation/Hardware.hw b/mappFramework/Physical/Simulation/Hardware.hw index e1171d33..1c56fd47 100644 --- a/mappFramework/Physical/Simulation/Hardware.hw +++ b/mappFramework/Physical/Simulation/Hardware.hw @@ -33,6 +33,12 @@ + + + + + + From 8eef13b08be8a8de4259f9e19fb34d1d4c649bd3 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Wed, 4 Jan 2023 09:38:53 -0500 Subject: [PATCH 064/112] AAZM-517: Added message box to let user know they were automatically logged out --- .../Texts/mappFrameworkTexts/UserXPageTexts.tmx | 11 +++++++++++ .../mappView/UserX/UserList_content.eventbinding | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx index 6deec32d..99bbe0b4 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx @@ -760,6 +760,17 @@ 退出 + + + Der Benutzer wurde automatisch abgemeldet. + + + 用户已自动注销 + + + The user was automatically logged out. + + Bestätigen Sie die Benutzerlöschung diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding index ce06909f..bb868487 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserList_content.eventbinding @@ -210,7 +210,7 @@ - + @@ -257,5 +257,15 @@ + + + + + + + + + + - + \ No newline at end of file From 4396e639629595766d3ada834de8ccd05556a97b Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Wed, 4 Jan 2023 09:45:39 -0500 Subject: [PATCH 065/112] AAZM-518: Changed text of disabled-button popup to be more generic --- .../Texts/mappFrameworkTexts/UserXPageTexts.tmx | 11 +++++++++++ .../UserXDialogs/UserXDisabled/UserXDisabled.content | 2 +- .../UserX/UserXDialog_Disabled_content.eventbinding | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx index 99bbe0b4..96f6c0b8 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/UserXPageTexts.tmx @@ -52,6 +52,17 @@ Invalid Username/Password + + + Diese Aktion kann im aktuellen Zustand nicht ausgeführt werden. + + + 当前状态下无法执行此操作 + + + It is not possible to perform this action in the current state and/or with the current user. + + Stornieren diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content index 21fd93f7..cd365f54 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding index 31f0ca97..3bf87564 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/UserX/UserXDialog_Disabled_content.eventbinding @@ -1,7 +1,7 @@  - + @@ -11,7 +11,7 @@ - + From 16f2773b3a567e9968241b30e150c32f8ec745de Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Wed, 4 Jan 2023 09:42:56 -0600 Subject: [PATCH 066/112] AAZM-356 - adding SLO trace configurations to be imported by the user --- .../Logical/UserPartition/Axis/Package.pkg | 8 +++ .../UserPartition/Axis/SLO_Pos.tracecfg | 71 +++++++++++++++++++ .../UserPartition/Axis/SLO_Speed.tracecfg | 71 +++++++++++++++++++ .../Logical/UserPartition/Package.pkg | 1 + 4 files changed, 151 insertions(+) create mode 100644 mappFramework/Logical/UserPartition/Axis/Package.pkg create mode 100644 mappFramework/Logical/UserPartition/Axis/SLO_Pos.tracecfg create mode 100644 mappFramework/Logical/UserPartition/Axis/SLO_Speed.tracecfg diff --git a/mappFramework/Logical/UserPartition/Axis/Package.pkg b/mappFramework/Logical/UserPartition/Axis/Package.pkg new file mode 100644 index 00000000..a8e83c68 --- /dev/null +++ b/mappFramework/Logical/UserPartition/Axis/Package.pkg @@ -0,0 +1,8 @@ + + + + + SLO_Pos.tracecfg + SLO_Speed.tracecfg + + \ No newline at end of file diff --git a/mappFramework/Logical/UserPartition/Axis/SLO_Pos.tracecfg b/mappFramework/Logical/UserPartition/Axis/SLO_Pos.tracecfg new file mode 100644 index 00000000..f105effa --- /dev/null +++ b/mappFramework/Logical/UserPartition/Axis/SLO_Pos.tracecfg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/UserPartition/Axis/SLO_Speed.tracecfg b/mappFramework/Logical/UserPartition/Axis/SLO_Speed.tracecfg new file mode 100644 index 00000000..5f58866d --- /dev/null +++ b/mappFramework/Logical/UserPartition/Axis/SLO_Speed.tracecfg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/UserPartition/Package.pkg b/mappFramework/Logical/UserPartition/Package.pkg index 3dc7afd0..822a72bc 100644 --- a/mappFramework/Logical/UserPartition/Package.pkg +++ b/mappFramework/Logical/UserPartition/Package.pkg @@ -4,5 +4,6 @@ Recipe Report + Axis \ No newline at end of file From d2cfc6610ee33596e4083b9362b64541a2df6a39 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Wed, 4 Jan 2023 15:42:26 -0500 Subject: [PATCH 067/112] Fixed red eventbindings and deleted empty eventbinding files --- .../PC/mappView/Axis/AxisAuto_content.eventbinding | 6 ------ .../PC/mappView/Axis/AxisManual_content.eventbinding | 4 ---- .../PC/mappView/Axis/AxisRecipe_content.eventbinding | 4 ++-- .../Physical/Simulation/PC/mappView/Axis/Package.pkg | 2 -- .../mappView/Recipe/RecipeDialog_New_content.eventbinding | 2 +- .../PC/mappView/Recipe/Recipe_content.eventbinding | 4 ++-- mappFramework/mappFramework.apj | 2 +- 7 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.eventbinding delete mode 100644 mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.eventbinding diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.eventbinding deleted file mode 100644 index 23f0d4a3..00000000 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.eventbinding +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.eventbinding deleted file mode 100644 index e6f4c2dc..00000000 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisManual_content.eventbinding +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding index 4f2d53ad..bb77b30c 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisRecipe_content.eventbinding @@ -55,7 +55,7 @@ - + @@ -68,4 +68,4 @@ - + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/Package.pkg b/mappFramework/Physical/Simulation/PC/mappView/Axis/Package.pkg index 00a1b422..4ae458dd 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/Package.pkg +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/Package.pkg @@ -3,9 +3,7 @@ AxisManual_content.binding - AxisManual_content.eventbinding AxisAuto_content.binding - AxisAuto_content.eventbinding AxisRecipe_content.eventbinding AxisRecipeDialog_New_content.eventbinding AxisRecipeDialog_Edit_content.eventbinding diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding index b6933752..956aab25 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/RecipeDialog_New_content.eventbinding @@ -95,4 +95,4 @@ - + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index bc16e6eb..c618d3ad 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -303,7 +303,7 @@ - + @@ -367,4 +367,4 @@ - + \ No newline at end of file diff --git a/mappFramework/mappFramework.apj b/mappFramework/mappFramework.apj index 9d0c52ba..ee179c8f 100644 --- a/mappFramework/mappFramework.apj +++ b/mappFramework/mappFramework.apj @@ -1,5 +1,5 @@  - + From b0a68b22b7291635cce0ef7b8486e6e7d9cace42 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Wed, 4 Jan 2023 17:04:08 -0500 Subject: [PATCH 068/112] Remove deleted event binding files from the .vis files --- mappFramework/Physical/Simulation/PC/mappView/Axis.vis | 2 -- mappFramework/Physical/Simulation/PC/mappView/Visualization.vis | 2 -- 2 files changed, 4 deletions(-) diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis.vis b/mappFramework/Physical/Simulation/PC/mappView/Axis.vis index b0794852..d2f2495e 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis.vis +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis.vis @@ -13,8 +13,6 @@ - - diff --git a/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis b/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis index f50e1aae..b38fef7c 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis +++ b/mappFramework/Physical/Simulation/PC/mappView/Visualization.vis @@ -57,8 +57,6 @@ - - From 7c1aad6c0a9985c72404b004194df4eaadc2fbf8 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Wed, 4 Jan 2023 17:41:13 -0500 Subject: [PATCH 069/112] AAZM-515 - widened the query table, make every other row a little darker, darkened the gray on the new SVGs --- .../Alarm/AlarmStateActiveNotAck.svg | 72 ++++++++++++++++--- .../Alarm/AlarmStateInactiveAck.svg | 72 ++++++++++++++++--- .../Alarm/AlarmStateInactiveNotAck.svg | 52 ++++++++++++-- .../AlarmsContent/AlarmXQuery.content | 6 +- 4 files changed, 170 insertions(+), 32 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg index 6f721b3a..4ffb9b62 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg @@ -1,11 +1,61 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg index 477cf743..a71e4993 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg @@ -1,11 +1,61 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg index 467e074c..91c9f1b8 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg @@ -1,7 +1,45 @@ - - - - - - - \ No newline at end of file + + + + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index 579ecb36..ddace36c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -1,12 +1,12 @@  - + - + - + From d423f5c6e5d68dd945053a2f5440796d6833344a Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 5 Jan 2023 13:49:51 -0500 Subject: [PATCH 070/112] Added a new .svg icon for the new recipe button --- .../mappFrameworkSymbols/File/NewRecipe.svg | 63 +++++++++++++++++++ .../mappFrameworkSymbols/File/Package.pkg | 1 + .../RecipeContent/Recipe.content | 2 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg new file mode 100644 index 00000000..a3cfae95 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index 0b35a9b9..30007dac 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -15,5 +15,6 @@ Search.svg TXT.svg XML.svg + NewRecipe.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index 0f6cb656..8ca719e3 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -2,7 +2,7 @@ - + From 3e221cd728db35d073ebb402cfa0ac5ecbc2eaba Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Thu, 5 Jan 2023 13:16:11 -0600 Subject: [PATCH 071/112] AAZM-515 - modified Query table and icon svg's to allow for larger icons --- .../Alarm/AlarmStateActiveAck.svg | 114 +++++++++++++++--- .../Alarm/AlarmStateActiveNotAck.svg | 62 +++++----- .../Alarm/AlarmStateInactiveAck.svg | 60 ++++----- .../Alarm/AlarmStateInactiveNotAck.svg | 19 ++- .../AlarmsContent/AlarmXQuery.content | 4 +- 5 files changed, 172 insertions(+), 87 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg index 099b8449..e991320d 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveAck.svg @@ -1,19 +1,97 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg index 4ffb9b62..3ad51c25 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateActiveNotAck.svg @@ -4,10 +4,9 @@ id="Ebene_1" x="0px" y="0px" - viewBox="0 0 32 32" - style="enable-background:new 0 0 32 32;" - width="32px" - height="32px" + viewBox="0 0 48 48" + width="48" + height="48" class="br-symbol-library" sodipodi:docname="AlarmStateActiveNotAck.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" @@ -28,34 +27,39 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="26.15625" - inkscape:cx="15.598566" - inkscape:cy="16.019116" - inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:cx="14.164875" + inkscape:cy="31.311828" + inkscape:window-width="3440" + inkscape:window-height="1377" inkscape:window-x="1912" - inkscape:window-y="-8" + inkscape:window-y="1072" inkscape:window-maximized="1" inkscape:current-layer="Ebene_1" /> - - - - - + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg index a71e4993..4e8f4a96 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveAck.svg @@ -4,10 +4,9 @@ id="Ebene_1" x="0px" y="0px" - viewBox="0 0 32 32" - style="enable-background:new 0 0 32 32;" - width="32px" - height="32px" + viewBox="0 0 48 48" + width="48" + height="48" class="br-symbol-library" sodipodi:docname="AlarmStateInactiveAck.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" @@ -28,34 +27,39 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="26.15625" - inkscape:cx="15.904421" + inkscape:cx="14.470729" inkscape:cy="16.019116" - inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-width="3440" + inkscape:window-height="1377" inkscape:window-x="1912" - inkscape:window-y="-8" + inkscape:window-y="1072" inkscape:window-maximized="1" inkscape:current-layer="Ebene_1" /> - - - - - + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg index 91c9f1b8..7abbada8 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Alarm/AlarmStateInactiveNotAck.svg @@ -4,10 +4,9 @@ id="Ebene_1" x="0px" y="0px" - viewBox="0 0 32 32" - style="enable-background:new 0 0 32 32;" - width="32px" - height="32px" + viewBox="0 0 48 48" + width="48" + height="48" class="br-symbol-library" sodipodi:docname="AlarmStateInactiveNotAck.svg" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" @@ -28,17 +27,17 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="26.15625" - inkscape:cx="15.904421" + inkscape:cx="14.470729" inkscape:cy="16.019116" - inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-width="3440" + inkscape:window-height="1377" inkscape:window-x="1912" - inkscape:window-y="-8" + inkscape:window-y="1072" inkscape:window-maximized="1" inkscape:current-layer="Ebene_1" /> diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index ddace36c..a8739eb2 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -1,9 +1,9 @@  - + - + From a8f13a80c2d6e942f182b7bed495f12bc42918ee Mon Sep 17 00:00:00 2001 From: Will_Marberry Date: Thu, 5 Jan 2023 15:14:03 -0500 Subject: [PATCH 072/112] AAZM-418 popup for creating new default recipe appears twice fixed --- .../Recipe/RecipeMgr/HMIActions.st | 394 +++++++++--------- .../Recipe/RecipeMgr/RecipeMgr.st | 361 ++++++++-------- .../Recipe/RecipeMgr/RecipeMgr.typ | 1 + .../Recipe/Recipe_content.eventbinding | 14 +- 4 files changed, 393 insertions(+), 377 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st index 5246cc89..a3d52110 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st @@ -1,6 +1,6 @@ ACTION FormatDeviceDataProvider: - // Select CF device if USB device is not available + // Select CF device if USB device is not available FOR i := 0 TO ((SIZEOF(gUSBAvailable) / SIZEOF(gUSBAvailable[0])) - 1) DO IF gUSBAvailable[i] THEN HmiRecipe.Status.DeviceDataProvider[i + 1] := '{"value":"USB'; @@ -15,210 +15,214 @@ ACTION FormatDeviceDataProvider: brsmemset(ADR(MpFileManagerUIConnect.DeviceList.DeviceNames[i + 1]), 0, SIZEOF(MpFileManagerUIConnect.DeviceList.DeviceNames[i + 1])); END_IF END_FOR + +END_ACTION - // Configure visible recipe list - IF MpRecipeUIConnect.Recipe.List.Names[0] = '' THEN - HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":0,"to":19, "visible":false}]}'; - ELSE - HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":'; - brsitoa(MpRecipeUIConnect.Recipe.List.MaxSelection + 1, ADR(HmiRecipe.Status.TableConfig) + brsstrlen(ADR(HmiRecipe.Status.TableConfig))); - brsstrcat(ADR(HmiRecipe.Status.TableConfig), ADR(',"to":19, "visible":false}]}')); - END_IF - - HmiRecipe.Status.FilesAvailable := (MpRecipeUIConnect.Recipe.List.Names[0] <> ''); +ACTION LoadStatus: + // Configure visible recipe list + IF MpRecipeUIConnect.Recipe.List.Names[0] = '' THEN + HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":0,"to":19, "visible":false}]}'; + ELSE + HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":'; + brsitoa(MpRecipeUIConnect.Recipe.List.MaxSelection + 1, ADR(HmiRecipe.Status.TableConfig) + brsstrlen(ADR(HmiRecipe.Status.TableConfig))); + brsstrcat(ADR(HmiRecipe.Status.TableConfig), ADR(',"to":19, "visible":false}]}')); + END_IF + + HmiRecipe.Status.FilesAvailable := (MpRecipeUIConnect.Recipe.List.Names[0] <> ''); HmiRecipe.Status.LoadAllowed := HmiRecipe.Status.FilesAvailable AND NOT HmiRecipe.Status.InvalidRecipe; + HmiRecipe.Status.DeviceValid := (MpFileManagerUI_0.Info.Diag.StatusID.Code <> 8197); END_ACTION ACTION LoadPreview: - // Load preview when a recipe is selected - IF (MpRecipeUIConnect.Recipe.List.SelectedIndex <> HmiRecipe.Status.LastSelectedIndex) OR (HmiRecipe.Status.LastMaxSelection <> MpRecipeUIConnect.Recipe.List.MaxSelection) THEN - // Check selected recipe name is not empty - IF (brsstrlen(ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex])) > 0) THEN - MpRecipe_0.FileName := ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]); - MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); - MpRecipe_0.Load := TRUE; - HmiRecipe.Status.LastSelectedIndex := MpRecipeUIConnect.Recipe.List.SelectedIndex; - HmiRecipe.Status.LastMaxSelection := MpRecipeUIConnect.Recipe.List.MaxSelection; - HmiRecipe.Status.InvalidRecipe := FALSE; - END_IF - END_IF - - // Reset load command on MpRecipe_0 FUB - IF MpRecipe_0.StatusID <> 0 THEN - HmiRecipe.Status.InvalidRecipe := TRUE; - HmiRecipe.Commands.ResetPreview := TRUE; - END_IF; - - IF ((MpRecipe_0.CommandDone = TRUE) OR (MpRecipe_0.Error = TRUE)) THEN - MpRecipe_0.Load := FALSE; - END_IF + // Load preview when a recipe is selected + IF (MpRecipeUIConnect.Recipe.List.SelectedIndex <> HmiRecipe.Status.LastSelectedIndex) OR (HmiRecipe.Status.LastMaxSelection <> MpRecipeUIConnect.Recipe.List.MaxSelection) THEN + // Check selected recipe name is not empty + IF (brsstrlen(ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex])) > 0) THEN + MpRecipe_0.FileName := ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]); + MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); + MpRecipe_0.Load := TRUE; + HmiRecipe.Status.LastSelectedIndex := MpRecipeUIConnect.Recipe.List.SelectedIndex; + HmiRecipe.Status.LastMaxSelection := MpRecipeUIConnect.Recipe.List.MaxSelection; + HmiRecipe.Status.InvalidRecipe := FALSE; + END_IF + END_IF + + // Reset load command on MpRecipe_0 FUB + IF MpRecipe_0.StatusID <> 0 THEN + HmiRecipe.Status.InvalidRecipe := TRUE; + HmiRecipe.Commands.ResetPreview := TRUE; + END_IF; + + IF ((MpRecipe_0.CommandDone = TRUE) OR (MpRecipe_0.Error = TRUE)) THEN + MpRecipe_0.Load := FALSE; + END_IF END_ACTION ACTION RecipeHMIcommands: - CASE HmiRecipe.Status.HMIcommand OF - REC_HMI_WAIT: - // The following commands are triggered directly from the HMI. If you imported the mapp View front end of - // the Framework, then this is already taken care of. If you did not, then your visualization must - // trigger each one of these command variables (CreateRecipe, SaveSelectedRecipe, LoadRecipe). - IF (MpRecipeUIConnect.Status <> mpRECIPE_UI_STATUS_IDLE) THEN - // MpRecipe is active so don't issue a new command - ELSIF HmiRecipe.Commands.CreateRecipe THEN - HmiRecipe.Status.HMIcommand := REC_HMI_CREATE; - HmiRecipe.Commands.CreateRecipe := FALSE; - ELSIF HmiRecipe.Commands.SaveSelectedRecipe THEN - HmiRecipe.Status.HMIcommand := REC_HMI_SAVE; - HmiRecipe.Commands.SaveSelectedRecipe := FALSE; - ELSIF HmiRecipe.Commands.LoadRecipe THEN - HmiRecipe.Status.HMIcommand := REC_HMI_LOAD; - HmiRecipe.Commands.LoadRecipe := FALSE; - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - HmiRecipe.Status.ProductRecipeLoaded := FALSE; - ELSE - HmiRecipe.Status.ConfigRecipeLoaded := FALSE; - END_IF - ELSIF HmiRecipe.Commands.ResetPreview THEN - HmiRecipe.Status.HMIcommand := REC_HMI_RESET_PREVIEW; - HmiRecipe.Commands.ResetPreview := FALSE; - END_IF - - REC_HMI_CREATE: - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - ParametersPreview := ParametersEdit; - brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); - brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.par')); - // If the default recipe was initially missing and just now created, immediately load it - IF HmiRecipe.Status.ParameterRecipeMissing THEN - HmiRecipe.Commands.LoadRecipe := TRUE; - END_IF - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettingsPreview := MachineSettingsEdit; - brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); - brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.mcfg')); - // If the default recipe was initially missing and just now created, immediately load it - IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN - HmiRecipe.Commands.LoadRecipe := TRUE; - END_IF - END_IF - - Header.Name := MpRecipeUIConnect.New.FileName; - DTGetTime_0.enable := TRUE; - REPEAT - DTGetTime_0(); - UNTIL (DTGetTime_0.status = 0) - END_REPEAT; - Header.DateTime := DTGetTime_0.DT1; - DTGetTime_0.enable := FALSE; - DTGetTime_0(); - MpRecipeUIConnect.New.Create := TRUE; - - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - - REC_HMI_LOAD: - IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - Parameters := ParametersPreview; - HmiRecipe.Status.ProductRecipeLoaded := TRUE; - // If the default recipe was initially missing and just now created, then it is the last loaded recipe - IF HmiRecipe.Status.ParameterRecipeMissing THEN - HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe), ADR(PARAMETERS_FILE_EXTENSION)); - HmiRecipe.Status.ParameterRecipeMissing := FALSE; - // Otherwise, the last loaded recipe is the selected recipe - ELSE - HmiRecipe.Status.LastLoadedProductRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - END_IF - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettings := MachineSettingsPreview; - HmiRecipe.Status.ConfigRecipeLoaded := TRUE; - // If the default recipe was initially missing and just now created, then it is the last loaded recipe - IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN - HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe), ADR(MACHINE_CONFIG_FILE_EXTENSION)); - HmiRecipe.Status.MachineSettingsRecipeMissing := FALSE; - // Otherwise, the last loaded recipe is the selected recipe - ELSE - HmiRecipe.Status.LastLoadedConfigRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - END_IF - END_IF - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - END_IF - - REC_HMI_SAVE: - IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN - - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - ParametersPreview := ParametersEdit; - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettingsPreview := MachineSettingsEdit; - END_IF - - IF (brsstrlen(ADR(HmiRecipe.Status.SelectedRecipe)) > 0) THEN - MpRecipe_0.FileName := ADR(HmiRecipe.Status.SelectedRecipe); - MpRecipe_0.Save := TRUE; - END_IF - - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - END_IF - - REC_HMI_RESET_PREVIEW: - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - brsmemset(ADR(ParametersPreview), 0, SIZEOF(ParametersPreview)); - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - brsmemset(ADR(MachineSettingsPreview), 0, SIZEOF(MachineSettingsPreview)); - END_IF - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - - END_CASE - - // IF NOT MpRecipe_0.CommandBusy AND brsstrcmp(ADR(HmiRecipe.Status.PreviousRecipe), ADR(HmiRecipe.Parameters.FileName)) <> 0 THEN - // HmiRecipe.Parameters.FileName := HmiRecipe.Status.PreviousRecipe; - // END_IF - - // If the Edit or Create dialog boxes open, copy the Preview structure into the Edit structure. - IF HmiRecipe.Status.EditDialogOpened OR HmiRecipe.Status.CreateDialogOpened THEN - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - ParametersEdit := ParametersPreview; - IF HmiRecipe.Status.ParameterRecipeMissing THEN - HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; - ELSE - HmiRecipe.Parameters.FileName:= 'newParameters'; - END_IF - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettingsEdit := MachineSettingsPreview; - IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN - HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; - ELSE - HmiRecipe.Parameters.FileName := 'newMachineConfig'; - END_IF - END_IF - HmiRecipe.Status.EditDialogOpened := FALSE; - HmiRecipe.Status.CreateDialogOpened := FALSE; - END_IF - - // Check if the file name has already been used - HmiRecipe.Status.FileDuplicate := FALSE; - FOR i:=0 TO ((SIZEOF(MpRecipeUIConnect.Recipe.List.Names) / SIZEOF(MpRecipeUIConnect.Recipe.List.Names[0])) - 1) DO - temp := HmiRecipe.Parameters.FileName; - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - brsstrcat(ADR(temp),ADR('.par')); - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - brsstrcat(ADR(temp),ADR('.mcfg')); - END_IF - IF temp = MpRecipeUIConnect.Recipe.List.Names[i] THEN - HmiRecipe.Status.FileDuplicate := TRUE; - END_IF - END_FOR - - // Set whether the loading .gif should be shown on the HMI - HmiRecipe.Status.LoadingRecipeList := (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_REFRESH); - HmiRecipe.Status.DefaultRecipeSelected := (HmiRecipe.Status.SelectedRecipe = 'Default.par') OR (HmiRecipe.Status.SelectedRecipe = 'Machine.mcfg'); - - // Update status information - HmiRecipe.Status.LastStatus := MpRecipeUIConnect.Status; - HmiRecipe.Status.SelectedRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - + CASE HmiRecipe.Status.HMIcommand OF + REC_HMI_WAIT: + // The following commands are triggered directly from the HMI. If you imported the mapp View front end of + // the Framework, then this is already taken care of. If you did not, then your visualization must + // trigger each one of these command variables (CreateRecipe, SaveSelectedRecipe, LoadRecipe). + IF (MpRecipeUIConnect.Status <> mpRECIPE_UI_STATUS_IDLE) THEN + // MpRecipe is active so don't issue a new command + ELSIF HmiRecipe.Commands.CreateRecipe THEN + HmiRecipe.Status.HMIcommand := REC_HMI_CREATE; + HmiRecipe.Commands.CreateRecipe := FALSE; + ELSIF HmiRecipe.Commands.SaveSelectedRecipe THEN + HmiRecipe.Status.HMIcommand := REC_HMI_SAVE; + HmiRecipe.Commands.SaveSelectedRecipe := FALSE; + ELSIF HmiRecipe.Commands.LoadRecipe THEN + HmiRecipe.Status.HMIcommand := REC_HMI_LOAD; + HmiRecipe.Commands.LoadRecipe := FALSE; + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + HmiRecipe.Status.ProductRecipeLoaded := FALSE; + ELSE + HmiRecipe.Status.ConfigRecipeLoaded := FALSE; + END_IF + ELSIF HmiRecipe.Commands.ResetPreview THEN + HmiRecipe.Status.HMIcommand := REC_HMI_RESET_PREVIEW; + HmiRecipe.Commands.ResetPreview := FALSE; + END_IF + + REC_HMI_CREATE: + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + ParametersPreview := ParametersEdit; + brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); + brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.par')); + // If the default recipe was initially missing and just now created, immediately load it + IF HmiRecipe.Status.ParameterRecipeMissing THEN + HmiRecipe.Commands.LoadRecipe := TRUE; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettingsPreview := MachineSettingsEdit; + brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); + brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.mcfg')); + // If the default recipe was initially missing and just now created, immediately load it + IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN + HmiRecipe.Commands.LoadRecipe := TRUE; + END_IF + END_IF + + Header.Name := MpRecipeUIConnect.New.FileName; + DTGetTime_0.enable := TRUE; + REPEAT + DTGetTime_0(); + UNTIL (DTGetTime_0.status = 0) + END_REPEAT; + Header.DateTime := DTGetTime_0.DT1; + DTGetTime_0.enable := FALSE; + DTGetTime_0(); + MpRecipeUIConnect.New.Create := TRUE; + + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + + REC_HMI_LOAD: + IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + Parameters := ParametersPreview; + HmiRecipe.Status.ProductRecipeLoaded := TRUE; + // If the default recipe was initially missing and just now created, then it is the last loaded recipe + IF HmiRecipe.Status.ParameterRecipeMissing THEN + HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe), ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipe.Status.ParameterRecipeMissing := FALSE; + // Otherwise, the last loaded recipe is the selected recipe + ELSE + HmiRecipe.Status.LastLoadedProductRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettings := MachineSettingsPreview; + HmiRecipe.Status.ConfigRecipeLoaded := TRUE; + // If the default recipe was initially missing and just now created, then it is the last loaded recipe + IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN + HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe), ADR(MACHINE_CONFIG_FILE_EXTENSION)); + HmiRecipe.Status.MachineSettingsRecipeMissing := FALSE; + // Otherwise, the last loaded recipe is the selected recipe + ELSE + HmiRecipe.Status.LastLoadedConfigRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + END_IF + END_IF + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + END_IF + + REC_HMI_SAVE: + IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN + + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + ParametersPreview := ParametersEdit; + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettingsPreview := MachineSettingsEdit; + END_IF + + IF (brsstrlen(ADR(HmiRecipe.Status.SelectedRecipe)) > 0) THEN + MpRecipe_0.FileName := ADR(HmiRecipe.Status.SelectedRecipe); + MpRecipe_0.Save := TRUE; + END_IF + + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + END_IF + + REC_HMI_RESET_PREVIEW: + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + brsmemset(ADR(ParametersPreview), 0, SIZEOF(ParametersPreview)); + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + brsmemset(ADR(MachineSettingsPreview), 0, SIZEOF(MachineSettingsPreview)); + END_IF + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + + END_CASE + + // IF NOT MpRecipe_0.CommandBusy AND brsstrcmp(ADR(HmiRecipe.Status.PreviousRecipe), ADR(HmiRecipe.Parameters.FileName)) <> 0 THEN + // HmiRecipe.Parameters.FileName := HmiRecipe.Status.PreviousRecipe; + // END_IF + + // If the Edit or Create dialog boxes open, copy the Preview structure into the Edit structure. + IF HmiRecipe.Status.EditDialogOpened OR HmiRecipe.Status.CreateDialogOpened THEN + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + ParametersEdit := ParametersPreview; + IF HmiRecipe.Status.ParameterRecipeMissing THEN + HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; + ELSE + HmiRecipe.Parameters.FileName:= 'newParameters'; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettingsEdit := MachineSettingsPreview; + IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN + HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; + ELSE + HmiRecipe.Parameters.FileName := 'newMachineConfig'; + END_IF + END_IF + HmiRecipe.Status.EditDialogOpened := FALSE; + HmiRecipe.Status.CreateDialogOpened := FALSE; + END_IF + + // Check if the file name has already been used + HmiRecipe.Status.FileDuplicate := FALSE; + FOR i:=0 TO ((SIZEOF(MpRecipeUIConnect.Recipe.List.Names) / SIZEOF(MpRecipeUIConnect.Recipe.List.Names[0])) - 1) DO + temp := HmiRecipe.Parameters.FileName; + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + brsstrcat(ADR(temp),ADR('.par')); + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + brsstrcat(ADR(temp),ADR('.mcfg')); + END_IF + IF temp = MpRecipeUIConnect.Recipe.List.Names[i] THEN + HmiRecipe.Status.FileDuplicate := TRUE; + END_IF + END_FOR + + // Set whether the loading .gif should be shown on the HMI + HmiRecipe.Status.LoadingRecipeList := (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_REFRESH); + HmiRecipe.Status.DefaultRecipeSelected := (HmiRecipe.Status.SelectedRecipe = 'Default.par') OR (HmiRecipe.Status.SelectedRecipe = 'Machine.mcfg'); + + // Update status information + HmiRecipe.Status.LastStatus := MpRecipeUIConnect.Status; + HmiRecipe.Status.SelectedRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + END_ACTION diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st index 6a385611..69204d86 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st @@ -7,197 +7,198 @@ PROGRAM _INIT - // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); - - // Check if folder already exist and if so disabled the function block call - IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN - DirCreate_0(enable := FALSE); - END_IF - - // Initialize mapp function blocks - // By default, the Framework sets up an XML recipe system. To swtich to the CSV format, refer to the "Change Recipe Format" - // page in the AS Help (GUID 2052b3a5-f59b-45f9-9fcd-3289c93401af) - MpRecipeUISetup.Confirmation.RecipeDelete := TRUE; - MpRecipeUISetup.RecipeListSize := 10; - MpRecipeUISetup.RecipeListScrollWindow := 0; - MpRecipeUISetup.AutoLoadHeader := TRUE; - MpRecipeUIConnect.New.FileName := 'newRecipe'; - MpRecipeUIConnect.Recipe.Filter := '*par'; - MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeUI_0.Enable := TRUE; - MpRecipeUI_0.UIConnect := ADR(MpRecipeUIConnect); - MpRecipeUI_0.UISetup := MpRecipeUISetup; - MpRecipeUI_0(); - - HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; - HmiRecipe.Status.DeviceDataProvider[0] := '{"value":"mappRecipeFiles","text":"CF/PLC"}'; - HmiRecipe.Parameters.DeviceName := 'mappRecipeFiles'; - MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); - MpRecipe_0.Enable := TRUE; - MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); - MpRecipe_0.DeviceName := ADR(HmiRecipe.Parameters.DeviceName); - MpRecipe_0.FileName := ADR(HmiRecipe.Parameters.FileName); - MpRecipe_0.Header := ADR(Header); - - // Wait for MpRecipe_0 to activate. This must be active before you can call the RegPar function blocks, which is below. - WHILE NOT(MpRecipe_0.Active OR MpRecipe_0.Error) DO - MpRecipe_0(); - END_WHILE - - // Register the preview variables to the recipe. These preview variables are a buffer between the recipe system and the - // variables used at runtime on the machine (Parameters, MachineSettings). By using these preview variables, you can - // preview and edit a recipe on the HMI without actually loading it to the machine. For more details, refer to the - // "Recipe System Design" page in the AS Help (GUID 3ccd7409-0b52-4bbc-a93a-4010f6db414c). - - MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeRegPar_PreviewPar.Enable := TRUE; - MpRecipeRegPar_PreviewPar.PVName := ADR('RecipeMgr:ParametersPreview'); - MpRecipeRegPar_PreviewPar.Category := ADR(PARAMETERS_CATEGORY); - MpRecipeRegPar_PreviewPar(); - - MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeRegPar_PreviewCfg.Enable := TRUE; - MpRecipeRegPar_PreviewCfg.PVName := ADR('RecipeMgr:MachineSettingsPreview'); - MpRecipeRegPar_PreviewCfg.Category := ADR(MACHINE_CONFIGURATION_CATEGORY); - MpRecipeRegPar_PreviewCfg(); - - // Wait for RegPar function blocks to activate. These must be active before you can load a recipe, - // which is further down in the Initialization program. - WHILE NOT(MpRecipeRegPar_PreviewPar.Active OR MpRecipeRegPar_PreviewPar.Error) DO - MpRecipeRegPar_PreviewPar(); - END_WHILE - WHILE NOT(MpRecipeRegPar_PreviewCfg.Active OR MpRecipeRegPar_PreviewCfg.Error) DO - MpRecipeRegPar_PreviewCfg(); - END_WHILE - - // Load default Machine Settings recipe - HmiRecipe.Parameters.Category := MACHINE_CONFIGURATION_CATEGORY; - HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(MACHINE_CONFIG_FILE_EXTENSION)); - MpRecipe_0.Load := TRUE; - WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO - MpRecipe_0(); - END_WHILE - MachineSettings := MachineSettingsPreview; - HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe),ADR(MACHINE_CONFIG_FILE_EXTENSION)); - HmiRecipe.Status.ConfigRecipeLoaded := TRUE; - - // Check if the default machine settings recipe is missing - IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN - HmiRecipe.Status.MachineSettingsRecipeMissing := TRUE; - HmiRecipe.Status.LastLoadedConfigRecipe := ''; - HmiRecipe.Status.ConfigRecipeLoaded := FALSE; - END_IF - - MpRecipe_0.ErrorReset := MpRecipe_0.Error; - MpRecipe_0.Load := FALSE; - MpRecipe_0(); - - // Load default Parameter recipe - HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; - HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(PARAMETERS_FILE_EXTENSION)); - HmiRecipe.Status.PreviousRecipe := DEFAULT_PARAMETERS; - MpRecipe_0.Load := TRUE; - WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO - MpRecipe_0(); - END_WHILE - Parameters := ParametersPreview; - HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe),ADR(PARAMETERS_FILE_EXTENSION)); - HmiRecipe.Status.ProductRecipeLoaded := TRUE; - - // Check if the default parameters recipe is missing - IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN - HmiRecipe.Status.ParameterRecipeMissing := TRUE; - HmiRecipe.Status.LastLoadedProductRecipe := ''; - HmiRecipe.Status.ProductRecipeLoaded := FALSE; - END_IF - - - - MpRecipe_0.ErrorReset := MpRecipe_0.Error; - MpRecipe_0.Load := FALSE; - MpRecipe_0(); - - // Trigger update notification so that the initial parameters are copied to the process - MpRecipe_0.UpdateNotification := TRUE; - - // Init Filemanager for exporting/importing files - MpFileManagerUI_0.Enable := TRUE; - MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); - MpFileManagerUI_0.UIConnect := ADR(MpFileManagerUIConnect); - MpFileManagerUI_0.UISetup.FileListSize := SIZEOF(MpFileManagerUIConnect.File.List.Items) / SIZEOF(MpFileManagerUIConnect.File.List.Items[0]); - MpFileManagerUIConnect.DeviceList.DeviceNames[0] := 'mappRecipeFiles'; - MpFileManagerUIConnect.DeviceList.DeviceNames[1] := ''; - MpFileManagerUI_0(); - - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + // Create folder for this component on the user file device + DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + + // Check if folder already exist and if so disabled the function block call + IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN + DirCreate_0(enable := FALSE); + END_IF + + // Initialize mapp function blocks + // By default, the Framework sets up an XML recipe system. To swtich to the CSV format, refer to the "Change Recipe Format" + // page in the AS Help (GUID 2052b3a5-f59b-45f9-9fcd-3289c93401af) + MpRecipeUISetup.Confirmation.RecipeDelete := TRUE; + MpRecipeUISetup.RecipeListSize := 10; + MpRecipeUISetup.RecipeListScrollWindow := 0; + MpRecipeUISetup.AutoLoadHeader := TRUE; + MpRecipeUIConnect.New.FileName := 'newRecipe'; + MpRecipeUIConnect.Recipe.Filter := '*par'; + MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeUI_0.Enable := TRUE; + MpRecipeUI_0.UIConnect := ADR(MpRecipeUIConnect); + MpRecipeUI_0.UISetup := MpRecipeUISetup; + MpRecipeUI_0(); + + HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; + HmiRecipe.Status.DeviceDataProvider[0] := '{"value":"mappRecipeFiles","text":"CF/PLC"}'; + HmiRecipe.Parameters.DeviceName := 'mappRecipeFiles'; + MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); + MpRecipe_0.Enable := TRUE; + MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); + MpRecipe_0.DeviceName := ADR(HmiRecipe.Parameters.DeviceName); + MpRecipe_0.FileName := ADR(HmiRecipe.Parameters.FileName); + MpRecipe_0.Header := ADR(Header); + + // Wait for MpRecipe_0 to activate. This must be active before you can call the RegPar function blocks, which is below. + WHILE NOT(MpRecipe_0.Active OR MpRecipe_0.Error) DO + MpRecipe_0(); + END_WHILE + + // Register the preview variables to the recipe. These preview variables are a buffer between the recipe system and the + // variables used at runtime on the machine (Parameters, MachineSettings). By using these preview variables, you can + // preview and edit a recipe on the HMI without actually loading it to the machine. For more details, refer to the + // "Recipe System Design" page in the AS Help (GUID 3ccd7409-0b52-4bbc-a93a-4010f6db414c). + + MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeRegPar_PreviewPar.Enable := TRUE; + MpRecipeRegPar_PreviewPar.PVName := ADR('RecipeMgr:ParametersPreview'); + MpRecipeRegPar_PreviewPar.Category := ADR(PARAMETERS_CATEGORY); + MpRecipeRegPar_PreviewPar(); + + MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeRegPar_PreviewCfg.Enable := TRUE; + MpRecipeRegPar_PreviewCfg.PVName := ADR('RecipeMgr:MachineSettingsPreview'); + MpRecipeRegPar_PreviewCfg.Category := ADR(MACHINE_CONFIGURATION_CATEGORY); + MpRecipeRegPar_PreviewCfg(); + + // Wait for RegPar function blocks to activate. These must be active before you can load a recipe, + // which is further down in the Initialization program. + WHILE NOT(MpRecipeRegPar_PreviewPar.Active OR MpRecipeRegPar_PreviewPar.Error) DO + MpRecipeRegPar_PreviewPar(); + END_WHILE + WHILE NOT(MpRecipeRegPar_PreviewCfg.Active OR MpRecipeRegPar_PreviewCfg.Error) DO + MpRecipeRegPar_PreviewCfg(); + END_WHILE + + // Load default Machine Settings recipe + HmiRecipe.Parameters.Category := MACHINE_CONFIGURATION_CATEGORY; + HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + MpRecipe_0.Load := TRUE; + WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO + MpRecipe_0(); + END_WHILE + MachineSettings := MachineSettingsPreview; + HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + HmiRecipe.Status.ConfigRecipeLoaded := TRUE; + + // Check if the default machine settings recipe is missing + IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN + HmiRecipe.Status.MachineSettingsRecipeMissing := TRUE; + HmiRecipe.Status.LastLoadedConfigRecipe := ''; + HmiRecipe.Status.ConfigRecipeLoaded := FALSE; + END_IF + + MpRecipe_0.ErrorReset := MpRecipe_0.Error; + MpRecipe_0.Load := FALSE; + MpRecipe_0(); + + // Load default Parameter recipe + HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; + HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipe.Status.PreviousRecipe := DEFAULT_PARAMETERS; + MpRecipe_0.Load := TRUE; + WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO + MpRecipe_0(); + END_WHILE + Parameters := ParametersPreview; + HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe),ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipe.Status.ProductRecipeLoaded := TRUE; + + // Check if the default parameters recipe is missing + IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN + HmiRecipe.Status.ParameterRecipeMissing := TRUE; + HmiRecipe.Status.LastLoadedProductRecipe := ''; + HmiRecipe.Status.ProductRecipeLoaded := FALSE; + END_IF + + + + MpRecipe_0.ErrorReset := MpRecipe_0.Error; + MpRecipe_0.Load := FALSE; + MpRecipe_0(); + + // Trigger update notification so that the initial parameters are copied to the process + MpRecipe_0.UpdateNotification := TRUE; + + // Init Filemanager for exporting/importing files + MpFileManagerUI_0.Enable := TRUE; + MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); + MpFileManagerUI_0.UIConnect := ADR(MpFileManagerUIConnect); + MpFileManagerUI_0.UISetup.FileListSize := SIZEOF(MpFileManagerUIConnect.File.List.Items) / SIZEOF(MpFileManagerUIConnect.File.List.Items[0]); + MpFileManagerUIConnect.DeviceList.DeviceNames[0] := 'mappRecipeFiles'; + MpFileManagerUIConnect.DeviceList.DeviceNames[1] := ''; + MpFileManagerUI_0(); + + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; END_PROGRAM PROGRAM _CYCLIC - // Call actions - FormatDeviceDataProvider; - LoadPreview; + // Call actions + FormatDeviceDataProvider; + LoadPreview; RecipeHMIcommands; - - // Reset commands on MpRecipe FUB - IF MpRecipe_0.CommandDone THEN - MpRecipe_0.Load := FALSE; - MpRecipe_0.Save := FALSE; - // Set update notification for machine category - IF ((brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_CATEGORY)) = 0) AND (MpRecipe_0.Save = TRUE)) THEN - MpRecipe_0.UpdateNotification := TRUE; - ELSE - MpRecipe_0.UpdateNotification := FALSE; - END_IF - END_IF - - - // Error reset - IF NOT MpRecipe_0.Error THEN - MpRecipe_0.ErrorReset := FALSE; - END_IF - - IF NOT MpRecipeUI_0.Error THEN - MpRecipeUI_0.ErrorReset := FALSE; - END_IF - - // Assign MpLinks - MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); - MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); - MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); - - // Call function blocks - MpRecipe_0(); - MpRecipeUI_0(); - MpFileManagerUI_0(); - MpRecipeRegPar_PreviewPar(); - MpRecipeRegPar_PreviewCfg(); + LoadStatus; + + // Reset commands on MpRecipe FUB + IF MpRecipe_0.CommandDone THEN + MpRecipe_0.Load := FALSE; + MpRecipe_0.Save := FALSE; + // Set update notification for machine category + IF ((brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_CATEGORY)) = 0) AND (MpRecipe_0.Save = TRUE)) THEN + MpRecipe_0.UpdateNotification := TRUE; + ELSE + MpRecipe_0.UpdateNotification := FALSE; + END_IF + END_IF + + + // Error reset + IF NOT MpRecipe_0.Error THEN + MpRecipe_0.ErrorReset := FALSE; + END_IF + + IF NOT MpRecipeUI_0.Error THEN + MpRecipeUI_0.ErrorReset := FALSE; + END_IF + + // Assign MpLinks + MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); + MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); + MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); + + // Call function blocks + MpRecipe_0(); + MpRecipeUI_0(); + MpFileManagerUI_0(); + MpRecipeRegPar_PreviewPar(); + MpRecipeRegPar_PreviewCfg(); END_PROGRAM PROGRAM _EXIT - // Disable the function blocls to unlink the MpLinks - MpRecipe_0.Enable := FALSE; - MpRecipeUI_0.Enable := FALSE; - MpRecipeRegPar_PreviewPar.Enable := FALSE; - MpRecipeRegPar_PreviewCfg.Enable := FALSE; - MpFileManagerUI_0.Enable := FALSE; - - // Call function blocks - MpRecipe_0(); - MpRecipeUI_0(); - MpRecipeRegPar_PreviewPar(); - MpRecipeRegPar_PreviewCfg(); - MpFileManagerUI_0(); + // Disable the function blocls to unlink the MpLinks + MpRecipe_0.Enable := FALSE; + MpRecipeUI_0.Enable := FALSE; + MpRecipeRegPar_PreviewPar.Enable := FALSE; + MpRecipeRegPar_PreviewCfg.Enable := FALSE; + MpFileManagerUI_0.Enable := FALSE; + + // Call function blocks + MpRecipe_0(); + MpRecipeUI_0(); + MpRecipeRegPar_PreviewPar(); + MpRecipeRegPar_PreviewCfg(); + MpFileManagerUI_0(); END_PROGRAM diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ index c304b187..10fc899c 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ @@ -35,6 +35,7 @@ TYPE LoadingRecipeList : BOOL; (*The recipe list is loading*) MachineSettingsRecipeMissing : BOOL; (*Flag for if the default machine settings recipe is not present*) ParameterRecipeMissing : BOOL; (*Flag for if the default parameters recipe is not present*) + DeviceValid : BOOL; (*Flag for whether FileDevice is valid. Prevents user from being prompted to load default recipe.*) LoadAllowed : BOOL; (*Flag for whether you can load a recipe. Recipe must exist and be valid. *) DeviceDataProvider : ARRAY[0..MAX_IDX_FILE_DEV]OF STRING[100]; (*File device data provider*) TableConfig : STRING[120]; (*Table configuration *) diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index c618d3ad..4ffbbd4d 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -303,7 +303,12 @@ - + + + + + + @@ -338,7 +343,12 @@ - + + + + + + From 756fe9d81f39af1270330d9f9dda5c7a333ec729 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Thu, 5 Jan 2023 15:27:45 -0600 Subject: [PATCH 073/112] AAZM-281 - fixed missing namespace in mappView report tmx --- .../Texts/mappFrameworkTexts/ReportTexts.tmx | 2 +- .../ReportCreate/ReportDialog_Create.content | 16 +++++++------- .../ReportDelete/ReportDialog_Delete.content | 6 +++--- .../AlarmsContent/AlarmXQuery.content | 2 +- .../ReportContent/Report.content | 21 ++++++++++--------- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx index 89425fe8..bc41b185 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx @@ -2,7 +2,7 @@
Change the namespace to define where this text module should be located within the logical structure of your texts - IAT/Report + IAT/mappFramework/Report
diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content index a65cff34..4297effb 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content @@ -3,19 +3,19 @@ - - - + + + - - + + - - - + + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content index cfdbfca3..a6b7878a 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content index a8739eb2..c750ca5f 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content @@ -1,7 +1,7 @@  - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content index 931cd42e..34e86c29 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content @@ -3,19 +3,20 @@ - - + + - + - - - - - - - + + + + + + + + \ No newline at end of file From 143a97ebb2e11105b05459fbe86160cde7cee0f0 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Fri, 6 Jan 2023 11:55:21 -0500 Subject: [PATCH 074/112] Added Backup button icons to match Recipe icons --- .../Backup/CreateBackup.svg | 59 +++++++++++++++++++ .../mappFrameworkSymbols/Backup/Package.pkg | 8 +++ .../Backup/RestoreBackup.svg | 52 ++++++++++++++++ .../Media/mappFrameworkSymbols/Package.pkg | 1 + .../BackupContent/Backup.content | 24 ++++---- .../RecipeContent/Recipe.content | 2 +- 6 files changed, 133 insertions(+), 13 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/RestoreBackup.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg new file mode 100644 index 00000000..3afac8e3 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg @@ -0,0 +1,59 @@ + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg new file mode 100644 index 00000000..c8d4bb72 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg @@ -0,0 +1,8 @@ + + + + + CreateBackup.svg + RestoreBackup.svg + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/RestoreBackup.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/RestoreBackup.svg new file mode 100644 index 00000000..422b090d --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/RestoreBackup.svg @@ -0,0 +1,52 @@ + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg index 556de064..f147a12c 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg @@ -12,5 +12,6 @@ Navigation Logos Gifs + Backup \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index 5c1465b4..b12e98ac 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -1,4 +1,4 @@ - + @@ -14,26 +14,26 @@ - - - - + + + + - - - - - - + + + + + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index 8ca719e3..db4ef6d6 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -14,7 +14,7 @@ - + From 5cb6dfe0b486db90107b67ef9a6937cdf2b4e8ea Mon Sep 17 00:00:00 2001 From: austin_justin Date: Fri, 6 Jan 2023 16:05:15 -0500 Subject: [PATCH 075/112] Added page up/down icons Added icons to button on right side of file page --- .../mappFrameworkSymbols/File/MultiSelect.svg | 62 +++++++++++++ .../mappFrameworkSymbols/File/Package.pkg | 2 + .../mappFrameworkSymbols/File/Refresh.svg | 92 +++++++++++++++++++ .../Navigation/Package.pkg | 2 + .../Navigation/PageDown.svg | 51 ++++++++++ .../Navigation/PageUp.svg | 50 ++++++++++ .../FrameworkPackage/FileContent/File.content | 8 +- .../RecipeContent/Recipe.content | 4 +- 8 files changed, 265 insertions(+), 6 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/MultiSelect.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Refresh.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageDown.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageUp.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/MultiSelect.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/MultiSelect.svg new file mode 100644 index 00000000..30eeffc8 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/MultiSelect.svg @@ -0,0 +1,62 @@ + +image/svg+xml + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index 30007dac..15ba46ae 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -16,5 +16,7 @@ TXT.svg XML.svg NewRecipe.svg + MultiSelect.svg + Refresh.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Refresh.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Refresh.svg new file mode 100644 index 00000000..77e79142 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Refresh.svg @@ -0,0 +1,92 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg index c0054e0e..714b7f1b 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/Package.pkg @@ -11,5 +11,7 @@ Recipe.svg Report.svg UserGroup.svg + PageDown.svg + PageUp.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageDown.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageDown.svg new file mode 100644 index 00000000..440a5a0d --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageDown.svg @@ -0,0 +1,51 @@ + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageUp.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageUp.svg new file mode 100644 index 00000000..6a4a9f28 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Navigation/PageUp.svg @@ -0,0 +1,50 @@ + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index f4d92cfb..0be4a648 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -21,8 +21,8 @@ - - + + @@ -35,8 +35,8 @@ - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index db4ef6d6..10f709fa 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -14,8 +14,8 @@ - - + + From 16d3aad17550c4d16144032c56fdd944421f694a Mon Sep 17 00:00:00 2001 From: austin_justin Date: Fri, 6 Jan 2023 16:54:56 -0500 Subject: [PATCH 076/112] Editted create icons --- .../Backup/CreateBackup.svg | 8 +- .../mappFrameworkSymbols/Backup/Package.pkg | 2 +- .../mappFrameworkSymbols/File/NewRecipe.svg | 14 +- .../mappFrameworkSymbols/File/Package.pkg | 2 +- .../Media/mappFrameworkSymbols/Package.pkg | 1 + .../mappFrameworkSymbols/Report/NewReport.svg | 181 ++++++++++++++++++ .../mappFrameworkSymbols/Report/Package.pkg | 7 + .../BackupContent/Backup.content | 4 +- .../ReportContent/Report.content | 8 +- 9 files changed, 208 insertions(+), 19 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/NewReport.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg index 3afac8e3..12f5821a 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/CreateBackup.svg @@ -36,8 +36,8 @@ inkscape:deskcolor="#505050" showgrid="false" inkscape:zoom="13.078125" - inkscape:cx="1.7968937" - inkscape:cy="15.751493" + inkscape:cx="-2.7144564" + inkscape:cy="15.827957" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" @@ -48,7 +48,7 @@ id="Server"> + d="M 2.6582031 0 C 1.1902061 0 1.1842367e-15 1.1902061 0 2.6582031 L 0 29.34375 C 0 30.810748 1.1902061 32 2.6582031 32 L 29.34375 32 C 30.810748 32 32 30.809793 32 29.341797 L 32 10.832031 A 8 8 0 0 1 30.751953 12.533203 L 30.751953 29.341797 L 30.75 29.341797 C 30.75 30.117795 30.118795 30.75 29.341797 30.75 L 2.6582031 30.75 C 1.8822047 30.75 1.25 30.118795 1.25 29.341797 L 1.25 2.6582031 C 1.25 1.8822047 1.8812047 1.25 2.6582031 1.25 L 19.464844 1.25 A 8 8 0 0 1 21.167969 0 L 2.6582031 0 z M 4 2.5 C 3.3100014 2.5 2.75 3.0600014 2.75 3.75 L 2.75 8.5 C 2.75 9.1899986 3.3100014 9.75 4 9.75 L 17.509766 9.75 A 8 8 0 0 1 17 7 A 8 8 0 0 1 18.400391 2.5 L 4 2.5 z M 4 12.25 C 3.3100014 12.25 2.75 12.810002 2.75 13.5 L 2.75 18.25 C 2.75 18.939998 3.3100014 19.5 4 19.5 L 28 19.5 C 28.689998 19.5 29.25 18.939998 29.25 18.25 L 29.25 13.771484 A 8 8 0 0 1 26.5 14.839844 L 26.5 15.75 L 24.5 15.75 L 24.5 14.964844 A 8 8 0 0 1 18.964844 12.25 L 4 12.25 z M 4 22 C 3.3100014 22 2.75 22.560002 2.75 23.25 L 2.75 28 C 2.75 28.689998 3.3100014 29.25 4 29.25 L 28 29.25 C 28.689998 29.25 29.25 28.689998 29.25 28 L 29.25 23.25 C 29.25 22.560002 28.689998 22 28 22 L 4 22 z M 24.5 23.5 L 26.5 23.5 L 26.5 25.5 L 24.5 25.5 L 24.5 23.5 z " /> @@ -56,4 +56,4 @@ + transform="matrix(0.43749998,0,0,0.43749997,18,0.65863559)" /> diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg index c8d4bb72..907356e3 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Backup/Package.pkg @@ -2,7 +2,7 @@ - CreateBackup.svg RestoreBackup.svg + CreateBackup.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg index a3cfae95..f1260ad4 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewRecipe.svg @@ -34,9 +34,9 @@ inkscape:pagecheckerboard="1" inkscape:deskcolor="#505050" showgrid="false" - inkscape:zoom="18.495262" - inkscape:cx="10.624343" - inkscape:cy="16.869185" + inkscape:zoom="1.32" + inkscape:cx="27.651515" + inkscape:cy="21.969697" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" @@ -49,15 +49,15 @@ id="g15"> + d="M 3.9570312 0 C 3.592032 -1.4802944e-16 3.25 0.4191101 3.25 0.78710938 L 3.25 31.283203 C 3.25 31.650203 3.592032 32 3.9570312 32 L 27.822266 32 C 28.189264 32 28.75 31.650203 28.75 31.283203 L 28.75 10.832031 A 8 8 0 0 1 21.75 15 A 8 8 0 0 1 15.714844 12.25 L 7 12.25 C 6.5850008 12.25 6.25 11.915 6.25 11.5 C 6.25 11.085 6.5850008 10.75 7 10.75 L 14.705078 10.75 A 8 8 0 0 1 13.767578 7.25 L 7 7.25 C 6.5850008 7.25 6.25 6.9149992 6.25 6.5 C 6.25 6.0850008 6.5850008 5.75 7 5.75 L 13.855469 5.75 A 8 8 0 0 1 17.917969 0 L 3.9570312 0 z M 7 15.75 L 25 15.75 C 25.415 15.75 25.75 16.085 25.75 16.5 C 25.75 16.915 25.415 17.25 25 17.25 L 7 17.25 C 6.5850008 17.25 6.25 16.915 6.25 16.5 C 6.25 16.085 6.5850008 15.75 7 15.75 z M 7 21 L 25 21 C 25.415 21 25.75 21.335 25.75 21.75 C 25.75 22.165 25.415 22.5 25 22.5 L 7 22.5 C 6.5850008 22.5 6.25 22.165 6.25 21.75 C 6.25 21.335 6.5850008 21 7 21 z M 7 26 L 20 26 C 20.415 26 20.75 26.335 20.75 26.75 C 20.75 27.165 20.415 27.5 20 27.5 L 7 27.5 C 6.5850008 27.5 6.25 27.165 6.25 26.75 C 6.25 26.335 6.5850008 26 7 26 z " /> - - + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index 15ba46ae..fccd158b 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -15,8 +15,8 @@ Search.svg TXT.svg XML.svg - NewRecipe.svg MultiSelect.svg Refresh.svg + NewRecipe.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg index f147a12c..10b1ffa1 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Package.pkg @@ -13,5 +13,6 @@ Logos Gifs Backup + Report \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/NewReport.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/NewReport.svg new file mode 100644 index 00000000..a58cfbd2 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/NewReport.svg @@ -0,0 +1,181 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg new file mode 100644 index 00000000..169f544d --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg @@ -0,0 +1,7 @@ + + + + + NewReport.svg + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index b12e98ac..006038be 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -18,8 +18,8 @@ - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content index 34e86c29..603179f2 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content @@ -12,11 +12,11 @@ - - + + - - + + \ No newline at end of file From a33dd4868d6e658e6cd844179b38400b6e2a37d3 Mon Sep 17 00:00:00 2001 From: Wesley Buchanan Date: Mon, 9 Jan 2023 07:51:32 -0500 Subject: [PATCH 077/112] use '/' to create the file devices folder in case it doesn't exist. This removes the need to use the USER_PARTITION which will make it easier if the user wants to move the location of the file devices AAZM-403 --- .../Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.st | 2 +- .../Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.var | 1 - .../Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st | 2 +- .../Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var | 1 - .../Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st | 2 +- .../Logical/Infrastructure/Backup/BackupMgr/BackupMgr.var | 1 - .../Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st | 2 +- .../Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var | 3 --- .../Logical/Infrastructure/Report/ReportMgr/ReportMgr.st | 2 +- .../Logical/Infrastructure/Report/ReportMgr/ReportMgr.var | 1 - .../Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st | 2 +- .../Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var | 1 - 12 files changed, 6 insertions(+), 14 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.st b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.st index 8e0bcbb8..70739c8e 100644 --- a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.st +++ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.st @@ -8,7 +8,7 @@ PROGRAM _INIT // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + DirCreate_0(enable := TRUE, pDevice := ADR('mappAlarmXFiles'), pName := ADR('/')); // Check if folder already exist and if so disabled the function block call IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN diff --git a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.var b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.var index 25adba28..3ccabefe 100644 --- a/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.var +++ b/mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmMgr.var @@ -13,7 +13,6 @@ VAR CONSTANT MAX_QUERY_RESULTS : USINT := 19; (*Maximum number of query results (Value+1)*) MAX_SAFETY_DOOR : UINT := 5; (*Maximum number of safety doors (Value+1)*) MAX_ESTOP : UINT := 2; (*Maximum number of emergency stops (Value+1)*) - LOCAL_FOLDER : STRING[10] := 'AlarmX'; (*Folder name on the file device for AlarmX files*) END_VAR (*Structure Types*) VAR diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st index 4fa926e5..32f0b4f6 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st @@ -8,7 +8,7 @@ PROGRAM _INIT // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + DirCreate_0(enable := TRUE, pDevice := ADR('mappAuditFiles'), pName := ADR('/')); // Check if folder already exist and if so disabled the function block call IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var index 8d962ecd..98d4a771 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.var @@ -10,7 +10,6 @@ END_VAR (*Constants*) VAR CONSTANT MAX_QUERY_RESULTS : USINT := 19; (*Maximum number of query results (Value+1)*) - LOCAL_FOLDER : STRING[10] := 'Audit'; (*Folder name on the file device for UserX files*) MAX_CUSTOM_EVENTS : USINT := 9; (*Maximum number of custom events*) MAX_QUERIES : USINT := 2; (*Maximum number of configured queries*) END_VAR diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st index 4f02ac82..f070e990 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st @@ -8,7 +8,7 @@ PROGRAM _INIT // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + DirCreate_0(enable := TRUE, pDevice := ADR('mappBackupFiles'), pName := ADR('/')); // Check if folder already exist and if so disabled the function block call IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.var b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.var index 87245f46..87b283f5 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.var +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.var @@ -7,7 +7,6 @@ VAR END_VAR (*Constants*) VAR CONSTANT - LOCAL_FOLDER : STRING[10] := 'Backup'; (*Folder name on the file device for Backup files*) MAX_IDX_FILE_DEV : USINT := MAX_IDX_USB_DEV_LIST + 1; (*Maximum number of file devices *) END_VAR (*Structure Types*) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st index 69204d86..f53f18ff 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st @@ -8,7 +8,7 @@ PROGRAM _INIT // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + DirCreate_0(enable := TRUE, pDevice := ADR('mappRecipeFiles'), pName := ADR('/')); // Check if folder already exist and if so disabled the function block call IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var index 181c6bb6..ec1f6934 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var @@ -20,9 +20,6 @@ VAR PARAMETERS_RECIPE : STRING[50] := 'Parameters'; (*Value of the DropDownBox selection for the Parameters category*) MACHINE_CONFIGURATION_RECIPE : STRING[50] := 'Machine Configuration'; (*Value of the DropDownBox selection for the Machine Configuration category*) END_VAR -VAR CONSTANT - LOCAL_FOLDER : STRING[10] := 'Recipe'; (*Folder name on the file device for Recipe files*) -END_VAR (*Structure Types*) VAR HmiRecipe : RecipeHmiInterfaceType; (*HMI interface structure*) diff --git a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st index f436f8b2..c318e9ad 100644 --- a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st +++ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st @@ -8,7 +8,7 @@ PROGRAM _INIT // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + DirCreate_0(enable := TRUE, pDevice := ADR('mappReportFiles'), pName := ADR('/')); // Check if folder already exist and if so disabled the function block call IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN diff --git a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.var b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.var index b89b6080..4dc4d392 100644 --- a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.var +++ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.var @@ -6,7 +6,6 @@ VAR END_VAR (*Constants*) VAR CONSTANT - LOCAL_FOLDER : STRING[10] := 'Report'; (*Folder name on the file device for Recipe files*) NUM_LINES : INT := 2; (*The number lines on the machine*) NUM_TEMP_SAMPLES : INT := 95; (*The number of temperature samples in the example data*) END_VAR diff --git a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st index a97dab37..c1205582 100644 --- a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st +++ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st @@ -8,7 +8,7 @@ PROGRAM _INIT // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('UserPartition'), pName := ADR(LOCAL_FOLDER)); + DirCreate_0(enable := TRUE, pDevice := ADR('mappUserXFiles'), pName := ADR('/')); // Check if folder already exist and if so disabled the function block call IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN diff --git a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var index 12d8f363..082050fc 100644 --- a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var +++ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.var @@ -10,7 +10,6 @@ VAR CONSTANT USER_LIST_MAX_SELECTION : USINT := 20; (*Maxiumum selections on the User List *) USER_LIST_RANGE_START : USINT := 0; (*Range start (used for UserXMgrUIConnect)*) USER_LIST_RANGE_END : USINT := 20; (*Range end (used for UserXMgrUIConnect)*) - LOCAL_FOLDER : STRING[10] := 'UserX'; (*Folder name on the file device for UserX files*) END_VAR (*Structure Types*) VAR From bbfca1b336d0a11f783398e145d160a53002d422 Mon Sep 17 00:00:00 2001 From: Wesley Buchanan Date: Mon, 9 Jan 2023 08:37:32 -0500 Subject: [PATCH 078/112] Update BaseProject to E4.91 to support USER_PATH Use USER_PATH instead of F:\ for file devices AAZM-403 --- mappFramework/Physical/Simulation/Hardware.hw | 88 +++++++++---------- mappFramework/Physical/Simulation/PC/Cpu.pkg | 56 ++++++------ 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/mappFramework/Physical/Simulation/Hardware.hw b/mappFramework/Physical/Simulation/Hardware.hw index 1c56fd47..f475115e 100644 --- a/mappFramework/Physical/Simulation/Hardware.hw +++ b/mappFramework/Physical/Simulation/Hardware.hw @@ -1,45 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/Cpu.pkg b/mappFramework/Physical/Simulation/PC/Cpu.pkg index e5578776..4ec2877f 100644 --- a/mappFramework/Physical/Simulation/PC/Cpu.pkg +++ b/mappFramework/Physical/Simulation/PC/Cpu.pkg @@ -1,29 +1,29 @@ - - - - - Cpu.sw - Cpu.per - IoMap.iom - PvMap.vvm - Connectivity - TextSystem - UnitSystem - AccessAndSecurity - mappControl - mappMotion - mappServices - mappSafety - mappView - mappVision - mappCockpit - - - - - - - - - + + + + + Cpu.sw + Cpu.per + IoMap.iom + PvMap.vvm + Connectivity + TextSystem + UnitSystem + AccessAndSecurity + mappControl + mappMotion + mappServices + mappSafety + mappView + mappVision + mappCockpit + + + + + + + + + \ No newline at end of file From 88e1e6217fbe2cb83dc8deed201dc679bf100d24 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Mon, 9 Jan 2023 16:26:11 -0500 Subject: [PATCH 079/112] Fixed user partition report package file --- mappFramework/Logical/UserPartition/Report/Images/Package.pkg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mappFramework/Logical/UserPartition/Report/Images/Package.pkg b/mappFramework/Logical/UserPartition/Report/Images/Package.pkg index 129ebead..edb02d60 100644 --- a/mappFramework/Logical/UserPartition/Report/Images/Package.pkg +++ b/mappFramework/Logical/UserPartition/Report/Images/Package.pkg @@ -1,5 +1,7 @@  - + + LogoWithTag.jpg + \ No newline at end of file From f652fb0606f0bf29d906eb4efe12d6faf0bfe189 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Mon, 9 Jan 2023 16:56:40 -0500 Subject: [PATCH 080/112] AAZM-519 - fixed binding within HmiRecipe (TableConfig moved from Parameters to Status) --- .../Simulation/PC/mappView/Recipe/Recipe_content.binding | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding index 9978e931..c9c2af07 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.binding @@ -6,7 +6,7 @@ - + From 922ba2735a5dfeda71f8becaba7bd37a3f110671 Mon Sep 17 00:00:00 2001 From: "BRGLOBAL\\langstonb" Date: Tue, 10 Jan 2023 13:42:41 -0500 Subject: [PATCH 081/112] AAZM-481 - lots of little changes for the sake of standardization. Updated some commenting. Added framework packages for mapp View session variables, expressions, and dialogs. Standardized calling all FUBs at the end of the cyclic (some were happening in cyclic actions). --- .../Infrastructure/Audit/AuditMgr/AuditMgr.st | 2 +- .../Backup/BackupMgr/BackupMgr.st | 17 +++++++++-------- .../File/FileMgr/FIFOOperations.st | 6 +----- .../Infrastructure/File/FileMgr/FileMgr.st | 13 +++++++------ .../Recipe/RecipeMgr/RecipeMgr.st | 2 +- .../Report/ReportMgr/ReportMgr.st | 8 +++++--- .../Infrastructure/UserX/UserXMgr/UserXMgr.st | 1 + .../mappView/Layouts/PDFViewerDialog.layout | 6 ++++++ .../mappView/Layouts/PDF_Viewer_Dialog.layout | 6 ------ .../Logical/mappView/Layouts/Package.pkg | 4 ++-- .../Dialogs/AreaContents/Package.pkg | 7 ------- .../mappView/Visualization/Dialogs/Package.pkg | 8 +------- .../AreaContents/Package.pkg | 7 +++++++ .../AreaContents/RecipeDialog_empty.content | 0 .../AuditArchiveSettings.dialog | 0 .../AuditDialog_ArchiveSettings.content | 0 .../AuditArchiveSettings/Package.pkg | 0 .../AuditDialogs/Package.pkg | 0 .../BackupAutoSettings.dialog | 0 .../BackupDialog_AutoSettings.content | 0 .../BackupAutoSettings/Package.pkg | 0 .../BackupCreate/BackupCreate.dialog | 0 .../BackupCreate/BackupDialog_Create.content | 0 .../BackupDialogs/BackupCreate/Package.pkg | 0 .../BackupDelete/BackupDelete.dialog | 0 .../BackupDelete/BackupDialog_Delete.content | 0 .../BackupDialogs/BackupDelete/Package.pkg | 0 .../BackupRestore/BackupDialog_Restore.content | 0 .../BackupRestore/BackupRestore.dialog | 0 .../BackupDialogs/BackupRestore/Package.pkg | 0 .../BackupUpdate/BackupDialog_Update.content | 0 .../BackupUpdate/BackupUpdate.dialog | 0 .../BackupDialogs/BackupUpdate/Package.pkg | 0 .../BackupDialogs/Package.pkg | 0 .../FileFIFO/FileDialog_FIFO.content | 0 .../FileDialogs/FileFIFO/FileFIFO.dialog | 0 .../FileDialogs/FileFIFO/Package.pkg | 0 .../FileMessage/FileDialog_Message.content | 0 .../FileDialogs/FileMessage/FileMessage.dialog | 0 .../FileDialogs/FileMessage/Package.pkg | 0 .../FileDialogs/Package.pkg | 0 .../Dialogs/mappFrameworkDialogs/Package.pkg | 13 +++++++++++++ .../RecipeDialogs/EditRecipe/EditRecipe.dialog | 0 .../RecipeDialogs/EditRecipe/Package.pkg | 0 .../EditRecipe/RecipeDialog_EditButtons.content | 0 .../RecipeDialog_EditMachConfig.content | 0 .../EditRecipe/RecipeDialog_EditPars.content | 0 .../RecipeDialogs/NewRecipe/NewRecipe.dialog | 0 .../RecipeDialogs/NewRecipe/Package.pkg | 0 .../NewRecipe/RecipeDialog_NewButtons.content | 0 .../RecipeDialog_NewMachConfig.content | 0 .../NewRecipe/RecipeDialog_NewPars.content | 0 .../RecipeDialogs/Package.pkg | 0 .../ReportDialogs/Package.pkg | 2 +- .../ReportDialogs/ReportCreate/Package.pkg | 2 +- .../ReportCreate/ReportCreate.dialog | 0 .../ReportCreate/ReportDialog_Create.content | 0 .../ReportDialogs/ReportDelete/Package.pkg | 2 +- .../ReportDelete/ReportDelete.dialog | 0 .../ReportDelete/ReportDialog_Delete.content | 0 .../ReportDialogs/ReportView/Package.pkg | 2 +- .../ReportView/ReportDialog_View.content | 0 .../ReportDialogs/ReportView/ReportView.dialog | 2 +- .../UserXDialogs/Package.pkg | 0 .../UserXDialogs/UserXDisabled/Package.pkg | 0 .../UserXDisabled/UserXDisabled.content | 0 .../UserXDisabled/UserXDisabled.dialog | 0 .../UserXDialogs/UserXDuplicate/Package.pkg | 2 +- .../UserXDuplicate/UserXDuplicate.content | 0 .../UserXDuplicate/UserXDuplicate.dialog | 0 .../UserXDialogs/UserXError/Package.pkg | 0 .../UserXError/UserXDialog_Error.content | 0 .../UserXDialogs/UserXError/UserXError.dialog | 0 .../UserXDialogs/UserXExport/Package.pkg | 0 .../UserXExport/UserXDialog_Export.content | 0 .../UserXDialogs/UserXExport/UserXExport.dialog | 0 .../UserXDialogs/UserXImport/Package.pkg | 0 .../UserXImport/UserXDialog_Import.content | 0 .../UserXDialogs/UserXImport/UserXImport.dialog | 0 .../UserXDialogs/UserXLogin/Package.pkg | 0 .../UserXLogin/UserXDialog_Login.content | 0 .../UserXDialogs/UserXLogin/UserXLogin.dialog | 0 .../Visualization/Expressions/Package.pkg | 9 +++------ .../Axis.expression | 0 .../AxisType.expressiontype | 0 .../mappFrameworkExpressions/Package.pkg | 10 ++++++++++ .../Recipe.expression | 0 .../RecipeType.expressiontype | 0 .../mappView/Visualization/Pages/Package.pkg | 6 +++--- .../AlarmsContent/AlarmX.content | 0 .../AlarmsContent/AlarmXCurrent.content | 0 .../AlarmsContent/AlarmXHistory.content | 0 .../AlarmsContent/AlarmXQuery.content | 0 .../AlarmsContent/Package.pkg | 0 .../AuditContent/Audit.content | 0 .../AuditContent/AuditQuery.content | 0 .../AuditContent/AuditTrail.content | 0 .../AuditContent/CustomEvents.content | 0 .../AuditContent/Package.pkg | 0 .../AxisContent/Axis.content | 0 .../AxisContent/AxisAuto.content | 0 .../AxisContent/AxisManual.content | 0 .../AxisContent/Package.pkg | 0 .../BackupContent/Backup.content | 0 .../BackupContent/Package.pkg | 0 .../FileContent/File.content | 0 .../FileContent/Package.pkg | 0 .../Package.pkg | 0 .../RecipeContent/Package.pkg | 0 .../RecipeContent/Recipe.content | 0 .../RecipePreviewMachConfig.content | 0 .../RecipeContent/RecipePreviewPars.content | 0 .../ReportContent/Package.pkg | 0 .../ReportContent/Report.content | 0 .../UserXContent/Package.pkg | 0 .../UserXContent/UserList.content | 0 .../UserXContent/UserX.content | 0 .../Visualization/Variables/Package.pkg | 5 +---- .../{ => mappFrameworkVariables}/File.svar | 0 .../mappFrameworkVariables/Package.pkg | 10 ++++++++++ .../{ => mappFrameworkVariables}/Recipe.svar | 0 .../{ => mappFrameworkVariables}/Report.svar | 0 .../{ => mappFrameworkVariables}/UserX.svar | 0 .../PC/Connectivity/OpcUA/FileMgr.uad | 13 ++++++++++--- mappFramework/Physical/Simulation/PC/Cpu.pkg | 2 +- 125 files changed, 98 insertions(+), 69 deletions(-) create mode 100644 mappFramework/Logical/mappView/Layouts/PDFViewerDialog.layout delete mode 100644 mappFramework/Logical/mappView/Layouts/PDF_Viewer_Dialog.layout delete mode 100644 mappFramework/Logical/mappView/Visualization/Dialogs/AreaContents/Package.pkg create mode 100644 mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AreaContents/Package.pkg rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/AreaContents/RecipeDialog_empty.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/AuditDialogs/AuditArchiveSettings/AuditArchiveSettings.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/AuditDialogs/AuditArchiveSettings/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/AuditDialogs/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupAutoSettings/BackupAutoSettings.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupAutoSettings/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupCreate/BackupCreate.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupCreate/BackupDialog_Create.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupCreate/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupDelete/BackupDelete.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupDelete/BackupDialog_Delete.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupDelete/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupRestore/BackupDialog_Restore.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupRestore/BackupRestore.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupRestore/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupUpdate/BackupDialog_Update.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupUpdate/BackupUpdate.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/BackupUpdate/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/BackupDialogs/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/FileFIFO/FileDialog_FIFO.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/FileFIFO/FileFIFO.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/FileFIFO/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/FileMessage/FileDialog_Message.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/FileMessage/FileMessage.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/FileMessage/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/FileDialogs/Package.pkg (100%) create mode 100644 mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/Package.pkg rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/EditRecipe/EditRecipe.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/EditRecipe/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/NewRecipe/NewRecipe.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/NewRecipe/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/RecipeDialogs/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/Package.pkg (89%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportCreate/Package.pkg (88%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportCreate/ReportCreate.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportCreate/ReportDialog_Create.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportDelete/Package.pkg (88%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportDelete/ReportDelete.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportDelete/ReportDialog_Delete.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportView/Package.pkg (88%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportView/ReportDialog_View.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/ReportDialogs/ReportView/ReportView.dialog (68%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXDisabled/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXDisabled/UserXDisabled.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXDisabled/UserXDisabled.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXDuplicate/Package.pkg (88%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXDuplicate/UserXDuplicate.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXDuplicate/UserXDuplicate.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXError/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXError/UserXDialog_Error.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXError/UserXError.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXExport/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXExport/UserXDialog_Export.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXExport/UserXExport.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXImport/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXImport/UserXDialog_Import.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXImport/UserXImport.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXLogin/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXLogin/UserXDialog_Login.content (100%) rename mappFramework/Logical/mappView/Visualization/Dialogs/{ => mappFrameworkDialogs}/UserXDialogs/UserXLogin/UserXLogin.dialog (100%) rename mappFramework/Logical/mappView/Visualization/Expressions/{ => mappFrameworkExpressions}/Axis.expression (100%) rename mappFramework/Logical/mappView/Visualization/Expressions/{ => mappFrameworkExpressions}/AxisType.expressiontype (100%) create mode 100644 mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Package.pkg rename mappFramework/Logical/mappView/Visualization/Expressions/{ => mappFrameworkExpressions}/Recipe.expression (100%) rename mappFramework/Logical/mappView/Visualization/Expressions/{ => mappFrameworkExpressions}/RecipeType.expressiontype (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AlarmsContent/AlarmX.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AlarmsContent/AlarmXCurrent.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AlarmsContent/AlarmXHistory.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AlarmsContent/AlarmXQuery.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AlarmsContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AuditContent/Audit.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AuditContent/AuditQuery.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AuditContent/AuditTrail.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AuditContent/CustomEvents.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AuditContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AxisContent/Axis.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AxisContent/AxisAuto.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AxisContent/AxisManual.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/AxisContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/BackupContent/Backup.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/BackupContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/FileContent/File.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/FileContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/RecipeContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/RecipeContent/Recipe.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/RecipeContent/RecipePreviewMachConfig.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/RecipeContent/RecipePreviewPars.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/ReportContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/ReportContent/Report.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/UserXContent/Package.pkg (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/UserXContent/UserList.content (100%) rename mappFramework/Logical/mappView/Visualization/Pages/{FrameworkPackage => mappFrameworkContents}/UserXContent/UserX.content (100%) rename mappFramework/Logical/mappView/Visualization/Variables/{ => mappFrameworkVariables}/File.svar (100%) create mode 100644 mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Package.pkg rename mappFramework/Logical/mappView/Visualization/Variables/{ => mappFrameworkVariables}/Recipe.svar (100%) rename mappFramework/Logical/mappView/Visualization/Variables/{ => mappFrameworkVariables}/Report.svar (100%) rename mappFramework/Logical/mappView/Visualization/Variables/{ => mappFrameworkVariables}/UserX.svar (100%) diff --git a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st index 32f0b4f6..51350359 100644 --- a/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st +++ b/mappFramework/Logical/Infrastructure/Audit/AuditMgr/AuditMgr.st @@ -100,7 +100,7 @@ PROGRAM _CYCLIC MpAuditTrail_0.ErrorReset := FALSE; END_IF - // Assign MpLinks and HMI connections + // Assign MpLinks MpAuditTrail_0.MpLink := ADR(gMpLinkAuditTrail); MpAuditTrailConfig_0.MpLink := ADR(gMpLinkAuditTrail); MpAuditTrail_CEvents.MpLink := ADR(gMpLinkCustomEvents); diff --git a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st index f070e990..73436d03 100644 --- a/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st +++ b/mappFramework/Logical/Infrastructure/Backup/BackupMgr/BackupMgr.st @@ -41,6 +41,14 @@ PROGRAM _INIT END_PROGRAM PROGRAM _CYCLIC + + // Call all cyclic actions + FileManager; + IF NOT DiagCpuIsARsim() THEN + ChangeConfiguration; + END_IF + FormatDeviceDataProvider; + CASE BackupState OF BACKUP_IDLE: HmiBackup.Status.CreateAllowed := NOT(MpBackupCore_0.Info.Automatic.Backup.InProgress) AND NOT HmiBackup.Status.SimulationActive; @@ -206,14 +214,6 @@ PROGRAM _CYCLIC HmiBackup.Status.Update := MpBackupCore_0.Info.Automatic.Update; HmiBackup.Status.BackupCtrlEnabled := (NOT HmiBackup.Status.SimulationActive); - // Call all actions - FileManager; - IF NOT DiagCpuIsARsim() THEN - ChangeConfiguration; - END_IF - - FormatDeviceDataProvider; - // Assign MpLinks MpBackupCore_0.MpLink := ADR(gMpLinkBackupCore); MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIBackup); @@ -223,6 +223,7 @@ PROGRAM _CYCLIC MpBackupCore_0(); MpFileManagerUI_0(); MpBackupCoreConfig_0(); + END_PROGRAM PROGRAM _EXIT diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st b/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st index f1c3de2e..67d607c9 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/FIFOOperations.st @@ -266,11 +266,7 @@ ACTION FIFOOperation: MpFileManagerUIConnect_FIFO.DeviceList.DeviceNames[0] := HmiFile.Parameters.Fifo.DeviceName; MpFileManagerUI_FIFO.UIConnect := ADR(MpFileManagerUIConnect_FIFO); - // Assign MpLink - MpFileManagerUI_FIFO.MpLink := ADR(gMpLinkFileManagerUIFile_FIFO); - MpFileManagerUI_FIFO.UISetup.FileListSize := SIZEOF(MpFileManagerUIConnect_FIFO.File.List.Items) / SIZEOF(MpFileManagerUIConnect_FIFO.File.List.Items[0]); - // Call function block - MpFileManagerUI_FIFO(); + END_ACTION diff --git a/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.st b/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.st index bfa3eee9..dd0abcb9 100644 --- a/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.st +++ b/mappFramework/Logical/Infrastructure/File/FileMgr/FileMgr.st @@ -87,7 +87,7 @@ END_PROGRAM PROGRAM _CYCLIC - // Call all actions + // Call all cyclic actions FormatDeviceDataProvider; FileManager; FIFOOperation; @@ -97,22 +97,23 @@ PROGRAM _CYCLIC MpFileManagerUI_0.ErrorReset := FALSE; END_IF - // Assign MpLink + // Assign MpLinks MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIFile); + MpFileManagerUI_FIFO.MpLink := ADR(gMpLinkFileManagerUIFile_FIFO); - // Call function block + // Call function blocks MpFileManagerUI_0(); - + MpFileManagerUI_FIFO(); END_PROGRAM PROGRAM _EXIT - // Disable the function blocls to unlink the MpLink + // Disable the function blocks to unlink the MpLink MpFileManagerUI_0.Enable := FALSE; MpFileManagerUI_FIFO.Enable := FALSE; - // Call function block + // Call function blocks MpFileManagerUI_0(); MpFileManagerUI_FIFO(); diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st index f53f18ff..4fd665fb 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st @@ -140,7 +140,7 @@ END_PROGRAM PROGRAM _CYCLIC - // Call actions + // Call all cyclic actions FormatDeviceDataProvider; LoadPreview; RecipeHMIcommands; diff --git a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st index c318e9ad..ceec4012 100644 --- a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st +++ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st @@ -15,7 +15,7 @@ PROGRAM _INIT DirCreate_0(enable := FALSE); END_IF - //Parameterize the report function block with the simple report + // Initialize mapp function blocks MpReportCore_0.Language := ADR('en'); MpReportCore_0.DeviceName := ADR('mappReportFiles'); MpReportCore_0.MpLink := ADR(gMpLinkSimpleReport); @@ -23,14 +23,13 @@ PROGRAM _INIT HmiReport.Parameters.Name := 'SimpleReport'; MpReportCore_0(); - //Parameterize the file mangement function block MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIReport); MpFileManagerUI_0.UIConnect := ADR(MpFileManagerUIConnect); MpFileManagerUI_0.UISetup.FileListSize := SIZEOF(MpFileManagerUIConnect.File.List.Items) / SIZEOF(MpFileManagerUIConnect.File.List.Items[0]); MpFileManagerUI_0.Enable := TRUE; MpFileManagerUI_0(); - //Fill an array to create example data for the example report + // Fill an array to create example data for the example report TimeIndex := 0; FOR i:=0 TO ((SIZEOF(ReportExample.SimpleReport.OeeLine[0].TemperatureSample.TimeStamp)/SIZEOF(ReportExample.SimpleReport.OeeLine[0].TemperatureSample.TimeStamp[0])) - 1) DO ReportExample.SimpleReport.OeeLine[0].TemperatureSample.TimeStamp[i] := TimeIndex; @@ -71,8 +70,11 @@ END_PROGRAM PROGRAM _EXIT + // Disable the function blocks to unlink the MpLinks MpReportCore_0.Enable := FALSE; MpFileManagerUI_0.Enable := FALSE; + + // Call function blocks MpReportCore_0(); MpFileManagerUI_0(); diff --git a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st index c1205582..9d5c9c73 100644 --- a/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st +++ b/mappFramework/Logical/Infrastructure/UserX/UserXMgr/UserXMgr.st @@ -57,6 +57,7 @@ PROGRAM _CYCLIC MpUserXLogin_0.ErrorReset := FALSE; END_IF + // Call all cyclic actions HMIAction; // Assign MpLinks diff --git a/mappFramework/Logical/mappView/Layouts/PDFViewerDialog.layout b/mappFramework/Logical/mappView/Layouts/PDFViewerDialog.layout new file mode 100644 index 00000000..d6aa0abf --- /dev/null +++ b/mappFramework/Logical/mappView/Layouts/PDFViewerDialog.layout @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Layouts/PDF_Viewer_Dialog.layout b/mappFramework/Logical/mappView/Layouts/PDF_Viewer_Dialog.layout deleted file mode 100644 index 96a645dd..00000000 --- a/mappFramework/Logical/mappView/Layouts/PDF_Viewer_Dialog.layout +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/mappFramework/Logical/mappView/Layouts/Package.pkg b/mappFramework/Logical/mappView/Layouts/Package.pkg index 8a64fbb8..29f079cb 100644 --- a/mappFramework/Logical/mappView/Layouts/Package.pkg +++ b/mappFramework/Logical/mappView/Layouts/Package.pkg @@ -1,11 +1,11 @@  - + StandardPage.layout SmallDialog.layout RecipeDialog.layout LargeDialog.layout - PDF_Viewer_Dialog.layout + PDFViewerDialog.layout \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AreaContents/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/AreaContents/Package.pkg deleted file mode 100644 index f768bd22..00000000 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/AreaContents/Package.pkg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - RecipeDialog_empty.content - - \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/Package.pkg index 7841661c..8f354a75 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/Package.pkg @@ -2,12 +2,6 @@ - AreaContents - BackupDialogs - FileDialogs - RecipeDialogs - UserXDialogs - AuditDialogs - ReportDialogs + mappFrameworkDialogs \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AreaContents/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AreaContents/Package.pkg new file mode 100644 index 00000000..510c69f2 --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AreaContents/Package.pkg @@ -0,0 +1,7 @@ + + + + + RecipeDialog_empty.content + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AreaContents/RecipeDialog_empty.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AreaContents/RecipeDialog_empty.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/AreaContents/RecipeDialog_empty.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AreaContents/RecipeDialog_empty.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditArchiveSettings.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/AuditArchiveSettings/AuditArchiveSettings.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditArchiveSettings.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/AuditArchiveSettings/AuditArchiveSettings.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/AuditArchiveSettings/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/AuditArchiveSettings/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/AuditDialogs/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupAutoSettings.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupAutoSettings/BackupAutoSettings.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupAutoSettings.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupAutoSettings/BackupAutoSettings.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupAutoSettings/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupAutoSettings/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupCreate.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupCreate/BackupCreate.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupCreate.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupCreate/BackupCreate.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupCreate/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupCreate/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDelete.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupDelete/BackupDelete.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDelete.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupDelete/BackupDelete.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupDelete/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupDelete/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupRestore.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupRestore/BackupRestore.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupRestore.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupRestore/BackupRestore.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupRestore/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupRestore/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupUpdate.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupUpdate/BackupUpdate.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupUpdate.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupUpdate/BackupUpdate.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupUpdate/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/BackupUpdate/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/BackupDialogs/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileFIFO.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileFIFO/FileFIFO.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileFIFO.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileFIFO/FileFIFO.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileFIFO/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileFIFO/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileMessage/FileDialog_Message.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileMessage/FileDialog_Message.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileMessage.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileMessage/FileMessage.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileMessage.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileMessage/FileMessage.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileMessage/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/FileMessage/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/FileDialogs/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/Package.pkg new file mode 100644 index 00000000..f08b7d49 --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/Package.pkg @@ -0,0 +1,13 @@ + + + + + AreaContents + BackupDialogs + FileDialogs + RecipeDialogs + UserXDialogs + AuditDialogs + ReportDialogs + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/EditRecipe.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/EditRecipe.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/EditRecipe.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/EditRecipe.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditMachConfig.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditPars.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/NewRecipe.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/NewRecipe.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/NewRecipe.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/NewRecipe.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewMachConfig.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewPars.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/RecipeDialogs/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/Package.pkg similarity index 89% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/Package.pkg index e6e010e7..d8280f7f 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/Package.pkg @@ -1,5 +1,5 @@  - + ReportCreate diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/Package.pkg similarity index 88% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/Package.pkg index 01d98d6c..6cd7d540 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/Package.pkg @@ -1,5 +1,5 @@  - + ReportCreate.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportCreate.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/ReportCreate.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportCreate.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/ReportCreate.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/Package.pkg similarity index 88% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/Package.pkg index 4045bb90..e1da48ec 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/Package.pkg @@ -1,5 +1,5 @@  - + ReportDelete.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDelete.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/ReportDelete.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDelete.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/ReportDelete.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/Package.pkg similarity index 88% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/Package.pkg index 4483ce47..42a5fc57 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/Package.pkg @@ -1,5 +1,5 @@  - + ReportView.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportDialog_View.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/ReportDialog_View.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportDialog_View.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/ReportDialog_View.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportView.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/ReportView.dialog similarity index 68% rename from mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportView.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/ReportView.dialog index 23af3fdd..86337aca 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportView/ReportView.dialog +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/ReportDialogs/ReportView/ReportView.dialog @@ -1,5 +1,5 @@  - + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDisabled/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDisabled/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDisabled/UserXDisabled.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDisabled/UserXDisabled.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDisabled/UserXDisabled.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/Package.pkg similarity index 88% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/Package.pkg index 0da00809..70b89ba3 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/Package.pkg @@ -1,5 +1,5 @@  - + UserXDuplicate.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXError/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXError/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXError/UserXDialog_Error.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXError/UserXDialog_Error.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXError.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXError/UserXError.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXError.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXError/UserXError.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXExport/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXExport/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXExport/UserXDialog_Export.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXExport/UserXDialog_Export.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXExport.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXExport/UserXExport.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXExport.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXExport/UserXExport.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXImport/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXImport/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXImport/UserXDialog_Import.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXImport/UserXDialog_Import.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXImport.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXImport/UserXImport.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXImport.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXImport/UserXImport.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/Package.pkg b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXLogin/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXLogin/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXLogin/UserXDialog_Login.content diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXLogin.dialog b/mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXLogin/UserXLogin.dialog similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXLogin/UserXLogin.dialog rename to mappFramework/Logical/mappView/Visualization/Dialogs/mappFrameworkDialogs/UserXDialogs/UserXLogin/UserXLogin.dialog diff --git a/mappFramework/Logical/mappView/Visualization/Expressions/Package.pkg b/mappFramework/Logical/mappView/Visualization/Expressions/Package.pkg index 3689b608..49c12f29 100644 --- a/mappFramework/Logical/mappView/Visualization/Expressions/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Expressions/Package.pkg @@ -1,10 +1,7 @@  - - + + - Axis.expression - AxisType.expressiontype - Recipe.expression - RecipeType.expressiontype + mappFrameworkExpressions \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Expressions/Axis.expression b/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Axis.expression similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Expressions/Axis.expression rename to mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Axis.expression diff --git a/mappFramework/Logical/mappView/Visualization/Expressions/AxisType.expressiontype b/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/AxisType.expressiontype similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Expressions/AxisType.expressiontype rename to mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/AxisType.expressiontype diff --git a/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Package.pkg b/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Package.pkg new file mode 100644 index 00000000..a5a37e4b --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Package.pkg @@ -0,0 +1,10 @@ + + + + + Axis.expression + AxisType.expressiontype + Recipe.expression + RecipeType.expressiontype + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Expressions/Recipe.expression b/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Recipe.expression similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Expressions/Recipe.expression rename to mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/Recipe.expression diff --git a/mappFramework/Logical/mappView/Visualization/Expressions/RecipeType.expressiontype b/mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/RecipeType.expressiontype similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Expressions/RecipeType.expressiontype rename to mappFramework/Logical/mappView/Visualization/Expressions/mappFrameworkExpressions/RecipeType.expressiontype diff --git a/mappFramework/Logical/mappView/Visualization/Pages/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/Package.pkg index 989601b1..adf5a9d9 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Pages/Package.pkg @@ -1,9 +1,9 @@  - - + + AreaContents - FrameworkPackage + mappFrameworkContents DemoPage \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmX.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmX.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmX.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmXCurrent.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXCurrent.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmXCurrent.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmXHistory.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXHistory.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmXHistory.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmXQuery.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/AlarmXQuery.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/AlarmXQuery.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AlarmsContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AlarmsContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Audit.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Audit.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Audit.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditQuery.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditQuery.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditQuery.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditTrail.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditTrail.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/CustomEvents.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/CustomEvents.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/CustomEvents.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Axis.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Axis.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Axis.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisAuto.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisAuto.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisAuto.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisManual.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisManual.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/AxisManual.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisManual.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AxisContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Backup.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Backup.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/File.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/File.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/RecipePreviewMachConfig.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewMachConfig.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/RecipePreviewMachConfig.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/RecipePreviewPars.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/RecipePreviewPars.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/RecipePreviewPars.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/Package.pkg b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/Package.pkg similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/Package.pkg rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/Package.pkg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserList.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserList.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserList.content diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserX.content similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/UserXContent/UserX.content rename to mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserX.content diff --git a/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg b/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg index a40efc18..307a3b06 100644 --- a/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg +++ b/mappFramework/Logical/mappView/Visualization/Variables/Package.pkg @@ -2,9 +2,6 @@ - Recipe.svar - UserX.svar - Report.svar - File.svar + mappFrameworkVariables \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Variables/File.svar b/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/File.svar similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Variables/File.svar rename to mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/File.svar diff --git a/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Package.pkg b/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Package.pkg new file mode 100644 index 00000000..b518c16e --- /dev/null +++ b/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Package.pkg @@ -0,0 +1,10 @@ + + + + + Recipe.svar + UserX.svar + Report.svar + File.svar + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Variables/Recipe.svar b/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Recipe.svar similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Variables/Recipe.svar rename to mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Recipe.svar diff --git a/mappFramework/Logical/mappView/Visualization/Variables/Report.svar b/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Report.svar similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Variables/Report.svar rename to mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/Report.svar diff --git a/mappFramework/Logical/mappView/Visualization/Variables/UserX.svar b/mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/UserX.svar similarity index 100% rename from mappFramework/Logical/mappView/Visualization/Variables/UserX.svar rename to mappFramework/Logical/mappView/Visualization/Variables/mappFrameworkVariables/UserX.svar diff --git a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad index 9ebb626d..cfa2f1ef 100644 --- a/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad +++ b/mappFramework/Physical/Simulation/PC/Connectivity/OpcUA/FileMgr.uad @@ -1,13 +1,20 @@  - + - + + + + + + + + - + diff --git a/mappFramework/Physical/Simulation/PC/Cpu.pkg b/mappFramework/Physical/Simulation/PC/Cpu.pkg index 4ec2877f..8112cf00 100644 --- a/mappFramework/Physical/Simulation/PC/Cpu.pkg +++ b/mappFramework/Physical/Simulation/PC/Cpu.pkg @@ -23,7 +23,7 @@ - + \ No newline at end of file From 34ed0a52b514120f9a3929e98a117ccc8f0f1943 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 12 Jan 2023 11:28:02 -0500 Subject: [PATCH 082/112] Edited FIFO selected and configuration icons Added FIFO checkmark column title --- .../mappFrameworkSymbols/File/Checkmark.svg | 63 +++++++++++++++++++ .../mappFrameworkSymbols/File/Package.pkg | 1 + .../FileFIFO/FileDialog_FIFO.content | 4 +- .../FrameworkPackage/FileContent/File.content | 6 +- 4 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Checkmark.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Checkmark.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Checkmark.svg new file mode 100644 index 00000000..8ebe3476 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Checkmark.svg @@ -0,0 +1,63 @@ + +image/svg+xml + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index fccd158b..03a24104 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -18,5 +18,6 @@ MultiSelect.svg Refresh.svg NewRecipe.svg + Checkmark.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content index 4d6f9a8e..5fa69758 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content @@ -1,7 +1,7 @@  - + @@ -19,4 +19,4 @@ - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index 0be4a648..302110ad 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -11,8 +11,8 @@ - - + + @@ -34,7 +34,7 @@ - + From 598f8450d6f4fbe7773853f2209979f2c8216c19 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 12 Jan 2023 12:57:47 -0500 Subject: [PATCH 083/112] Added cancel and view icons for report content and dialogs --- .../mappFrameworkSymbols/Edit/Cancel.svg | 63 +++++++++++++++ .../mappFrameworkSymbols/Edit/Package.pkg | 1 + .../mappFrameworkSymbols/Report/Package.pkg | 1 + .../mappFrameworkSymbols/Report/View.svg | 76 +++++++++++++++++++ .../ReportCreate/ReportDialog_Create.content | 6 +- .../ReportDelete/ReportDialog_Delete.content | 6 +- .../ReportContent/Report.content | 2 +- 7 files changed, 148 insertions(+), 7 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Cancel.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/View.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Cancel.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Cancel.svg new file mode 100644 index 00000000..912ae072 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Cancel.svg @@ -0,0 +1,63 @@ + +image/svg+xml + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg index ddec13cf..34d629f3 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Edit/Package.pkg @@ -8,5 +8,6 @@ Filter.svg Save.svg Sort.svg + Cancel.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg index 169f544d..8b9d8c14 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/Package.pkg @@ -3,5 +3,6 @@ NewReport.svg + View.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/View.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/View.svg new file mode 100644 index 00000000..7719c342 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/Report/View.svg @@ -0,0 +1,76 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content index 4297effb..e96cde5b 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportCreate/ReportDialog_Create.content @@ -1,10 +1,10 @@ - + - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content index a6b7878a..f3a48f7a 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/ReportDialogs/ReportDelete/ReportDialog_Delete.content @@ -1,8 +1,8 @@ - + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content index 603179f2..f84d1179 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/ReportContent/Report.content @@ -14,7 +14,7 @@ - + From d5c0301f95fc96f16fbf0fb9e479b1db0fe716d0 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Thu, 12 Jan 2023 16:54:33 -0500 Subject: [PATCH 084/112] Added icons for file page file edit buttons --- .../Media/mappFrameworkSymbols/File/Copy.svg | 45 +++++++++++++++ .../Media/mappFrameworkSymbols/File/Cut.svg | 42 ++++++++++++++ .../File/NewDirectory.svg | 57 +++++++++++++++++++ .../mappFrameworkSymbols/File/Package.pkg | 5 ++ .../Media/mappFrameworkSymbols/File/Paste.svg | 45 +++++++++++++++ .../mappFrameworkSymbols/File/Rename.svg | 51 +++++++++++++++++ .../Texts/mappFrameworkTexts/FileTexts.tmx | 2 +- .../FrameworkPackage/FileContent/File.content | 12 ++-- 8 files changed, 252 insertions(+), 7 deletions(-) create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Copy.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Cut.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Paste.svg create mode 100644 mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Rename.svg diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Copy.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Copy.svg new file mode 100644 index 00000000..83fad0e4 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Copy.svg @@ -0,0 +1,45 @@ + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Cut.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Cut.svg new file mode 100644 index 00000000..ae5e0400 --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Cut.svg @@ -0,0 +1,42 @@ + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg new file mode 100644 index 00000000..9f45a03f --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg @@ -0,0 +1,57 @@ + +image/svg+xml diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index 03a24104..450e4a0a 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -19,5 +19,10 @@ Refresh.svg NewRecipe.svg Checkmark.svg + Cut.svg + Paste.svg + Copy.svg + NewDirectory.svg + Rename.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Paste.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Paste.svg new file mode 100644 index 00000000..6e4fa6cc --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Paste.svg @@ -0,0 +1,45 @@ + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Rename.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Rename.svg new file mode 100644 index 00000000..af61089a --- /dev/null +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Rename.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx index 5bad13d0..b713bf2d 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/FileTexts.tmx @@ -208,7 +208,7 @@ - Verzeichnis erstellen + Neuer Ordner 创建目录 diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index 302110ad..e358b0f0 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -15,12 +15,12 @@ - - - - - - + + + + + + From fb7fd24933da5a66f12c26b645bbd5dec5302432 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Fri, 13 Jan 2023 10:36:32 -0500 Subject: [PATCH 085/112] Slight edit to the create directory icon --- .../Media/mappFrameworkSymbols/File/NewDirectory.svg | 6 +++--- .../Resources/Media/mappFrameworkSymbols/File/Package.pkg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg index 9f45a03f..9b25014d 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/NewDirectory.svg @@ -42,9 +42,9 @@ id="namedview15" showgrid="false" inkscape:zoom="22.627417" - inkscape:cx="10.893864" + inkscape:cx="8.2864076" inkscape:cy="13.744388" - inkscape:window-x="1912" + inkscape:window-x="3832" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg13" @@ -54,4 +54,4 @@ id="title2" /> + d="m 18.75,1 c -2.906264,0 -5.25,2.0625324 -5.25,5.25 0,3.3749635 2.343736,5.25 5.25,5.25 C 21.656265,11.5 24,9.1562184 24,6.25 24,3.3437797 21.656265,1 18.75,1 Z m -0.46875,1.96875 h 1.03125 c 0.281252,0 0.28125,0.3750027 0.28125,0.65625 v 1.5 H 21.375 c 0.281251,0 0.5625,0.3750027 0.5625,0.65625 V 6.8125 c 0,0.2812463 -0.281249,0.46875 -0.5625,0.46875 h -1.78125 v 1.6875 c 0,0.2812473 2e-6,0.46875 -0.28125,0.46875 H 18.28125 C 18,9.4375 17.71875,9.2499973 17.71875,8.96875 V 7.28125 H 16.125 c -0.281252,0 -0.5625,-0.1875037 -0.5625,-0.46875 V 5.78125 c 0,-0.3749957 0.281248,-0.65625 0.5625,-0.65625 h 1.59375 v -1.5 c 0,-0.3749967 0.28125,-0.65625 0.5625,-0.65625 z M 2,3 A 2,2 0 0 0 0,5 V 12.484375 20 a 2,2 0 0 0 2,2 H 4 V 22.6875 22.980469 23 H 8 V 22.980469 22.6875 22 h 8 V 22.6875 22.980469 23 h 4 V 22.980469 22.6875 22 h 2 a 2,2 0 0 0 2,-2 V 13.525391 9.1210938 A 6,6 0 0 1 23,10.464844 V 20 c 0,0.37978 -0.211187,0.705617 -0.521484,0.875 C 22.336172,20.9527 22.174214,21 22,21 H 21 20 V 20 19 15 A 2,2 0 0 0 18,13 H 6 a 2,2 0 0 0 -2,2 v 5 1 H 2 C 1.446006,21 1,20.55399 1,20 V 14.96875 13 11.96875 8 H 9.7109375 L 11.710938,6 h 1.05664 A 6,6 0 0 1 12.896484,5 H 11.710938 L 9.7109375,3 H 5.5878906 Z M 2,4 H 4.8613281 9.3007812 L 10.800781,5.5 9.3007812,7 H 4.8613281 2.546875 2 1 V 6 5 C 1,4.4460096 1.4460096,4 2,4 Z M 2.5,5 V 6 6.00195 H 8.3027344 L 8.3007812,6 H 8.5 V 5 H 8.3007812 Z M 6,14 h 12 a 1,1 0 0 1 1,1 v 7 H 17 V 16 H 7 v 6 H 5 V 15 A 1,1 0 0 1 6,14 Z M 8.2402344,16.992188 8.25,17 H 16 v 4 H 8 v -4 h 0.1523438 z" /> diff --git a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg index 450e4a0a..291efb69 100644 --- a/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg +++ b/mappFramework/Logical/mappView/Resources/Media/mappFrameworkSymbols/File/Package.pkg @@ -22,7 +22,7 @@ Cut.svg Paste.svg Copy.svg - NewDirectory.svg Rename.svg + NewDirectory.svg \ No newline at end of file From fbb41e181efc3f5ce3e429d9f51fbe01e838c3d0 Mon Sep 17 00:00:00 2001 From: Wesley Buchanan Date: Fri, 13 Jan 2023 14:02:38 -0500 Subject: [PATCH 086/112] whitespace cleanup --- .../Recipe/RecipeMgr/RecipeMgr.st | 358 +++++++++--------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st index 4fd665fb..1f63d361 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st @@ -7,198 +7,198 @@ PROGRAM _INIT - // Create folder for this component on the user file device - DirCreate_0(enable := TRUE, pDevice := ADR('mappRecipeFiles'), pName := ADR('/')); - - // Check if folder already exist and if so disabled the function block call - IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN - DirCreate_0(enable := FALSE); - END_IF - - // Initialize mapp function blocks - // By default, the Framework sets up an XML recipe system. To swtich to the CSV format, refer to the "Change Recipe Format" - // page in the AS Help (GUID 2052b3a5-f59b-45f9-9fcd-3289c93401af) - MpRecipeUISetup.Confirmation.RecipeDelete := TRUE; - MpRecipeUISetup.RecipeListSize := 10; - MpRecipeUISetup.RecipeListScrollWindow := 0; - MpRecipeUISetup.AutoLoadHeader := TRUE; - MpRecipeUIConnect.New.FileName := 'newRecipe'; - MpRecipeUIConnect.Recipe.Filter := '*par'; - MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeUI_0.Enable := TRUE; - MpRecipeUI_0.UIConnect := ADR(MpRecipeUIConnect); - MpRecipeUI_0.UISetup := MpRecipeUISetup; - MpRecipeUI_0(); - - HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; - HmiRecipe.Status.DeviceDataProvider[0] := '{"value":"mappRecipeFiles","text":"CF/PLC"}'; - HmiRecipe.Parameters.DeviceName := 'mappRecipeFiles'; - MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); - MpRecipe_0.Enable := TRUE; - MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); - MpRecipe_0.DeviceName := ADR(HmiRecipe.Parameters.DeviceName); - MpRecipe_0.FileName := ADR(HmiRecipe.Parameters.FileName); - MpRecipe_0.Header := ADR(Header); - - // Wait for MpRecipe_0 to activate. This must be active before you can call the RegPar function blocks, which is below. - WHILE NOT(MpRecipe_0.Active OR MpRecipe_0.Error) DO - MpRecipe_0(); - END_WHILE - - // Register the preview variables to the recipe. These preview variables are a buffer between the recipe system and the - // variables used at runtime on the machine (Parameters, MachineSettings). By using these preview variables, you can - // preview and edit a recipe on the HMI without actually loading it to the machine. For more details, refer to the - // "Recipe System Design" page in the AS Help (GUID 3ccd7409-0b52-4bbc-a93a-4010f6db414c). - - MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeRegPar_PreviewPar.Enable := TRUE; - MpRecipeRegPar_PreviewPar.PVName := ADR('RecipeMgr:ParametersPreview'); - MpRecipeRegPar_PreviewPar.Category := ADR(PARAMETERS_CATEGORY); - MpRecipeRegPar_PreviewPar(); - - MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeRegPar_PreviewCfg.Enable := TRUE; - MpRecipeRegPar_PreviewCfg.PVName := ADR('RecipeMgr:MachineSettingsPreview'); - MpRecipeRegPar_PreviewCfg.Category := ADR(MACHINE_CONFIGURATION_CATEGORY); - MpRecipeRegPar_PreviewCfg(); - - // Wait for RegPar function blocks to activate. These must be active before you can load a recipe, - // which is further down in the Initialization program. - WHILE NOT(MpRecipeRegPar_PreviewPar.Active OR MpRecipeRegPar_PreviewPar.Error) DO - MpRecipeRegPar_PreviewPar(); - END_WHILE - WHILE NOT(MpRecipeRegPar_PreviewCfg.Active OR MpRecipeRegPar_PreviewCfg.Error) DO - MpRecipeRegPar_PreviewCfg(); - END_WHILE - - // Load default Machine Settings recipe - HmiRecipe.Parameters.Category := MACHINE_CONFIGURATION_CATEGORY; - HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(MACHINE_CONFIG_FILE_EXTENSION)); - MpRecipe_0.Load := TRUE; - WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO - MpRecipe_0(); - END_WHILE - MachineSettings := MachineSettingsPreview; - HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe),ADR(MACHINE_CONFIG_FILE_EXTENSION)); - HmiRecipe.Status.ConfigRecipeLoaded := TRUE; - - // Check if the default machine settings recipe is missing - IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN - HmiRecipe.Status.MachineSettingsRecipeMissing := TRUE; - HmiRecipe.Status.LastLoadedConfigRecipe := ''; - HmiRecipe.Status.ConfigRecipeLoaded := FALSE; - END_IF - - MpRecipe_0.ErrorReset := MpRecipe_0.Error; - MpRecipe_0.Load := FALSE; - MpRecipe_0(); - - // Load default Parameter recipe - HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; - HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(PARAMETERS_FILE_EXTENSION)); - HmiRecipe.Status.PreviousRecipe := DEFAULT_PARAMETERS; - MpRecipe_0.Load := TRUE; - WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO - MpRecipe_0(); - END_WHILE - Parameters := ParametersPreview; - HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe),ADR(PARAMETERS_FILE_EXTENSION)); - HmiRecipe.Status.ProductRecipeLoaded := TRUE; - - // Check if the default parameters recipe is missing - IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN - HmiRecipe.Status.ParameterRecipeMissing := TRUE; - HmiRecipe.Status.LastLoadedProductRecipe := ''; - HmiRecipe.Status.ProductRecipeLoaded := FALSE; - END_IF - - - - MpRecipe_0.ErrorReset := MpRecipe_0.Error; - MpRecipe_0.Load := FALSE; - MpRecipe_0(); - - // Trigger update notification so that the initial parameters are copied to the process - MpRecipe_0.UpdateNotification := TRUE; - - // Init Filemanager for exporting/importing files - MpFileManagerUI_0.Enable := TRUE; - MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); - MpFileManagerUI_0.UIConnect := ADR(MpFileManagerUIConnect); - MpFileManagerUI_0.UISetup.FileListSize := SIZEOF(MpFileManagerUIConnect.File.List.Items) / SIZEOF(MpFileManagerUIConnect.File.List.Items[0]); - MpFileManagerUIConnect.DeviceList.DeviceNames[0] := 'mappRecipeFiles'; - MpFileManagerUIConnect.DeviceList.DeviceNames[1] := ''; - MpFileManagerUI_0(); - - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + // Create folder for this component on the user file device + DirCreate_0(enable := TRUE, pDevice := ADR('mappRecipeFiles'), pName := ADR('/')); + + // Check if folder already exist and if so disabled the function block call + IF DirCreate_0.status = fiERR_DIR_ALREADY_EXIST THEN + DirCreate_0(enable := FALSE); + END_IF + + // Initialize mapp function blocks + // By default, the Framework sets up an XML recipe system. To swtich to the CSV format, refer to the "Change Recipe Format" + // page in the AS Help (GUID 2052b3a5-f59b-45f9-9fcd-3289c93401af) + MpRecipeUISetup.Confirmation.RecipeDelete := TRUE; + MpRecipeUISetup.RecipeListSize := 10; + MpRecipeUISetup.RecipeListScrollWindow := 0; + MpRecipeUISetup.AutoLoadHeader := TRUE; + MpRecipeUIConnect.New.FileName := 'newRecipe'; + MpRecipeUIConnect.Recipe.Filter := '*par'; + MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeUI_0.Enable := TRUE; + MpRecipeUI_0.UIConnect := ADR(MpRecipeUIConnect); + MpRecipeUI_0.UISetup := MpRecipeUISetup; + MpRecipeUI_0(); + + HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; + HmiRecipe.Status.DeviceDataProvider[0] := '{"value":"mappRecipeFiles","text":"CF/PLC"}'; + HmiRecipe.Parameters.DeviceName := 'mappRecipeFiles'; + MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); + MpRecipe_0.Enable := TRUE; + MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); + MpRecipe_0.DeviceName := ADR(HmiRecipe.Parameters.DeviceName); + MpRecipe_0.FileName := ADR(HmiRecipe.Parameters.FileName); + MpRecipe_0.Header := ADR(Header); + + // Wait for MpRecipe_0 to activate. This must be active before you can call the RegPar function blocks, which is below. + WHILE NOT(MpRecipe_0.Active OR MpRecipe_0.Error) DO + MpRecipe_0(); + END_WHILE + + // Register the preview variables to the recipe. These preview variables are a buffer between the recipe system and the + // variables used at runtime on the machine (Parameters, MachineSettings). By using these preview variables, you can + // preview and edit a recipe on the HMI without actually loading it to the machine. For more details, refer to the + // "Recipe System Design" page in the AS Help (GUID 3ccd7409-0b52-4bbc-a93a-4010f6db414c). + + MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeRegPar_PreviewPar.Enable := TRUE; + MpRecipeRegPar_PreviewPar.PVName := ADR('RecipeMgr:ParametersPreview'); + MpRecipeRegPar_PreviewPar.Category := ADR(PARAMETERS_CATEGORY); + MpRecipeRegPar_PreviewPar(); + + MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeRegPar_PreviewCfg.Enable := TRUE; + MpRecipeRegPar_PreviewCfg.PVName := ADR('RecipeMgr:MachineSettingsPreview'); + MpRecipeRegPar_PreviewCfg.Category := ADR(MACHINE_CONFIGURATION_CATEGORY); + MpRecipeRegPar_PreviewCfg(); + + // Wait for RegPar function blocks to activate. These must be active before you can load a recipe, + // which is further down in the Initialization program. + WHILE NOT(MpRecipeRegPar_PreviewPar.Active OR MpRecipeRegPar_PreviewPar.Error) DO + MpRecipeRegPar_PreviewPar(); + END_WHILE + WHILE NOT(MpRecipeRegPar_PreviewCfg.Active OR MpRecipeRegPar_PreviewCfg.Error) DO + MpRecipeRegPar_PreviewCfg(); + END_WHILE + + // Load default Machine Settings recipe + HmiRecipe.Parameters.Category := MACHINE_CONFIGURATION_CATEGORY; + HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + MpRecipe_0.Load := TRUE; + WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO + MpRecipe_0(); + END_WHILE + MachineSettings := MachineSettingsPreview; + HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + HmiRecipe.Status.ConfigRecipeLoaded := TRUE; + + // Check if the default machine settings recipe is missing + IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN + HmiRecipe.Status.MachineSettingsRecipeMissing := TRUE; + HmiRecipe.Status.LastLoadedConfigRecipe := ''; + HmiRecipe.Status.ConfigRecipeLoaded := FALSE; + END_IF + + MpRecipe_0.ErrorReset := MpRecipe_0.Error; + MpRecipe_0.Load := FALSE; + MpRecipe_0(); + + // Load default Parameter recipe + HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; + HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipe.Status.PreviousRecipe := DEFAULT_PARAMETERS; + MpRecipe_0.Load := TRUE; + WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO + MpRecipe_0(); + END_WHILE + Parameters := ParametersPreview; + HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe),ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipe.Status.ProductRecipeLoaded := TRUE; + + // Check if the default parameters recipe is missing + IF MpRecipe_0.Info.Diag.StatusID.ID = mpRECIPE_ERR_LOAD_DATA THEN + HmiRecipe.Status.ParameterRecipeMissing := TRUE; + HmiRecipe.Status.LastLoadedProductRecipe := ''; + HmiRecipe.Status.ProductRecipeLoaded := FALSE; + END_IF + + + + MpRecipe_0.ErrorReset := MpRecipe_0.Error; + MpRecipe_0.Load := FALSE; + MpRecipe_0(); + + // Trigger update notification so that the initial parameters are copied to the process + MpRecipe_0.UpdateNotification := TRUE; + + // Init Filemanager for exporting/importing files + MpFileManagerUI_0.Enable := TRUE; + MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); + MpFileManagerUI_0.UIConnect := ADR(MpFileManagerUIConnect); + MpFileManagerUI_0.UISetup.FileListSize := SIZEOF(MpFileManagerUIConnect.File.List.Items) / SIZEOF(MpFileManagerUIConnect.File.List.Items[0]); + MpFileManagerUIConnect.DeviceList.DeviceNames[0] := 'mappRecipeFiles'; + MpFileManagerUIConnect.DeviceList.DeviceNames[1] := ''; + MpFileManagerUI_0(); + + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; END_PROGRAM PROGRAM _CYCLIC - // Call all cyclic actions - FormatDeviceDataProvider; - LoadPreview; + // Call all cyclic actions + FormatDeviceDataProvider; + LoadPreview; RecipeHMIcommands; LoadStatus; - // Reset commands on MpRecipe FUB - IF MpRecipe_0.CommandDone THEN - MpRecipe_0.Load := FALSE; - MpRecipe_0.Save := FALSE; - // Set update notification for machine category - IF ((brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_CATEGORY)) = 0) AND (MpRecipe_0.Save = TRUE)) THEN - MpRecipe_0.UpdateNotification := TRUE; - ELSE - MpRecipe_0.UpdateNotification := FALSE; - END_IF - END_IF - - - // Error reset - IF NOT MpRecipe_0.Error THEN - MpRecipe_0.ErrorReset := FALSE; - END_IF - - IF NOT MpRecipeUI_0.Error THEN - MpRecipeUI_0.ErrorReset := FALSE; - END_IF - - // Assign MpLinks - MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); - MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); - MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); - MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); - - // Call function blocks - MpRecipe_0(); - MpRecipeUI_0(); - MpFileManagerUI_0(); - MpRecipeRegPar_PreviewPar(); - MpRecipeRegPar_PreviewCfg(); + // Reset commands on MpRecipe FUB + IF MpRecipe_0.CommandDone THEN + MpRecipe_0.Load := FALSE; + MpRecipe_0.Save := FALSE; + // Set update notification for machine category + IF ((brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_CATEGORY)) = 0) AND (MpRecipe_0.Save = TRUE)) THEN + MpRecipe_0.UpdateNotification := TRUE; + ELSE + MpRecipe_0.UpdateNotification := FALSE; + END_IF + END_IF + + + // Error reset + IF NOT MpRecipe_0.Error THEN + MpRecipe_0.ErrorReset := FALSE; + END_IF + + IF NOT MpRecipeUI_0.Error THEN + MpRecipeUI_0.ErrorReset := FALSE; + END_IF + + // Assign MpLinks + MpRecipe_0.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeUI_0.MpLink := ADR(gMpLinkRecipeXml); + MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIRecipe); + MpRecipeRegPar_PreviewPar.MpLink := ADR(gMpLinkRecipeXml); + MpRecipeRegPar_PreviewCfg.MpLink := ADR(gMpLinkRecipeXml); + + // Call function blocks + MpRecipe_0(); + MpRecipeUI_0(); + MpFileManagerUI_0(); + MpRecipeRegPar_PreviewPar(); + MpRecipeRegPar_PreviewCfg(); END_PROGRAM PROGRAM _EXIT - // Disable the function blocls to unlink the MpLinks - MpRecipe_0.Enable := FALSE; - MpRecipeUI_0.Enable := FALSE; - MpRecipeRegPar_PreviewPar.Enable := FALSE; - MpRecipeRegPar_PreviewCfg.Enable := FALSE; - MpFileManagerUI_0.Enable := FALSE; - - // Call function blocks - MpRecipe_0(); - MpRecipeUI_0(); - MpRecipeRegPar_PreviewPar(); - MpRecipeRegPar_PreviewCfg(); - MpFileManagerUI_0(); + // Disable the function blocls to unlink the MpLinks + MpRecipe_0.Enable := FALSE; + MpRecipeUI_0.Enable := FALSE; + MpRecipeRegPar_PreviewPar.Enable := FALSE; + MpRecipeRegPar_PreviewCfg.Enable := FALSE; + MpFileManagerUI_0.Enable := FALSE; + + // Call function blocks + MpRecipe_0(); + MpRecipeUI_0(); + MpRecipeRegPar_PreviewPar(); + MpRecipeRegPar_PreviewCfg(); + MpFileManagerUI_0(); END_PROGRAM From 0c7f917632faa95b8f2dc0eb23e9007dec057740 Mon Sep 17 00:00:00 2001 From: austin_justin Date: Fri, 13 Jan 2023 14:24:48 -0500 Subject: [PATCH 087/112] Made several text alignment/fitment changes to clean up the buttons and fit all text Added icons to dialog buttons --- .../AuditDialog_ArchiveSettings.content | 6 ++--- .../BackupDialog_AutoSettings.content | 10 ++++----- .../BackupCreate/BackupDialog_Create.content | 12 +++++----- .../BackupDelete/BackupDialog_Delete.content | 8 +++---- .../BackupDialog_Restore.content | 6 ++--- .../BackupUpdate/BackupDialog_Update.content | 8 +++---- .../FileFIFO/FileDialog_FIFO.content | 2 +- .../FileMessage/FileDialog_Message.content | 4 ++-- .../RecipeDialog_EditButtons.content | 4 ++-- .../NewRecipe/RecipeDialog_NewButtons.content | 4 ++-- .../UserXDisabled/UserXDisabled.content | 2 +- .../UserXDuplicate/UserXDuplicate.content | 6 ++--- .../UserXError/UserXDialog_Error.content | 4 ++-- .../UserXExport/UserXDialog_Export.content | 4 ++-- .../UserXImport/UserXDialog_Import.content | 4 ++-- .../AuditContent/AuditTrail.content | 6 ++--- .../BackupContent/Backup.content | 12 +++++----- .../FrameworkPackage/FileContent/File.content | 22 +++++++++---------- .../RecipeContent/Recipe.content | 4 ++-- 19 files changed, 64 insertions(+), 64 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content index c523ef7a..fd4b7aed 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/AuditDialogs/AuditArchiveSettings/AuditDialog_ArchiveSettings.content @@ -1,8 +1,8 @@  - - + + @@ -25,4 +25,4 @@ - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content index ff733b29..6693b328 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupAutoSettings/BackupDialog_AutoSettings.content @@ -1,8 +1,8 @@  - - + + @@ -10,12 +10,12 @@ - + - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content index 6f92540d..bfdd1831 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupCreate/BackupDialog_Create.content @@ -4,12 +4,12 @@ - - - - + + + + - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content index 6f276319..6dff9e38 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupDelete/BackupDialog_Delete.content @@ -1,8 +1,8 @@  - - - + + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content index 2a0b0fbe..99f63a37 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupRestore/BackupDialog_Restore.content @@ -4,11 +4,11 @@ - - + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content index f624c20b..e5423ed0 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/BackupDialogs/BackupUpdate/BackupDialog_Update.content @@ -1,11 +1,11 @@ - + - - + + @@ -16,4 +16,4 @@ - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content index 5fa69758..70962c4c 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileFIFO/FileDialog_FIFO.content @@ -6,7 +6,7 @@ - + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content index ff34c2d8..ac3434b4 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/FileDialogs/FileMessage/FileDialog_Message.content @@ -3,8 +3,8 @@ - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content index 178a47fe..1410cdd1 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/EditRecipe/RecipeDialog_EditButtons.content @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content index 2e971f49..64013a96 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/RecipeDialogs/NewRecipe/RecipeDialog_NewButtons.content @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content index cd365f54..ffec224b 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDisabled/UserXDisabled.content @@ -1,7 +1,7 @@  - + diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content index 818d28ab..54c15fed 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXDuplicate/UserXDuplicate.content @@ -3,7 +3,7 @@ - - + + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content index ed7de5a7..96f1125e 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXError/UserXDialog_Error.content @@ -3,6 +3,6 @@ - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content index 0af0c1ef..f71658c5 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXExport/UserXDialog_Export.content @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content index 41e0bb3b..2fa4fc6f 100644 --- a/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content +++ b/mappFramework/Logical/mappView/Visualization/Dialogs/UserXDialogs/UserXImport/UserXDialog_Import.content @@ -2,8 +2,8 @@ - - + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content index e8e1b4f3..a9007d0d 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/AuditContent/AuditTrail.content @@ -10,9 +10,9 @@ - + - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content index 006038be..4b7d3468 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/BackupContent/Backup.content @@ -14,12 +14,12 @@ - - - - - - + + + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content index e358b0f0..668efc7b 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/FileContent/File.content @@ -15,14 +15,14 @@ - - - - - - - - + + + + + + + + @@ -34,9 +34,9 @@ - - - + + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content index 10f709fa..87cb049c 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/FrameworkPackage/RecipeContent/Recipe.content @@ -14,8 +14,8 @@ - - + + From 1d10517d3efc3d978b97829652e835386c0a4aa0 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Tue, 17 Jan 2023 10:10:51 -0500 Subject: [PATCH 088/112] AAZM-530: Added ability to sort file list on Report content --- .../Report/ReportMgr/HMIActions.st | 16 ++++ .../Report/ReportMgr/ReportMgr.st | 1 + .../Report/ReportMgr/ReportMgr.typ | 1 + .../Texts/mappFrameworkTexts/ReportTexts.tmx | 77 +++++++++++++++++++ .../ReportContent/Report.content | 2 + .../PC/mappView/Report/Report_content.binding | 7 +- 6 files changed, 103 insertions(+), 1 deletion(-) diff --git a/mappFramework/Logical/Infrastructure/Report/ReportMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/Report/ReportMgr/HMIActions.st index 94b1cabf..0232f74b 100644 --- a/mappFramework/Logical/Infrastructure/Report/ReportMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/HMIActions.st @@ -92,4 +92,20 @@ ACTION ReportFileExplorer: // Set file device to selected MpReportCore_0.DeviceName := ADR(MpFileManagerUIConnect.DeviceList.DeviceNames[MpFileManagerUIConnect.DeviceList.SelectedIndex]); + + // Sort reports for next cycle + IF HmiReport.Parameters.SortType = 'NameAsc' THEN + MpFileManagerUIConnect.File.SortOrder := mpFILE_SORT_BY_NAME_ASC; + ELSIF HmiReport.Parameters.SortType = 'NameDesc' THEN + MpFileManagerUIConnect.File.SortOrder := mpFILE_SORT_BY_NAME_DESC; + ELSIF HmiReport.Parameters.SortType = 'DateAsc' THEN + MpFileManagerUIConnect.File.SortOrder := mpFILE_SORT_BY_MOD_TIME_ASC; + ELSIF HmiReport.Parameters.SortType = 'DateDesc' THEN + MpFileManagerUIConnect.File.SortOrder := mpFILE_SORT_BY_MOD_TIME_DESC; + ELSIF HmiReport.Parameters.SortType = 'SizeAsc' THEN + MpFileManagerUIConnect.File.SortOrder := mpFILE_SORT_BY_SIZE_ASC; + ELSIF HmiReport.Parameters.SortType = 'SizeDesc' THEN + MpFileManagerUIConnect.File.SortOrder := mpFILE_SORT_BY_SIZE_DES; + END_IF + END_ACTION \ No newline at end of file diff --git a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st index ceec4012..53fb3037 100644 --- a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st +++ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.st @@ -21,6 +21,7 @@ PROGRAM _INIT MpReportCore_0.MpLink := ADR(gMpLinkSimpleReport); MpReportCore_0.Name := ADR(HmiReport.Parameters.Name); HmiReport.Parameters.Name := 'SimpleReport'; + HmiReport.Parameters.SortType := 'NameAsc'; MpReportCore_0(); MpFileManagerUI_0.MpLink := ADR(gMpLinkFileManagerUIReport); diff --git a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.typ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.typ index cce565da..3f3def6e 100644 --- a/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.typ +++ b/mappFramework/Logical/Infrastructure/Report/ReportMgr/ReportMgr.typ @@ -15,6 +15,7 @@ TYPE UseAdvancedFormat : BOOL; (*Whether or not the report should use the advanced format*) PathOfReportToView : STRING[255]; (*The file path of the selected report*) SelectedLanguage : STRING[10] := 'en'; (*Selected language*) + SortType : STRING[30]; (*How to sort reports for HMI*) END_STRUCT; ReportStatusType : STRUCT (*Structure to hold the status information from the HMI*) ViewAllowed : BOOL; (*Bit to indicate it is allowable to view a report right now*) diff --git a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx index bc41b185..7d0c4176 100644 --- a/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx +++ b/mappFramework/Logical/mappView/Resources/Texts/mappFrameworkTexts/ReportTexts.tmx @@ -324,5 +324,82 @@ Error on Report Core, please check the following causes Oee summary, Temperature samples, Alarm history + + + aufsteigender (alphabetischer) Reihenfolge + + + (字母)升序排列 + + + ascending (alphabetic) order + + + + + absteigende (alphabetische) Reihenfolge + + + (字母)降序排列 + + + descending (alphabetic) order + + + + + aufsteigend sortiert nach Datum der letzten Änderung + + + 按最后修改时间升序排列 + + + ascending order by date last modified + + + + + absteigend sortiert nach Datum der letzten Änderung + + + 按最后修改时间降序排列 + + + descending order by date last modified + + + + + aufsteigende Reihenfolge nach Dateigröße + + + 按文件大小升序排列 + + + ascending order by file size + + + + + absteigende Reihenfolge nach Dateigröße + + + 按文件大小降序排列 + + + descending order by file size + + + + + Sortiere nach + + + 排序方式 + + + Sort by + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content index 34e86c29..ff306082 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content @@ -18,5 +18,7 @@ + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding index b64f4835..9d00a8f2 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Report/Report_content.binding @@ -53,5 +53,10 @@ - + + + + + + From 43dd6447664622cfe35851d7098ae4aa01ef1d80 Mon Sep 17 00:00:00 2001 From: tclark-brautomation Date: Thu, 19 Jan 2023 15:39:02 -0500 Subject: [PATCH 089/112] Standardized locations, fonts, and styles of buttons, lists, widgets --- .../AuditContent/Audit.content | 6 ++-- .../AuditContent/AuditQuery.content | 6 ++-- .../AuditContent/AuditTrail.content | 6 ++-- .../AuditContent/CustomEvents.content | 4 +-- .../AxisContent/Axis.content | 4 +-- .../BackupContent/Backup.content | 18 +++++------ .../FileContent/File.content | 30 +++++++++---------- .../RecipeContent/Recipe.content | 16 +++++----- .../ReportContent/Report.content | 22 +++++++------- .../UserXContent/UserList.content | 28 ++++++++--------- 10 files changed, 70 insertions(+), 70 deletions(-) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Audit.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Audit.content index 328e6c3a..6ace25cb 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Audit.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/Audit.content @@ -3,17 +3,17 @@ - + - + - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditQuery.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditQuery.content index a951561b..58dec462 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditQuery.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditQuery.content @@ -1,14 +1,14 @@  - + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditTrail.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditTrail.content index a9007d0d..b531d2c1 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditTrail.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/AuditTrail.content @@ -1,7 +1,7 @@  - + @@ -10,9 +10,9 @@ - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/CustomEvents.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/CustomEvents.content index 2004c396..34bed1b9 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/CustomEvents.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AuditContent/CustomEvents.content @@ -3,11 +3,11 @@ - + - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Axis.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Axis.content index dc62cf41..146c20e7 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Axis.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/Axis.content @@ -3,12 +3,12 @@ - + - + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Backup.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Backup.content index 4b7d3468..2d393ee9 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Backup.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/BackupContent/Backup.content @@ -1,25 +1,25 @@  - + - + - + - - - - - - + + + + + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/File.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/File.content index 668efc7b..50386926 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/File.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/FileContent/File.content @@ -1,7 +1,7 @@  - + @@ -9,7 +9,7 @@ - + @@ -21,21 +21,21 @@ - - - - - - - - - - + + + + + + + + + + - - - + + + diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content index 87cb049c..c2f8797d 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content @@ -4,7 +4,7 @@ - + @@ -12,12 +12,12 @@ - - - - - - + + + + + + @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content index 1920021d..9cb9f862 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/ReportContent/Report.content @@ -1,24 +1,24 @@  - + - - + + - + - - - - - + + + + + - - + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserList.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserList.content index 426a8c71..d25e62e8 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserList.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/UserXContent/UserList.content @@ -1,25 +1,25 @@  - + - - - + + + - - - - - - + + + + + + - - + + - - + + \ No newline at end of file From db73654d020038abbe35e00763a2d411c1593ec1 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Thu, 19 Jan 2023 14:53:54 -0600 Subject: [PATCH 090/112] AAZM-534 - Implement recipe table updates to always select the active recipe and keep the active selection thru a warmstart --- .../Recipe/RecipeMgr/HMIActions.st | 409 +++++++++--------- .../Recipe/RecipeMgr/RecipeMgr.st | 34 +- .../Recipe/RecipeMgr/RecipeMgr.typ | 5 + .../Recipe/RecipeMgr/RecipeMgr.var | 5 + .../RecipeContent/Recipe.content | 10 +- .../Recipe/Recipe_content.eventbinding | 77 ++-- 6 files changed, 293 insertions(+), 247 deletions(-) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st index a3d52110..eb15b4f6 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st @@ -1,6 +1,6 @@ ACTION FormatDeviceDataProvider: - // Select CF device if USB device is not available + // Select CF device if USB device is not available FOR i := 0 TO ((SIZEOF(gUSBAvailable) / SIZEOF(gUSBAvailable[0])) - 1) DO IF gUSBAvailable[i] THEN HmiRecipe.Status.DeviceDataProvider[i + 1] := '{"value":"USB'; @@ -19,16 +19,16 @@ ACTION FormatDeviceDataProvider: END_ACTION ACTION LoadStatus: - // Configure visible recipe list - IF MpRecipeUIConnect.Recipe.List.Names[0] = '' THEN - HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":0,"to":19, "visible":false}]}'; - ELSE - HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":'; - brsitoa(MpRecipeUIConnect.Recipe.List.MaxSelection + 1, ADR(HmiRecipe.Status.TableConfig) + brsstrlen(ADR(HmiRecipe.Status.TableConfig))); - brsstrcat(ADR(HmiRecipe.Status.TableConfig), ADR(',"to":19, "visible":false}]}')); - END_IF - - HmiRecipe.Status.FilesAvailable := (MpRecipeUIConnect.Recipe.List.Names[0] <> ''); + // Configure visible recipe list + IF MpRecipeUIConnect.Recipe.List.Names[0] = '' THEN + HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":0,"to":19, "visible":false}]}'; + ELSE + HmiRecipe.Status.TableConfig := '{ "specRows": [{"from":'; + brsitoa(MpRecipeUIConnect.Recipe.List.MaxSelection + 1, ADR(HmiRecipe.Status.TableConfig) + brsstrlen(ADR(HmiRecipe.Status.TableConfig))); + brsstrcat(ADR(HmiRecipe.Status.TableConfig), ADR(',"to":19, "visible":false}]}')); + END_IF + + HmiRecipe.Status.FilesAvailable := (MpRecipeUIConnect.Recipe.List.Names[0] <> ''); HmiRecipe.Status.LoadAllowed := HmiRecipe.Status.FilesAvailable AND NOT HmiRecipe.Status.InvalidRecipe; HmiRecipe.Status.DeviceValid := (MpFileManagerUI_0.Info.Diag.StatusID.Code <> 8197); @@ -36,193 +36,212 @@ END_ACTION ACTION LoadPreview: - // Load preview when a recipe is selected - IF (MpRecipeUIConnect.Recipe.List.SelectedIndex <> HmiRecipe.Status.LastSelectedIndex) OR (HmiRecipe.Status.LastMaxSelection <> MpRecipeUIConnect.Recipe.List.MaxSelection) THEN - // Check selected recipe name is not empty - IF (brsstrlen(ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex])) > 0) THEN - MpRecipe_0.FileName := ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]); - MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); - MpRecipe_0.Load := TRUE; - HmiRecipe.Status.LastSelectedIndex := MpRecipeUIConnect.Recipe.List.SelectedIndex; - HmiRecipe.Status.LastMaxSelection := MpRecipeUIConnect.Recipe.List.MaxSelection; - HmiRecipe.Status.InvalidRecipe := FALSE; - END_IF - END_IF - - // Reset load command on MpRecipe_0 FUB - IF MpRecipe_0.StatusID <> 0 THEN - HmiRecipe.Status.InvalidRecipe := TRUE; - HmiRecipe.Commands.ResetPreview := TRUE; - END_IF; - - IF ((MpRecipe_0.CommandDone = TRUE) OR (MpRecipe_0.Error = TRUE)) THEN - MpRecipe_0.Load := FALSE; - END_IF + // Load preview when a recipe is selected + IF (MpRecipeUIConnect.Recipe.List.SelectedIndex <> HmiRecipe.Status.LastSelectedIndex) OR (HmiRecipe.Status.LastMaxSelection <> MpRecipeUIConnect.Recipe.List.MaxSelection) THEN + // Check selected recipe name is not empty + IF (brsstrlen(ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex])) > 0) THEN + MpRecipe_0.FileName := ADR(MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]); + MpRecipe_0.Category := ADR(HmiRecipe.Parameters.Category); + MpRecipe_0.Load := TRUE; + HmiRecipe.Status.LastSelectedIndex := MpRecipeUIConnect.Recipe.List.SelectedIndex; + HmiRecipe.Status.LastMaxSelection := MpRecipeUIConnect.Recipe.List.MaxSelection; + HmiRecipe.Status.InvalidRecipe := FALSE; + END_IF + END_IF + + // Reset load command on MpRecipe_0 FUB + IF MpRecipe_0.StatusID <> 0 THEN + HmiRecipe.Status.InvalidRecipe := TRUE; + HmiRecipe.Commands.ResetPreview := TRUE; + END_IF; + + IF ((MpRecipe_0.CommandDone = TRUE) OR (MpRecipe_0.Error = TRUE)) THEN + MpRecipe_0.Load := FALSE; + END_IF END_ACTION ACTION RecipeHMIcommands: - CASE HmiRecipe.Status.HMIcommand OF - REC_HMI_WAIT: - // The following commands are triggered directly from the HMI. If you imported the mapp View front end of - // the Framework, then this is already taken care of. If you did not, then your visualization must - // trigger each one of these command variables (CreateRecipe, SaveSelectedRecipe, LoadRecipe). - IF (MpRecipeUIConnect.Status <> mpRECIPE_UI_STATUS_IDLE) THEN - // MpRecipe is active so don't issue a new command - ELSIF HmiRecipe.Commands.CreateRecipe THEN - HmiRecipe.Status.HMIcommand := REC_HMI_CREATE; - HmiRecipe.Commands.CreateRecipe := FALSE; - ELSIF HmiRecipe.Commands.SaveSelectedRecipe THEN - HmiRecipe.Status.HMIcommand := REC_HMI_SAVE; - HmiRecipe.Commands.SaveSelectedRecipe := FALSE; - ELSIF HmiRecipe.Commands.LoadRecipe THEN - HmiRecipe.Status.HMIcommand := REC_HMI_LOAD; - HmiRecipe.Commands.LoadRecipe := FALSE; - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - HmiRecipe.Status.ProductRecipeLoaded := FALSE; - ELSE - HmiRecipe.Status.ConfigRecipeLoaded := FALSE; - END_IF - ELSIF HmiRecipe.Commands.ResetPreview THEN - HmiRecipe.Status.HMIcommand := REC_HMI_RESET_PREVIEW; - HmiRecipe.Commands.ResetPreview := FALSE; - END_IF - - REC_HMI_CREATE: - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - ParametersPreview := ParametersEdit; - brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); - brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.par')); - // If the default recipe was initially missing and just now created, immediately load it - IF HmiRecipe.Status.ParameterRecipeMissing THEN - HmiRecipe.Commands.LoadRecipe := TRUE; - END_IF - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettingsPreview := MachineSettingsEdit; - brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); - brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.mcfg')); - // If the default recipe was initially missing and just now created, immediately load it - IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN - HmiRecipe.Commands.LoadRecipe := TRUE; - END_IF - END_IF - - Header.Name := MpRecipeUIConnect.New.FileName; - DTGetTime_0.enable := TRUE; - REPEAT - DTGetTime_0(); - UNTIL (DTGetTime_0.status = 0) - END_REPEAT; - Header.DateTime := DTGetTime_0.DT1; - DTGetTime_0.enable := FALSE; - DTGetTime_0(); - MpRecipeUIConnect.New.Create := TRUE; - - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - - REC_HMI_LOAD: - IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - Parameters := ParametersPreview; - HmiRecipe.Status.ProductRecipeLoaded := TRUE; - // If the default recipe was initially missing and just now created, then it is the last loaded recipe - IF HmiRecipe.Status.ParameterRecipeMissing THEN - HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe), ADR(PARAMETERS_FILE_EXTENSION)); - HmiRecipe.Status.ParameterRecipeMissing := FALSE; - // Otherwise, the last loaded recipe is the selected recipe - ELSE - HmiRecipe.Status.LastLoadedProductRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - END_IF - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettings := MachineSettingsPreview; - HmiRecipe.Status.ConfigRecipeLoaded := TRUE; - // If the default recipe was initially missing and just now created, then it is the last loaded recipe - IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN - HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe), ADR(MACHINE_CONFIG_FILE_EXTENSION)); - HmiRecipe.Status.MachineSettingsRecipeMissing := FALSE; - // Otherwise, the last loaded recipe is the selected recipe - ELSE - HmiRecipe.Status.LastLoadedConfigRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - END_IF - END_IF - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - END_IF - - REC_HMI_SAVE: - IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN - - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - ParametersPreview := ParametersEdit; - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettingsPreview := MachineSettingsEdit; - END_IF - - IF (brsstrlen(ADR(HmiRecipe.Status.SelectedRecipe)) > 0) THEN - MpRecipe_0.FileName := ADR(HmiRecipe.Status.SelectedRecipe); - MpRecipe_0.Save := TRUE; - END_IF - - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - END_IF - - REC_HMI_RESET_PREVIEW: - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - brsmemset(ADR(ParametersPreview), 0, SIZEOF(ParametersPreview)); - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - brsmemset(ADR(MachineSettingsPreview), 0, SIZEOF(MachineSettingsPreview)); - END_IF - HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; - - END_CASE - - // IF NOT MpRecipe_0.CommandBusy AND brsstrcmp(ADR(HmiRecipe.Status.PreviousRecipe), ADR(HmiRecipe.Parameters.FileName)) <> 0 THEN - // HmiRecipe.Parameters.FileName := HmiRecipe.Status.PreviousRecipe; - // END_IF - - // If the Edit or Create dialog boxes open, copy the Preview structure into the Edit structure. - IF HmiRecipe.Status.EditDialogOpened OR HmiRecipe.Status.CreateDialogOpened THEN - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - ParametersEdit := ParametersPreview; - IF HmiRecipe.Status.ParameterRecipeMissing THEN - HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; - ELSE - HmiRecipe.Parameters.FileName:= 'newParameters'; - END_IF - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - MachineSettingsEdit := MachineSettingsPreview; - IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN - HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; - ELSE - HmiRecipe.Parameters.FileName := 'newMachineConfig'; - END_IF - END_IF - HmiRecipe.Status.EditDialogOpened := FALSE; - HmiRecipe.Status.CreateDialogOpened := FALSE; - END_IF - - // Check if the file name has already been used - HmiRecipe.Status.FileDuplicate := FALSE; - FOR i:=0 TO ((SIZEOF(MpRecipeUIConnect.Recipe.List.Names) / SIZEOF(MpRecipeUIConnect.Recipe.List.Names[0])) - 1) DO - temp := HmiRecipe.Parameters.FileName; - IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN - brsstrcat(ADR(temp),ADR('.par')); - ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN - brsstrcat(ADR(temp),ADR('.mcfg')); - END_IF - IF temp = MpRecipeUIConnect.Recipe.List.Names[i] THEN - HmiRecipe.Status.FileDuplicate := TRUE; - END_IF - END_FOR - - // Set whether the loading .gif should be shown on the HMI - HmiRecipe.Status.LoadingRecipeList := (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_REFRESH); - HmiRecipe.Status.DefaultRecipeSelected := (HmiRecipe.Status.SelectedRecipe = 'Default.par') OR (HmiRecipe.Status.SelectedRecipe = 'Machine.mcfg'); - - // Update status information - HmiRecipe.Status.LastStatus := MpRecipeUIConnect.Status; - HmiRecipe.Status.SelectedRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; - + CASE HmiRecipe.Status.HMIcommand OF + REC_HMI_WAIT: + // The following commands are triggered directly from the HMI. If you imported the mapp View front end of + // the Framework, then this is already taken care of. If you did not, then your visualization must + // trigger each one of these command variables (CreateRecipe, SaveSelectedRecipe, LoadRecipe). + IF (MpRecipeUIConnect.Status <> mpRECIPE_UI_STATUS_IDLE) THEN + // MpRecipe is active so don't issue a new command + ELSIF HmiRecipe.Commands.CreateRecipe THEN + HmiRecipe.Status.HMIcommand := REC_HMI_CREATE; + HmiRecipe.Commands.CreateRecipe := FALSE; + ELSIF HmiRecipe.Commands.SaveSelectedRecipe THEN + HmiRecipe.Status.HMIcommand := REC_HMI_SAVE; + HmiRecipe.Commands.SaveSelectedRecipe := FALSE; + ELSIF HmiRecipe.Commands.LoadRecipe THEN + HmiRecipe.Status.HMIcommand := REC_HMI_LOAD; + HmiRecipe.Commands.LoadRecipe := FALSE; + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + HmiRecipe.Status.ProductRecipeLoaded := FALSE; + ELSE + HmiRecipe.Status.ConfigRecipeLoaded := FALSE; + END_IF + ELSIF HmiRecipe.Commands.ResetPreview THEN + HmiRecipe.Status.HMIcommand := REC_HMI_RESET_PREVIEW; + HmiRecipe.Commands.ResetPreview := FALSE; + END_IF + + REC_HMI_CREATE: + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + ParametersPreview := ParametersEdit; + brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); + brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.par')); + // If the default recipe was initially missing and just now created, immediately load it + IF HmiRecipe.Status.ParameterRecipeMissing THEN + HmiRecipe.Commands.LoadRecipe := TRUE; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettingsPreview := MachineSettingsEdit; + brsstrcpy(ADR(MpRecipeUIConnect.New.FileName), ADR(HmiRecipe.Parameters.FileName)); + brsstrcat(ADR(MpRecipeUIConnect.New.FileName), ADR('.mcfg')); + // If the default recipe was initially missing and just now created, immediately load it + IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN + HmiRecipe.Commands.LoadRecipe := TRUE; + END_IF + END_IF + + Header.Name := MpRecipeUIConnect.New.FileName; + DTGetTime_0.enable := TRUE; + REPEAT + DTGetTime_0(); + UNTIL (DTGetTime_0.status = 0) + END_REPEAT; + Header.DateTime := DTGetTime_0.DT1; + DTGetTime_0.enable := FALSE; + DTGetTime_0(); + MpRecipeUIConnect.New.Create := TRUE; + + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + + REC_HMI_LOAD: + IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + Parameters := ParametersPreview; + HmiRecipe.Status.ProductRecipeLoaded := TRUE; + // If the default recipe was initially missing and just now created, then it is the last loaded recipe + IF HmiRecipe.Status.ParameterRecipeMissing THEN + HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe), ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipe.Status.ParameterRecipeMissing := FALSE; + // Otherwise, the last loaded recipe is the selected recipe + ELSE + HmiRecipe.Status.LastLoadedProductRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + HmiRecipeRetain.LastLoadedProductRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettings := MachineSettingsPreview; + HmiRecipe.Status.ConfigRecipeLoaded := TRUE; + // If the default recipe was initially missing and just now created, then it is the last loaded recipe + IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN + HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe), ADR(MACHINE_CONFIG_FILE_EXTENSION)); + HmiRecipe.Status.MachineSettingsRecipeMissing := FALSE; + // Otherwise, the last loaded recipe is the selected recipe + ELSE + HmiRecipe.Status.LastLoadedConfigRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + HmiRecipeRetain.LastLoadedConfigRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + END_IF + END_IF + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + END_IF + + REC_HMI_SAVE: + IF (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_IDLE) THEN + + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + ParametersPreview := ParametersEdit; + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettingsPreview := MachineSettingsEdit; + END_IF + + IF (brsstrlen(ADR(HmiRecipe.Status.SelectedRecipe)) > 0) THEN + MpRecipe_0.FileName := ADR(HmiRecipe.Status.SelectedRecipe); + MpRecipe_0.Save := TRUE; + END_IF + + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + END_IF + + REC_HMI_RESET_PREVIEW: + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + brsmemset(ADR(ParametersPreview), 0, SIZEOF(ParametersPreview)); + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + brsmemset(ADR(MachineSettingsPreview), 0, SIZEOF(MachineSettingsPreview)); + END_IF + HmiRecipe.Status.HMIcommand := REC_HMI_WAIT; + + END_CASE + + // IF NOT MpRecipe_0.CommandBusy AND brsstrcmp(ADR(HmiRecipe.Status.PreviousRecipe), ADR(HmiRecipe.Parameters.FileName)) <> 0 THEN + // HmiRecipe.Parameters.FileName := HmiRecipe.Status.PreviousRecipe; + // END_IF + + // If the Edit or Create dialog boxes open, copy the Preview structure into the Edit structure. + IF HmiRecipe.Status.EditDialogOpened OR HmiRecipe.Status.CreateDialogOpened THEN + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + ParametersEdit := ParametersPreview; + IF HmiRecipe.Status.ParameterRecipeMissing THEN + HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; + ELSE + HmiRecipe.Parameters.FileName:= 'newParameters'; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + MachineSettingsEdit := MachineSettingsPreview; + IF HmiRecipe.Status.MachineSettingsRecipeMissing THEN + HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; + ELSE + HmiRecipe.Parameters.FileName := 'newMachineConfig'; + END_IF + END_IF + HmiRecipe.Status.EditDialogOpened := FALSE; + HmiRecipe.Status.CreateDialogOpened := FALSE; + END_IF + + // Check if the file name has already been used + HmiRecipe.Status.FileDuplicate := FALSE; + FOR i:=0 TO ((SIZEOF(MpRecipeUIConnect.Recipe.List.Names) / SIZEOF(MpRecipeUIConnect.Recipe.List.Names[0])) - 1) DO + temp := HmiRecipe.Parameters.FileName; + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + brsstrcat(ADR(temp),ADR(PARAMETERS_FILE_EXTENSION)); + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + brsstrcat(ADR(temp),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + END_IF + IF temp = MpRecipeUIConnect.Recipe.List.Names[i] THEN + HmiRecipe.Status.FileDuplicate := TRUE; + END_IF + END_FOR + + // Find loaded recipe index + IF (HmiRecipe.Status.RecipeContentLoaded AND (HmiRecipe.Status.LoadingRecipeList = FALSE)) THEN + HmiRecipe.Status.RecipeContentLoaded := FALSE; + FOR i:=0 TO ((SIZEOF(MpRecipeUIConnect.Recipe.List.Names) / SIZEOF(MpRecipeUIConnect.Recipe.List.Names[0])) - 1) DO + temp := HmiRecipe.Status.LastLoadedProductRecipe; + IF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(PARAMETERS_RECIPE)) = 0) THEN + IF HmiRecipe.Status.LastLoadedProductRecipe = MpRecipeUIConnect.Recipe.List.Names[i] THEN + MpRecipeUIConnect.Recipe.List.SelectedIndex := i; + END_IF + ELSIF (brsstrcmp(ADR(HmiRecipe.Parameters.Category), ADR(MACHINE_CONFIGURATION_RECIPE)) = 0) THEN + IF HmiRecipe.Status.LastLoadedConfigRecipe = MpRecipeUIConnect.Recipe.List.Names[i] THEN + MpRecipeUIConnect.Recipe.List.SelectedIndex := i; + END_IF + END_IF + END_FOR + END_IF + + // Set whether the loading .gif should be shown on the HMI + HmiRecipe.Status.LoadingRecipeList := (MpRecipeUIConnect.Status = mpRECIPE_UI_STATUS_REFRESH); + HmiRecipe.Status.DefaultRecipeSelected := (HmiRecipe.Status.SelectedRecipe = 'Default.par') OR (HmiRecipe.Status.SelectedRecipe = 'Machine.mcfg'); + + // Update status information + HmiRecipe.Status.LastStatus := MpRecipeUIConnect.Status; + HmiRecipe.Status.SelectedRecipe := MpRecipeUIConnect.Recipe.List.Names[MpRecipeUIConnect.Recipe.List.SelectedIndex]; + END_ACTION diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st index 1f63d361..03824c6b 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.st @@ -73,15 +73,24 @@ PROGRAM _INIT // Load default Machine Settings recipe HmiRecipe.Parameters.Category := MACHINE_CONFIGURATION_CATEGORY; - HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + IF (brsstrcmp(ADR(HmiRecipeRetain.LastLoadedConfigRecipe), ADR('')) <> 0) THEN + HmiRecipe.Parameters.FileName := HmiRecipeRetain.LastLoadedConfigRecipe; + ELSE + HmiRecipe.Parameters.FileName := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + END_IF MpRecipe_0.Load := TRUE; WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO MpRecipe_0(); END_WHILE MachineSettings := MachineSettingsPreview; - HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + IF (brsstrcmp(ADR(HmiRecipeRetain.LastLoadedConfigRecipe), ADR('')) <> 0) THEN + HmiRecipe.Status.LastLoadedConfigRecipe := HmiRecipeRetain.LastLoadedConfigRecipe; + ELSE + HmiRecipe.Status.LastLoadedConfigRecipe := DEFAULT_MACHINE_CONFIGURATION; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedConfigRecipe),ADR(MACHINE_CONFIG_FILE_EXTENSION)); + HmiRecipeRetain.LastLoadedConfigRecipe := HmiRecipe.Status.LastLoadedConfigRecipe; + END_IF HmiRecipe.Status.ConfigRecipeLoaded := TRUE; // Check if the default machine settings recipe is missing @@ -97,16 +106,25 @@ PROGRAM _INIT // Load default Parameter recipe HmiRecipe.Parameters.Category := PARAMETERS_CATEGORY; - HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(PARAMETERS_FILE_EXTENSION)); + IF (brsstrcmp(ADR(HmiRecipeRetain.LastLoadedProductRecipe), ADR('')) <> 0) THEN + HmiRecipe.Parameters.FileName := HmiRecipeRetain.LastLoadedProductRecipe; + ELSE + HmiRecipe.Parameters.FileName := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Parameters.FileName),ADR(PARAMETERS_FILE_EXTENSION)); + END_IF HmiRecipe.Status.PreviousRecipe := DEFAULT_PARAMETERS; MpRecipe_0.Load := TRUE; WHILE NOT(MpRecipe_0.CommandDone OR MpRecipe_0.Error) DO MpRecipe_0(); END_WHILE Parameters := ParametersPreview; - HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; - brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe),ADR(PARAMETERS_FILE_EXTENSION)); + IF (brsstrcmp(ADR(HmiRecipeRetain.LastLoadedProductRecipe), ADR('')) <> 0) THEN + HmiRecipe.Status.LastLoadedProductRecipe := HmiRecipeRetain.LastLoadedProductRecipe; + ELSE + HmiRecipe.Status.LastLoadedProductRecipe := DEFAULT_PARAMETERS; + brsstrcat(ADR(HmiRecipe.Status.LastLoadedProductRecipe),ADR(PARAMETERS_FILE_EXTENSION)); + HmiRecipeRetain.LastLoadedProductRecipe := HmiRecipe.Status.LastLoadedProductRecipe; + END_IF HmiRecipe.Status.ProductRecipeLoaded := TRUE; // Check if the default parameters recipe is missing diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ index 10fc899c..c2c3b061 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.typ @@ -41,6 +41,11 @@ TYPE TableConfig : STRING[120]; (*Table configuration *) SelectedRecipe : STRING[255]; (*The name of the selected recipe*) DefaultRecipeSelected : BOOL; (*The default recipe is selected*) + RecipeContentLoaded : BOOL; (*Recipe content is loading and previous selection is restored*) + END_STRUCT; + RecipeRetainType : STRUCT (*Structure to hold parameters for retain after restart *) + LastLoadedConfigRecipe : STRING[255]; (*Last loaded configuration recipe*) + LastLoadedProductRecipe : STRING[255]; (*Last loaded product recipe*) END_STRUCT; ParametersType : STRUCT (*Demo / starter structure for machine parameters*) AddParametersHere1 : BOOL; (*Add your parameteres here *) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var index ec1f6934..37b28eb0 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/RecipeMgr.var @@ -23,6 +23,11 @@ END_VAR (*Structure Types*) VAR HmiRecipe : RecipeHmiInterfaceType; (*HMI interface structure*) +END_VAR +VAR RETAIN + HmiRecipeRetain : RecipeRetainType; +END_VAR +VAR Parameters : ParametersType; (*Machine parameters. Used by the machine at runtime*) ParametersEdit : {REDUND_UNREPLICABLE} ParametersType; (*Machine parameters edit structure. Enables you to edit a recipe that is not currently active*) ParametersPreview : ParametersType; (*Machine parameters preview structure. Registered to the recipe. Enables you to preview a recipe that is not currently active.*) diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content index 87cb049c..3ff4d6db 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/RecipeContent/Recipe.content @@ -21,11 +21,11 @@ - - - - - + + + + + diff --git a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding index 4ffbbd4d..be04cbcb 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding +++ b/mappFramework/Physical/Simulation/PC/mappView/Recipe/Recipe_content.eventbinding @@ -157,43 +157,35 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -260,29 +252,29 @@ - - + + - - + + - + - - + + @@ -293,6 +285,13 @@ + + + + + + + From 37fcfa1ad260854c8cc8223aafffcc9e4ad4d574 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Fri, 20 Jan 2023 08:46:53 -0600 Subject: [PATCH 091/112] AAZM-418 - minor code change for better readability in code --- .../Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st index eb15b4f6..279165e0 100644 --- a/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st +++ b/mappFramework/Logical/Infrastructure/Recipe/RecipeMgr/HMIActions.st @@ -30,7 +30,7 @@ ACTION LoadStatus: HmiRecipe.Status.FilesAvailable := (MpRecipeUIConnect.Recipe.List.Names[0] <> ''); HmiRecipe.Status.LoadAllowed := HmiRecipe.Status.FilesAvailable AND NOT HmiRecipe.Status.InvalidRecipe; - HmiRecipe.Status.DeviceValid := (MpFileManagerUI_0.Info.Diag.StatusID.Code <> 8197); + HmiRecipe.Status.DeviceValid := (MpFileManagerUI_0.StatusID <> mpFILE_ERR_INVALID_FILE_DEV); END_ACTION From f5f348b5ec0debb6705bc39e43140acd31aa4ed6 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Fri, 27 Jan 2023 07:46:39 -0600 Subject: [PATCH 092/112] AAZM-521 - update Axis auto content based on the modified manual compound widget --- .../AxisContent/AxisAuto.content | 11 +- .../AutoControl/Package.pkg | 7 + .../AutoControl/Widget.compoundwidget | 198 ++++++++++++++++++ .../AxisControl/Widget.compoundwidget | 26 +-- .../Widgets/AxisControlWidgetLib/Package.pkg | 1 + .../Resources/Media/AxisControl/Package.pkg | 2 + .../Resources/Media/AxisControl/Start.svg | 11 + .../Resources/Media/AxisControl/Update.svg | 92 ++++++++ .../Resources/Texts/AxisFaceplate.tmx | 26 ++- .../PC/mappView/Axis/AxisAuto_content.binding | 31 +-- 10 files changed, 357 insertions(+), 48 deletions(-) create mode 100644 mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Package.pkg create mode 100644 mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Widget.compoundwidget create mode 100644 mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Start.svg create mode 100644 mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Update.svg diff --git a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisAuto.content b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisAuto.content index 2b6c2a04..56924b35 100644 --- a/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisAuto.content +++ b/mappFramework/Logical/mappView/Visualization/Pages/mappFrameworkContents/AxisContent/AxisAuto.content @@ -1,15 +1,6 @@  - - - - - - - - - - + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Package.pkg b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Package.pkg new file mode 100644 index 00000000..e56db615 --- /dev/null +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Package.pkg @@ -0,0 +1,7 @@ + + + + + Widget.compoundwidget + + \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Widget.compoundwidget b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Widget.compoundwidget new file mode 100644 index 00000000..2c510c4d --- /dev/null +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AutoControl/Widget.compoundwidget @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PositionUnit + + + + + + + Unit + + + + + + + + Label Text + + + + + + + Axis Control + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget index f4795169..bdd60e92 100644 --- a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/AxisControl/Widget.compoundwidget @@ -10,21 +10,23 @@ 'LocalMedia/AxisControl/GearRotating.svg', 'LocalMedia/AxisControl/GearRotating.svg', 'LocalMedia/AxisControl/GearRotating.svg']" selectedIndex="0" visible="true"/> - + - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Package.pkg b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Package.pkg index 5659aca4..e29353ff 100644 --- a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Package.pkg +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Package.pkg @@ -5,6 +5,7 @@ Description.widgetlibrary Resources AxisControl + AutoControl AxisControlWidgetLib.png \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Package.pkg b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Package.pkg index a88e7925..b1476c86 100644 --- a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Package.pkg +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Package.pkg @@ -14,5 +14,7 @@ GearDisabled.svg GearEnabled.svg GearRotating.svg + Start.svg + Update.svg \ No newline at end of file diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Start.svg b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Start.svg new file mode 100644 index 00000000..eafaf8bb --- /dev/null +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Start.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Update.svg b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Update.svg new file mode 100644 index 00000000..29a883ca --- /dev/null +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Media/AxisControl/Update.svg @@ -0,0 +1,92 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Texts/AxisFaceplate.tmx b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Texts/AxisFaceplate.tmx index f1ef6fbd..24364eaf 100644 --- a/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Texts/AxisFaceplate.tmx +++ b/mappFramework/Logical/mappView/Widgets/AxisControlWidgetLib/Resources/Texts/AxisFaceplate.tmx @@ -84,7 +84,7 @@ - Fahre Geschwindigkeit + Konstante Geschwindigkeit 按速度运行 @@ -117,7 +117,7 @@ - Zurücksetzen + Reset 复位 @@ -170,5 +170,27 @@ Stop + + + Starten + + + 开始 + + + Start + + + + + Parameter akzeptieren + + + 确认速度 + + + Confirm Speed + + \ No newline at end of file diff --git a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding index e1e93e0d..73fda641 100644 --- a/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding +++ b/mappFramework/Physical/Simulation/PC/mappView/Axis/AxisAuto_content.binding @@ -1,27 +1,10 @@ - + - - - - - - + - - - - - - - - - - - - - - - - - + + + + + From d48f9f4135e0146fcf090273189ac3a0d66a4543 Mon Sep 17 00:00:00 2001 From: Marcel Voigt Date: Fri, 27 Jan 2023 08:13:17 -0600 Subject: [PATCH 093/112] AAZM-520 - standardize all orange colors --- .../BuRThemeFlat1/brease/Buttons.styles | 34 ++++++++--------- .../Themes/BuRThemeFlat1/brease/Charts.styles | 4 +- .../BuRThemeFlat1/brease/Default.styles | 38 +++++++++---------- .../BuRThemeFlat1/brease/LabelTexts.styles | 2 +- .../BuRThemeFlat1/brease/Sequencer.styles | 10 ++--- .../Themes/BuRThemeFlat1/brease/System.styles | 2 +- .../UserXContent/UserList.content | 4 +- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/mappFramework/Logical/mappView/Resources/Themes/BuRThemeFlat1/brease/Buttons.styles b/mappFramework/Logical/mappView/Resources/Themes/BuRThemeFlat1/brease/Buttons.styles index 93034abd..a4a8d424 100644 --- a/mappFramework/Logical/mappView/Resources/Themes/BuRThemeFlat1/brease/Buttons.styles +++ b/mappFramework/Logical/mappView/Resources/Themes/BuRThemeFlat1/brease/Buttons.styles @@ -21,9 +21,9 @@ borderWidth="1px 1px 1px 1px" borderColor="#646464" mouseDownBorderWidth="1px 1px 1px 1px" - mouseDownBorderColor="#ff8500" + mouseDownBorderColor="#ff8800" backColor="#646464" - mouseDownBackColor="#ff8500" + mouseDownBackColor="#ff8800" disabledBackColor="#d1d1d1" />