Changeset d84bc69 in sasview for src/sas/qtgui/Perspectives/Invariant

Timestamp:

Feb 16, 2017 9:40:53 AM (7 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

6a9559d

Parents:

dba6e57 (diff), 83d6249 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Conflict resolved

File:

• src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -39 +39 @@
     # The controller which is responsible for managing signal slots connections
     # for the gui and providing an interface to the data model.
+    name = "Invariant" # For displaying in the combo box
     def __init__(self, manager=None, parent=None):
         super(InvariantWindow, self).__init__(parent)
@@ -102 +103 @@
         self.setupMapper()
 
-    def closeEvent(self, event):
-        """
-        Overwrite the default close method of QWidget
-        """
-        # No close on perspectives - one must always be active.
-        event.ignore()
+    #def closeEvent(self, event):
+    #    """
+    #    Overwrite the default close method of QWidget
+    #    """
+    #    # No close on perspectives - one must always be active.
+    #    event.ignore()
 
     def communicator(self):