Changeset 318b5bbb in sasview for sansguiframe/src

Timestamp:

Dec 18, 2012 10:55:24 AM (12 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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

Location:

sansguiframe/src/sans/guiframe

Files:

• data_panel.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• media/M_angles_pic.bmp (added)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -35 +35 @@
 from sans.guiframe.events import NewBatchEvent
 from sans.dataloader.loader import Loader
-from sans.guiframe.local_perspectives.plotting.masking \
-    import FloatPanel as QucikPlotDialog
-
+#from sans.guiframe.local_perspectives.plotting.masking \
+#    import FloatPanel as QucikPlotDialog
+from sans.guiframe.local_perspectives.plotting.SimplePlot import PlotFrame \
+        as QucikPlotDialog
 import sans.guiframe.config as config
  
@@ -447 +448 @@
             dimension = 2
         else:
-            dimension = 1
-        panel = QucikPlotDialog(base=self, data=data, 
-                                dimension=dimension, id=wx.NewId())
-        panel.ShowModal()    
+            dimension = 1 
+        #panel = QucikPlotDialog(base=self, data=data, 
+        #                        dimension=dimension, id=wx.NewId())
+        frame = QucikPlotDialog(self, -1, "Plot " + data.name, 'log_{10}')
+        self.parent.put_icon(frame)
+        frame.add_plot(data)
+        #frame.SetTitle(title)
+        frame.Show(True)
+        frame.SetFocus()
+        #panel.ShowModal()    
     
     def on_data_info(self, event):

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -130 +130 @@
         _labels['Square'] = i
         i += 1
-        _labels['Diamond'] = i
+        _labels['diamond'] = i
         i += 1
         _labels['Diamond'] = i