Rearranging a bit the DQ GUI.

Author: pacesm

app/scripts/controller/OrthoQualityController.js

@@ -60,13 +60,12 @@
                     this.listenTo(Communicator.mediator, "selection:changed", this.onSelectionChange);
                     this.listenTo(Communicator.mediator, "selection:bbox:changed", this.onBBoxChange);
                     this.listenTo(Communicator.mediator, "dialog:open:orthoQuality", this.onOrthoQualityOpen);
-                    this.listenTo(Communicator.mediator, "dialog:open:orthoQualitySelection", this.onOthroQualitySelectionOpen);
+                    this.listenTo(Communicator.mediator, "dialog:open:orthoQualitySelection", this.onOrthoQualitySelectionOpen);
                     this.listenTo(Communicator.mediator, "dialog:close:orthoQualitySelection", this.onOrthoQualitySelectionClose);
                     this.listenTo(Communicator.mediator, "dialog:toggle:orthoQualitySelection", this.onOrthoQualitySelectionToggle);
 
                     // instantiate component's view
                     this.view = new qs.OrthoQualitySelectionView({model:this.model});
-                    console.log(" ** this.view="+this.view);
                 },
 
                 // event handlers ...
@@ -123,7 +122,6 @@
 
                 onOrthoQualityOpen: function (toOpen)
                 {
-                    console.log("onOrthoQualityOpen"+toOpen);
                     if(toOpen){
                         App.viewContent.show(new v.OrthoQualityView({model:this.model}));
                     }
@@ -143,12 +141,11 @@
                     }
                 },
 
-                onOrthoQualitySelectionToggle: function (event)
-                {
-                    if (this.isOrthoQualitySelectionClosed() ) {  
-                        App.viewContent.show(this.view);
+                onOrthoQualitySelectionToggle: function (event_) {
+                    if ( this.isOrthoQualitySelectionClosed() ) {
+                        this.onOrthoQualitySelectionOpen(event_);
                     } else {
-                        this.view.close();
+                        this.onOrthoQualitySelectionClose(event_);
                     }
                 }
 

app/scripts/views/OrthoQualityView.js

@@ -28,9 +28,6 @@
   function( Backbone, Communicator, globals, m, OrthoQualityTmpl,
    SelectCoverageListItemTmpl, CoverageInfoTmpl,CoverageDownloadPostTmpl) {
 
-    //var qtmpUrl = "http://dream.eox.at/q1/pq.html";
-    //var qtmpUrl = "http://127.0.0.1/qss/index.html";
-
     function getQUrl(key) {
         var q_options = globals.objects.get('orthoQualityConfig');
         return q_options[key];
@@ -52,8 +49,8 @@
       events: {
         //"click #btn-select-all-coverages": "onSelectAllCoveragesClicked",
         //"click #btn-invert-coverage-selection": "onInvertCoverageSelectionClicked",
-        "click #btn-refresh-list": "onRefreshClick",
-        "click #btn-modify-selection": "onModifyClick",
+        "click #btn-refresh-dq-list": "onRefreshClick",
+        "click #btn-modify-dq-selection": "onModifyClick",
         //"click #btn-start-download": "onStartDownloadClicked"
       },
 
@@ -118,15 +115,15 @@
       },
 
       onRefreshClick: function () {
-	  	Communicator.mediator.trigger("dialog:open:orthoQuality", false);
-	    Communicator.mediator.trigger("dialog:open:orthoQualitySelection", true);
+        Communicator.mediator.trigger("dialog:open:orthoQuality", false);
+        Communicator.mediator.trigger("dialog:open:orthoQuality", true);
       },
 
       onModifyClick: function () {
-		Communicator.mediator.trigger("dialog:open:orthoQuality", false);
+        Communicator.mediator.trigger("dialog:open:orthoQuality", false);
         this.close();
-		Communicator.mediator.trigger("dialog:open:orthoQualitySelection");
-   	  },
+        Communicator.mediator.trigger("dialog:open:orthoQualitySelection");
+      },
 
       onSelectAllCoveragesClicked: function() {
         // select all coverages

app/templates/OrthoQuality.hbs

@@ -18,13 +18,13 @@
   <p>
     resolution:
     <select class="input-small" id="select-resolution" title="Resolution for the Orthrectify process - should match that of the raw input image.">
-      <option value="20">20</option>
-      <option value="10">10</option>
-      <option value="5" selected>5</option>
-      <option value="2.5">2.5</option>
+      <option value="20">20.0&nbsp;m</option>
+      <option value="10">10.0&nbsp;m</option>
+      <option value="5" selected>&nbsp;5.0&nbsp;m</option>
+      <option value="2.5">&nbsp;2.5&nbsp;m</option>
     </select>
     &nbsp;&nbsp;projection:
-    <select class="input-medium" id="select-output-crs" title="Select the CRS for orthorectification.">
+    <select class="input-medium" id="select-output-crs" title="Select the CRS of the ortho-rectified product.">
       <option value="epsg:4326">Geog. Lat/Lon / WGS84 (EPSG:4326)</option>
       <option value="epsg:3857">Spherical Mercator(EPSG:3857)</option>
       <option value="epsg:3034">ETRS-LCC (EPSG:3034)</option>
@@ -159,8 +159,11 @@
       <option value="epsg:32760">UTM 60S / WGS84 (EPSG:32760)</option>
     </select>
     &nbsp;&nbsp;
-  <button class="btn btn-default" id="btn-q-improve"><i class="icon-white icon-download-alt" title="Orthorectification."></i>Improve Quality</button>
-  <button class="btn btn-default" id="btn-q-assess"><i class="icon-white icon-download-alt"></i>Assess Quality</button>
-    <!-- button type="button" class="btn btn-default" id="btn-modify-selection" title="Return to the time and area specification."><i class="fa fa-fw fa-edit"></i> Modify</button -->
+  </p>
+  <p>
+    <button class="btn btn-primary" id="btn-q-improve" style="float:right;margin-left:1ex;"><i class="icon-white icon-download-alt" title="Orthorectification."></i>Improve Quality</button>
+    <button class="btn btn-primary" id="btn-q-assess" style="float:right;"><i class="icon-white icon-download-alt"></i>Assess Quality</button>
+    <button type="button" class="btn btn-default" id="btn-refresh-dq-list" title="Refresh the list of the matching datasets (e.g., after modified layer selection)."><i class="fa fa-fw fa-refresh"></i> Refresh</button>
+    <button type="button" class="btn btn-default" id="btn-modify-dq-selection" title="Return to the time and area specification."><i class="fa fa-fw fa-edit"></i> Modify</button>
   </p>
 </div>