Begin edits on adding multi-ontology feature.

svn path=/; revision=496

diff --git a/Annotation/resources/config/view.properties b/Annotation/resources/config/view.properties
index e3a9cca3f669f8c8182b8ee3b0b01027519efa75..bb15570fe409d8464782b316dab173b80d4c8df5 100644 (file)
--- a/Annotation/resources/config/view.properties
+++ b/Annotation/resources/config/view.properties
@@ -49,9 +49,14 @@ SegmentationView.Action.SetPainter.image=
 SegmentationView.Action.SegmenterOptions.text=Configure Segmenter@Ctrl+Shift+C
 SegmentationView.Action.SegmenterOptions.tooltip=Configure the segmenter
 SegmentationView.Action.SegmenterOptions.image=file:resources/icons/preferences.png
-SegmentationView.Action.SetLabel.text=Annotate:
+
+SegmentationView.Action.SetOntologyLabel.text=Select ontology:
+SegmentationView.Action.SetOntologyLabel.tooltip==Select an ontology to search for terms
+
+SegmentationView.Action.SetLabel.text=Select term:
 SegmentationView.Action.SetLabel.tooltip=Annotate the segmented piece
 SegmentationView.Action.SetLabel.image=
+
 SegmentationView.Action.SetSpecies.text=Species Name:
 SegmentationView.Action.SetSpecies.tooltip=Type in your species of interest and click the 'Search' button
 SegmentationView.Action.SetSpecies.image=

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 20778abe824b655b0db492b13ac02f6beeb5a36b..d989874ae95872926cd46b9cce881514dd05b146 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -287,6 +287,14 @@ public class SegmentationView extends Composite {
         * Third tool bar for holding the Annotate Combo box. 
         */
        private void createToolTermLookupComposite() {
+               /*SwtUtils.addLabelToComposite(termLookupComposite, getAction(Tool.SetOntologyLabel).getText());
+               comboLabel = SwtUtils.addComboToComposite(termLookupComposite, 250, SWT.SIMPLE);
+               comboLabel.setToolTipText( getAction(Tool.SetOntologyLabel).getToolTipText());
+               comboLabel.addKeyListener(new KeyAdapter() {
+                       public void keyReleased(KeyEvent e) {
+                               dropdownLabelsFromJSON(e,comboLabel);
+                       }
+               });*/
                SwtUtils.addLabelToComposite(termLookupComposite, getAction(Tool.SetLabel).getText());
                comboLabel = SwtUtils.addComboToComposite(termLookupComposite, 250, SWT.SIMPLE);
                comboLabel.setToolTipText( getAction(Tool.SetLabel).getToolTipText());
@@ -300,7 +308,7 @@ public class SegmentationView extends Composite {
                                termDetailLookup(parseAccessionIdFromComboLabel(comboLabel));                                           
                        }
                });
-               assign = SwtUtils.addButtonToComposite(termLookupComposite, 55, "Assign");
+               assign = SwtUtils.addButtonToComposite(termLookupComposite, 75, "Assign");
                assign.addSelectionListener(new SelectionAdapter() {
         public void widgetSelected(SelectionEvent arg0) {
                if(view.getContext().isEnabled())
@@ -526,7 +534,7 @@ public class SegmentationView extends Composite {
                speciesCombo = SwtUtils.addComboToComposite(termDetailComposite, 250, SWT.READ_ONLY);
                speciesCombo.setToolTipText( getAction(Tool.SetSpecies).getToolTipText());
                
-               searchSpecies = SwtUtils.addButtonToComposite(termDetailComposite, 55, "Search");
+               searchSpecies = SwtUtils.addButtonToComposite(termDetailComposite, 75, "Search");
                Label dummyLabel = SwtUtils.spacer(termDetailComposite);
                searchSpecies.addSelectionListener(new SelectionAdapter() {
         public void widgetSelected(SelectionEvent e) {