dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Fixed bugs:

Browse Source 
* Importing 1 fit would open stage3 of that ship, but add incorrect history data.
* Deleting fit from search stage caused blank stage most times, fixed this.
This commit is contained in:
blitzmann
2015-02-08 20:29:54 -05:00
parent 30d2ab23ad
commit cbcd5ccca5
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/mainFrame.py
View File

@@ -599,8 +599,9 @@ class MainFrame(wx.Frame):
def _openAfterImport(self, fits): def _openAfterImport(self, fits):
if len(fits) > 0: if len(fits) > 0:
if len(fits) == 1: if len(fits) == 1:
wx.PostEvent(self, FitSelected(fitID=fits[0].ID)) fit = fits[0]
wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fits[0].shipID, back=False)) wx.PostEvent(self, FitSelected(fitID=fit.ID))
wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=0))
else: else:
wx.PostEvent(self.shipBrowser, ImportSelected(fits=fits, back=False)) wx.PostEvent(self.shipBrowser, ImportSelected(fits=fits, back=False))

2
gui/sfBrowserItem.py
View File

@@ -413,4 +413,4 @@ class SFBrowserItem(wx.Window):
self.bkBitmap.state = state self.bkBitmap.state = state
self.bkBitmap.sFactor = sFactor self.bkBitmap.sFactor = sFactor
self.bkBitmap.eFactor = eFactor self.bkBitmap.eFactor = eFactor
self.bkBitmap.mFactor = mFactor self.bkBitmap.mFactor = mFactor

24
gui/shipBrowser.py
View File

@@ -324,7 +324,7 @@ class RaceSelector(wx.Window):
event.Skip() event.Skip()
class NavigationPanel(SFItem.SFBrowserItem): class NavigationPanel(SFItem.SFBrowserItem):
def __init__(self,parent, size = (-1,24)): def __init__(self,parent, size = (-1, 24)):
SFItem.SFBrowserItem.__init__(self,parent,size = size) SFItem.SFBrowserItem.__init__(self,parent,size = size)
self.rewBmpH = bitmapLoader.getBitmap("frewind_small","icons") self.rewBmpH = bitmapLoader.getBitmap("frewind_small","icons")
@@ -352,7 +352,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
self.padding = 4 self.padding = 4
self.lastSearch = "" self.lastSearch = ""
self.recentSearches = [] self.recentSearches = [] # not used?
self.inSearch = False self.inSearch = False
self.fontSmall = wx.Font(fonts.SMALL, wx.SWISS, wx.NORMAL, wx.NORMAL) self.fontSmall = wx.Font(fonts.SMALL, wx.SWISS, wx.NORMAL, wx.NORMAL)
@@ -371,7 +371,6 @@ class NavigationPanel(SFItem.SFBrowserItem):
self.Bind(wx.EVT_SIZE, self.OnResize) self.Bind(wx.EVT_SIZE, self.OnResize)
def OnScheduleSearch(self, event): def OnScheduleSearch(self, event):
search = self.BrowserSearchBox.GetValue() search = self.BrowserSearchBox.GetValue()
# Make sure we do not count wildcard as search symbol # Make sure we do not count wildcard as search symbol
@@ -384,6 +383,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
self.gotoStage(stage,data) self.gotoStage(stage,data)
else: else:
if search: if search:
self.lastSearch = search
wx.PostEvent(self.shipBrowser,SearchSelected(text=search, back = False)) wx.PostEvent(self.shipBrowser,SearchSelected(text=search, back = False))
self.inSearch = True self.inSearch = True
else: else:
@@ -401,8 +401,6 @@ class NavigationPanel(SFItem.SFBrowserItem):
self.OnBrowserSearchBoxLostFocus(None) self.OnBrowserSearchBoxLostFocus(None)
def OnBrowserSearchBoxLostFocus(self, event): def OnBrowserSearchBoxLostFocus(self, event):
self.lastSearch = self.BrowserSearchBox.GetValue()
self.BrowserSearchBox.ChangeValue("")
self.BrowserSearchBox.Show(False) self.BrowserSearchBox.Show(False)
def OnBrowserSearchBoxEsc(self, event): def OnBrowserSearchBoxEsc(self, event):
@@ -411,7 +409,6 @@ class NavigationPanel(SFItem.SFBrowserItem):
else: else:
event.Skip() event.Skip()
def OnResize(self, event): def OnResize(self, event):
self.Refresh() self.Refresh()
@@ -460,11 +457,11 @@ class NavigationPanel(SFItem.SFBrowserItem):
def OnHistoryBack(self): def OnHistoryBack(self):
if len(self.shipBrowser.browseHist) > 0: if len(self.shipBrowser.browseHist) > 0:
stage,data = self.shipBrowser.browseHist.pop() stage,data = self.shipBrowser.browseHist.pop()
self.gotoStage(stage,data) self.gotoStage(stage, data)
def AdjustChannels(self, bitmap): def AdjustChannels(self, bitmap):
img = wx.ImageFromBitmap(bitmap) img = wx.ImageFromBitmap(bitmap)
img = img.AdjustChannels(1.05,1.05,1.05,1) img = img.AdjustChannels(1.05, 1.05, 1.05, 1)
return wx.BitmapFromImage(img) return wx.BitmapFromImage(img)
def UpdateElementsPos(self, mdc): def UpdateElementsPos(self, mdc):
@@ -811,12 +808,12 @@ class ShipBrowser(wx.Panel):
self.lpane.ShowLoading(False) self.lpane.ShowLoading(False)
if event.back == 0: if event.back == 0:
self.browseHist.append( (2,self._stage2Data) ) self.browseHist.append((self._activeStage, self.lastdata))
elif event.back == -1: elif event.back == -1:
if len(self.navpanel.recentSearches)>0: if self.navpanel.lastSearch != "":
self.browseHist.append((4, self.navpanel.lastSearch)) self.browseHist.append((4, self.navpanel.lastSearch))
elif event.back > 0: elif event.back > 0:
self.browseHist.append( (2,event.back) ) self.browseHist.append((2, event.back))
shipID = event.shipID shipID = event.shipID
self.lastdata = shipID self.lastdata = shipID
@@ -1663,14 +1660,13 @@ class FitItem(SFItem.SFBrowserItem):
sFit.deleteFit(self.fitID) sFit.deleteFit(self.fitID)
if self.shipBrowser.GetActiveStage() == 4: if self.shipBrowser.GetActiveStage() == 4:
wx.PostEvent(self.shipBrowser,SearchSelected(text=self.shipBrowser.navpanel.lastSearch,back=True)) wx.PostEvent(self.shipBrowser, SearchSelected(text=self.shipBrowser.navpanel.lastSearch, back=True))
else: else:
wx.PostEvent(self.shipBrowser,Stage3Selected(shipID=self.shipID, back=True)) wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=self.shipID, back=True))
wx.PostEvent(self.mainFrame, FitRemoved(fitID=self.fitID)) wx.PostEvent(self.mainFrame, FitRemoved(fitID=self.fitID))
def MouseLeftUp(self, event): def MouseLeftUp(self, event):
if self.dragging and self.dragged: if self.dragging and self.dragged:
self.dragging = False self.dragging = False
self.dragged = False self.dragged = False