Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lu 231 lca results #218

Merged
merged 432 commits into from
Mar 22, 2019
Merged

Lu 231 lca results #218

merged 432 commits into from
Mar 22, 2019
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 29, 2018

  1. Configuration menu
    Copy the full SHA
    64372b5 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. Configuration menu
    Copy the full SHA
    ce799f5 View commit details
    Browse the repository at this point in the history
  2. Relative/Absolute button now doesn't reset combobox

    e4BdSBmUzHowFico5Ktn committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    a16b155 View commit details
    Browse the repository at this point in the history
  3. Cleaned up Combobox signals

    e4BdSBmUzHowFico5Ktn committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    eb32046 View commit details
    Browse the repository at this point in the history
  4. General code improvements

    e4BdSBmUzHowFico5Ktn committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    26cff74 View commit details
    Browse the repository at this point in the history
  5. Functional unit tables and arrays now working as intended.

    e4BdSBmUzHowFico5Ktn committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    c2792f4 View commit details
    Browse the repository at this point in the history
  6. MiniMap functional

    maxreinicke authored and maxreinicke committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    30d8cbf View commit details
    Browse the repository at this point in the history
  7. MiniMap functional

    Merge remote-tracking branch 'origin/graph_navigator_simplified' into _fresh_d3v4_MiniMap_working
    
    # Conflicts:
    #	activity_browser/app/ui/web/graphnav/navigator.py
    maxreinicke authored and maxreinicke committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    9693722 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    ec73529 View commit details
    Browse the repository at this point in the history
  9. Clean up of code

    e4BdSBmUzHowFico5Ktn committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    c07e790 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6d39c0b View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    b945cad View commit details
    Browse the repository at this point in the history
  12. Scrollbar management for custom tab improved. Will need to limit tabl…

    …e size to keep it in bounds of the scroll-area
    Athunc committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    9c66ecf View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    8be218e View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4342643 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    9eb29b8 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    b5eab8d View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    04c5933 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    481b722 View commit details
    Browse the repository at this point in the history
  19. Biosphere matrix is now cut to size and displayed, but it appears tha…

    …t it rounds all values to 0.
    Athunc committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    a0141bb View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    1c3ddfa View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    b5034e2 View commit details
    Browse the repository at this point in the history
  22. The data in the inventory table is finally ordered from large to smal…

    …l amounts, making the table much more useful. It displays the top 1000 values, much more will slow the calculation down considerably.
    Athunc committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    33dfd63 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    dbd2f9d View commit details
    Browse the repository at this point in the history
  24. Set the minimum-sizes for the Biosphere Table and its Widget, automat…

    …ic size policy isn't doing a good job. Will have to find a working size policy in the future.
    Athunc committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    7681080 View commit details
    Browse the repository at this point in the history
  25. The functional units ComboBox now functions correctly. I have made a …

    …small function that translates the functional unit descritions back to their hashed codes through an existing library, preventing key-errors.
    Athunc committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    1f92eea View commit details
    Browse the repository at this point in the history
  26. Eradicated some more key-errors caused by arguments being passed to w…

    …rong functions.
    
    The functional units ComboBox now functions correctly. I have made a small function that translates the functional unit descritions back to their hashed codes through an existing library, preventing key-errors.
    Athunc committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    3280d2e View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    8e51f5d View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    1268bd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2018

  1. refactoring ActivityDetailsTab class: beginning

    remove unused legacy code ("_key")
    promote contents of get_grid() out of unnecessary method
    separate widget definition code from layout within grid
    tmillross committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    76d203f View commit details
    Browse the repository at this point in the history
  2. promote contents of get_details_widget() out of unnecessary method

    separate widget definition code from layout code
    remove from controller.py some code which was left there accidentally in the past
    tmillross committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    0401a22 View commit details
    Browse the repository at this point in the history
  3. move read-only checkbox to above activity data

    requires moving check function to ActivityDetailsTab populate()
    tmillross committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f40a2f1 View commit details
    Browse the repository at this point in the history
  4. toward handling read-only / editable activities

    new functions: set_exchange_tables_read_only & set_activity_fields_read_only
    the tables currently use .setEnabled rather than .readOnly, as in the activity_fields. This is not so good as it doesn't allow selection (e.g. for copy-paste).
    panel.py: remove 'new' from open_new_activity_tab
    as it is not necessarily new, and to retain naming convention of signal
    add placeholder dict object representing a file which saved in each project containing (amongst other things) the activity keys which are not read-only
    activity.py: put erroneously removed '_key' assignments back in, else Signals.activity_modified throws an error after editing fields
    tmillross committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    69b5270 View commit details
    Browse the repository at this point in the history
  5. Added totals to tables when relevant, changed switching buttons to be…

    … more descriptive
    e4BdSBmUzHowFico5Ktn committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    d3167ad View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8ef139b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    71ebc32 View commit details
    Browse the repository at this point in the history
  8. rename ActivityDetailsTab to ActivityTab

    tmillross committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    8f79682 View commit details
    Browse the repository at this point in the history
  9. Added radiobuttons (no logic), reverted Totals logic.

    e4BdSBmUzHowFico5Ktn committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    38ebf97 View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'origin/Results_Analysis' into Results_A…

    …nalysis
    e4BdSBmUzHowFico5Ktn committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    9e5ca3d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    ff3cd15 View commit details
    Browse the repository at this point in the history
  12. Merge remote-tracking branch 'origin/Results_Analysis' into Results_A…

    …nalysis
    
    # Conflicts:
    #	activity_browser/app/ui/widgets/calculation_setup.py
    Athunc committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f457959 View commit details
    Browse the repository at this point in the history
  13. Updated TODO list

    Athunc committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    31d3e3a View commit details
    Browse the repository at this point in the history
  14. Simplified some of the coding

    Athunc committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    1b54e70 View commit details
    Browse the repository at this point in the history
  15. Simplified some of the coding

    Athunc committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    69bfcf5 View commit details
    Browse the repository at this point in the history
  16. Moved making top_contributions dict to function

    e4BdSBmUzHowFico5Ktn committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    79e88a4 View commit details
    Browse the repository at this point in the history
  17. Merge remote-tracking branch 'origin/Results_Analysis' into Results_A…

    …nalysis
    e4BdSBmUzHowFico5Ktn committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    f86f082 View commit details
    Browse the repository at this point in the history
  18. set_exchange_tables_read_only function improved

    instead of setEnabled (which does not allow selection/scrolling), we use DragDropMode and EditTriggers
    rename activity_data to activity_data_grid
    rename tables to exchange_tables
    tmillross committed Jul 31, 2018
    Configuration menu
    Copy the full SHA
    3727614 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Merge branch 'appdirs' of https://github.com/LCA-ActivityBrowser/acti…

    …vity-browser into redesign_act_tab
    tmillross committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    e7050c2 View commit details
    Browse the repository at this point in the history
  2. working functionality: read-only status of relevant open activities u…

    …pdated by user click on database-read_only checkbox
    
    rename function to update_activity_table_context
    improve and reduce some comments
    in update_activity_table_context: check that the open activity inventory table is the one that read-only is changed for (to prevent minor bug with context menu enabled/disabled)
    rename ActivityTab argument 'activity' to activity_key, which consists of the BW tuple (db_name, code [or act_code]) according to:
    https://docs.brightwaylca.org/intro.html#activities-must-be-uniquely-identified
    remove need for extra call of new_tab.populate() in open_activity_tab by passing the activity_key sooner
    tmillross committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    fe80749 View commit details
    Browse the repository at this point in the history
  3. toward properly enabling and disabling the read-only activity checkbox

    currently saving state to files is just simulated with static dictionary objects
    next: implement saving to new settings files (to be created) in the BW projects directory
    tmillross committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    61d426b View commit details
    Browse the repository at this point in the history
  4. toward user_project_settings()

    on startup and each time a new project is selected, user_project_settings reads the settings from disc (in the bw2 project directory) or creates a new file there.
    Contents of settings file not yet being properly parsed or saved
    tmillross committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    122b2ec View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. user project settings files seemingly functional

    now parsed and saved at necessary times
    used to drive valid read-only behaviour
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    477e2ce View commit details
    Browse the repository at this point in the history
  2. rename readOnlyStateChanged to read_only_changed

    aligned with existing function naming conventions
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    0aa92c8 View commit details
    Browse the repository at this point in the history
  3. modify class ActivityTab to inherit from QTabWidget rather than QWidget

    This enables the appropriate stylesheets to work
    add to file style.py the class ActivitiesTab
    update the active stylesheet when the read-only status of an activity changes
    currently adds a green or red border to indicate status
    update utils to give a longer tab title (30 instead of 22 chars)
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    709f19d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ee9a203 View commit details
    Browse the repository at this point in the history
  5. reduce whitespace on activity tab

    increase size of read_only checkbox
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    b8445d7 View commit details
    Browse the repository at this point in the history
  6. remove empty legacy function

    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    33b9544 View commit details
    Browse the repository at this point in the history
  7. refactor for consistency: only use term 'read_only' throughout code

    not editable or writable
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    b5f08a9 View commit details
    Browse the repository at this point in the history
  8. improve duplicate activities to other databases from inventory context:

    	automatically opens new activity when copied
    	read-only databases are no longer accessible on the list selection
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    cfbe026 View commit details
    Browse the repository at this point in the history
  9. toward duplicating activity to databases with dropdown

    still todo: refactor controller.py duplicate_activity_to_db method
    tmillross committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    c04ab47 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2018

  1. Configuration menu
    Copy the full SHA
    e69d39c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    73d2765 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f40b5da View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. Change 'Read Only' checkbox to 'Edit Activity' checkbox

    Update the widget name label, tooltips,
    and check behaviour (using NOT inversion on parameter pass)
    have not changed the use of 'read-only' throughout the rest of the codebase
    tmillross committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    36be397 View commit details
    Browse the repository at this point in the history
  2. some amends as requested in feedback on PR:

    remove database from project settings file when deleted
    reset settings object when project is deleted
    change value formatting from scientific {0:.3e} back to mixed notation {:.3g}
    remove border of detailsgroupboxes to reduce interface clutter
    ...todo: auto-size column widths within exchangetables on init or update. Nothing so far seems to affect them
    tmillross committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    ab68567 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. remove unused imports and organise them

    ... by running command 'optimize imports' from PyCharms on open edited files
    tmillross committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    84fe5ca View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. Configuration menu
    Copy the full SHA
    ea6c6d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2018

  1. Configuration menu
    Copy the full SHA
    f0f88bd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6085d92 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6f08363 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    51947ab View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2018

  1. Still better output

    bsteubing committed Aug 10, 2018
    Configuration menu
    Copy the full SHA
    99aa686 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2018

  1. Configuration menu
    Copy the full SHA
    8038f27 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3f88d3 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Configuration menu
    Copy the full SHA
    f1324b9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fbeb8e9 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Configuration menu
    Copy the full SHA
    a2f06b8 View commit details
    Browse the repository at this point in the history
  2. fix issue where activities context menu was disabled on first opening…

    … of editable databases
    
    modify function name to update_activity_table_read_only for more general context
    tmillross committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    e16e693 View commit details
    Browse the repository at this point in the history
  3. fix bug where activityTab properties could be out of sync with databa…

    …se after user edits
    tmillross committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    668f6eb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e959839 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'redesign_act_tab' of github.com:TMillross/activity-brow…

    …ser into redesign_act_tab
    tmillross committed Aug 31, 2018
    Configuration menu
    Copy the full SHA
    9774c0b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c56d5a1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b56b464 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8d4b510 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b08fdf7 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2018

  1. The options for comparing LCIA Methods or comparing Functional units …

    …are now named properly and have switched places with the combobox where the functional unit or LCIA Method can be selected.
    Athunc committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    150675a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c893364 View commit details
    Browse the repository at this point in the history
  3. Placed the cutoff slider, its minimum value and its maximum value in …

    …a horizontal layout, inline with one another.
    Athunc committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    57a6f22 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b42b7ab View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2018

  1. remove red border-line from top of locked activities due to aesthetic…

    … preference of bsteubing
    tmillross committed Sep 8, 2018
    Configuration menu
    Copy the full SHA
    5241fa5 View commit details
    Browse the repository at this point in the history
  2. update activity database dropdown list on db_read_only_changed so act…

    …s can't be copied to read-only dbs
    
    rename activity tab functions to db_read_only_changed and act_read_only_changed for clarity and consistency
    tmillross committed Sep 8, 2018
    Configuration menu
    Copy the full SHA
    89e6dd6 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. add location list combo to activity tab

    allows user to select from all location names which already exist in the database of the selected activity
    Or add a new location that's not in the list, simply by typing
    
    whilst implementing - found an issue that was causing many issues in the past and in this function implementation...
    The "activity" data was redundantly duplicated in objects across the interface:
    	addressed in this commit: ActivityTab.activity and ActivityDataGrid.activity redundancy
    	not addressed in this commit: the *possible* redundancy between the ActivityCache and ActivitiesPanel, which is less clear-cut
    
    ActivityDataGrid.activity is no longer stored. Rather, the ActivityTab is referenced as a parent, and the ActivityTab.activity object used in all code
    Such that when data is being edited, it is no longer necessary to maintain synchronisation of these two separate objects, as well as the displayed values in the widgets
    
    Also addressed the assumption(?) in previous code, that an ActivityTab instance could be created without an activity_key. This might have been a legacy thing.
    	No longer provides default values for activities
    	Or checks if an activity was passed (e.g. before populate()
    
    rename all references to 'dropdown' to 'combo' - aligned with PyQT naming convention
    tmillross committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    638ca9d View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. add documentation and suggested improvements to activity_browser/app/…

    …ui/tabs/activity.py and related calling functions
    
    to develop my understanding, and in preparation for an open discussion on optimal design/behaviour for these tables
    next: reverting mostly back to previous table-column layout (names etc.), from before I made any changes
    ...to screenshot images and act as a uncontroversial/familiar starting point, for development discussion
    tmillross committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    36b1b25 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Configuration menu
    Copy the full SHA
    a1aedfd View commit details
    Browse the repository at this point in the history
  2. cleaned the code up a bit and made a start with expanding the invento…

    …ry table to show data for all functional units simultaneously
    Athunc committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    8e9b840 View commit details
    Browse the repository at this point in the history
  3. Expanded the inventory table to show data for all functional units si…

    …multaneously and changed labels to be more complete.
    Athunc committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    a0c0619 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

  1. First complete version of the Inventory table. The export of this tab…

    …le to Excel has been tested and works for the full table now.
    Athunc committed Oct 3, 2018
    Configuration menu
    Copy the full SHA
    9524c67 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    21c56bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8935679 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. ready for code-review and discussion with Bernhard

    revert some ExchangeTable column/design changes
    ...I previously misunderstood which specific types of data should be shown in each column, and hence removed too many
    Add in-line documentation, comments, and TODO suggestions for further improvements
    rename filter_clicks to filter_double_clicks
    modify the way that the exchange tables are set to read only/editable so dragging still permitted as in earlier versions
    	- from setDragDropMode(DropOnly) to self.setAcceptDrops(True)
    tmillross committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    49e6485 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a3bafac View commit details
    Browse the repository at this point in the history
  3. delete merge conflict tag

    ... tried to resolve conflict in the GitHub editor which meant that a conflict-tag (<<<<<<< redesign_act_tab) could slip through
    tmillross committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    d6408ea View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. Merge pull request #200 from tmillross/redesign_act_tab

    Pulling Tom's work into the changes_LU branch to integrate all the recent work of LU
    bsteubing authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    7ef048a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #203 from LU-CML/graph_navigator_towards_contribut…

    …ion_sankey
    
    pull of "Graph navigator towards contribution sankey" branch in to master repository
    bsteubing authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    d613f87 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #202 from LU-CML/Results_Analysis

    moving Results analysis to master repository
    bsteubing authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    cb9ebfd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    789689a View commit details
    Browse the repository at this point in the history
  5. Merge branch 'changes_LU_1' into LU_231

    # Conflicts:
    #	activity_browser/app/bwutils/commontasks.py
    #	activity_browser/app/controller.py
    #	activity_browser/app/settings.py
    #	activity_browser/app/ui/panels/right.py
    bsteubing committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    c375059 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b52f701 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a2513f0 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d87d340 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fd6f262 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2018

  1. Configuration menu
    Copy the full SHA
    05453de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c65e30c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    675367c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    64e3399 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0ff7bc4 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Configuration menu
    Copy the full SHA
    11f48da View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7436fff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a9b007a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6aeec84 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9a0b7ca View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8c146ec View commit details
    Browse the repository at this point in the history
  7. CF_tab, ActivitiesTab, and LCA_results tabs now all use the tabs dict…

    …ionary and methods from the ABTab
    bsteubing committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    1dbe3c7 View commit details
    Browse the repository at this point in the history
  8. Opening, closing, and selecting behaviour of tabs works fine now. Cod…

    …e duplication reduced.
    bsteubing committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    7c2138b View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Configuration menu
    Copy the full SHA
    cee9962 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    28158e5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    52485ab View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b2464bf View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. Configuration menu
    Copy the full SHA
    861a449 View commit details
    Browse the repository at this point in the history
  2. Improving Sankey Navigator

    bsteubing committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    be3a86b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b1901e1 View commit details
    Browse the repository at this point in the history
  4. Set app default font

    bsteubing committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    b7d3311 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2018

  1. Configuration menu
    Copy the full SHA
    08f89f6 View commit details
    Browse the repository at this point in the history
  2. Introduction of convenience data, i.e. data across databases, which m…

    …ay be re-used and should not be parsed every time, e.g. locations, units, etc. (use of this data in the Activity Editor still needs to be improved)
    bsteubing committed Oct 28, 2018
    Configuration menu
    Copy the full SHA
    fc158b0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6d3a863 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Configuration menu
    Copy the full SHA
    c281cb4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0e6c06c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dd5303c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2250beb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f34c5c0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1ba18d9 View commit details
    Browse the repository at this point in the history
  7. Units and products can now be edited... however, this needs to be sub…

    …stantially improved...
    bsteubing committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    1b42913 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Configuration menu
    Copy the full SHA
    30dad92 View commit details
    Browse the repository at this point in the history
  2. Minor changes

    bsteubing committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    2eb6570 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Using verticalHeader().setDefaultSectionSize(22) instead of resizeRow…

    …s/ColumnsToContents(), which generates the tables a lot faster
    bsteubing committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    137fe9f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b21d60d View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2018

  1. Configuration menu
    Copy the full SHA
    c133eb6 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Configuration menu
    Copy the full SHA
    e364bac View commit details
    Browse the repository at this point in the history
  2. Improve saving of tables

    bsteubing committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    8a64bab View commit details
    Browse the repository at this point in the history
  3. Elementary flow and process contribution tables work, but the latter …

    …needs a cut-off by default to reduce table generation time
    bsteubing committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    2badb47 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Configuration menu
    Copy the full SHA
    967b8c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Configuration menu
    Copy the full SHA
    31b5a5f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3260a4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55001ec View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    632a01e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7be05d2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    998a60f View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. Configuration menu
    Copy the full SHA
    f9c54de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8c94d73 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2019

  1. Configuration menu
    Copy the full SHA
    f5b01da View commit details
    Browse the repository at this point in the history
  2. EF and process contributions now relate to the new Contribution Analy…

    …sis and the DF generated there.
    bsteubing committed Mar 1, 2019
    Configuration menu
    Copy the full SHA
    73441a3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2bbfd12 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2019

  1. Metadata in LCA Results now works and is fast (but still needs to be …

    …managed AB-wide so that subsequent LCA calculations go faster)
    bsteubing committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    832f455 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d614585 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2b79f62 View commit details
    Browse the repository at this point in the history
  4. minor improvements

    bsteubing committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    976536e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8f63087 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c6aa8b1 View commit details
    Browse the repository at this point in the history
  7. Cosmetic changes

    bsteubing committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    de52049 View commit details
    Browse the repository at this point in the history
  8. Better save file names

    bsteubing committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    d1e2fda View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. Configuration menu
    Copy the full SHA
    1b270a4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    618627c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    afcb0ba View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2a5912f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    914dde5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    53259f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. Updating metadata seems to work now (if e.g. activities are added, mo…

    …dified or deleted).
    
    Also styling of metadata tables works.
    bsteubing committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    ce49527 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b293aea View commit details
    Browse the repository at this point in the history
  3. Cosmetic changes

    bsteubing committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    5b395aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2770de1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    969aa08 View commit details
    Browse the repository at this point in the history
  6. More table sizing and fixing that exchanges can be deleted from any f…

    …ield in the technosphere exchanges
    bsteubing committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    3b72d6e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e0364aa View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2019

  1. Fixed some smaller bugs

    bsteubing committed Mar 6, 2019
    Configuration menu
    Copy the full SHA
    c5ab654 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4cc41f7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    774a8ca View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. Configuration menu
    Copy the full SHA
    8a683d2 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2019

  1. A few small improvements

    bsteubing committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    19c1252 View commit details
    Browse the repository at this point in the history
  2. Tried threading for Monte Carlo simulation... but pyparadiso crashing…

    … on Windows seems to prevent this unfortunately.
    bsteubing committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    13447ae View commit details
    Browse the repository at this point in the history
  3. Added medians to MC plot

    bsteubing committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    b35e60f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d017763 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    07d6711 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b7848d8 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2019

  1. Configuration menu
    Copy the full SHA
    856d5dc View commit details
    Browse the repository at this point in the history
  2. bumping version

    bsteubing committed Mar 9, 2019
    Configuration menu
    Copy the full SHA
    e7a76b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2019

  1. Configuration menu
    Copy the full SHA
    4bcc5e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3fdb6ab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fa59d4e View commit details
    Browse the repository at this point in the history
  4. LCA results now don't update anymore, but simply recalculate, which e…

    …liminated a couple of bugs and made the code less complex
    bsteubing committed Mar 10, 2019
    Configuration menu
    Copy the full SHA
    b475276 View commit details
    Browse the repository at this point in the history
  5. LCA results now don't update anymore, but simply recalculate, which e…

    …liminated a couple of bugs and made the code less complex
    bsteubing committed Mar 10, 2019
    Configuration menu
    Copy the full SHA
    b682b7d View commit details
    Browse the repository at this point in the history
  6. Update of welcome tab

    bsteubing committed Mar 10, 2019
    Configuration menu
    Copy the full SHA
    ff147bc View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. Configuration menu
    Copy the full SHA
    47358c3 View commit details
    Browse the repository at this point in the history
  2. Improved the welcome screen

    bsteubing committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    afb72fd View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Update of welcome tab

    bsteubing committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    f352b67 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5f09926 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    523f536 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8226fff View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2934545 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2019

  1. added networkx dependency

    bsteubing committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    524e422 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    40f52bc View commit details
    Browse the repository at this point in the history
  3. Updated image in readme.md

    bsteubing committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    890d824 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. Configuration menu
    Copy the full SHA
    2339630 View commit details
    Browse the repository at this point in the history
  2. new yaml file

    bsteubing committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    c391556 View commit details
    Browse the repository at this point in the history
  3. more yaml

    bsteubing committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    08a03de View commit details
    Browse the repository at this point in the history
  4. more yaml

    bsteubing committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    67353c6 View commit details
    Browse the repository at this point in the history
  5. more yaml

    bsteubing committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    284605f View commit details
    Browse the repository at this point in the history
  6. more yaml

    bsteubing committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    1b496a0 View commit details
    Browse the repository at this point in the history
  7. more yaml

    bsteubing committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    4b6f2f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2019

  1. more yaml

    bsteubing committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    6235f43 View commit details
    Browse the repository at this point in the history
  2. more yaml

    bsteubing committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    db599f2 View commit details
    Browse the repository at this point in the history
  3. more yaml - without testing

    bsteubing committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    13372f5 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. more yaml - without testing

    bsteubing committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    6074eca View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    f75559c View commit details
    Browse the repository at this point in the history
  2. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    848147f View commit details
    Browse the repository at this point in the history
  3. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    7e172d8 View commit details
    Browse the repository at this point in the history
  4. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    88b4608 View commit details
    Browse the repository at this point in the history
  5. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    b2907d5 View commit details
    Browse the repository at this point in the history
  6. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    6ea69df View commit details
    Browse the repository at this point in the history
  7. more yaml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    9ae1d3e View commit details
    Browse the repository at this point in the history
  8. conda_build.sh

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    42eb5bc View commit details
    Browse the repository at this point in the history
  9. conda_build.sh

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    ba4be43 View commit details
    Browse the repository at this point in the history
  10. conda_build.sh

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    23e4c9f View commit details
    Browse the repository at this point in the history
  11. travis

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    3bb9a5d View commit details
    Browse the repository at this point in the history
  12. travis

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    34cfc93 View commit details
    Browse the repository at this point in the history
  13. conda upload script

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    ab835b2 View commit details
    Browse the repository at this point in the history
  14. conda upload script

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    a7b507c View commit details
    Browse the repository at this point in the history
  15. webhook for travis

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    af7f33a View commit details
    Browse the repository at this point in the history
  16. webhook for travis

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    1af64fb View commit details
    Browse the repository at this point in the history
  17. webhook for travis

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    39b3088 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    95f8e31 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    2e2b9c3 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    98d9b0b View commit details
    Browse the repository at this point in the history
  21. working on travis.yml

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    1631483 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    65ece8a View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    9df04d6 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    7c90141 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    9884387 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    2ce5ff0 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    051af89 View commit details
    Browse the repository at this point in the history
  28. more yaml - without testing

    bsteubing committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    9823a08 View commit details
    Browse the repository at this point in the history