diff --git a/Makefile b/Makefile index 4c18626..4fbf9e7 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ TEMP_PATH:=$(shell echo ~/work/lipase/tmp) TESTS_OUTPUT_DATA_PATH:=$(TEMP_PATH) LIB_SRC_FILES=$(shell find ./src/lipase -name "*.py") PLUGINS_SRC_FILES=$(shell find ./src/ij-plugins -name "*.py") -LIPASE_VERSION=1.07 +LIPASE_VERSION=1.08 BUILD_ROOT_PATH:=$(TEMP_PATH)/build PACKAGE_FILE_PATH=$(BUILD_ROOT_PATH)/lipase-$(LIPASE_VERSION).zip diff --git a/src/ij-plugins/Ipr/Lipase/Display_Sequence.py b/src/ij-plugins/Ipr/Lipase/Display_Sequence.py index 742e073..3107a3a 100644 --- a/src/ij-plugins/Ipr/Lipase/Display_Sequence.py +++ b/src/ij-plugins/Ipr/Lipase/Display_Sequence.py @@ -48,6 +48,11 @@ from java.awt.event import ItemListener class SequenceChoiceListener(ItemListener): def __init__(self, channel_choice, catalog): + """ + Args: + channel_choice (java.awt.Choice): The widget used for choosing the channel + catalog (Catalog): The catalog of sequences + """ ItemListener.__init__(self) self.channel_choice = channel_choice self.catalog = catalog @@ -61,10 +66,9 @@ class SequenceChoiceListener(ItemListener): logger.debug("SequenceChoiceListener : type(event.item) : %s" % str(type(event.item))) selected_sequence_id = event.item selected_sequence = self.catalog.sequences[selected_sequence_id] - channel_ids = selected_sequence.get_channel_names() + channel_ids = ['all'] + selected_sequence.get_channel_names() self.channel_choice.removeAll() - self.channel_choice.add('all') for channel_id in channel_ids: self.channel_choice.add(channel_id) @@ -77,8 +81,8 @@ def ask_for_sequence(catalog): assert len(sequence_ids) > 0 default_sequence_id = sequence_ids[0] gd.addChoice('sequence', sequence_ids, default_sequence_id) - channel_ids = catalog.sequences[default_sequence_id].get_channel_names() - gd.addChoice('channel', channel_ids, channel_ids[0]) + channel_ids = ['all'] + catalog.sequences[default_sequence_id].get_channel_names() + gd.addChoice('channel', channel_ids, 'all') choices = gd.getChoices() logger.debug("choices = %s" % choices) sequence_choice = choices[0]