Changeset dafc36f in sasview for fittingview/src/sans/perspectives/fitting/simfitpage.py

Timestamp:

Oct 16, 2011 12:59:57 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:

e7281fd

Parents:

a490860

Message:

minor changes for better flow

File:

• fittingview/src/sans/perspectives/fitting/simfitpage.py (modified) (2 diffs)

fittingview/src/sans/perspectives/fitting/simfitpage.py

@@ -795 +795 @@
         sizer.Clear(True)
         
-        new_name = wx.StaticText(self, -1, 'New Model Name', 
+        new_name = wx.StaticText(self, -1, '  Model Title ',
                                  style=wx.ALIGN_CENTER)
         new_name.SetBackgroundColour('orange')
+        new_name.SetForegroundColour(wx.WHITE)
         sizer.Add(new_name,(iy, ix),(1,1),
                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 2 
-        model_type = wx.StaticText(self, -1, '  Model Type')
+        model_type = wx.StaticText(self, -1, '  Model ')
         model_type.SetBackgroundColour('grey')
+        model_type.SetForegroundColour(wx.WHITE)
         sizer.Add(model_type,(iy, ix),(1,1),
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         ix += 1 
-        data_used = wx.StaticText(self, -1, '  Used Data')
+        data_used = wx.StaticText(self, -1, '  Data ')
         data_used.SetBackgroundColour('grey')
+        data_used.SetForegroundColour(wx.WHITE)
         sizer.Add(data_used,(iy, ix),(1,1),
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
         ix += 1 
-        tab_used = wx.StaticText(self, -1, '  Fit Tab')
+        tab_used = wx.StaticText(self, -1, '  FitPage ')
         tab_used.SetBackgroundColour('grey')
+        tab_used.SetForegroundColour(wx.WHITE)
         sizer.Add(tab_used,(iy, ix),(1,1),
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
@@ -821 +825 @@
                 ix = 0
                 for fitproblem in value.get_fit_problem():
-                    if  not self.parent.get_page_by_id(id).batch_on:
-                        iy += 1 
-                        data = fitproblem.get_fit_data()
-                        model = fitproblem.get_model()
-                        name = '_'
-                        if model is not None:
-                            name = str(model.name)
-                        cb = wx.CheckBox(self, -1, name)
-                        cb.SetValue(False)
-                        cb.Enable(model is not None and data.is_data)
-                        sizer.Add(cb, (iy, ix), (1, 1), 
-                                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-                        wx.EVT_CHECKBOX(self, cb.GetId(), self.check_model_name)
-                        ix += 2 
-                        type = model.__class__.__name__
-                        model_type = wx.StaticText(self, -1, str(type))
-                        sizer.Add(model_type, (iy, ix), (1, 1), 
-                                  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                        name = '-'
-                        if data is not None and data.is_data:
-                            name = str(data.name)
-                        data_used = wx.StaticText(self, -1, name)
-                        ix += 1 
-                        sizer.Add(data_used, (iy, ix), (1, 1), 
-                                  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                        ix += 1 
-                        caption = value.get_fit_tab_caption()
-                        tab_caption_used= wx.StaticText(self, -1, str(caption))
-                        sizer.Add(tab_caption_used, (iy, ix), (1, 1), 
-                                  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                    
-                        self.model_list.append([cb,value,id,model])
+                    if  self.parent.get_page_by_id(id).batch_on:
+                        continue
+                    data = fitproblem.get_fit_data()
+                    if not data.is_data:
+                        continue
+                    model = fitproblem.get_model()
+                    if model == None:
+                        continue
+                    iy += 1 
+                    name = '_'
+                    if model is not None:
+                        name = str(model.name)
+                    cb = wx.CheckBox(self, -1, name)
+                    cb.SetValue(False)
+                    cb.Enable(model is not None and data.is_data)
+                    sizer.Add(cb, (iy, ix), (1, 1), 
+                               wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                    wx.EVT_CHECKBOX(self, cb.GetId(), self.check_model_name)
+                    ix += 2 
+                    type = model.__class__.__name__
+                    model_type = wx.StaticText(self, -1, str(type))
+                    sizer.Add(model_type, (iy, ix), (1, 1), 
+                              wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    name = '-'
+                    if data is not None and data.is_data:
+                        name = str(data.name)
+                    data_used = wx.StaticText(self, -1, name)
+                    ix += 1 
+                    sizer.Add(data_used, (iy, ix), (1, 1), 
+                              wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    ix += 1 
+                    caption = value.get_fit_tab_caption()
+                    tab_caption_used= wx.StaticText(self, -1, str(caption))
+                    sizer.Add(tab_caption_used, (iy, ix), (1, 1), 
+                              wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                 
+                    self.model_list.append([cb,value,id,model])   
             except:
                 raise