Changeset 77a43fb in sasview

Timestamp:

Sep 28, 2011 11:08:12 AM (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:

c6cc2910

Parents:

b1bda35

Message:

a bit better flow of gui buttons

File:

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

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

@@ -180 +180 @@
             ## display constraint fields
             if self.show_constraint.GetValue():
+                self._show_all_constraint() 
                 self._show_constraint()
                 return
@@ -208 +209 @@
             if self.show_constraint.GetValue() and\
                              len(self.constraints_list)==0:
+                self._show_all_constraint() 
                 self._show_constraint()
         elif len(self.model_toFit)< 2:
@@ -463 +465 @@
         wx.EVT_COMBOBOX(param_cbox,-1, self._on_select_param)
         self.ctl2 = wx.TextCtrl(self, -1)
-        egal_txt= wx.StaticText(self,-1," = ")
-        btRemove = wx.Button(self,wx.NewId(),'Remove')
-        btRemove.Bind(wx.EVT_BUTTON, self.onRemove,id= btRemove.GetId())
-        btRemove.SetToolTipString("Remove constraint.")
-       
+        egal_txt= wx.StaticText(self,-1, " = ")
+        self.btRemove = wx.Button(self,wx.NewId(),'Remove')
+        self.btRemove.Bind(wx.EVT_BUTTON, self.onRemove, 
+                                    id=self.btRemove.GetId())
+        self.btRemove.SetToolTipString("Remove constraint.")
+        self.btRemove.Hide()
+        if hasattr(self,"btAdd"):
+            self.btAdd.Hide()
         for id, model in self.constraint_dict.iteritems():
             ## check if all parameters have been selected for constraint
@@ -482 +487 @@
         sizer_constraint.Add(egal_txt, flag= wx.RIGHT|wx.EXPAND,border=5)
         sizer_constraint.Add(self.ctl2, flag= wx.RIGHT|wx.EXPAND,border=10)
-        sizer_constraint.Add(btRemove, flag= wx.RIGHT|wx.EXPAND,border=10)
+        sizer_constraint.Add(self.btRemove, flag= wx.RIGHT|wx.EXPAND,border=10)
       
         self.sizer_constraints.Insert(before=self.nb_constraint,
-                                      item=sizer_constraint, flag= wx.TOP|wx.BOTTOM|wx.EXPAND,
-                                   border=5)
+                        item=sizer_constraint, flag= wx.TOP|wx.BOTTOM|wx.EXPAND,
+                        border=5)
         ##[combobox1, combobox2,=,textcrtl, remove button ]
-        self.constraints_list.append([model_cbox, param_cbox, egal_txt, self.ctl2,btRemove,sizer_constraint])
+        self.constraints_list.append([model_cbox, param_cbox, egal_txt, 
+                                    self.ctl2,self.btRemove,sizer_constraint])
     
         self.nb_constraint += 1
@@ -538 +544 @@
             
         param_cbox.Show(True)
+        self.btRemove.Show(True)
+        self.btAdd.Show(True)
         self.sizer2.Layout()
         #self.SetScrollbars(20,20,25,65)