diff --git a/eos/db/gamedata/dynamicAttributes.py b/eos/db/gamedata/dynamicAttributes.py index be0e9b9d1..26d25be0e 100644 --- a/eos/db/gamedata/dynamicAttributes.py +++ b/eos/db/gamedata/dynamicAttributes.py @@ -38,8 +38,7 @@ dynamicAttributes_table = Table("mutaplasmidAttributes", gamedata_meta, dynamicApplicable_table = Table("mutaplasmidItems", gamedata_meta, Column("typeID", ForeignKey("mutaplasmids.typeID"), primary_key=True), - Column("applicableTypeID", ForeignKey("invtypes.typeID"), primary_key=True), - ) + Column("applicableTypeID", ForeignKey("invtypes.typeID"), primary_key=True),) mapper(DynamicItem, dynamic_table, properties={ "attributes": relation(DynamicItemAttribute), diff --git a/eos/db/gamedata/item.py b/eos/db/gamedata/item.py index 767029d21..fba3e9820 100644 --- a/eos/db/gamedata/item.py +++ b/eos/db/gamedata/item.py @@ -63,8 +63,7 @@ mapper(Item, items_table, primaryjoin=dynamicApplicable_table.c.applicableTypeID == items_table.c.typeID, secondaryjoin=dynamicApplicable_table.c.typeID == DynamicItem.typeID, secondary=dynamicApplicable_table, - backref="applicableItems" - ) + backref="applicableItems") }) Item.category = association_proxy("group", "category") diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py index 956ef054e..90e757788 100644 --- a/eos/db/gamedata/queries.py +++ b/eos/db/gamedata/queries.py @@ -127,6 +127,7 @@ def getItemWithBaseItemAttribute(lookfor, baseItemID, eager=None): gamedata_session.expunge(item) return item + @cachedQuery(1, "lookfor") def getItems(lookfor, eager=None): """ diff --git a/eos/db/saveddata/mutator.py b/eos/db/saveddata/mutator.py index 43ecff834..11b595025 100644 --- a/eos/db/saveddata/mutator.py +++ b/eos/db/saveddata/mutator.py @@ -29,7 +29,6 @@ mutator_table = Table("mutators", saveddata_meta, Column("attrID", Integer, primary_key=True, index=True), Column("value", Float, nullable=False), Column("created", DateTime, nullable=True, default=datetime.datetime.now), - Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now) - ) + Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now)) mapper(Mutator, mutator_table) diff --git a/eos/effects/shipprojectilerofmf.py b/eos/effects/shipprojectilerofmf.py index d0a0e0b1b..d4eb0ef4a 100644 --- a/eos/effects/shipprojectilerofmf.py +++ b/eos/effects/shipprojectilerofmf.py @@ -3,5 +3,8 @@ # Used by: # Ship: Claw type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF"), stackingPenalties=True, skill="Minmatar Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", + src.getModifiedItemAttr("shipBonusMF"), stackingPenalties=True, skill="Minmatar Frigate") diff --git a/eos/gamedata.py b/eos/gamedata.py index 243f71bad..7c7f85b8f 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -536,6 +536,7 @@ class DynamicItemAttribute(EqBase): class DynamicItemItem(EqBase): pass + class MarketGroup(EqBase): def __repr__(self): return "MarketGroup(ID={}, name={}, parent={}) at {}".format( diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index cb90d6679..06d348b81 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -42,6 +42,7 @@ class ItemAttrShortcut(object): return return_value or default + class ChargeAttrShortcut(object): def getModifiedChargeAttr(self, key, default=0): return_value = self.chargeModifiedAttributes.get(key) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 8146561c5..d95afc5c6 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -177,7 +177,6 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): self.__chargeModifiedAttributes.original = self.__charge.attributes self.__chargeModifiedAttributes.overrides = self.__charge.overrides - @classmethod def buildEmpty(cls, slot): empty = Module(None) @@ -209,7 +208,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): return self.__item is None or \ (self.__item.category.name not in ("Module", "Subsystem", "Structure Module") and self.__item.group.name not in self.SYSTEM_GROUPS) or \ - (self.item.isAbyssal and (not self.baseItemID or not self.mutaplasmidID) ) + (self.item.isAbyssal and (not self.baseItemID or not self.mutaplasmidID)) @property def isMutated(self): diff --git a/eos/saveddata/mutator.py b/eos/saveddata/mutator.py index ff1473005..07af6876f 100644 --- a/eos/saveddata/mutator.py +++ b/eos/saveddata/mutator.py @@ -79,7 +79,7 @@ class Mutator(EqBase): @validates("value") def validator(self, key, val): """ Validates values as properly falling within the range of the modules' Mutaplasmid """ - mod = val/self.baseValue + mod = val / self.baseValue if self.minMod <= mod <= self.maxMod: # sweet, all good @@ -129,5 +129,3 @@ class Mutator(EqBase): @property def attribute(self): return self.__attr - - diff --git a/gui/attribute_gauge.py b/gui/attribute_gauge.py index 38de597b9..1057775f7 100644 --- a/gui/attribute_gauge.py +++ b/gui/attribute_gauge.py @@ -169,7 +169,7 @@ class AttributeGauge(wx.Window): def SetValue(self, value, animate=True): """ Sets the current position of the gauge. """ - print ("="*20, self._percentage) + print("=" * 20, self._percentage) if self._value == value: return @@ -248,14 +248,15 @@ class AttributeGauge(wx.Window): w = min(w, half) # Ensure that we don't overshoot our drawing area w = math.ceil(w) # round up to nearest pixel, this ensures that we don't lose representation for sub pixels - # print("Percentage: {}\t\t\t\t\tValue: {}\t\t\t\t\tWidth: {}\t\t\t\t\tHalf: {}\t\t\t\t\tRect Width: {}".format(round(self._percentage, 3), round(value,3), w, half, rect.width)) + # print("Percentage: {}\t\t\t\t\tValue: {}\t\t\t\t\tWidth: {}\t\t\t\t\tHalf: {}\t\t\t\t\tRect Width: {}".format( + # round(self._percentage, 3), round(value,3), w, half, rect.width)) # set guide_lines every 10 pixels of the main gauge (not including borders) if self.guide_lines: for x in range(1, 20): dc.SetBrush(wx.Brush(wx.LIGHT_GREY)) dc.SetPen(wx.Pen(wx.LIGHT_GREY)) - dc.DrawRectangle(x*10, 1, 1, rect.height) + dc.DrawRectangle(x * 10, 1, 1, rect.height) dc.SetBrush(wx.Brush(colour)) dc.SetPen(wx.Pen(colour)) @@ -264,10 +265,10 @@ class AttributeGauge(wx.Window): # However, if there is an odd width, the middle pixel is shared between the left and right gauge if value >= 0: - padding = (half if is_even else math.ceil(half-1)) + 1 + padding = (half if is_even else math.ceil(half - 1)) + 1 dc.DrawRectangle(padding, 1, w, rect.height) else: - padding = half - w + 1 if is_even else math.ceil(half)-(w-1) + padding = half - w + 1 if is_even else math.ceil(half) - (w - 1) dc.DrawRectangle(padding, 1, w, rect.height) if self.leading_edge and (self.edge_on_neutral or value != 0): @@ -277,7 +278,7 @@ class AttributeGauge(wx.Window): if value > 0: dc.DrawRectangle(min(padding + w, rect.width), 1, 1, rect.height) else: - dc.DrawRectangle(max(padding-1, 1), 1, 1, rect.height) + dc.DrawRectangle(max(padding - 1, 1), 1, 1, rect.height) def OnTimer(self, event): old_value = self._old_percentage @@ -332,14 +333,12 @@ if __name__ == "__main__": wx.Panel.__init__(self, parent, size=size) box = wx.BoxSizer(wx.VERTICAL) - font = wx.Font(9, wx.SWISS, wx.NORMAL, wx.NORMAL, False) - self.gauge = gauge = AttributeGauge(self, size=(204, 4)) gauge.SetBackgroundColour(wx.Colour(52, 86, 98)) gauge.SetBarColour(wx.Colour(255, 128, 0)) gauge.SetValue(100) gauge.SetFractionDigits(1) - box.Add(gauge, 0, wx.ALL|wx.CENTER, 10) + box.Add(gauge, 0, wx.ALL | wx.CENTER, 10) self.gauge11 = gauge = AttributeGauge(self, size=(204, 6)) gauge.SetBackgroundColour(wx.Colour(52, 86, 98)) @@ -473,16 +472,16 @@ if __name__ == "__main__": def UpdateValue2(self, event): num = self.spinCtrl2.GetValue() self.gauge2.SetValue(num) - self.gauge3.SetValue(num*-1) + self.gauge3.SetValue(num * -1) self.gauge4.SetValue(num) - self.gauge5.SetValue(num*-1) + self.gauge5.SetValue(num * -1) self.gauge6.SetValue(num) - self.gauge7.SetValue(num*-1) + self.gauge7.SetValue(num * -1) self.gauge8.SetValue(num) - self.gauge9.SetValue(num*-1) + self.gauge9.SetValue(num * -1) def OnTimer(self, evt): - num = random.randint(-100,100) + num = random.randint(-100, 100) self.gauge.SetValue(num) self.gauge11.SetValue(num) self.gauge12.SetValue(num) diff --git a/gui/builtinItemStatsViews/attributeSlider.py b/gui/builtinItemStatsViews/attributeSlider.py index 49cb776fa..69358278c 100644 --- a/gui/builtinItemStatsViews/attributeSlider.py +++ b/gui/builtinItemStatsViews/attributeSlider.py @@ -100,10 +100,10 @@ class AttributeSlider(wx.Panel): slider_percentage = 0 if mod < 1: modEnd = self.UserMinValue - slider_percentage = (1-mod)/(1 - modEnd) * -100 + slider_percentage = (1 - mod) / (1 - modEnd) * -100 elif mod > 1: modEnd = self.UserMaxValue - slider_percentage = ((mod-1)/(modEnd-1)) * 100 + slider_percentage = ((mod - 1) / (modEnd - 1)) * 100 # print(slider_percentage) if self.inverse: slider_percentage *= -1 @@ -111,6 +111,7 @@ class AttributeSlider(wx.Panel): if post_event: wx.PostEvent(self, ValueChanged(self, None, value, None, slider_percentage)) + class TestAttributeSlider(wx.Frame): def __init__(self, parent, id): @@ -245,4 +246,3 @@ if __name__ == "__main__": # else: # self.statxt2.SetLabel("{0:.3f} ({1:+.3f})".format(newValue, newValue - self.base_value, )) # self.statxt2.SetToolTip("{0:+f}%".format(new_mod*100)) - diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py index ac76955b1..614274e6e 100644 --- a/gui/builtinItemStatsViews/itemMutator.py +++ b/gui/builtinItemStatsViews/itemMutator.py @@ -9,13 +9,13 @@ from gui.contextMenu import ContextMenu from .itemAttributes import ItemParams from gui.bitmap_loader import BitmapLoader import gui.globalEvents as GE -import gui.mainFrame import random from logbook import Logger pyfalog = Logger(__name__) + class ItemMutator(wx.Panel): def __init__(self, parent, stuff, item): @@ -77,7 +77,6 @@ class ItemMutator(wx.Panel): headingSizer.Add(displayName, 3, wx.ALL | wx.EXPAND, 0) - range_low = wx.StaticText(self, wx.ID_ANY, ItemParams.FormatValue(*m.attribute.unit.TranslateValue(worse_range[0]))) range_low.SetForegroundColour(self.goodColor if worse_range[2] else self.badColor) @@ -168,4 +167,3 @@ class ItemMutator(wx.Panel): # Send signal to GUI to update stats with current active fit wx.PostEvent(mainFrame, GE.FitChanged(fitID=activeFit)) - diff --git a/gui/pyfa_gauge.py b/gui/pyfa_gauge.py index 43b1dc728..61379c5b0 100644 --- a/gui/pyfa_gauge.py +++ b/gui/pyfa_gauge.py @@ -130,7 +130,7 @@ class PyGauge(wx.Window): return self._max_range def Animate(self): - #sFit = Fit.getInstance() + # sFit = Fit.getInstance() if True: if not self._timer: self._timer = wx.Timer(self, self._timer_id) diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py index 796e3aa4c..d1c0af9d0 100644 --- a/gui/utils/exportHtml.py +++ b/gui/utils/exportHtml.py @@ -238,8 +238,8 @@ class exportHtmlThread(threading.Thread): HTML += ( '
  • \n' '

    ' + group.groupName + ' ' + str(groupFits) + '

    \n' - '