ESASky final changes - added to view ribbon. Also WIP on "view from location" bug

This commit is contained in:
Ron Gilchrist 2019-03-11 12:37:44 -07:00
Родитель 0bbb203735
Коммит 6c283aef1e
6 изменённых файлов: 22 добавлений и 3 удалений

Просмотреть файл

@ -802,6 +802,12 @@
<span data-localize="Galactic Plane Mode">Galactic Plane Mode</span>
</label>
</div>
<div style="margin:20px 0 20px 0">
<a bs-tooltip="'See current view in ESASky'"
href="http://sky.esa.int/?action=goto&target={{viewport.RA*15}}%20{{viewport.Dec}}&hips=DSS2%20color&fov={{viewport.Fov}}&cooframe=J2000&sci=true" target="esasky">
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAAUCAYAAADY6P5TAAAEXElEQVR42tWXa5COZRjHXyuyVmtp16FJGqdKIdTqsIOd0WIwzGiG0Ug25ZDeJFkqlN1IrXE+LKtCOokVOui0ofLFoTKT6kNjmkpiaplGMentf5nfY65uz07TN+8983sP93M/93Odr/tJJGJGKpW6VPQQI8Wj4lXxmBgsZoubRf1EOg4J3k2MEG+LReJZ8Y5IMr9TLBX3ifx0UqyuKMVT96PIC/x/TTwlhoqPxFsoO1VUiKbpoOA9KDJfDBefil1iGGFpYVou5ogFYqXYJsaJZhe7cqPxWpnYKhaixBviSVGMMlvEbaKNuEk0xIMfin617F1HdBFziYpdGDHfoiZmfStksWftFuuQLzdmbRMxRrwk9ooDYhPyNooWZRCKZXjxEzYuJs+qxXtioLjG1tdSlCy8s2KumbDHUxeOGgv7YG178X0qfuwTbd3apqRLbWPrOSX1USimix3idfE4obherCb3jAK3uSl6u3kysGb3QOA+7oFH2b9SfOXmRzgjfczcCTGRaj1Z/BIJ7fZOMvcX3h6EN6O9z4ohCS48wSIrHrNQOBLGQnWs2/gWMZMHmAUfFJcQCcPcukzCMRrdA2NEnvpcZIs8cZi5isBQy6NN3Fw1Uz+J5m5+gPiTa1MTxPgeUwJhrYhsFxOooC+Ldm6Du/BoBRYujHqi5YnlHL9vIAxTGK4BudhZXCfmce0Ue1wmDjqDTEfYTqKlyDmfVxemRw65a/JUuT3mJ/CG5c+bZmWKQi7WX0VxaOk2vJeWkg11As9k8btI/MGDZogHxO8oXYNi0SjmnoeCPDotfhPfiRdFi0A5a1Xvi0OE8ang/iW2aDFV08Kxq6gnehL7ZXiqq9vU2kUHPHStaC2uFFeJjqIx6+5wCpoBR4lvEeYQuWJ8EynIfYM5ZPxALp51Ah93EbImmN9N3ZjkIuecgubSjZTuKnJyLEVnCg9r4QSI2shQvGkhvQwDrXXrOrkHVTsPR+RRNTuEBwWMfAWtyFJiv1PGnnur+/8lYd+QezuHCvancprgz4lXcHuSPmieXBH0NbPSB7QX65PTyEufq1niMydIr0CJDe7acKLn7/PF4d9rB7m143leNCpjwva0V/BqPDgXb5lCS6ieM/BMudsggyJRSqVdQHHKCxu3Nf8gjKyglVCxo/G1nYQoFF8w96uVeA4S17v2kcLjRe7/j7SH3hj7mLu2NIFgd+PBmVTQSg7UG1HEPLXWQiOmil3+H6ekcbU0ehs/B+2jgLyLG2fEM27tu87jqUDhM/yu8ufQNdw0jZNLkm/zzmbybDTto8n/OAaax2/k7HqUBx+m97aNWd+FwnfEKWZt7E5rCW5dDict66MnKWBlHEIe5i2oxG+8kHc/ezV6xCm5g+/lhPAEik9fQtWE75EObxOZxHAV2m+hmOwkL+dwqH6aojCLIjTJWzYdFB1JiJTgzTF8LyIkNpD01lby0vWtvhnNvgiFLQef53eSSpYd92ZxsY1/AFA79CaOvwfwAAAAAElFTkSuQmCC"/>
</a>
</div>
</fieldset>
</div>
<div ng-switch-when="Settings" ng-controller="SettingsController">

3
app.js
Просмотреть файл

@ -43,10 +43,9 @@ var wwt = {
wwt.smallVP = ($(window).height() < 600 || $(window).width() < 700);
wwt.definitelyMobile = wwt.smallVP && ($(window).height() < 900 && $(window).width() < 600);
},
smallVP:false
smallVP:false
};
$(window).on('load', function() {
wwt.resize();
//load search data after everything else

Просмотреть файл

@ -458,6 +458,9 @@ wwt.controllers.controller('MainController',
if (viewport.isDirty || viewport.init) {
$rootScope.viewport = viewport;
$scope.coords = wwtlib.Coordinates.fromRaDec(viewport.RA, viewport.Dec);
window.coords = $scope.coords;
var lng = $scope.coords.get_lng();
lng = 180 - ((lng) / 24.0 * 360) - 180;
$scope.formatted = {
RA: util.formatHms(viewport.RA, true),
Dec: util.formatHms(viewport.Dec, false, true),

Просмотреть файл

@ -53,6 +53,7 @@ wwt.controllers.controller('DataVizController', ['$scope', '$rootScope', 'Util',
return {label: c, type: i};
});
l.computeDateDomainRange(0,-1);
console.log('compute');
var none = {label: 'None', index: -1};
$scope.columns.splice(0, 0, none);
l.psType = l.get_pointScaleType();

Просмотреть файл

@ -65,7 +65,7 @@
</ul>
</li>
<li>
<a href="http://sky.esa.int/?action=goto&target={{scopePlace.get_RA()*15}}%20{{scopePlace.get_dec()}}&hips=DSS2%20color&fov={{viewport.Fov}}&cooframe=J2000&sci=true" target="esa"><span localize="View in ESA Sky"></span></a>
<a href="http://sky.esa.int/?action=goto&target={{scopePlace.get_RA()*15}}%20{{scopePlace.get_dec()}}&hips=DSS2%20color&fov={{viewport.Fov}}&cooframe=J2000&sci=true" target="esasky"><span localize="View in ESASky"></span></a>
</li>
<li role="presentation" class="divider"></li>
<li><a ng-click="setBackgroundImage(scopePlace)" href="javascript:void(0)" localize="Set as Background Imagery"></a></li>

Просмотреть файл

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>