Commit Graph

1314 Commits

Author SHA1 Message Date
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
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
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
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
Ebag333
a588aec978 Simple change to not try and reimport handlers if they have failed previously. 2017-03-15 15:53:40 -07:00
blitzman
4633a1c136 some clean up 2017-03-14 19:22:18 -04:00
Ebag333
9d34c2a2e6 Add TODO 2017-03-13 11:52:18 -07:00
Ebag333
4f12caa05f Remove test variable 2017-03-13 11:30:07 -07:00
Ebag333
649ba71c0f Make sure overrides are enabled before we return override values 2017-03-13 11:15:14 -07:00
Ebag333
af5a9b31bc Fix another hidden import (move to top) 2017-03-13 11:09:12 -07:00
Ebag333
b72304203c Add default option to getOriginal. This eliminates some double lookups and simplifies the code. 2017-03-13 10:56:33 -07:00
Ebag333
f70d250995 Cleanup code. Use slightly faster comparison (is instead of isinstance). Rename OVERRIDES variable to eliminate confusion. 2017-03-13 10:11:15 -07:00
Ryan Holmes
53937d1723 Merge pull request #1023 from Ebag333/EosLoggingCleanup
Quick Eos cleanup and logging fix
2017-03-11 19:33:58 -05:00
Ebag333
46626e9a63 Kill another double lookup 2017-03-09 15:31:19 -08:00
Ebag333
b5626c13b1 Refactor __calculateValue 2017-03-09 15:16:52 -08:00
Ebag333
84de420002 Remove comment 2017-03-09 12:27:45 -08:00
Ebag333
99f939026f Refactor some logic in modifiedAttributeDict 2017-03-09 12:14:23 -08:00
Ebag333
9da485da55 Cleaning up tox errors that crept in by the pep8 gremlins. 2017-03-08 21:02:57 -08:00
Ebag333
8322307ae0 Add tooltip for neut resist. Add handling missing attributes in getting modified value (return default, not exception). Tox fixes to clean up a little. 2017-03-07 09:45:34 -08:00
blitzman
1c4128b9a1 Change probe size cap to 1.08 (previous testing done apparently showed 1.1 - 1.12, however most people refer to 1.08 as the cap. 2017-03-05 17:01:00 -05:00