UI and term search web service adjustments

svn path=/; revision=335

diff --git a/Annotation/resources/config/application.properties b/Annotation/resources/config/application.properties
index 6d3eed3c06dc769c20eb0b8106ebdddf143093ad..1c3a73d4d350a4f8cedebfcb1f20888f62965725 100644 (file)
--- a/Annotation/resources/config/application.properties
+++ b/Annotation/resources/config/application.properties
@@ -27,11 +27,11 @@ ExperimentPanel.button.text.start=Start
 ExperimentPanel.button.text.finish=Finish
 
 # Web Service Configuration - NOTE: removed branch filter from term search per PJ's request
-POWebService.TermSearch.URL=http://palea.cgrb.oregonstate.edu/services/PO_web_service.php?request_type=term_search&search_value=<search_term>&inc_synonyms&max=20
+POWebService.TermSearch.URL=http://palea.cgrb.oregonstate.edu/services/PO_web_service.php?request_type=term_search&search_value=<search_term>&inc_synonyms&max=50
 POWebService.TermDetail.URL=http://palea.cgrb.oregonstate.edu/services/PO_web_service.php?request_type=term_detail&accession_id=<acc_id>
 
 # UBio Web Service Configuration
-UbioWebService.SpeciesTermSearch.URL=http://www.ubio.org/webservices/service.php?function=namebank_search&searchName=<search_term>&sci=1&vern=1&keyCode=9c5ed3537fb089c0467c42c4d70b3dee71cbf3cd
+UbioWebService.SpeciesTermSearch.URL=http://www.ubio.org/webservices/service.php?function=namebank_search&searchName=<search_term>&sci=1&vern=0&keyCode=9c5ed3537fb089c0467c42c4d70b3dee71cbf3cd
 
 #Curators names
 CuratorNamesList=Nikhil Lingutla,Justin Preece,Pankaj Jaiswal,Laurel Cooper,Rajani Raja
\ No newline at end of file

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 32c54361c72caa1e4b38640e0df4c8549129532e..a5700ce8d11c532856da531a856a45aa62599b90 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -218,7 +218,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                super.configureShell(shell);
                updateWindowTitle();
                loadIcons(shell);
-               shell.setSize(1165, 650);
+               shell.setSize(1280, 768);
                SwtUtils.center(shell);
        }
        

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index bff72ac2390f30df59998c177695de475e5065fb..964b486322f93b47aab1f548147ff7d48b634b12 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -247,7 +247,7 @@ public class SegmentationView extends Composite {
         */
        private void createToolTermLookupBar() {
                SwtUtils.addLabel(termLookupBar, getAction(Tool.SetLabel).getText());
-               comboLabel = SwtUtils.addCombo(termLookupBar, 150, SWT.SIMPLE);
+               comboLabel = SwtUtils.addCombo(termLookupBar, 250, SWT.SIMPLE);
                comboLabel.setToolTipText( getAction(Tool.SetLabel).getToolTipText());
                comboLabel.addKeyListener(new KeyAdapter() {
                        public void keyReleased(KeyEvent e) {
@@ -422,9 +422,9 @@ public class SegmentationView extends Composite {
        
        private void createTermDetailFields() {
                
-               // Combo box and label for curator
+               // Combo box and label for species
                SwtUtils.addLabelToComposite(termDetailComposite, "Species Name");
-               speciesCombo = SwtUtils.addComboToComposite(termDetailComposite, 150, SWT.READ_ONLY);
+               speciesCombo = SwtUtils.addComboToComposite(termDetailComposite, 250, SWT.READ_ONLY);
                speciesCombo.setToolTipText( getAction(Tool.SetPainter).getToolTipText());
                
                searchSpecies = SwtUtils.addButtonToComposite(termDetailComposite, 55, "Search");
@@ -437,7 +437,7 @@ public class SegmentationView extends Composite {
                
                // Combo box and label for curator
                SwtUtils.addLabelToComposite(termDetailComposite, getAction(Tool.SetCurator).getText());
-               curatorCombo = SwtUtils.addComboToComposite(termDetailComposite, 150, SWT.READ_ONLY);
+               curatorCombo = SwtUtils.addComboToComposite(termDetailComposite, 250, SWT.READ_ONLY);
                curatorCombo.setToolTipText( getAction(Tool.SetPainter).getToolTipText());
                curatorCombo.addSelectionListener(new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
@@ -496,7 +496,7 @@ public class SegmentationView extends Composite {
                gd.grabExcessVerticalSpace = true;
                gd.horizontalAlignment = SWT.FILL;
                gd.verticalAlignment = SWT.FILL;
-               gd.widthHint = 900;
+               gd.widthHint = 880;
                view.setLayoutData(gd);
                
                // Layout term lookup toolbar
@@ -517,15 +517,25 @@ public class SegmentationView extends Composite {
                
                // Inner composite properties
                gd = new GridData();
-               gd.verticalAlignment = GridData.BEGINNING;
-               gd.horizontalAlignment = SWT.FILL;
                gd.grabExcessHorizontalSpace = true;
                gd.grabExcessVerticalSpace = true;
+               gd.horizontalAlignment = SWT.FILL;
+               //gd.verticalAlignment = GridData.BEGINNING;
+               gd.verticalAlignment = SWT.FILL;
+               gd.heightHint = 200;
+               gd.widthHint = 70;
                termDetailComposite.setLayoutData(gd);
                
                // Layout term detail table                             
-               gd = new GridData(SWT.FILL,SWT.FILL,true,true);
+               gd = new GridData();
                gd.horizontalSpan = 2;
+               gd.grabExcessHorizontalSpace = true;
+               gd.grabExcessVerticalSpace = true;
+               gd.horizontalAlignment = SWT.FILL;
+               gd.verticalAlignment = GridData.BEGINNING;
+               //gd.verticalAlignment = SWT.FILL;
+               gd.heightHint = 200;
+               gd.widthHint = 70;
                termDetailTable.setLayoutData(gd);
 
                // Layout species dropdown