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

Fix issue with deleting a fit while having certain other fits open (#1339) (#1340)

Browse Source 
Also, bump dev version
This commit is contained in:
Ryan Holmes
2017-11-22 21:44:15 -05:00
committed by GitHub
parent 2f6e306f8e
commit b596447095
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/builtinViewColumns/misc.py
View File

@@ -49,6 +49,7 @@ class Miscellanea(ViewColumn):
self.columnText = "Misc data"
self.mask |= wx.LIST_MASK_TEXT
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.fittingView = fittingView
def getText(self, stuff):
return self.__getData(stuff)[0]
@@ -487,7 +488,7 @@ class Miscellanea(ViewColumn):
if not hp or not cycleTime or not cycles:
return "", None
fit = Fit.getInstance().getFit(self.mainFrame.getActiveFit())
fit = Fit.getInstance().getFit(self.fittingView.getActiveFit())
ehpTotal = fit.ehp
hpTotal = fit.hp
useEhp = self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective