Changeset 7c7fe67 in sasview

Timestamp:

Apr 26, 2011 2:06:20 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

9c35257

Parents:

60642b4

Message:

commit icon for guiframe and plot 2d in separated plot on new plot

File:

• guiframe/gui_manager.py (modified) (2 diffs)

guiframe/gui_manager.py

@@ -109 +109 @@
             if os.path.isfile(ico_file):
                 self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
+            else:
+                ico_file = os.path.join(os.path.dirname(os.path.sys.path[0]),
+                             'images', 'ball.ico')
+                if os.path.isfile(ico_file):
+                    self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         
         ## Application manager
@@ -1683 +1688 @@
             else:
                 #if not append then new plot
-                new_plot.group_id = GROUP_ID
+                from sans.guiframe.dataFitting import Data2D
+                if (Data2D, new_plot.__class__):
+                    #for 2 D always plot in a separated new plot
+                    new_plot.group_id = wx.NewId()
+                else:
+                    # plot all 1D in a new plot
+                    new_plot.group_id = GROUP_ID
             title = "PLOT " + str(new_plot.title)
             wx.PostEvent(self, NewPlotEvent(plot=new_plot,