blitzmann
711537dcf4
Change to using inspect() instead of the current shitty way
2017-04-21 00:45:36 -04:00
blitzmann
e971b7927e
Fix issue in which prices are removed all the time (forgot to add the check for deleted to the condition >.<)
2017-04-21 00:40:45 -04:00
blitzmann
53cab4b1ab
Merge branch 'master' into development
...
Conflicts:
requirements.txt
2017-04-17 21:41:44 -04:00
blitzmann
9c406a0a44
Fix for #1128 - these modifiers are in their own pen-group
2017-04-16 23:53:19 -04:00
blitzmann
1ee679903c
Bring dev up to date with master
...
Conflicts:
service/fit.py
2017-04-16 11:42:41 -04:00
Ryan Holmes
5aeb3a38c8
Fit Calculation Code Cleanup ( #1103 )
...
* Remove dirtyStorage, legacy of old fleet boosting system
* Remove withBooster flag from the recalc() function.
This was a legacy parameter dealing with the old fleet boost code, the purpose of which has changed with the addition of command boosts. We no longer have to call recalc with this particular parameter (indeed, it was forced to False in `recalc`). These were never cleaned up. We still have the withBoosters parameter for the `calculateModifiedAttributes` function, however that will be renamed and has a different meaning than it used to (used in the recursion of command fits)
* Add some comments
* Consolidate the tangled mess of conditional flags meant to determine if a fit is local/projected/command. This should make the logic flow a bit clearer.
Also rewrite a blurb about returning on a calculated fit - need to look into this a little bit more.
* fix up test to no longer pass `withBooster`
2017-04-12 19:50:16 -04:00
blitzmann
87a600349c
Temporarily fix issue with removing a self projected fit
2017-04-11 23:58:05 -04:00
Ryan Holmes
114246bf1e
Do not recalc fits on tab switch ( #1105 )
...
* Do not recalc fits if they are already calculated. Fits that are projected onto other fits recursively set their victims to `calculated=False` so that the victim will re calculate when it loads again.
* Reset boosted fits when calculating a fit that is boosting others. Also, remove semicolon due to habit :x
* Develop a `__resetDependantCalc()` which will reset any fits that are immediately affected by the current fits calculation.
2017-04-11 23:40:40 -04:00
blitzmann
efaede0929
Use queries to bulk-delete target resists and damage profiles
2017-04-10 21:49:35 -04:00
blitzmann
50e604f412
convert print to debug statement >.<
2017-04-10 21:32:26 -04:00
blitzmann
894c86ebc3
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
2017-04-10 21:09:40 -04:00
Ryan Holmes
47ea12f4ba
Merge pull request #1048 from Ebag333/ErrorDialog_and_miscfixes
...
Error Dialog improvements and Pyfa.py refactoring
2017-04-10 21:09:11 -04:00
blitzmann
ce01c66b3e
Better manage price object juggling in Item.price property. The previous way was creating new price objects when an object already existed in the database which could lead to Integrity issues.
2017-04-10 20:48:58 -04:00
blitzmann
1260900668
Merge branch 'pricing_v2' into development
2017-04-10 20:46:57 -04:00
Ryan Holmes
82f6d26a88
Merge pull request #1109 from Ebag333/eos_fit_cleanup
...
Some quick cleanup of logging and shtuff
2017-04-09 23:25:11 -04:00
Ryan Holmes
82edaf05d3
Merge pull request #1116 from pyfa-org/eos_cleanup
...
Eos cleanup
2017-04-09 22:43:29 -04:00
blitzmann
fadc514592
Add back the booster side effect stuff
2017-04-09 22:38:31 -04:00
Ryan Holmes
07f88cc4d1
Add Create and Modify fields for most database tables ( #1073 )
...
* Add created/modified fields to relevant tables.
* Add migration for created and modified fields
* Seriously tox?
2017-04-05 18:54:57 -04:00
Ryan Holmes
5f35553438
Restrict cap modules to only cap ships ( #1097 )
...
* Restrict capital modules to capital hulls
* tweak comment
* Make a isCapitalSize property for modules
2017-04-05 18:54:16 -04:00
Ebag333
802e2afcc0
General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out
2017-04-05 15:47:19 -07:00
Ebag333
ee09b41e08
Use rlock instead of lock
2017-04-05 14:56:22 -07:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ebag333
c1b74f481a
Tox
2017-04-05 00:44:02 -07:00
Ebag333
df510c40f4
Some quick cleanup of logging and shtuff
2017-04-05 00:17:13 -07:00
Ebag333
48db3c8ce4
Add some key logging for database information.
2017-04-04 15:01:05 -07:00
Ryan Holmes
9d029b46b1
Respect command fit state ( #1100 )
...
* Respect command fit state in calculations
* Utilize `getCommandInfo` instead (we do it this way for projections. Consistency, fuck yeah!)
2017-04-02 23:20:31 -05:00
Ryan Holmes
f9ec79c8eb
Merge pull request #1093 from pyfa-org/master
...
Bring dev up to date with master
2017-04-01 23:14:26 -05:00
Ryan Holmes
112ab91e34
Fix for #1091 ( #1092 )
2017-04-01 23:09:32 -05:00
Ryan Holmes
e03b3227d4
Fix for #1081 ( #1085 )
...
* Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081
* Make tox happy
2017-04-01 22:23:50 -05:00
Ebag333
c6d50b7d6e
Merge branch 'development' into ErrorDialog_and_miscfixes
2017-03-27 21:00:51 -07:00
Ryan Holmes
a67c28a4c9
Merge branch 'development' into feature/commandmenu
2017-03-26 14:43:12 -04:00
blitzman
e7de57fc7a
tox fixes
2017-03-26 14:39:45 -04:00
blitzman
d928df9c69
Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now
2017-03-26 14:28:13 -04:00
blitzman
b18bb200a9
Merge branch 'development' into MorePreferences
2017-03-26 13:52:59 -04:00
Ryan Holmes
4795571629
Merge branch 'development' into HandleBadHandleres
2017-03-26 12:33:58 -04:00
Ryan Holmes
df587892a3
Merge branch 'development' into feature/commandmenu
2017-03-26 12:27:52 -04:00
Ryan Holmes
57a1f71fdd
Merge branch 'development' into ErrorDialog_and_miscfixes
2017-03-26 12:22:08 -04:00
Ryan Holmes
1ffcdc92f2
Merge pull request #1031 from Ebag333/tooltip_capacitor_neut_resistance
...
Tooltip for capacitor neut resistance
2017-03-26 12:16:41 -04:00
blitzman
e7aceb6a8b
Bringing branch up to date with dev
...
Merge branch 'development' into ErrorDialog_and_miscfixes
Conflicts:
eos/saveddata/fit.py
pyfa.py
2017-03-25 22:30:18 -04:00
Ebag333
8baeafbdc2
Rename a few tests to follow standards. Move fits into a helper so they can be reused. Add two new Eos tests.
...
(cherry picked from commit f87ac4d)
2017-03-24 11:15:25 -07:00
Ebag333
1240e0f768
attempt terrible hack make run in memory
...
(cherry picked from commit 357275c)
2017-03-24 11:15:20 -07:00
Ebag333
cdbd2979d2
Back to what works on Windows
...
(cherry picked from commit 3401b87)
2017-03-24 11:15:05 -07:00
Ebag333
da493d07c0
recreate DB connection
...
(cherry picked from commit 5593e28)
2017-03-24 11:15:02 -07:00
Ebag333
d84787b041
add test
...
(cherry picked from commit b1b5cb1)
2017-03-24 11:14:57 -07:00
Ebag333
403b39659c
Fix tox things.
...
(cherry picked from commit 60298c8)
2017-03-24 11:14:34 -07:00
blitzman
6c1d949cef
Proof of concept for gathering fits based on modules that are fit
2017-03-23 00:38:23 -04:00
blitzman
b4ad4becd3
Fix for #1060
2017-03-19 16:27:41 -04:00
Ebag333
0ccd812398
Add logging OS version. Deprioritize some messages to debug, so devs can run at info level with less spam (and much less impact on recalc times).
2017-03-18 13:27:07 -07:00
Ebag333
6ce52a1da9
PEP8 cleanup
...
(cherry picked from commit 63f2f85
2017-03-16 08:40:14 -07:00
Ebag333
63f2f85c25
PEP8 cleanup
2017-03-16 02:12:26 -07:00
