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

Continuing work on attribute grouping. Break out attribute add to list into a centralized function. create some utility lists of attributes that are grouped

Browse Source
This commit is contained in:
blitzmann
2018-10-14 13:30:05 -04:00
parent 46ece5da0c
commit 38f1314c05
2 changed files with 130 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
gui/builtinItemStatsViews/attributeGrouping.py
View File

@@ -1,29 +1,21 @@
from enum import Enum
class AttrGroupingType(Enum):
# These are self-explanatory
LABEL = 0
NORMAL = 1
RESIST = 2
SENSOR = 3
from enum import Enum, auto
# Define the various groups of attributes
class AttrGroup(Enum):
FITTING = 0
STRUCTURE = 1
SHIELD = 2
ARMOR = 3
TARGETING = 4
EWAR_RESISTS = 5
CAPACITOR = 6
SHARED_FACILITIES = 7
FIGHTER_FACILITIES = 8
ON_DEATH = 9
JUMP_SYSTEMS = 10
PROPULSIONS = 11
FIGHTERS = 12
FITTING = auto()
STRUCTURE = auto()
SHIELD = auto()
ARMOR = auto()
TARGETING = auto()
EWAR_RESISTS = auto()
CAPACITOR = auto()
SHARED_FACILITIES = auto()
FIGHTER_FACILITIES = auto()
ON_DEATH = auto()
JUMP_SYSTEMS = auto()
PROPULSIONS = auto()
FIGHTERS = auto()
# todo: instead of defining the attribute grouping as "grouped attributes" vs "normal attributes",
@@ -31,10 +23,33 @@ class AttrGroup(Enum):
# the first one and apply them all
RequiredSkillAttrs = sum((["requiredSkill{}".format(x), "requiredSkill{}Level".format(x)] for x in range(1, 7)), [])
#todo: maybe moved some of these basic definitions into eos proper? Can really be useful with effect writing as a lot of these are used over and over
damage_types = ["em", "thermal", "kinetic", "explosive"]
scan_types = ["radar", "magnetometric", "gravimetric", "ladar"]
DamageAttrs = ["{}Damage".format(x) for x in damage_types]
HullResistsAttrs = ["{}DamageResonance".format(x) for x in damage_types]
ArmorResistsAttrs = ["armor{}DamageResonance".format(x.capitalize()) for x in damage_types]
ShieldResistsAttrs = ["shield{}DamageResonance".format(x.capitalize()) for x in damage_types]
ScanStrAttrs = ["scan{}Strength".format(x.capitalize()) for x in scan_types]
# convert to named tuples
AttrGroups = [
(DamageAttrs, "Damage"),
(HullResistsAttrs, "Resistances"),
(ArmorResistsAttrs, "Resistances"),
(ShieldResistsAttrs, "Resistances"),
(ScanStrAttrs, "Sensor Strengths")
]
GroupedAttributes = []
for x in AttrGroups:
GroupedAttributes += x[0]
AttrGroupDict = {
AttrGroup.FITTING : {
AttrGroupingType.LABEL : "Fitting",
AttrGroupingType.NORMAL: [
"label" : "Fitting",
"attributes": [
# parent-level attributes
"cpuOutput",
"powerOutput",
@@ -55,8 +70,8 @@ AttrGroupDict = {
]
},
AttrGroup.STRUCTURE : {
AttrGroupingType.LABEL : "Structure",
AttrGroupingType.NORMAL: [
"label" : "Structure",
"attributes": [
"hp",
"capacity",
"mass",
@@ -78,46 +93,40 @@ AttrGroupDict = {
"specialPlanetaryCommoditiesHoldCapacity",
"structureDamageLimit",
"specialSubsystemHoldCapacity",
],
AttrGroupingType.RESIST: [
("em", "emDamageResonance"),
("thermal", "thermalDamageResonance"),
("kinetic", "kineticDamageResonance"),
("explosive", "explosiveDamageResonance")
"emDamageResonance",
"thermalDamageResonance",
"kineticDamageResonance",
"explosiveDamageResonance"
]
},
AttrGroup.ARMOR : {
AttrGroupingType.LABEL : "Armor",
AttrGroupingType.NORMAL: [
"label": "Armor",
"attributes":[
"armorHP",
"armorDamageLimit"
],
AttrGroupingType.RESIST: [
("em", "armorEmDamageResonance"),
("thermal", "armorThermalDamageResonance"),
("kinetic", "armorKineticDamageResonance"),
("explosive", "armorExplosiveDamageResonance")
"armorDamageLimit",
"armorEmDamageResonance",
"armorThermalDamageResonance",
"armorKineticDamageResonance",
"armorExplosiveDamageResonance",
]
},
AttrGroup.SHIELD : {
AttrGroupingType.LABEL : "Shield",
AttrGroupingType.NORMAL: [
"label": "Shield",
"attributes": [
"shieldCapacity",
"shieldRechargeRate",
"shieldDamageLimit"
],
AttrGroupingType.RESIST: [
("em", "shieldEmDamageResonance"),
("thermal", "shieldExplosiveDamageResonance"),
("kinetic", "shieldKineticDamageResonance"),
("explosive", "shieldThermalDamageResonance")
"shieldDamageLimit",
"shieldEmDamageResonance",
"shieldExplosiveDamageResonance",
"shieldKineticDamageResonance",
"shieldThermalDamageResonance",
]
},
AttrGroup.EWAR_RESISTS : {
AttrGroupingType.LABEL : "Electronic Warfare",
AttrGroupingType.NORMAL: [
"label": "Electronic Warfare",
"attributes": [
"ECMResistance",
"remoteAssistanceImpedance",
"remoteRepairImpedance",
@@ -129,15 +138,15 @@ AttrGroupDict = {
]
},
AttrGroup.CAPACITOR : {
AttrGroupingType.LABEL : "Capacitor",
AttrGroupingType.NORMAL: [
"label": "Capacitor",
"attributes": [
"capacitorCapacity",
"rechargeRate",
]
},
AttrGroup.TARGETING : {
AttrGroupingType.LABEL : "Targeting",
AttrGroupingType.NORMAL: [
"label": "Targeting",
"attributes": [
"maxTargetRange",
"maxRange",
"maxLockedTargets",
@@ -147,8 +156,6 @@ AttrGroupDict = {
"proximityRange",
"falloff",
"trackingSpeed",
],
AttrGroupingType.SENSOR: [
"scanRadarStrength",
"scanMagnetometricStrength",
"scanGravimetricStrength",
@@ -156,16 +163,16 @@ AttrGroupDict = {
]
},
AttrGroup.SHARED_FACILITIES : {
AttrGroupingType.LABEL : "Shared Facilities",
AttrGroupingType.NORMAL: [
"label" : "Shared Facilities",
"attributes": [
"fleetHangarCapacity",
"shipMaintenanceBayCapacity",
"maxJumpClones",
]
},
AttrGroup.FIGHTER_FACILITIES: {
AttrGroupingType.LABEL : "Fighter Squadron Facilities",
AttrGroupingType.NORMAL: [
"label": "Fighter Squadron Facilities",
"attributes": [
"fighterCapacity",
"fighterTubes",
"fighterLightSlots",
@@ -177,8 +184,8 @@ AttrGroupDict = {
]
},
AttrGroup.ON_DEATH : {
AttrGroupingType.LABEL : "On Death",
AttrGroupingType.NORMAL: [
"label": "On Death",
"attributes": [
"onDeathDamageEM",
"onDeathDamageTherm",
"onDeathDamageKin",
@@ -188,8 +195,8 @@ AttrGroupDict = {
]
},
AttrGroup.JUMP_SYSTEMS : {
AttrGroupingType.LABEL : "Jump Drive Systems",
AttrGroupingType.NORMAL: [
"label": "Jump Drive Systems",
"attributes": [
"jumpDriveCapacitorNeed",
"jumpDriveRange",
"jumpDriveConsumptionType",
@@ -202,14 +209,14 @@ AttrGroupDict = {
]
},
AttrGroup.PROPULSIONS : {
AttrGroupingType.LABEL : "Propulsion",
AttrGroupingType.NORMAL: [
"label": "Propulsion",
"attributes": [
"maxVelocity"
]
},
AttrGroup.FIGHTERS : {
AttrGroupingType.LABEL : "Fighters",
AttrGroupingType.NORMAL: [
"label": "Fighters",
"attributes": [
"mass",
"maxVelocity",
"agility",

125
gui/builtinItemStatsViews/itemAttributes.py
View File

@@ -41,7 +41,7 @@ class ItemParams(wx.Panel):
self.totalAttrsLabel = wx.StaticText(self, wx.ID_ANY, " ", wx.DefaultPosition, wx.DefaultSize, 0)
bSizer.Add(self.totalAttrsLabel, 0, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT)
self.toggleViewBtn = wx.ToggleButton(self, wx.ID_ANY, "Toggle view mode", wx.DefaultPosition, wx.DefaultSize,
self.toggleViewBtn = wx.ToggleButton(self, wx.ID_ANY, "Veiw Raw Data", wx.DefaultPosition, wx.DefaultSize,
0)
bSizer.Add(self.toggleViewBtn, 0, wx.ALIGN_CENTER_VERTICAL)
@@ -158,6 +158,28 @@ class ItemParams(wx.Panel):
]
)
def AddAttribute(self, parent, attr):
if attr in self.attrValues and attr not in self.processed_attribs:
data = self.GetData(attr)
if data is None:
return
attrIcon, attrName, currentVal, baseVal = data
attr_item = self.paramList.AppendItem(parent, attrName)
self.paramList.SetItemText(attr_item, currentVal, 1)
if self.stuff is not None:
self.paramList.SetItemText(attr_item, baseVal, 2)
self.paramList.SetItemImage(attr_item, attrIcon, which=wx.TreeItemIcon_Normal)
self.processed_attribs.add(attr)
def ExpandOrDelete(self, item):
if self.paramList.GetChildrenCount(item) == 0:
self.paramList.Delete(item)
else:
self.paramList.Expand(item)
def PopulateList(self):
self.paramList.AddColumn("Attribute")
self.paramList.AddColumn("Current Value")
@@ -172,73 +194,41 @@ class ItemParams(wx.Panel):
self.imageList = wx.ImageList(16, 16)
self.paramList.AssignImageList(self.imageList)
processed_attribs = set()
self.processed_attribs = set()
misc_parent = root
if self.item.category.categoryName in ("Ship", "Fighter"):
order = CategoryGroups.get(self.item.category.categoryName, {})
# start building out the tree
for data in [AttrGroupDict[o] for o in order]:
heading = data.get(AttrGroupingType.LABEL)
header_item = self.paramList.AppendItem(root, heading)
order = CategoryGroups.get(self.item.category.categoryName, [AttrGroup.FITTING])
# start building out the tree
for data in [AttrGroupDict[o] for o in order]:
heading = data.get("label")
for attr in data.get(AttrGroupingType.NORMAL, []):
if attr in self.attrValues:
attrIcon, attrName, currentVal, baseVal = self.GetData(attr)
attr_item = self.paramList.AppendItem(header_item, attrName)
header_item = self.paramList.AppendItem(root, heading)
for attr in data.get("attributes", []):
self.paramList.SetItemText(attr_item , currentVal, 1)
if self.stuff is not None:
self.paramList.SetItemText(attr_item , baseVal, 2)
self.paramList.SetItemImage(attr_item , attrIcon, which=wx.TreeItemIcon_Normal)
processed_attribs.add(attr)
# if attr in self.processed_attribs:
# continue
resists = data.get(AttrGroupingType.RESIST, [])
if len(resists) > 0:
resist_item = self.paramList.AppendItem(header_item, "Resistances")
for _, attr in data.get(AttrGroupingType.RESIST, []):
if attr in self.attrValues:
attrIcon, attrName, currentVal, baseVal = self.GetData(attr)
attr_item = self.paramList.AppendItem(resist_item , attrName)
if attr in GroupedAttributes:
# find which group it's in
for grouping in AttrGroups:
if attr in grouping[0]:
break
self.paramList.SetItemText(attr_item , currentVal, 1)
if self.stuff is not None:
self.paramList.SetItemText(attr_item , baseVal, 2)
self.paramList.SetItemImage(attr_item , attrIcon, which=wx.TreeItemIcon_Normal)
processed_attribs.add(attr)
# get all attributes in group
item = self.paramList.AppendItem(header_item, grouping[1])
for attr2 in grouping[0]:
self.AddAttribute(item, attr2)
if self.paramList.GetChildrenCount(resist_item) == 0:
self.paramList.Delete(resist_item)
else:
self.paramList.Expand(resist_item)
self.ExpandOrDelete(item)
continue
sensors = data.get(AttrGroupingType.SENSOR, [])
if len(sensors) > 0:
sensor_item = self.paramList.AppendItem(header_item, "Sensor Strengths")
for attr in data.get(AttrGroupingType.SENSOR, []):
if attr in self.attrValues:
attrIcon, attrName, currentVal, baseVal = self.GetData(attr)
attr_item = self.paramList.AppendItem(sensor_item, attrName)
self.AddAttribute(header_item, attr)
self.paramList.SetItemText(attr_item, currentVal, 1)
if self.stuff is not None:
self.paramList.SetItemText(attr_item, baseVal, 2)
self.paramList.SetItemImage(attr_item, attrIcon, which=wx.TreeItemIcon_Normal)
processed_attribs.add(attr)
self.ExpandOrDelete(header_item)
if self.paramList.GetChildrenCount(resist_item) == 0:
self.paramList.Delete(sensor_item)
else:
self.paramList.Expand(sensor_item)
if self.paramList.GetChildrenCount(header_item) == 0:
self.paramList.Delete(header_item)
else:
self.paramList.Expand(header_item)
misc_parent = self.paramList.AppendItem(root, "Miscellaneous")
# misc_parent = self.paramList.AppendItem(root, "Other")
names = list(self.attrValues.keys())
names.sort()
@@ -246,21 +236,9 @@ class ItemParams(wx.Panel):
idNameMap = {}
idCount = 0
for name in names:
if name in processed_attribs:
continue
self.AddAttribute(root, name)
if self.toggleView == AttributeView.NORMAL and not self.attrInfo.get(name).published:
continue
attrIcon, attrName, currentVal, baseVal = self.GetData(name)
attr_item = self.paramList.AppendItem(misc_parent, attrName)
self.paramList.SetItemText(attr_item, currentVal, 1)
if self.stuff is not None:
self.paramList.SetItemText(attr_item, baseVal, 2)
self.paramList.SetItemImage(attr_item, attrIcon, which=wx.TreeItemIcon_Normal)
self.paramList.Expand(misc_parent)
# @todo: pheonix, this lamda used cmp() which no longer exists in py3. Probably a better way to do this in the
# long run, take a look
@@ -287,6 +265,9 @@ class ItemParams(wx.Panel):
val = getattr(att, "value", None)
value = val if val is not None else att
if self.toggleView == AttributeView.NORMAL and (not value or not info.published or attr in RequiredSkillAttrs):
return None
if info and info.displayName and self.toggleView == 1:
attrName = info.displayName
else:
@@ -329,7 +310,7 @@ class ItemParams(wx.Panel):
valueUnitDefault = formatAmount(valueDefault, 3, 0, 0)
# todo: attribute that point to another item should load that item's icon.
return (attrIcon, attrName + " {}".format(info.published), valueUnit, valueUnitDefault)
return (attrIcon, attrName, valueUnit, valueUnitDefault)
# self.paramList.SetItemText(index, valueUnit, 1)
# if self.stuff is not None:
@@ -363,8 +344,8 @@ if __name__ == "__main__":
# item = eos.db.getItem(23773) # Ragnarok
# item = eos.db.getItem(23061) # Einherji I
item = eos.db.getItem(24483) # Nidhoggur
# item = eos.db.getItem(587) # Rifter
# item = eos.db.getItem(2486) # Warrior I
#item = eos.db.getItem(587) # Rifter
item = eos.db.getItem(2486) # Warrior I
#item = eos.db.getItem(526) # Stasis Webifier I
super().__init__(None, title="Test Attribute Window | {} - {}".format(item.ID, item.name), size=(1000, 500))