Merge branch 'master' of evefit.org:pyfa

This commit is contained in:
cncfanatics
2010-11-12 21:06:54 +01:00
3 changed files with 13 additions and 4 deletions

View File

@@ -67,16 +67,16 @@ class GraphFrame(wx.Frame):
self.subplot = self.figure.add_subplot(111)
self.subplot.grid(True)
self.mainSizer.Add(self.canvas, 0, wx.EXPAND)
self.mainSizer.Add(self.canvas, 1, wx.EXPAND)
self.gridPanel = wx.Panel(self)
self.mainSizer.Add(self.gridPanel, 1, wx.EXPAND)
self.mainSizer.Add(self.gridPanel, 0, wx.EXPAND)
dummyBox = wx.BoxSizer(wx.VERTICAL)
self.gridPanel.SetSizer(dummyBox)
self.gridSizer = wx.FlexGridSizer(0, 2)
self.gridSizer.AddGrowableCol(0)
self.gridSizer.AddGrowableCol(1)
dummyBox.Add(self.gridSizer, 0, wx.EXPAND)
for view in Graph.views:

View File

@@ -1283,7 +1283,7 @@ class PFBitmapFrame(wx.Frame):
self.timer = wx.Timer(self,wx.ID_ANY)
self.direction = 1
self.transp = 0
self.SetSize((bitmap.GetWidth(),bitmap.GetHeight()))
self.SetMinSize((bitmap.GetWidth(),bitmap.GetHeight()))
if 'wxMSW' in wx.PlatformInfo:
self.SetRoundShape()
else:

View File

@@ -1,4 +1,13 @@
#!/usr/bin/env python
# --------------------------------------------------------------------------------- #
# Pyfa's custom Notebook core python IMPLEMENTATION
#
# Darriele (homeworld using gmail point com) - 10/27/2010
# Updated: 11/11/2010
#
# --------------------------------------------------------------------------------- #
import wx
import copy
import time