diff --git a/src/model/Study.py b/src/model/Study.py index 06a6c2ca..47977bb8 100644 --- a/src/model/Study.py +++ b/src/model/Study.py @@ -13,7 +13,6 @@ class Study(Serializable): # Study general information self.name = "" self.description = "" - self.solver = "" self.creation_date = datetime.now() self.last_modification_date = datetime.now() @@ -27,9 +26,8 @@ class Study(Serializable): return cls() @classmethod - def new(cls, name, description, solver): + def new(cls, name, description): me = cls() me.name = name me.description = description - me.solver = solver return me diff --git a/src/view/MainWindow.py b/src/view/MainWindow.py index 18521df4..0e1e032b 100644 --- a/src/view/MainWindow.py +++ b/src/view/MainWindow.py @@ -23,7 +23,7 @@ no_model_action = [ ] model_action = [ - "action_menu_close", "action_menu_save_maille", "action_menu_save", + "action_menu_close", "action_menu_edit", "action_menu_save", "action_menu_save_as", "action_toolBar_close", "action_toolBar_save", ] @@ -83,6 +83,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow): # Menu action "action_menu_config": self.open_configure, "action_menu_new": self.open_new_study, + "action_menu_edit": self.open_edit_study, "action_menu_open": self.open_model, "action_menu_save": self.save_study, "action_menu_save_as": self.save_as_study, @@ -255,6 +256,17 @@ class ApplicationWindow(QMainWindow, ListedSubWindow): self.new_study = NewStudyWindow(parent=self) self.new_study.show() + def open_edit_study(self): + """Open dialog to set new study + + Returns: + Nothing + """ + if not self.model is None: + self.new_study = NewStudyWindow(study=self.model, parent=self) + self.new_study.show() + + # TODO: Delete me ! ############### # DUMMY STUFF # diff --git a/src/view/NewStudyWindow.py b/src/view/NewStudyWindow.py index 28719fa4..7de5cf0b 100644 --- a/src/view/NewStudyWindow.py +++ b/src/view/NewStudyWindow.py @@ -4,19 +4,25 @@ from model.Study import Study from view.ASubWindow import ASubWindow class NewStudyWindow(ASubWindow): - def __init__(self, title="New Study", parent=None): + def __init__(self, study=None, title="New Study", parent=None): super(NewStudyWindow, self).__init__(name=title, ui="NewStudy", parent=parent) self.ui.setWindowTitle(title) self.parent = parent + self.study = study + + if not self.study is None: + self.set_line_edit_text("lineEdit_name", study.name) + self.set_text_edit_text("textEdit_description", study.description) + def accept(self): name = self.get_line_edit_text("lineEdit_name") description = self.get_text_edit_text("textEdit_description") - if self.get_radio_button("radioButton_mage"): - solver = "mage" - else: - solver = "rubarbe" - self.parent.set_model(Study.new(name, description, solver)) - self.close() + if self.study is None: + self.parent.set_model(Study.new(name, description)) + else: + self.study.name = name + self.study.description = description + self.done(True) diff --git a/src/view/ui/MainWindow.ui b/src/view/ui/MainWindow.ui index da74b972..9c8d862d 100644 --- a/src/view/ui/MainWindow.ui +++ b/src/view/ui/MainWindow.ui @@ -85,7 +85,7 @@ - + @@ -896,6 +896,18 @@ Ouvrir l'éditeur des ouvrages (seuils, vannes, etc.), singularités et pompes + + + + ressources/edit.pngressources/edit.png + + + Éditer l'étude + + + Éditer l'étude + + diff --git a/src/view/ui/NewStudy.ui b/src/view/ui/NewStudy.ui index 254d51c3..f8047cec 100644 --- a/src/view/ui/NewStudy.ui +++ b/src/view/ui/NewStudy.ui @@ -13,7 +13,7 @@ Dialog - + 10 @@ -34,16 +34,6 @@ - - - - false - - - false - - - @@ -58,37 +48,16 @@ - - - - Solver + + + + false + + + false - - - - - - Mage - - - true - - - - - - - false - - - Rubarbe - - - - -