Re-introduce Command Fit State (#1074)

Reintroduce command view state

Squashes `blitzmann/command-fit-state`:

* Reintroduces command view state, allowing users to toggle command fits on and off.
* Remove type() function call and use __class__ instead
This commit is contained in:
Ryan Holmes
2017-04-01 22:04:44 -05:00
committed by GitHub
parent 878d9d7148
commit f08a66924c
2 changed files with 10 additions and 4 deletions

View File

@@ -68,11 +68,17 @@ class State(ViewColumn):
"gui")
elif isinstance(stuff, Fit):
fitID = self.mainFrame.getActiveFit()
projectionInfo = stuff.getProjectionInfo(fitID)
if projectionInfo is None:
# Can't use isinstance here due to being prevented from importing CommandView.
# So we do the next best thing and compare Name of class.
if self.fittingView.__class__.__name__ == "CommandView":
info = stuff.getCommandInfo(fitID)
else:
info = stuff.getProjectionInfo(fitID)
if info is None:
return -1
if projectionInfo.active:
if info.active:
return generic_active
return generic_inactive
elif isinstance(stuff, Implant) and stuff.character:

View File

@@ -57,7 +57,7 @@ class CommandViewDrop(wx.PyDropTarget):
class CommandView(d.Display):
DEFAULT_COLS = ["Base Name"]
DEFAULT_COLS = ["State", "Base Name"]
def __init__(self, parent):
d.Display.__init__(self, parent, style=wx.LC_SINGLE_SEL | wx.BORDER_NONE)