Changeset 365aa1ed in sasview

Timestamp:

Jun 13, 2012 5:59:25 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d9e59ad

Parents:

1618a7e

Message:

cleaning up

Files:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (3 diffs)
• sansdataloader/src/sans/dataloader/data_info.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/data_operator.py

@@ -602 +602 @@
         self.erase_legend()
         self.figure.tight_layout()
-        self.figure.subplots_adjust(left=0.1, bottom=0.1)
+        #self.figure.subplots_adjust(left=0.1, bottom=0.1)
 
         self.subplot.figure.canvas.draw()
@@ -637 +637 @@
         except:
             self.subplot.set_frame_on(False)
-        self.figure.tight_layout()#subplots_adjust(left=0.1, bottom=0.1)
-        self.figure.subplots_adjust(left=0.1, bottom=0.1)
+        self.figure.tight_layout()
+        #self.figure.subplots_adjust(left=0.1, bottom=0.1)
         if len(label) > 0 and xpos > 0 and ypos > 0:
             new_text = self.subplot.text(str(xpos), str(ypos), str(label),
@@ -707 +707 @@
    
     app  = wx.App()
-    window = DataEditorWindow(parent=None, data=[], title="Data Editor")
+    window = DataOperatorWindow(parent=None, data=[], title="Data Editor")
     app.MainLoop()
  

sansdataloader/src/sans/dataloader/data_info.py

@@ -504 +504 @@
         """
         Private method to perform operation. Not implemented for DataInfo,
+        but should be implemented for each data class inherited from DataInfo
+        that holds actual data (ex.: Data1D)
+        """
+        return NotImplemented
+    
+    def _perform_union(self, other):
+        """
+        Private method to perform union operation. Not implemented for DataInfo,
         but should be implemented for each data class inherited from DataInfo
         that holds actual data (ex.: Data1D)