fix broken events preventing additions panels to not work

This commit is contained in:
Ryan Holmes
2017-07-03 01:46:46 -04:00
parent 1082d8a173
commit 0527a506ac
8 changed files with 17 additions and 3 deletions

View File

@@ -68,7 +68,7 @@ class Effect(EqBase):
if not self.__generated:
self.__generateHandler()
pyfalog.debug("Generating effect: {0} ({1}) [runTime: {2}]", self.name, self.effectID, self.runTime)
#pyfalog.debug("Generating effect: {0} ({1}) [runTime: {2}]", self.name, self.effectID, self.runTime)
return self.__handler

View File

@@ -102,7 +102,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
@property
def cycleTime(self):
return max(self.getModifiedItemAttr("duration"), 0)
return max(self.getModifiedItemAttr("duration", 0), 0)
@property
def dealsDamage(self):

View File

@@ -66,7 +66,6 @@ class CommandView(d.Display):
self.lastFitId = None
self.mainFrame.Bind(GE.FIT_CHANGED, CommandFits.populateFits)
self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
self.Bind(wx.EVT_LEFT_DOWN, self.click)
self.Bind(wx.EVT_RIGHT_DOWN, self.click)
@@ -134,6 +133,8 @@ class CommandView(d.Display):
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
CommandFits.populateFits(event)
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)
# Clear list and get out if current fitId is None
@@ -165,6 +166,8 @@ class CommandView(d.Display):
self.update(stuff)
event.Skip()
def get(self, row):
numFits = len(self.fits)

View File

@@ -21,6 +21,7 @@
import wx
import gui.globalEvents as GE
import gui.mainFrame
from gui.builtinMarketBrowser.events import ItemSelected, ITEM_SELECTED
from gui.display import Display
from gui.builtinViewColumns.state import State
@@ -66,6 +67,8 @@ class DroneView(Display):
self.hoveredRow = None
self.hoveredColumn = None
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
self.mainFrame.Bind(ITEM_SELECTED, self.addItem)
self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)

View File

@@ -108,6 +108,8 @@ class FighterView(wx.Panel):
self.Refresh()
event.Skip()
class FighterDisplay(d.Display):
DEFAULT_COLS = ["State",

View File

@@ -71,6 +71,8 @@ class ImplantView(wx.Panel):
self.rbFit.Enable(fit is not None)
self.rbChar.Enable(fit is not None)
event.Skip()
def OnRadioSelect(self, event):
fitID = self.mainFrame.getActiveFit()
sFit = Fit.getInstance()

View File

@@ -40,6 +40,8 @@ class NotesView(wx.Panel):
self.lastFitId = event.fitID
self.editNotes.SetValue(fit.notes or "")
event.Skip()
def onText(self, event):
# delay the save so we're not writing to sqlite on every keystroke
self.saveTimer.Stop() # cancel the existing timer

View File

@@ -222,6 +222,8 @@ class ProjectedView(d.Display):
self.update(stuff)
event.Skip()
def get(self, row):
numMods = len(self.modules)
numDrones = len(self.drones)