blitzman
|
f34e564ccd
|
Merge branch 'MatPlotLib' of https://github.com/Ebag333/Pyfa into Ebag333-MatPlotLib
Conflicts:
gui/graphFrame.py
|
2017-02-11 10:53:24 -05:00 |
|
blitzman
|
423a433e16
|
Merge branch 'SorryNotSorryBlitzmann' into development
|
2017-02-11 10:47:22 -05:00 |
|
blitzman
|
bdee8f662c
|
Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann
|
2017-02-11 10:46:59 -05:00 |
|
Ebag333
|
3562577521
|
Tox fix, and catch an extra shadowing
|
2017-02-10 12:06:23 -08:00 |
|
Ebag333
|
8c7682c6d4
|
Little more OCD on cleaning up imports.
|
2017-02-10 12:02:23 -08:00 |
|
Ebag333
|
2b45a16872
|
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
|
2017-02-10 11:50:04 -08:00 |
|
Ebag333
|
73cc17ce72
|
Clean up some more import statements
|
2017-02-10 11:29:52 -08:00 |
|
Ebag333
|
07a2020303
|
Don't try and import an old version and then fail back to the 2.7 version. Just do the 2.7 version. :)
|
2017-02-10 11:22:06 -08:00 |
|
Ebag333
|
0fc45ead6e
|
Catch missing import
|
2017-02-10 11:16:51 -08:00 |
|
Ebag333
|
6b37e2c973
|
More clean handling of possibly missing attributes. Thanks @blitzmann!
|
2017-02-10 10:09:11 -08:00 |
|
Ebag333
|
cdabd83afe
|
Remove old init
|
2017-02-10 07:19:33 -08:00 |
|
Ebag333
|
f610f525ba
|
Use getattr directly, insead of doing a check then setting it (yay for defaults)
|
2017-02-10 06:44:40 -08:00 |
|
Ebag333
|
514f927a56
|
Revert removing call. This class likely needs to be callable.
|
2017-02-10 05:50:32 -08:00 |
|
Ebag333
|
3c641606da
|
Revert until we actually get a Linux developer.
|
2017-02-10 05:41:06 -08:00 |
|
blitzman
|
af44d878d1
|
tweak
|
2017-02-10 00:57:53 -05:00 |
|
blitzman
|
72ebafe925
|
Remove redundant init
|
2017-02-10 00:37:45 -05:00 |
|
blitzman
|
134365c764
|
Reverts commit de87c9, and instead uses the mod variable to access the method needed.
Conflicts:
service/fit.py
|
2017-02-10 00:29:40 -05:00 |
|
Ebag333
|
228425fdb9
|
Cast to int so we can compare
|
2017-02-09 14:07:37 -08:00 |
|
Ebag333
|
9775d1064e
|
Move import code down into class init
|
2017-02-09 13:27:54 -08:00 |
|
Ebag333
|
1a9591d411
|
pyCharm inspection and code style
|
2017-02-09 10:56:26 -08:00 |
|
Ebag333
|
64070a0798
|
Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.
|
2017-02-09 09:36:16 -08:00 |
|
Ebag333
|
dd9924a7a7
|
Fix issues where we assume something can exist when it may not.
|
2017-02-09 07:22:09 -08:00 |
|
Ebag333
|
0f00b7237a
|
Another classic class conversion
|
2017-02-09 01:02:55 -08:00 |
|
Ebag333
|
579a13da44
|
Tox fixes
|
2017-02-09 00:59:22 -08:00 |
|
Ebag333
|
7865219164
|
Add a ton of default values
|
2017-02-09 00:56:33 -08:00 |
|
Ebag333
|
f2c84692a9
|
Clean up a bunch of unused variables
|
2017-02-09 00:22:14 -08:00 |
|
Ebag333
|
f61aeb8285
|
Fix bug where the toggle button the compare pane didn't do anything. (Need to check toggleView because you can hit both first and second if otherwise.)
|
2017-02-09 00:18:19 -08:00 |
|
Ebag333
|
11d7f9d029
|
Make modules static if they do not use self.
|
2017-02-09 00:04:41 -08:00 |
|
Ebag333
|
72633825cf
|
Formatting and layout changes
|
2017-02-08 23:32:51 -08:00 |
|
Ebag333
|
9a137bb158
|
Convert old style classes to new
|
2017-02-08 23:06:39 -08:00 |
|
Ebag333
|
32944f4c9c
|
More import fixes
|
2017-02-08 22:47:02 -08:00 |
|
Ebag333
|
23c6f2add5
|
We have two of the exact same backported file. Get rid of one. Also, handle the except if we can't import so we don't get stacktraces. (Currently the three functions affected are not used.)
|
2017-02-08 22:42:19 -08:00 |
|
Ebag333
|
e535f050c1
|
Disable inspection of writing to some wx properties. These do seem to get written, so it is likely pyCharm doesn't understand wx
|
2017-02-08 22:32:12 -08:00 |
|
Ebag333
|
7a2feb9152
|
Fix a bunch of calls to functions that pass the wrong type of parameter, the wrong number, etc.
|
2017-02-08 22:20:56 -08:00 |
|
Ebag333
|
3b91ec8c06
|
Move check for module state being valid out of effectHandlerHelpers and into service\fit. We can't have it there because of cyclical imports. Plus we're already checking the module state here, so makes lots of sense to merge them.
|
2017-02-08 21:24:24 -08:00 |
|
Ebag333
|
636474610b
|
More of: Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
|
2017-02-08 20:16:58 -08:00 |
|
Ebag333
|
6e524de320
|
Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
|
2017-02-08 20:15:24 -08:00 |
|
Ebag333
|
3e916e42f2
|
pyCharm inspection fixes. Mostly variable refernce issues
|
2017-02-08 17:55:20 -08:00 |
|
Ebag333
|
de87c992d7
|
Remove calling es_Module from effectHandlerHelpers, this causes a circular import. Instead pass in from fit.
|
2017-02-08 16:50:41 -08:00 |
|
Ebag333
|
e5fb90f017
|
Fix commit message. LOTS of fixes for flake8.
|
2017-02-08 14:22:56 -08:00 |
|
Ebag333
|
e18deb5eeb
|
Roll up #967 and #974
Takes the import fixes and cleanup out of those and rolls it into this
one
|
2017-02-08 13:12:54 -08:00 |
|
Ebag333
|
a8fd7cf2e9
|
Matplotlib 2.0 support
|
2017-02-08 12:50:42 -08:00 |
|
Ryan Holmes
|
25182de365
|
Merge branch 'master' into development
Conflicts:
gui/builtinViewColumns/baseName.py
|
2017-02-08 13:58:37 -05:00 |
|
Ryan Holmes
|
c90efb8d0a
|
Fix emAmount > {type}Amount, some formatting tweaks
|
2017-02-08 09:41:59 -05:00 |
|
Ebag333
|
7a521c655f
|
Wrap dlg.Destroy() in a Try/Except
Conflicts:
gui/mainFrame.py
|
2017-02-08 00:15:02 -05:00 |
|
blitzman
|
8a9d2a032e
|
Revert the try... except, see #960
|
2017-02-08 00:00:16 -05:00 |
|
Ryan Holmes
|
b1b3ff2637
|
Merge pull request #960 from Ebag333/Fueled_Booster_Misc_Column_Improvements
Add extra info for misc column for fueled boosters (cap, shield, and armor)
|
2017-02-07 23:59:07 -05:00 |
|
Ryan Holmes
|
752f9e77f5
|
Merge pull request #971 from Ebag333/ToxFixes2
Some additional Tox tweaks
|
2017-02-07 23:28:42 -05:00 |
|
blitzman
|
e52db0b2f5
|
Merge branch 'AncientDatabaseRepair' of https://github.com/Ebag333/Pyfa
Conflicts:
service/prefetch.py
|
2017-02-07 23:26:06 -05:00 |
|
blitzman
|
ce9069af4a
|
Fix projected fit view not showing projected fit count
|
2017-02-07 20:11:02 -05:00 |
|