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

Add active column. Looping the fit to apply it x amount of times doesn't seem to work. Probably because it's been flagged calculated and returns early

Browse Source
This commit is contained in:
blitzmann
2015-07-07 00:25:24 -04:00
parent 2bca3ddcc8
commit b95a10d284
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eos/db/saveddata/fit.py
View File

@@ -46,14 +46,18 @@ fits_table = Table("fits", saveddata_meta,
projectedFits_table = Table("projectedFits", saveddata_meta,
Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
Column("victimID", ForeignKey("fits.ID"), primary_key = True),
Column("amount", Integer))
Column("amount", Integer),
Column("active", Boolean),
)
class ProjectedFit(object):
def __init__(self, source_item, dest_item, enabled):
print "init projected item", source_item, dest_item, enabled
def __init__(self, source_item, dest_item, amount=1, active=True):
print "init projected item", source_item, dest_item, active, amount
self.source_item = source_item
self.dest_item = dest_item
self.amount = enabled
self.amount = amount
self.active = active
self.dest_item.projectionInfo = self
@reconstructor
def init(self):
@@ -65,7 +69,7 @@ class ProjectedFit(object):
Fit._Fit__projectedFits = association_proxy(
"projected_items",
"dest_item",
creator=lambda dest_item: ProjectedFit(None, dest_item, True)
creator=lambda dest_item: ProjectedFit(None, dest_item)
)
mapper(Fit, fits_table,

5
eos/saveddata/fit.py
View File

@@ -461,8 +461,9 @@ class Fit(object):
item.calculateModifiedAttributes(targetFit, runTime, True)
for fit in self.projectedFits:
if fit.projectionInfo.amount > 0:
fit.calculateModifiedAttributes(self, withBoosters=withBoosters, dirtyStorage=dirtyStorage)
if fit.projectionInfo.active:
#for _ in xrange(fit.projectionInfo.amount):
fit.calculateModifiedAttributes(self, withBoosters=withBoosters, dirtyStorage=dirtyStorage)
def fill(self):
"""