Skip to content

Commit

Permalink
finish merge
Browse files Browse the repository at this point in the history
  • Loading branch information
alexhroom committed Sep 2, 2024
1 parent 61b859e commit 2f6fdb6
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions rascal2/ui/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ def setupMDI(self):
# TODO implement user save for layouts, this should default to use saved layout and fallback to tile
self.mdi.tileSubWindows()
self.setCentralWidget(self.mdi)
<<<<<<< HEAD

<<<<<<< HEAD
def init_settings_and_log(self, save_path: str):
"""Initialise settings and logging for the project.
Expand All @@ -126,18 +124,3 @@ def init_settings_and_log(self, save_path: str):

log_path.parents[0].mkdir(parents=True, exist_ok=True)
self.logging = setup_logging(log_path, level=self.settings.log_level)
=======
def createErrorDialog(self, error: Exception):
"""Produce an error dialog from an Exception.
Parameters
----------
error : Exception
The exception passed to the View.
"""
dlg = ErrorDialog(error=error, parent=self)
dlg.exec()
>>>>>>> c07550b (fixed controls widget on view)
=======
>>>>>>> 77b4863 (completed working widget)

0 comments on commit 2f6fdb6

Please sign in to comment.