From 15b63fd4dc1b1a7617c897bf02857ead77993761 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Mon, 12 Sep 2016 11:31:29 -0700 Subject: [PATCH 1/2] Story 1960: Rework for dynamic sizing and auto navigating to selected row. --- .../cadc.plugin.footprint-viewer.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js b/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js index 0772406..58bfa15 100644 --- a/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js +++ b/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js @@ -50,6 +50,7 @@ decFieldID: "dec", fovFieldID: "fov", colour: "orange", + navigateToSelected: true, highlightColour: "yellow", /** * Perform further calculations on the FOV before setting it. Useful @@ -378,7 +379,6 @@ if ((raValue != null) && ($.trim(raValue) != "") && (decValue != null) && ($.trim(decValue) != "")) { - _self.aladin.gotoRaDec(raValue, decValue); var selectedFootprint = sanitizeFootprint(_dataRow[_self.footprintFieldID]); @@ -387,15 +387,20 @@ _self.currentFootprint.addFootprints( _self.aladin.createFootprintsFromSTCS(selectedFootprint)); - var fovValue = _dataRow[_self.fovFieldID]; - if (fovValue != null) + if (inputs.navigateToSelected === true) { - if (inputs.afterFOVCalculation != null) + _self.aladin.gotoRaDec(raValue, decValue); + + var fovValue = _dataRow[_self.fovFieldID]; + if (fovValue != null) { - fovValue = inputs.afterFOVCalculation(fovValue); - } + if (inputs.afterFOVCalculation != null) + { + fovValue = inputs.afterFOVCalculation(fovValue); + } - _self.aladin.setFoV(fovValue); + _self.aladin.setFoV(fovValue); + } } } else From eeac7cff0f435b26d24244389c5a187f322766b9 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Mon, 12 Sep 2016 11:42:05 -0700 Subject: [PATCH 2/2] Story 1960: Rework for dynamic sizing and auto navigating to selected row. --- .../www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js b/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js index 58bfa15..f370580 100644 --- a/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js +++ b/cadc-votv/src/www/cadcVOTV/javascript/cadc.plugin.footprint-viewer.js @@ -44,6 +44,7 @@ $toggleSelector.data("open", $toggleSelector.html()); $toggleSelector.html($toggleSelector.data("close")); }, + aladin_options: {}, // Specific options for AladinLite. renderedRowsOnly: true, footprintFieldID: "footprint", raFieldID: "ra", @@ -148,7 +149,7 @@ _self.viewer = _viewer; _self.grid = _viewer.getGrid(); - _self.aladin = A.aladin(inputs.targetSelector); + _self.aladin = A.aladin(inputs.targetSelector, inputs.aladin_options); _self.aladinOverlay = A.graphicOverlay({color: inputs.colour, lineWidth: 3}); _self.DEC = _defaults.coords.slice(0);