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

Avoid using modPosition where possible

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-17 16:14:30 +03:00
parent 400bb10ed3
commit 9fd70a4ba9
6 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
eos/saveddata/module.py
View File

@@ -239,8 +239,15 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
@property
def modPosition(self):
if self.owner:
return self.owner.modules.index(self) if not self.isProjected else self.owner.projectedModules.index(self)
return self.getModPosition()
def getModPosition(self, fit=None):
# Pass in fit for reliability. When it's not passed, we rely on owner and owner
# is set by sqlalchemy during flush
fit = fit if fit is not None else self.owner
if fit:
return fit.modules.index(self) if not self.isProjected else fit.projectedModules.index(self)
@property
def isProjected(self):
@@ -570,7 +577,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
current = 0 # if self.owner != fit else -1 # Disabled, see #1278
for mod in fit.modules:
if (mod.item and mod.item.groupID == self.item.groupID and
self.modPosition != mod.modPosition):
self.getModPosition(fit) != mod.getModPosition(fit)):
current += 1
if current >= max: