Commit Graph

65 Commits

Author SHA1 Message Date
Ryan Holmes
da33a372cb Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. (#1168) 2017-05-14 20:52:06 -04:00
Ebag333
26238e731d Fix matplotlib importing 2017-03-16 10:22:40 -07:00
blitzman
1c273210e9 tox fixes 2017-02-26 00:44:37 -05:00
blitzman
94c098cce3 Fix path and graphFrame issue. I could have sworn these were already fixed during the previous merge... 2017-02-25 19:06:39 -05:00
blitzman
7115cd178c Merge branch 'development' into LogBook_v2
Conflicts:
	config.py
	eos/saveddata/fit.py
	gui/bitmapLoader.py
	gui/graphFrame.py
	gui/utils/exportHtml.py
	pyfa.py
	service/crest.py
	service/price.py
	service/server.py
2017-02-25 18:21:07 -05:00
blitzman
b583589849 Remove unicode path fixes for now to better test original problems 2017-02-19 01:01:12 -05:00
Ebag333
cdf392e3e5 Change matplotlib to be imported at the top and not use the import hack. Slows down the startup times slightly, but much simpler. 2017-02-18 10:15:06 -08:00
Ebag333
35e330f574 Improve handling for exceptions, output more information so we can find and fix problems. 2017-02-12 13:09:26 -08:00
Ebag333
3b185e1bcb Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers 2017-02-11 11:51:53 -08:00
Ebag333
096842de44 Tox fixes, and catching a few things lost in the merge. 2017-02-11 09:23:23 -08:00
blitzman
a2ca5eb8a4 fix oops 2017-02-11 11:01:39 -05:00
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
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
32944f4c9c More import fixes 2017-02-08 22:47:02 -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
a8fd7cf2e9 Matplotlib 2.0 support 2017-02-08 12:50:42 -08:00
blitzman
542542f48d import changes to graphframe 2017-02-07 00:33:15 -05:00
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -08:00
Ebag333
a50e4fcc46 Fix issue caused by file path and import fix merges 2017-01-24 17:37:37 -08:00
blitzman
85131e6166 oh god this isn't gonna work
Merge branch 'ebag_importchanges' into test_import

Conflicts:
	config.py
	eos/db/saveddata/queries.py
	eos/effects/chargebonuswarfarecharge.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
	eos/effects/energydestabilizationnew.py
	eos/effects/iceharvestingdroneoperationdurationbonus.py
	eos/effects/miningforemanstrengthbonus.py
	eos/effects/modulebonuswarfarelinkarmor.py
	eos/effects/modulebonuswarfarelinkinfo.py
	eos/effects/modulebonuswarfarelinkmining.py
	eos/effects/modulebonuswarfarelinkshield.py
	eos/effects/modulebonuswarfarelinkskirmish.py
	eos/effects/moduletitaneffectgenerator.py
	eos/effects/remotehullrepair.py
	eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipmodesmallmissiledamagepostdiv.py
	eos/effects/structureenergyneutralizerfalloff.py
	eos/effects/structuremoduleeffectstasiswebifier.py
	eos/effects/structurerigmaxtargets.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/techtwocommandburstbonus.py
	eos/saveddata/fighter.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	eve.db
	gui/bitmapLoader.py
	gui/builtinContextMenus/itemStats.py
	gui/builtinStatsViews/miningyieldViewFull.py
	gui/builtinViewColumns/misc.py
	gui/builtinViews/__init__.py
	gui/builtinViews/fittingView.py
	gui/contextMenu.py
	gui/graphFrame.py
	gui/itemStats.py
	gui/mainFrame.py
	gui/marketBrowser.py
	service/__init__.py
	service/character.py
	service/fit.py
	service/port.py
	service/prefetch.py
	service/pycrest/eve.py
	service/settings.py
2017-01-23 21:06:12 -05:00
Ebag333
bef17e53c6 Recreating wheels 2016-12-19 00:11:55 -08:00
Ebag333
d4b6099d6e Handle unicode, utf8, and windows-1252
(cherry picked from commit 0d4f24a)
2016-12-18 14:11:55 -08:00
Ebag333
08b5abc7ad Handle unicode, utf8, and windows-1252
(cherry picked from commit 0d4f24a)
2016-12-14 10:38:56 -08:00
Ebag333
be53dedb18 Large pep8 compliance to make work for Tox 2016-12-13 21:23:01 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes
(cherry picked from commit bee125d)
2016-12-13 20:16:44 -08:00
Ebag333
d963327ed4 Make it run again 2016-12-02 03:13:54 -08:00
blitzmann
e9d02ce4c8 Change to use BitmapLoader class 2015-09-24 12:21:50 -04:00
blitzmann
474f270b26 Change to new icon locations 2015-09-24 12:17:17 -04:00
blitzmann
cda8dd4c8b Windows skel has an issue with this, so if there is an issue, use default path to cache file. 2015-08-21 19:04:42 -04:00
blitzmann
ab7bbcb6ef Remove matplotlib's font cache. Fixes #234 2015-08-04 22:18:28 -04:00
blitzmann
05c73d1b1b If something happens and an error happens, return so that status is not reset later on 2014-11-13 11:18:44 -05:00
HomeWorld
dc096621e1 Added a gentle matplotlib version check in graphFrame 2010-12-07 10:21:22 +02:00
Corollax
ab26acbd9a Fix traceback on opening graphs
Resolves http://trac.evefit.org/ticket/341
2010-12-06 18:38:51 -06:00
HomeWorld
6160550f2d Added legend for graphFrame 2010-12-05 18:40:37 +02:00
HomeWorld
7d0f5cf910 Load matplotlib only when needed, this speeds up a little pyfa startup 2010-12-05 17:47:49 +02:00
HomeWorld
1c820e3859 Fixed PFNotebook not sending PageChanged event when deleting a tab (if it's the case); multiSwitch uses a smarter BlankPage that responds to PageChanged event, now pyfa is behaving correctly when switching betwen fittingView tabs and empty tabs; FIT_CHANGED event moved to globalEvents.py since it is used a lot in different locations;... 2010-11-28 20:04:45 +02:00
HomeWorld
95e68c069d Let wx autosize Graphframe 2010-11-28 11:12:04 +02:00
HomeWorld
34fe62196e Graph frame layout improvement 2010-11-28 11:07:26 +02:00
cncfanatics
fcbecb37ca Rework of the shipBrowser drag system, make it extensible and reusable 2010-11-22 20:54:08 +01:00
Niklas Bölter
efeb24cc3b Fixed some old references to gui.fittingView 2010-11-20 22:30:49 +01:00
Niklas Bölter
32d57a80f2 Revert "Fixed silly oversight from cncfanatics :O"
This reverts commit 50cfab8649.
2010-11-20 22:26:43 +01:00
Niklas Bölter
50cfab8649 Fixed silly oversight from cncfanatics :O 2010-11-20 22:22:21 +01:00
cncfanatics
6e1b789fb2 Move some view handling stuff around and do initial work on the
fleetBrowser
2010-11-20 20:32:47 +01:00
cncfanatics
7ebab66994 Add a correct try/except block 2010-11-18 10:51:44 +01:00
HomeWorld
4922d6c880 Some changes in graphFrame, it doesnt look awesome, but it's nonetheless prettier than before 2010-11-15 19:26:28 +02:00
cncfanatics
659e9ba580 Fix fit removal 2010-11-13 15:25:26 +01:00
cncfanatics
0205dfb33c Unbind when graphframe gets closed 2010-11-12 22:29:50 +01:00
HomeWorld
f8588c41b4 Resize fix for graphframe, have only the graph canvas adjust its size 2010-11-12 15:39:31 +02:00
HomeWorld
04661c5645 Merge branch 'master' of evefit.org:pyfa 2010-11-12 14:21:59 +02:00