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

WIP: Refactor PV slicing tool #1663

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ v1.3.0 (unreleased)
* Remove bundled version of pvextractor and include it as a proper
dependency. [#2252]

* Remove ``StandaloneImageViewer`` class. [#1663]

v1.2.4 (2022-01-27)
-------------------

Expand Down
3 changes: 3 additions & 0 deletions glue/app/qt/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,9 @@ def _artihmetic_dialog(self, *event):
dialog = ArithmeticEditorWidget(self.data_collection)
dialog.exec_()

def selected_layers(self):
return self._layer_widget.selected_layers()

def _on_data_collection_change(self, *event):
self._button_save_data.setEnabled(len(self.data_collection) > 0)
self._button_link_data.setEnabled(len(self.data_collection) > 1)
Expand Down
2 changes: 1 addition & 1 deletion glue/core/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ def compute_histogram(self, cids, weights=None, range=None, bins=None, log=None,
raise NotImplementedError()

def compute_fixed_resolution_buffer(self, bounds, target_data=None, target_cid=None,
subset_state=None, broadcast=True):
subset_state=None, broadcast=True, cache_id=None):
"""
Get a fixed-resolution buffer.

Expand Down
2 changes: 1 addition & 1 deletion glue/icons/convert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
for input in *.svg
do
output=${input/svg/png}
inkscape --without-gui --export-png=$PWD/$output --export-width=125 --export-height=125 $PWD/$input
inkscape --without-gui --export-file=$PWD/$output --export-type=png --export-width=125 --export-height=125 $PWD/$input
done

convert -flop playback_forw.png playback_back.png
Expand Down
Binary file added glue/icons/glue_path.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 101 additions & 0 deletions glue/icons/glue_path.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified glue/icons/glue_slice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 41 additions & 20 deletions glue/icons/glue_slice.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading