Changeset 2893 for branch/2frame/GSASII.py
- Timestamp:
- Jul 2, 2017 9:33:22 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branch/2frame/GSASII.py
r2890 r2893 2561 2561 self.Status = self.CreateStatusBar() 2562 2562 #TODO - split window tree on left, data on right 2563 self.mainPanel = GSASIIsplit(self,-1) 2563 self.mainPanel = GSASIIsplit(self,-1) 2564 2564 self.treePanel = wx.Panel(self.mainPanel, wx.ID_ANY, 2565 2565 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER) 2566 self.treePanel.SetAutoLayout(True)2567 2566 self.dataPanel = wx.Panel(self.mainPanel, wx.ID_ANY, 2568 2567 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER) 2569 self.dataWindow = G2gd.DataWindow(self.dataPanel)2570 self.dataWindow.SetAutoLayout(True)2571 self.dataWindow.SetInitialSize()2572 2568 self.mainPanel.SetMinimumPaneSize(100) 2573 2569 self.mainPanel.SplitVertically(self.treePanel, self.dataPanel, 200) 2574 self.dataFrame = self.dataWindow #kluge!!2575 2570 2576 2571 wxID_PATTERNTREE = wx.NewId() 2577 2572 treeSizer = wx.BoxSizer() 2573 self.treePanel.SetSizer(treeSizer) 2578 2574 self.PatternTree = G2G.G2TreeCtrl(id=wxID_PATTERNTREE, 2579 parent=self.treePanel, size=self.treePanel.GetSize(),style=wx.TR_DEFAULT_STYLE ) 2580 treeSizer.Add(self.PatternTree,1,wx.EXPAND) 2581 self.treePanel.SetSizer(treeSizer) 2575 parent=self.treePanel, size=self.treePanel.GetClientSize(),style=wx.TR_DEFAULT_STYLE ) 2576 treeSizer.Add(self.PatternTree,1,wx.EXPAND|wx.ALL,0) 2582 2577 self.PatternTree.Bind(wx.EVT_TREE_SEL_CHANGED,self.OnDataTreeSelChanged) 2583 2578 self.PatternTree.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK,self.OnDataTreeSelChanged) … … 2596 2591 self.root = self.PatternTree.root 2597 2592 2593 self.dataWindow = G2gd.DataWindow(self.dataPanel) 2594 self.dataWindow.SetSize(self.dataPanel.GetClientSize()) 2595 self.dataWindow.SetAutoLayout(True) 2596 self.dataWindow.SetInitialSize() 2597 self.dataFrame = self.dataWindow #kluge!! 2598 # self.SetDataSize() 2599 2600 2598 2601 plotFrame = wx.Frame(None,-1,'GSASII Plots',size=wx.Size(700,600), \ 2599 2602 style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX) 2600 2603 self.G2plotNB = G2plt.G2PlotNoteBook(plotFrame,G2frame=self) 2601 2604 plotFrame.Show() 2602 self.SetDataSize()2603 2605 2604 2606 def __init__(self, parent): … … 2712 2714 w,h = self.GetClientSizeTuple() 2713 2715 self.dataWindow.SetupScrolling() 2714 self.mainPanel.SetSize(wx.Size(w,h+1))2715 2716 self.mainPanel.SetSize(wx.Size(w,h)) 2716 2717 self.PatternTree.SetSize(wx.Size(w,h)) 2717 self.dataWindow.SetSize(wx.Size(w,h)) 2718 # self.dataWindow.Refresh() 2719 # self.dataWindow.Update() 2718 self.dataWindow.SetSize(self.dataPanel.GetClientSize()) 2720 2719 2721 2720 def SetDataSize(self): 2722 2721 Size = self.GetSize() 2722 self.SetSize(Size) 2723 2723 Size[1] += 1 #kluge to ensure scrollbar settings & window properly displayed 2724 self.SetSize(Size)2725 Size[1] -= 1 #kluge to ensure scrollbar settings & window properly displayed2726 2724 self.SetSize(Size) 2727 2725
Note: See TracChangeset
for help on using the changeset viewer.