Commit Graph

855 Commits

Author SHA1 Message Date
blitzmann
dd09b3d951 Add fitting notes to the ship browser tooltips 2017-05-08 19:20:30 -04:00
blitzmann
f022c2474c Restrict fit notes export to 400 character for CREST and XML export 2017-05-08 19:02:30 -04:00
blitzmann
249956689a text tweaks 2017-05-08 18:26:44 -04:00
blitzmann
6b22bd189a Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
Conflicts:
	eos/config.py
	gui/notesView.py
	service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb Merge branch 'feature/recent' into dev
Conflicts:
	eos/db/saveddata/character.py
	eos/db/saveddata/fit.py

Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities. 2017-05-07 02:02:54 -04:00
blitzmann
4a9662c0f7 Merge branch 'feature/skill-filter' into dev
Conflicts:
	gui/characterEditor.py

This implements a long-requested feature to be able to search skills in the character editor
2017-05-06 13:25:20 -04:00
blitzmann
47a683c44c Merge branch 'feature/strictSkills' into dev
Conflicts:
	service/character.py

Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
blitzmann
184c46dbce Merge branch 'bug/unicode-skill-export' into dev 2017-05-06 13:11:07 -04:00
blitzmann
703d6dbc85 Merge branch 'feature/grant-needed-skills' into dev 2017-05-06 13:09:30 -04:00
blitzmann
d342e66db4 Merge branch 'feature/sec-status-change' into dev
Add ability to change characters sec status
2017-05-06 12:23:40 -04:00
blitzmann
1222567a4f Merge branch 'feature/allow-restrictions' into dev.
Allows user to turn off most fitting restrictions (#1117)
2017-05-06 12:11:00 -04:00
blitzmann
1f7858f853 Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
blitzmann
c2880c0175 Move queue and wait variables to __init__.
Turns out threading.start() returns before the thread actually starts, so there were situations in which we would start the thread and immediately try to use it before run() happened.
2017-05-04 19:27:54 -04:00
blitzmann
f57e7cf1ec Implement FloatSpin as well as changing sec status via character editor 2017-04-26 22:14:30 -04:00
blitzmann
9bffc6afd6 Fix issue in which exception happened because of a bad type check 2017-04-26 19:59:57 -04:00
blitzmann
32f417ce5a Created first iteration of "Recent Fits" view, in which a nav button is interacted with to show a list of the 100 most recently modified fits. Ship Broswer is littered with ToggleRecentShips() to reset the icon when not in "recent" mode. This should probably be fixed at some point.
Removed the FIT_CHANGED binding from FitItem - this was causing very odd issues when the object was destroyed (navigating to another "stage") such as the Fit Changed event for that fit no longer firing (or at least seemingly so)

To fix this, simply look at the active fit during FitItem.Refresh()

Also creates a new query to get a list of items from the DB, although it's not used (was gonna use it, decided against it, but didn't want to delete the code - could prove handy later)
2017-04-26 18:51:39 -04:00
blitzmann
ae99a179d9 Update FitItem to use modified datetime of fit (fallback to created and old timestamp). Remove activation of FitItem timer (no idea what this is trying to do???) 2017-04-22 19:30:50 -04:00
blitzmann
c9a04e886a Add eos setting for strict skills, and update info in skill tree without doing a repopulation 2017-04-22 14:02:40 -04:00
blitzmann
d0a4fa1c9d Get strict skills working. Todo: add engine setting 2017-04-22 02:43:06 -04:00
blitzmann
988861af1f Add option to ignore fitting restrictions on a per-fit basis 2017-04-18 23:57:34 -04:00
blitzmann
f0fc5643e9 Return and save sec status for character when updating skills 2017-04-18 00:01:25 -04:00
blitzmann
8c83ac120f Implement asynchronous api skill fetching 2017-04-18 00:01:24 -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
962c45b807 Merge pull request #1124 from StinGer-ShoGuN/PR_01
Default HTML export to pyfa save path, and allow override of database file path
2017-04-14 00:31:59 -04:00
blitzmann
04242ef52c Fix issue with handling item names that include unicode 2017-04-13 23:39:42 -04:00
blitzmann
da9816d1bd Implement character skill searching 2017-04-13 23:39:00 -04:00
blitzmann
283aba4f85 Add grant missing skills feature 2017-04-13 23:26:08 -04:00
blitzmann
e28bf545e9 Fix some bugs with notes view - exception happening due to lack of fit, and possibility of notes saving under the wrong fit 2017-04-12 23:22:57 -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
StinGer ShoGun
c00372900f Save HTML export to .pyfa user's directory by default.
This commit is part of attempts to ease system package creation and
maintenance (specifically Gentoo ebuilds).
2017-04-12 16:13:56 +02: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
Ryan Holmes
ebda1349cf Add a small delay on key down for market search (#1123)
* Add a small delay on key down for market search

* prevent a double search if user does something like hit enter in the middle of a timer
2017-04-11 23:30:38 -04:00
blitzmann
4e74555b5d Opps, forgot to change this back from testing. 2017-04-10 21:26:03 -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
jeffy-g
c07bcf6a29 Determine the necessary changes to use db with test code,
I made necessary edits

.travis.yml
  necessary to depend on wx mod indirectly when running test code

eos\config.py
  copy from development branch, This change was necessary when using data base in test code.

service\settings.py
  copy from development branch.
  and modified SettingsProvider.getSettings and Settings.save.
  After that, we made the same as master branch except for necessary code.
  This change was necessary when using data base in test code.

and other improvement.
2017-04-10 14:23:50 +09:00
jeffy-g
fc7ca56f8b searching for a way to open db with minimal changes required 2017-04-10 09:33:54 +09:00
jeffy-g
4a964ab6be apply recent improvements 2017-04-10 03:05:44 +09:00
Ebag333
994bd72409 Rework pricing. 2017-04-05 14:40:27 -07:00
jeffy-g
d4d69522f5 edit source 2017-04-06 03:37:40 +09:00
jeffy-g
e9e8ef964c refactoring some code and added docstring
added stopwatch.py(modify from utils.timer.py) for test
2017-04-05 21:18:30 +09:00
Ryan Holmes
3dd539b4f0 Improve some efficiencies with the variations context menu: Do not recalc twice when switching items. (#1095) 2017-04-02 16:46:25 -05:00
jeffy-g
8fd424814a edit... 2017-04-03 02:00:10 +09:00
jeffy-g
4d8c3eadbc pep8 2017-04-03 01:50:26 +09:00
Ryan Holmes
92722d491f Remove functionality related to auto HTML export (#1088) 2017-04-02 11:46:17 -05:00
jeffy-g
c560d17bdd Improved processing status notification for import and export 2017-04-03 01:34:07 +09:00
Ryan Holmes
216dac068d Fix for #1090 - using variations on implants is not recalcing fit correctly. (#1094) 2017-04-02 01:04:34 -05:00
blitzman
cb77987129 Fix an exception caused by too few variables for string formatting 2017-03-26 23:51:05 -04:00
Ryan Holmes
a67c28a4c9 Merge branch 'development' into feature/commandmenu 2017-03-26 14:43:12 -04:00
blitzman
d928df9c69 Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now 2017-03-26 14:28:13 -04:00