From 59315b0b4e4a3c900d42f4452ca3962be81fb84c Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Wed, 7 Jun 2017 15:23:05 +0200 Subject: [PATCH] Minor syntax corrections --- src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py | 1 - src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py index 3570041..77d0a0f 100644 --- a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py +++ b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py @@ -85,7 +85,6 @@ def windows(): # called when module is initialized # return list of 2d/3d views to be used ny the module def views(): - print("views") return [] def createPreferences(): diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py index 8d47feb..4210c9e 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py @@ -156,7 +156,7 @@ class AdaoCaseManager(EficasObserver): adaoLogger.debug("currentSelectionChanged") salomeStudyItem = adaoGuiHelper.getSelectedItem() if salomeStudyItem is not None: - for case_editor, adao_case in list(self.cases.items()): + for case_editor, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): self.eficas_manager.selectCase(adao_case.eficas_editor) break @@ -168,7 +168,7 @@ class AdaoCaseManager(EficasObserver): et la selection dans l'etude SALOME """ editor = eficasEvent.callbackId - for case_editor, adao_case in list(self.cases.items()): + for case_editor, adao_case in self.cases.items(): if case_editor is editor: adaoGuiHelper.selectItem(adao_case.salome_study_item.GetID()) break @@ -184,7 +184,7 @@ class AdaoCaseManager(EficasObserver): editor = self.eficas_manager.getCurrentEditor() # 2: sync with SALOME GUI is a tab is opened if editor: - for case_editor, adao_case in list(self.cases.items()): + for case_editor, adao_case in self.cases.items(): if case_editor is editor: adaoGuiHelper.selectItem(adao_case.salome_study_item.GetID()) break @@ -247,7 +247,7 @@ class AdaoCaseManager(EficasObserver): # dans le GUI d'Eficas self.harmonizeSelectionFromEficas() salomeStudyItem = adaoGuiHelper.getSelectedItem() - for case_name, adao_case in list(self.cases.items()): + for case_name, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): if not adao_case.isOk(): adaoLogger.debug("Cas invalide, donc il est sauvegarde, mais il ne peut pas etre exporte vers YACS ensuite") @@ -260,7 +260,7 @@ class AdaoCaseManager(EficasObserver): # dans le GUI d'Eficas self.harmonizeSelectionFromEficas() salomeStudyItem = adaoGuiHelper.getSelectedItem() - for case_name, adao_case in list(self.cases.items()): + for case_name, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): if not adao_case.isOk(): adaoLogger.debug("Cas invalide, donc il est sauvegarde, mais il ne peut pas etre exporte vers YACS ensuite") @@ -291,7 +291,7 @@ class AdaoCaseManager(EficasObserver): # dans le GUI d'Eficas self.harmonizeSelectionFromEficas() salomeStudyItem = adaoGuiHelper.getSelectedItem() - for case_name, adao_case in list(self.cases.items()): + for case_name, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): self.eficas_manager.adaoFileClose(adao_case) break @@ -321,7 +321,7 @@ class AdaoCaseManager(EficasObserver): adaoLogger.debug("Validation du cas par un rapport sur le JDC") self.harmonizeSelectionFromEficas() salomeStudyItem = adaoGuiHelper.getSelectedItem() - for case_name, adao_case in list(self.cases.items()): + for case_name, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): msg = adao_case.validationReportforJDC() adaoGuiHelper.gui_information(SalomePyQt.SalomePyQt().getDesktop(), msg) @@ -338,7 +338,7 @@ class AdaoCaseManager(EficasObserver): adaoLogger.debug("Validation du cas par un rapport sur le JDC") self.harmonizeSelectionFromEficas() salomeStudyItem = adaoGuiHelper.getSelectedItem() - for case_name, adao_case in list(self.cases.items()): + for case_name, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): msg = adao_case.showTreeAdaoCase() break @@ -356,7 +356,7 @@ class AdaoCaseManager(EficasObserver): # dans le GUI d'Eficas self.harmonizeSelectionFromEficas() salomeStudyItem = adaoGuiHelper.getSelectedItem() - for case_name, adao_case in list(self.cases.items()): + for case_name, adao_case in self.cases.items(): if adao_case.salome_study_item.GetID() == salomeStudyItem.GetID(): if adao_case.isOk(): msg = adao_case.exportCaseToYACS() -- 2.39.2