Skip to content

Commit

Permalink
Merge pull request #924 from linea-it/change_link_to_ned
Browse files Browse the repository at this point in the history 
Changed link to NED in Explorer
  • Loading branch information
linea-relmanager authored Dec 1, 2017
2 parents eb61021 + aee7d1c commit 02c09b8
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 58 deletions.
2 changes: 1 addition & 1 deletion frontend/build/production/Explorer/app.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/build/production/Explorer/app.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"remote":true,"path":"https://d3js.org/d3.v4.min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171130170710","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"1f657c7a60a9918cad2babe434b1079312b1e385","profile":"","resources":{"path":"resources"}}
{"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"remote":true,"path":"https://d3js.org/d3.v4.min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171201165551","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"a51f038d09a13c585a123d7a9c8e0406ddd6e6bc","profile":"","resources":{"path":"resources"}}
2 changes: 1 addition & 1 deletion frontend/build/production/Explorer/app.jsonp
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Ext.Microloader.setManifest({"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"remote":true,"path":"https://d3js.org/d3.v4.min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171130170710","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"1f657c7a60a9918cad2babe434b1079312b1e385","profile":"","resources":{"path":"resources"}});
Ext.Microloader.setManifest({"packages":{"aladin":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux","common"],"version":"1.0.0"},"charts":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"classic":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core"],"version":"6.0.1.250"},"cmd":{"current":"6.5.1.240","version":"6.5.1.240"},"common":{"css":true,"included":true,"required":true,"requires":["ext","core","classic","ux"],"version":"1.0.0"},"core":{"css":true,"included":true,"required":true,"requires":["ext","classic"],"version":"6.0.1.250"},"ext":{"css":true,"included":true,"license":"gpl","namespace":"Ext","required":true,"requires":[],"version":"6.0.1.250"},"font-awesome":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"theme":"theme-neptune","version":"6.0.1.250"},"theme-base":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"theme-crisp":{"css":true,"extend":"theme-neptune","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral","theme-neptune"],"version":"6.0.1.250"},"theme-neptune":{"css":true,"extend":"theme-neutral","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base","theme-neutral"],"version":"6.0.1.250"},"theme-neutral":{"css":true,"extend":"theme-base","included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic","theme-base"],"version":"6.0.1.250"},"ux":{"css":true,"included":true,"namespace":"Ext","required":true,"requires":["ext","core","classic"],"version":"6.0.1.250"},"visiomatic":{"css":true,"included":true,"namespace":"visiomatic","required":true,"requires":["ext","core","classic"],"version":"1.0.0"}},"js":[{"remote":true,"path":"https://d3js.org/d3.v4.min.js"},{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jquery-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum-min.js"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic-src.js"},{"path":"packages/local/aladin/src/aladin/aladin-min.js"},{"path":"app.js"}],"css":[{"path":"packages/local/visiomatic/src/Leaflet/dist/leaflet.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/visiomatic.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/spectrum.css"},{"path":"packages/local/visiomatic/src/visiomatic/dist/jqplot.css"},{"path":"packages/local/aladin/src/aladin/aladin-min.css"},{"exclude":["fashion"],"path":"resources/Explorer-all.css"}],"cache":{"enable":true,"deltas":true},"fashion":{"inliner":{"enable":false}},"name":"Explorer","version":"1.0.0.0","framework":"ext","toolkit":"classic","theme":"theme-crisp","loader":{"cache":"20171201165551","cacheParam":"_dc"},"id":"1739eae9-ca05-49a0-800a-3c2bd487fa19","hash":"a51f038d09a13c585a123d7a9c8e0406ddd6e6bc","profile":"","resources":{"path":"resources"}});
8 changes: 6 additions & 2 deletions frontend/explorer/app/view/coadd/CoaddController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,14 @@ Ext.define('Explorer.view.coadd.CoaddController', {
var me = this,
vm = me.getViewModel(),
object = vm.get('object_data'),
ra = parseFloat(object._meta_ra).toFixed(4),
dec = parseFloat(object._meta_dec).toFixed(4),
radius = .1,
url; // Arcmin

url = Ext.String.format(
"http://simbad.u-strasbg.fr/simbad/sim-coo?Coord={0}+{1}&CooFrame=FK5&CooEpoch=2000&Radius={2}&Radius.unit=arcmin&submit=submit+query",
object._meta_ra, object._meta_dec, radius)
ra, dec, radius)

window.open(url, '_blank')

Expand All @@ -413,11 +415,13 @@ Ext.define('Explorer.view.coadd.CoaddController', {
vm = me.getViewModel(),
object = vm.get('object_data'),
radius = .1,
ra = parseFloat(object._meta_ra).toFixed(4),
dec = parseFloat(object._meta_dec).toFixed(4),
url; // Arcmin

url = Ext.String.format(
"https://ned.ipac.caltech.edu/cgi-bin/objsearch?search_type=Near+Position+Search&in_csys=Equatorial&in_equinox=J2000.0&lon={0}d&lat={1}d&radius={2}",
object._meta_ra, object._meta_dec, radius)
ra, dec, radius)

window.open(url, '_blank')
},
Expand Down
31 changes: 27 additions & 4 deletions frontend/explorer/app/view/coadd/Visiomatic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,25 @@ Ext.define('Explorer.view.coadd.Visiomatic', {

xtype: 'coadd-visiomatic',

// controller: 'coadd',
enableTools: true,

// viewModel: 'coadd',
enableLink: false,

enableTools: false,
enableShift: false,

showCrosshair: true,

mapOptions: {
fullscreenControl: true,
zoom: 1,
enableLineaOverlay: false
},

initComponent: function () {
var me = this;

Ext.apply(this, {
tbar: [
auxTools:[
{
xtype: 'combobox',
reference: 'cmbCurrentDataset',
Expand Down Expand Up @@ -47,6 +55,15 @@ Ext.define('Explorer.view.coadd.Visiomatic', {
bind: {
value: '{currentDataset.tli_tilename}'
}
},
{
xtype: 'button',
iconCls: 'x-fa fa-crosshairs',
tooltip: 'Show/Hide Crosshair',
enableToggle: true,
pressed: true,
scope: this,
toggleHandler: 'onShowHideCrosshair'
}
]
});
Expand All @@ -57,6 +74,12 @@ Ext.define('Explorer.view.coadd.Visiomatic', {
changeDataset: function (combo) {
this.fireEvent('changedataset', combo.getSelectedRecord(), this);

},

onShowHideCrosshair: function (btn, state) {
var me = this;

me.setShowCrosshair(state);
}

});
16 changes: 10 additions & 6 deletions frontend/explorer/app/view/system/SystemController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,14 @@ Ext.define('Explorer.view.system.SystemController', {
var me = this,
vm = me.getViewModel(),
object = vm.get('object_data'),
radius = 2,
url; // Arcmin
ra = parseFloat(me.parseRA(object._meta_ra)).toFixed(4),
dec = parseFloat(object._meta_dec).toFixed(4),
radius = 2, // Arcmin
url;

url = Ext.String.format(
"http://simbad.u-strasbg.fr/simbad/sim-coo?Coord={0}+{1}&CooFrame=FK5&CooEpoch=2000&Radius={2}&Radius.unit=arcmin&submit=submit+query",
me.parseRA(object._meta_ra), object._meta_dec, radius)
ra, dec, radius)

window.open(url, '_blank')

Expand All @@ -565,12 +567,14 @@ Ext.define('Explorer.view.system.SystemController', {
var me = this,
vm = me.getViewModel(),
object = vm.get('object_data'),
radius = 2,
url; // Arcmin
ra = parseFloat(me.parseRA(object._meta_ra)).toFixed(2),
dec = parseFloat(object._meta_dec).toFixed(2),
radius = 2, // Arcmin
url;

url = Ext.String.format(
"https://ned.ipac.caltech.edu/cgi-bin/objsearch?search_type=Near+Position+Search&in_csys=Equatorial&in_equinox=J2000.0&lon={0}d&lat={1}d&radius={2}",
me.parseRA(object._meta_ra), object._meta_dec, radius)
ra, dec, radius)

window.open(url, '_blank')
},
Expand Down
49 changes: 6 additions & 43 deletions frontend/explorer/app/view/system/Visiomatic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Ext.define('Explorer.view.system.Visiomatic', {

showCrosshair: true,

mapOptions: {
fullscreenControl: true,
zoom: 1,
enableLineaOverlay: false
},

initComponent: function () {
var me = this;

Expand Down Expand Up @@ -60,49 +66,6 @@ Ext.define('Explorer.view.system.Visiomatic', {
toggleHandler: 'onShowHideCrosshair'
}
]

// tbar: [
// {
// xtype: 'combobox',
// reference: 'cmbCurrentDataset',
// publishes: 'id',
// width: 250,
// displayField: 'release_tag',
// bind: {
// store: '{datasets}',
// disabled: '{!coadd.COADD_OBJECT_ID}',
// selection: '{!currentDataset}'
// },
// queryMode: 'local',
// listConfig: {
// itemTpl: [
// '<div data-qtip="{release_display_name} - {tag_display_name}">{release_display_name} - {tag_display_name}</div>'
// ]
// },
// listeners: {
// scope: this,
// change: 'changeDataset'
// }
// },
// {
// xtype: 'textfield',
// width: 120,
// readOnly: true,
// bind: {
// value: '{currentDataset.tli_tilename}'
// }
// },
// {
// xtype: 'button',
// iconCls: 'x-fa fa-crosshairs',
// tooltip: 'Show/Hide Crosshair',
// enableToggle: true,
// pressed: true,
// scope: this,
// toggleHandler: 'onShowHideCrosshair'
// }
// ]

});

me.callParent(arguments);
Expand Down

0 comments on commit 02c09b8

Please sign in to comment.