Changeset 2975

Timestamp:

Aug 8, 2017 4:54:15 PM (6 years ago)

Author:

toby

Message:

fix for wx2.8 and null file path

Location:

branch/2frame

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -4558 +4558 @@
         Sizer = self.GetSizer()
         if not Sizer: return
-        if Sizer.GetItemCount() == 1: # if there is a single grid, resize it
+        #if Sizer.GetItemCount() == 1: # not wx 2.8
+        if len(Sizer.GetChildren()) == 1: # if there is a single grid, resize it
             if isinstance(Sizer.GetItem(0).GetWindow(), G2G.GSGrid): 
                 Sizer.GetItem(0).GetWindow().SetSize(self.GetSize())
@@ -4570 +4571 @@
             if GSASIIpath.GetConfigValue('debug'): raise Exception
             return
-        if Sizer.GetItemCount() == 1: # handle cases with a single grid in DataWindow differently
+        #if Sizer.GetItemCount() == 1: # not wx 2.8
+        if len(Sizer.GetChildren()) == 1: # handle cases with a single grid in DataWindow differently
             # note that Grid's scroll bars must be turned on with .SetScrollRate(1,1)
             # just after the call to .GSGrid()

branch/2frame/GSASIIplot.py

@@ -382 +382 @@
         '''Adds additional icons to toolbar'''
         Toolbar.__init__(self,plotCanvas)
+        G2path = os.path.split(os.path.abspath(__file__))[0]
         self.plotCanvas = plotCanvas
         POSITION_OF_CONFIGURE_SUBPLOTS_BTN = 6 # remove one button, nos. start at 1!
         self.DeleteToolByPos(POSITION_OF_CONFIGURE_SUBPLOTS_BTN)    #doesn't work in miniconda
         self.parent = self.GetParent()
-        key = os.path.join(os.path.split(__file__)[0],'key.ico')
+        key = os.path.join(G2path,'key.ico')
         self.AddSimpleTool(self.ON_MPL_KEY,_load_bitmap(key),'Key press','Select key press')
         wx.EVT_TOOL(self,self.ON_MPL_KEY,self.OnKey)
-        help = os.path.join(os.path.split(__file__)[0],'help.ico')
+        help = os.path.join(G2path,'help.ico')
         self.AddSimpleTool(self.ON_MPL_HELP,_load_bitmap(help),'Help on','Show help on')
         wx.EVT_TOOL(self,self.ON_MPL_HELP,self.OnHelp)
@@ -395 +396 @@
         for direc in ('left','right','up','down'):
             wx.EVT_TOOL(self,self.arrows[direc],self.OnArrow)
-            icon =  os.path.join(os.path.split(__file__)[0],direc[0]+'arrow.ico')
+            icon =  os.path.join(G2path,direc[0]+'arrow.ico')
             self.AddSimpleTool(self.arrows[direc],_load_bitmap(icon),
                                'Shift '+direc,'Shift plot '+direc)
@@ -401 +402 @@
             fil = ''.join([i[0].lower() for i in direc.split()]+['arrow.ico'])
             wx.EVT_TOOL(self,self.arrows[direc],self.OnArrow)
-            icon =  os.path.join(os.path.split(__file__)[0],fil)
+            icon =  os.path.join(G2path,fil)
             self.AddSimpleTool(self.arrows[direc],_load_bitmap(icon),
                                direc,'Zoom: '+direc)