Changeset 9f51c2c in sasview for sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py

Timestamp:

Aug 15, 2012 6:52:34 PM (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:

f866fb5

Parents:

25e4dda

Message:

broken plot/graph modification panel fixes

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py (modified) (10 diffs)

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

@@ -7 +7 @@
 
 /**
-        This software was developed by Institut Laue-Langevin as part of
-        Distributed Data Analysis of Neutron Scattering Experiments (DANSE).
-
-        Copyright 2012 Institut Laue-Langevin
+    This software was developed by Institut Laue-Langevin as part of
+    Distributed Data Analysis of Neutron Scattering Experiments (DANSE).
+
+    Copyright 2012 Institut Laue-Langevin
 
 **/
@@ -24 +24 @@
 
 
-class appearanceDialog(wx.Dialog):
+class appearanceDialog(wx.Frame):
 
     def __init__(self,parent,title):
-        super(appearanceDialog,self).__init__(parent, title=title,
-                                              size=(570, 430))
-
-        self.symbolLabels = self.get_symbol_label()
-        self.colorLabels = self.get_color_label()
+        super(appearanceDialog,self).__init__(parent, title=title,size=(570,450), style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT)
+
+        self.okay_clicked = False
+        self.parent = parent
+        self.symbolLabels = self.parent.get_symbol_label()
+        self.colorLabels = self.parent.get_color_label()
 
 
@@ -64 +65 @@
         symbolText = wx.StaticText(panel, label='Shape')
         colorText = wx.StaticText(panel, label='Color')
-        sizeText = wx.StaticText(panel, label='Size')
+        sizeText = wx.StaticText(panel, label='Size ')
         labelText = wx.StaticText(panel, label='Legend label')
 
@@ -77 +78 @@
 
         # buttons
-        OkButton = wx.Button(panel, wx.ID_OK, label='OK')
+        OkButton = wx.Button(panel, label='OK')
+        OkButton.Bind(wx.EVT_BUTTON,self.onOK)
         cancelButton = wx.Button(panel, label='Cancel')
         cancelButton.Bind(wx.EVT_BUTTON, self.CloseDlg)
@@ -86 +88 @@
 
         ihbox1.Add(sizeText, flag = wx.ALL| wx.ALIGN_LEFT , border=10)
-        ihbox1.Add(self.sizeComboBox, flag =  wx.ALL | wx.ALIGN_LEFT , border=10)
+        ihbox1.Add(self.sizeComboBox, flag =  wx.ALL|wx.RIGHT | wx.ALIGN_LEFT , border=10)
         ihbox1.Add(self.sizeCustomButton, flag = wx.ALIGN_LEFT | wx.ALL, border=10)
 
@@ -94 +96 @@
 
 
-        ivbox2.Add(ihbox1, flag =  wx.ALL | wx.ALIGN_RIGHT,border=10)
-        ivbox2.Add(ihbox2, flag =  wx.ALL | wx.ALIGN_RIGHT,border=10)
+        ivbox2.Add(ihbox1, flag =wx.ALIGN_LEFT,border=10)
+        ivbox2.Add(ihbox2, flag =wx.ALIGN_LEFT,border=10)
 
         
-        hbox1.Add(ivbox1,flag =  wx.EXPAND | wx.ALIGN_LEFT ,border=10)
-        hbox1.Add(ivbox2,flag =  wx.EXPAND | wx.ALIGN_RIGHT ,border=10)
+        hbox1.Add(ivbox1,flag =wx.ALIGN_LEFT ,border=10)
+        hbox1.Add(ivbox2,flag =wx.ALIGN_LEFT ,border=10)
 
    
@@ -105 +107 @@
         hbox2.Add(cancelButton, flag = wx.ALL | wx.ALIGN_RIGHT, border=10)
 
-        hbox3.Add(labelText, flag= wx.EXPAND | wx.ALL |  wx.ALIGN_LEFT, border=10)
-        hbox3.Add(self.labelTextBox, wx.EXPAND | wx.ALL |wx.ALIGN_LEFT , border=10)
+        hbox3.Add(labelText, flag= wx.EXPAND | wx.RIGHT |  wx.ALIGN_LEFT, border=10)
+        hbox3.Add(self.labelTextBox, wx.EXPAND | wx.RIGHT |wx.ALIGN_LEFT , border=10)
   
         symbolStaticBoxSizer.Add(hbox1,flag = wx.ALL | wx.EXPAND,border=10)
@@ -154 +156 @@
             self.sizeComboBox.SetSelection(4)
         self.symbolListBox.SetSelection(self.sorted_sym_dic[symbol])
-        colorname = appearanceDialog.find_key(self.get_color_label(),color)
+        colorname = appearanceDialog.find_key(self.parent.get_color_label(),color)
         self.colorListBox.SetStringSelection(colorname)
 
@@ -170 +172 @@
         
         for color in sortedcolorLabels:
-            self.colorListBox.Append(str(color[0]))
+             self.colorListBox.Append(str(color[0]))
  
     def populateSize(self):
@@ -258 +260 @@
         return(size,color,symbol,name)
 
+    def onOK(self,e):
+        self.okay_clicked = True
+
+        self.Close()