Commit Graph

2814 Commits

Author SHA1 Message Date
Ebag333
c6d50b7d6e Merge branch 'development' into ErrorDialog_and_miscfixes 2017-03-27 21:00:51 -07:00
Ebag333
03f12bfca1 Finish implementing wx 2.8 selector. Add a bunch of error catching. General cleanup.
(cherry picked from commit b0ec69e)
2017-03-27 20:52:45 -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
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
aacddb251d pep8 stuff
(cherry picked from commit e87b6c3)
2017-03-24 11:15:23 -07:00
blitzman
79040adf1a tox fixes 2017-03-23 01:13:41 -04:00
blitzman
cbcc81d42e Actually apply the command fit, and remove print statement 2017-03-23 00:38:24 -04:00
blitzman
732386b83a Get command fit menu up and running. Had to revert to a non-cached version of the menu, as the instance has root menu, which we need in order to properly bind. Don't think caching the menu would have really given a large performance gain anyway. 2017-03-23 00:38:24 -04:00
blitzman
4065022866 Initial work on caching command fits unless needing to update. FitChanged event can now carry an action and typeID, only used in the CommandFit context menu (for now, can use this elsewhere). If the module being added or removed, we update the cached list. 2017-03-23 00:38:23 -04:00
blitzman
6c1d949cef Proof of concept for gathering fits based on modules that are fit 2017-03-23 00:38:23 -04:00
blitzman
0a1008f64f Merge branch 'master' into development 2017-03-23 00:35:28 -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
9c693cd7ed Python now properly requires 2.7 and not 2.6 or 2.7. Removed duplicate output to log, now that we handle exceptions. 2017-03-18 13:11:40 -07:00
Ebag333
b1be2eee06 Add unhandled exception handler. Now catches problems and will try and output to the pyfalog, falling back to outputting to the console. 2017-03-18 12:37:23 -07:00
Ebag333
301e874cd4 Add a ton of logging to the fitting service 2017-03-17 16:05:09 -07:00
blitzman
2ff66970ad remove __all__ from contect menus 2017-03-16 19:05:07 -04:00
Ryan Holmes
58142664cc Merge pull request #1051 from Ebag333/Fix_PR943
Fix bad merge of #943
2017-03-16 18:58:09 -04:00
Ryan Holmes
73f6a68b9d Merge pull request #1047 from Ebag333/Hotfix_Implant_ContextMenu
Hotfix - Implant ContextMenu
2017-03-16 18:54:04 -04:00
Ebag333
e3c2220a1c Fix matplotlib importing 2017-03-16 14:09:10 -07:00
Ebag333
26238e731d Fix matplotlib importing 2017-03-16 10:22:40 -07:00
Ebag333
6ce52a1da9 PEP8 cleanup
(cherry picked from commit 63f2f85)
2017-03-16 08:40:14 -07:00
Ebag333
f2a0e42810 Rework error dialog to have better layout and more information 2017-03-16 02:13:02 -07:00
Ebag333
63f2f85c25 PEP8 cleanup 2017-03-16 02:12:26 -07:00
blitzman
73a12aedeb Fix for #1041 2017-03-15 20:05:38 -04:00
blitzman
8b124f3194 Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-03-15 00:03:01 -04:00
blitzman
588ac62b6f fix for #1039 2017-03-15 00:02:48 -04:00
Ebag333
8991e1dbad Fix the view. Not sure why it broke (it was working at one point). 2017-03-13 20:09:37 -07:00
blitzman
d5f6f7b37c Disable "minimal" selection for remote reps pane (doesn't work) 2017-03-13 21:49:31 -04:00
blitzman
4ffec21cd3 Add real icons for the new pref pages 2017-03-13 21:46:56 -04: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
99f939026f Refactor some logic in modifiedAttributeDict 2017-03-09 12:14:23 -08:00
Ebag333
da922601cd You say Potatoe, I say tomahtie 2017-03-08 20:59:53 -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
Ryan Holmes
58977810f9 Merge pull request #1030 from Will-W/new_tab
Add option to open fit in new tab
2017-03-06 21:14:51 -05:00
Will Wykeham
05facc6961 Remove semicolon caused by too much C programming 2017-03-06 14:03:27 +00:00
Will Wykeham
f8db54136e Add option to open fit in new tab
Works from context menu and on middle click - like a browser
2017-03-06 13:52:56 +00:00
JJ Berry
9ad61c1e23 Need to enter if block in case of modPosition 0 as it refers to the first low slot 2017-03-05 18:54:17 -08:00
blitzman
2c4a2f7dd9 Fix probe size not updating #1026 2017-03-05 16:38:00 -05:00
Ebag333
9134464a39 Fixes case that would generate a exception on the first fit calc (would trigger logging dumps for users). Also clean up a bunch of unnecessary try/exceptions, and some logging improvements 2017-02-28 11:28:41 -08:00
Ebag333
9a284bc740 Add preference to disable ship browser tooltip popup. 2017-02-27 14:33:18 -08:00
Ebag333
d67573f83a Add more functionality to preferences window. 2017-02-27 12:05:38 -08:00
Ebag333
370b58d500 Changes required to implement the remote reps pane 2017-02-26 12:42:39 -08:00