Final time scrubber fixes plus issues with place sharing, search data, and misc fixes uncovered during this code pass.
This commit is contained in:
Ron Gilchrist
Родитель
c85aadd429
Коммит
76bbd1d8c0
162
app.js
162
app.js
|
|
@ -46,6 +46,167 @@ var wwt = {
|
|||
smallVP:false
|
||||
};
|
||||
|
||||
function runPYTimeSeries() {
|
||||
return
|
||||
setTimeout(function () {
|
||||
let pywwt = wwt.wc;
|
||||
// PYTHON: wwt.background = wwt.imagery.visible.tycho
|
||||
// PYTHON: wwt.foreground_opacity = 0
|
||||
/*wwt.setBackgroundImageByName("Tycho (Synthetic, Optical)");
|
||||
wwt.setForegroundOpacity(80);
|
||||
wwt.setForegroundOpacity(0);*/
|
||||
|
||||
|
||||
// PYTHON: wwt.set_view('solar system')
|
||||
// We need to set both the backround and foreground layers
|
||||
// otherwise when changing to planet view, there are weird
|
||||
// artifacts due to the fact one of the layers is the sky.
|
||||
//pywwt.setBackgroundImageByName("3D Solar System View");
|
||||
pywwt.setBackgroundImageByName("3D Solar System View");
|
||||
//pywwt.gotoRaDecZoom(0, 0, 50, false);
|
||||
|
||||
|
||||
// PYTHON: wwt.solar_system.track_object('Earth')
|
||||
var object = "Earth";
|
||||
var classification = wwtlib.Classification.solarSystem;
|
||||
var constellation = wwtlib.Place._constellation;
|
||||
var imageType = wwtlib.ImageSetType.sky;
|
||||
var scale = pywwt.settings.get_solarSystemScale();
|
||||
var zoom;
|
||||
|
||||
var place = wwtlib.Place.create(object, 0, 0, classification, constellation, imageType, zoom);
|
||||
place.set_target(wwtlib.Planets.getPlanetIDFromName(object));
|
||||
wwtlib.WWTControl.singleton.gotoTarget(place, false, true, true);
|
||||
|
||||
|
||||
// PYTHON: wwt.layers.add_data_layer(table=japan, frame='Earth', lon_att='longitude', lat_att='latitude', size_scale=50, color='#ff0000', time_series=True, time_att='time', far_side_visible=True)
|
||||
|
||||
// NOTE: first, create the table
|
||||
// Decode table from base64
|
||||
const csv = atob("dGltZSxsYXRpdHVkZSxsb25naXR1ZGUsZGVwdGgsbWFnLG1hZ1R5cGUsbnN0LGdhcCxkbWluLHJtcyxuZXQsaWQsdXBkYXRlZCxwbGFjZSx0eXBlLGhvcml6b250YWxFcnJvcixkZXB0aEVycm9yLG1hZ0Vycm9yLG1hZ05zdCxzdGF0dXMsbG9jYXRpb25Tb3VyY2UsbWFnU291cmNlDQoyMDEwLTAxLTAxIDAwOjAwOjA4Ljg5Miw0Mi4zMzgsMTQyLjk5MSw2MC4xLDUuMCxtd2MsMjA5LDYxLjQsLDAuNzcsdXMsdXNwMDAwaDY0NSwyMDE1LTAzLTI0VDAyOjA4OjM4LjMxN1osIkhva2thaWRvLCBKYXBhbiByZWdpb24iLGVhcnRocXVha2UsLCwsLHJldmlld2VkLHVzLGdjbXQNCjIwMTAtMDEtMDEgMDA6MDA6MDcuOTgxLDM2LjU3NSwxNDEuNDUzLDEwLjAsNC4wLG13ciwyMSwxMjcuNywsMC44Nyx1cyx1c3AwMDBoNjJnLDIwMTQtMTEtMDdUMDE6NDA6MjcuNDEyWiwibmVhciB0aGUgZWFzdCBjb2FzdCBvZiBIb25zaHUsIEphcGFuIixlYXJ0aHF1YWtlLCwsLCxyZXZpZXdlZCx1cyxuaWVkDQoyMDEwLTAxLTAxIDAwOjAwOjA3LjYzMSwzMy45NzIsMTM2Ljg2NywzNTIuMCw0LjIsbWIsNDEsMTIxLjIsLDAuODIsdXMsdXNwMDAwaDYwYywyMDE0LTExLTA3VDAxOjQwOjI2LjY2MlosIm5lYXIgdGhlIHNvdXRoIGNvYXN0IG9mIHdlc3Rlcm4gSG9uc2h1LCBKYXBhbiIsZWFydGhxdWFrZSwsNi4wLCwzNCxyZXZpZXdlZCx1cyx1cw0KMjAxMC0wMS0wMSAwMDowMDowNy4wOTEsNDMuMDE0LDE0NS4yNzIsMTAxLjQsMy44LG13ciwxNiwyMDIuNiwsMC40Nyx1cyx1c3AwMDBoNXpiLDIwMTQtMTEtMDdUMDE6NDA6MjYuNTMxWiwiSG9ra2FpZG8sIEphcGFuIHJlZ2lvbiIsZWFydGhxdWFrZSwsNi44LCwscmV2aWV3ZWQsdXMsbmllZA0KMjAxMC0wMS0wMSAwMDowMDowNi45MzIsMjIuMTExLDE0My4zNjIsMTc2LjgsNC41LG1iLDM1LDg1LjcsLDEuMDYsdXMsdXNwMDAwaDV5dywyMDE0LTExLTA3VDAxOjQwOjI2LjQ4MlosIlZvbGNhbm8gSXNsYW5kcywgSmFwYW4gcmVnaW9uIixlYXJ0aHF1YWtlLCwsLDcscmV2aWV3ZWQsdXMsdXMNCjIwMTAtMDEtMDEgMDA6MDA6MDQuNDQ1LDI5LjE2NywxNDIuMjM1LDIzLjQsNC4zLG13ciwyOSwxNTEuMywsMC43Nix1cyx1c3AwMDBoNXU1LDIwMTQtMTEtMDdUMDE6NDA6MjUuNzA0WiwiSXp1IElzbGFuZHMsIEphcGFuIHJlZ2lvbiIsZWFydGhxdWFrZSwsMTUuOCwsLHJldmlld2VkLHVzLG5pZWQNCjIwMTAtMDEtMDEgMDA6MDA6MDQuMjMxLDM2LjIzNSwxNDEuNzQ2LDM3LjYsNC4yLG13ciw0MiwxMTkuMSwsMS4xLHVzLHVzcDAwMGg1dHosMjAxNC0xMS0wN1QwMTo0MDoyNS42NzNaLCJuZWFyIHRoZSBlYXN0IGNvYXN0IG9mIEhvbnNodSwgSmFwYW4iLGVhcnRocXVha2UsLDEwLjIsLCxyZXZpZXdlZCx1cyxuaWVkDQoyMDEwLTAxLTAxIDAwOjAwOjAzLjkxNCwzNi4yOTQsMTQxLjc3NSwzNy41LDQuNCxtd3IsMzgsMTI3LjAsLDAuNzQsdXMsdXNwMDAwaDV0YywyMDE0LTExLTA3VDAxOjQwOjI1LjU5MFosIm5lYXIgdGhlIGVhc3QgY29hc3Qgb2YgSG9uc2h1LCBKYXBhbiIsZWFydGhxdWFrZSwsNi42LCwscmV2aWV3ZWQsdXMsbmllZA0KMjAxMC0wMS0wMSAwMDowMDowMy43ODEsNDIuMDE3LDE0Mi4yOTEsNzAuMiw0LjMsbXdyLDk3LDkwLjcsLDAuNzEsdXMsdXNwMDAwaDV0OCwyMDE0LTExLTA3VDAxOjQwOjI1LjU3M1osIkhva2thaWRvLCBKYXBhbiByZWdpb24iLGVhcnRocXVha2UsLCwsLHJldmlld2VkLHVzLG5pZWQNCjIwMTAtMDEtMDEgMDA6MDA6MDEuNjA1LDQ0LjAyMSwxNDguNDU1LDI3LjcsNC4zLG1iLDI0LDEzNy42LCwxLjE5LHVzLHVzcDAwMGg1bjEsMjAxNC0xMS0wN1QwMTo0MDoyMy45MTdaLEt1cmlsIElzbGFuZHMsZWFydGhxdWFrZSwsMjAuNywsNixyZXZpZXdlZCx1cyx1cw0KMjAxMC0wMS0wMSAwMDowMDowMC45NDQsMjIuMTI2LDE0Mi44MDYsMjUzLjcsNC43LG1iLDUzLDUwLjEsLDAuNzIsdXMsdXNwMDAwaDVtOCwyMDE0LTExLTA3VDAxOjQwOjIzLjYwMFosIlZvbGNhbm8gSXNsYW5kcywgSmFwYW4gcmVnaW9uIixlYXJ0aHF1YWtlLCw3LjksLDE3LHJldmlld2VkLHVzLHVzDQo=")
|
||||
|
||||
// Get reference frame
|
||||
const frame = "Earth";
|
||||
|
||||
const layer = wwtlib.LayerManager.createSpreadsheetLayer(frame, 'PyWWT Layer', csv);
|
||||
layer.set_referenceFrame(frame);
|
||||
|
||||
// Override any guesses
|
||||
layer.set_lngColumn(-1);
|
||||
layer.set_latColumn(-1);
|
||||
layer.set_altColumn(-1);
|
||||
layer.set_sizeColumn(-1);
|
||||
layer.set_colorMapColumn(-1);
|
||||
layer.set_startDateColumn(-1);
|
||||
layer.set_endDateColumn(-1);
|
||||
|
||||
// FIXME: at the moment WWT incorrectly sets the mean radius of the object
|
||||
// in the frame to that of the Earth, so we need to override this here.
|
||||
var ReferenceFramesRadius = {
|
||||
Sun: 696000000,
|
||||
Mercury: 2439700,
|
||||
Venus: 6051800,
|
||||
Earth: 6371000,
|
||||
Mars: 3390000,
|
||||
Jupiter: 69911000,
|
||||
Saturn: 58232000,
|
||||
Uranus: 25362000,
|
||||
Neptune: 24622000,
|
||||
Pluto: 1161000,
|
||||
Moon: 1737100,
|
||||
Io: 1821500,
|
||||
Europa: 1561000,
|
||||
Ganymede: 2631200,
|
||||
Callisto: 2410300
|
||||
};
|
||||
|
||||
radius = ReferenceFramesRadius[frame];
|
||||
if (radius != undefined) {
|
||||
layer._meanRadius$1 = radius;
|
||||
}
|
||||
|
||||
// FIXME: for now, this doesn't have any effect because WWT should add a 180
|
||||
// degree offset but it doesn't - see
|
||||
// https://github.com/WorldWideTelescope/wwt-web-client/pull/182 for a
|
||||
// possible fix.
|
||||
if (frame == 'Sky') {
|
||||
layer.set_astronomical(true);
|
||||
}
|
||||
|
||||
layer.set_altUnit(1);
|
||||
|
||||
|
||||
// NOTE: then, set the attributes in the arguments of the python call one-by-one, beginning with defaults:
|
||||
var name = "altType";
|
||||
var value = wwtlib.AltTypes[""];
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "scaleFactor";
|
||||
var value = 10;
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "color";
|
||||
var value = wwtlib.Color.fromHex("#ffffff");
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "opacity";
|
||||
var value = 1;
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "plotType";
|
||||
var value = wwtlib.PlotTypes["gaussian"];
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "markerScale";
|
||||
var value = wwtlib.MarkerScales["screen"];
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "showFarSide";
|
||||
var value = false;
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "timeSeries";
|
||||
var value = false;
|
||||
layer["set_" + name](value);
|
||||
|
||||
// NOTE: then set the attributes specified in my python function call
|
||||
var name = "lngColumn";
|
||||
var value = layer.get__table().header.indexOf("longitude");
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "latColumn";
|
||||
var value = layer.get__table().header.indexOf("latitude");
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "scaleFactor";
|
||||
var value = 50;
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "color";
|
||||
value = wwtlib.Color.fromHex("#c4d600");
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "timeSeries";
|
||||
var value = true;
|
||||
layer["set_" + name](value);
|
||||
|
||||
var name = "startDateColumn";
|
||||
var value = layer.get__table().header.indexOf("time");
|
||||
layer["set_" + name](value);
|
||||
layer.computeDateDomainRange(0,-1);
|
||||
var name = "showFarSide";
|
||||
var value = true;
|
||||
layer["set_" + name](value);
|
||||
|
||||
|
||||
// PYTHON: wwt.set_current_time(Time('2010-01-01'))
|
||||
var date = new Date(2011, 0, 1, 0, 0, 0, 0);
|
||||
const stc = wwtlib.SpaceTimeController;
|
||||
stc.set_timeRate(1);
|
||||
stc.set_now(date);
|
||||
|
||||
}, 5555);
|
||||
};
|
||||
|
||||
|
||||
$(window).on('load', function() {
|
||||
|
|
@ -54,4 +215,5 @@ $(window).on('load', function() {
|
|||
var scr = document.createElement('script');
|
||||
scr.setAttribute("src", 'searchdata.min.js');
|
||||
document.getElementsByTagName("head")[0].appendChild(scr);
|
||||
//runPYTimeSeries();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
$scope.clickThumb = function (item,instant) {
|
||||
$rootScope.instant = !!instant;
|
||||
thumbList.clickThumb(item, $scope);
|
||||
util.removeHoverCircle();
|
||||
};
|
||||
|
||||
$scope.hoverThumb = function (item) {
|
||||
|
|
|
|||
|
|
@ -9,12 +9,20 @@
|
|||
searchIndex = {},
|
||||
initPromise,
|
||||
constellations = [];
|
||||
|
||||
function getData() {
|
||||
var deferredInit = $q.defer();
|
||||
var allDataDeferred = $q.defer();
|
||||
var allDataPromise = (function(){return allDataDeferred.promise;})();
|
||||
function getData(all) {
|
||||
var deferred = $q.defer();
|
||||
if (all){
|
||||
allDataPromise.then(function () {
|
||||
deferred.resolve(data);
|
||||
});
|
||||
}else {
|
||||
initPromise.then(function () {
|
||||
deferred.resolve(data);
|
||||
});
|
||||
}
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
|
|
@ -26,7 +34,7 @@
|
|||
return deferred.promise;
|
||||
};
|
||||
|
||||
var deferredInit = $q.defer();
|
||||
|
||||
var isId = 100;
|
||||
var init = function () {
|
||||
if (wwt.searchData) {
|
||||
|
|
@ -107,6 +115,7 @@
|
|||
});
|
||||
var end = new Date();
|
||||
util.log('parsed places in ' + (end.valueOf() - start.valueOf()) + 'ms', data);
|
||||
|
||||
importWtml('Wise.wtml').then(function () {
|
||||
//console.log('wise loaded');
|
||||
importWtml('Hubble.wtml').then(function () {
|
||||
|
|
@ -116,13 +125,13 @@
|
|||
importWtml('Chandra.wtml').then(function () {
|
||||
//console.log('chandra loaded');
|
||||
importWtml('Spitzer.wtml').then(function () {
|
||||
//console.log('spitzer loaded');
|
||||
allDataDeferred.resolve(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
deferredInit.resolve(data);
|
||||
});
|
||||
|
||||
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ wwt.app.directive('ngRightClick', ['$parse', function ($parse) {
|
|||
var fn = $parse(attrs.ngRightClick);
|
||||
element.bind('contextmenu', function (event) {
|
||||
|
||||
scope.$apply(function () {
|
||||
scope.$applyAsync(function () {
|
||||
wwt.lastmouseContext = event;
|
||||
event.preventDefault();
|
||||
fn(scope, { $event: event });
|
||||
|
|
|
|||
|
|
@ -14,8 +14,11 @@
|
|||
var rowsAboveFold = Math.ceil((st + h) / tn.height());
|
||||
var totalItems = (rowsAboveFold + buffer) * cols;
|
||||
if (scope.scrollDepth < totalItems) {
|
||||
scope.$applyAsync(function(){
|
||||
scope.scrollDepth = totalItems;
|
||||
scope.$apply();
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,21 +48,45 @@
|
|||
}
|
||||
|
||||
var sortByImagery = function(p1, p2) {
|
||||
return p2.get_constellation() === 'SolarSystem' && p1.get_constellation() !== 'SolarSystem' ? 1 :
|
||||
return p1.fromCenter - p2.fromCenter;/*p2.get_constellation() === 'SolarSystem' && p1.get_constellation() !== 'SolarSystem' ? 1 :
|
||||
p1.get_constellation() === 'SolarSystem' && p2.get_constellation() !== 'SolarSystem' ? -1 :
|
||||
p2.get_studyImageset() && !p1.get_studyImageset() ? 1 :
|
||||
p1.get_studyImageset() && !p2.get_studyImageset() ? -1 :
|
||||
p1.get_name() - p2.get_name();
|
||||
p1.get_studyImageset() && !p2.get_studyImageset() ? -1 :*/
|
||||
|
||||
}
|
||||
|
||||
function getPlaceById(id) {
|
||||
var deferred = $q.defer();
|
||||
|
||||
searchDataService.getData().then(function (d) {
|
||||
var tryFind = function(all){
|
||||
var deferred2 = $q.defer();
|
||||
searchDataService.getData(all).then(function (d) {
|
||||
var constellationIndex = parseInt(id.split('.')[0]);
|
||||
var placeIndex = parseInt(id.split('.')[1]);
|
||||
deferred.resolve(d.Constellations[constellationIndex].places[placeIndex]);
|
||||
var p = d.Constellations[constellationIndex].places[placeIndex];
|
||||
if (p) {
|
||||
deferred2.resolve(p);
|
||||
}else{
|
||||
deferred2.resolve(null);
|
||||
}
|
||||
});
|
||||
return deferred2.promise;
|
||||
};
|
||||
|
||||
|
||||
tryFind().then(function(p){
|
||||
if (p){
|
||||
deferred.resolve(p);
|
||||
}else{
|
||||
console.log('wait for full');
|
||||
tryFind(true).then(function(p) {
|
||||
if (p) {
|
||||
deferred.resolve(p);
|
||||
}
|
||||
else deferred.reject()
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
return deferred.promise;
|
||||
}
|
||||
|
|
@ -96,14 +120,23 @@
|
|||
|
||||
|
||||
var results = [];
|
||||
var ss = [];
|
||||
var imgsets = [];
|
||||
|
||||
//console.log(dist);
|
||||
$.each(searchPlaces, function(i, place) {
|
||||
if (place && place.get_name() !== 'Earth') {
|
||||
try {
|
||||
var placeDist = wwtlib.Vector3d.subtractVectors(place.get_location3d(), center);
|
||||
if (dist > placeDist.length()) {
|
||||
place.fromCenter = placeDist.length();
|
||||
if (place.get_constellation()==='SolarSystem'){
|
||||
ss.push(place)
|
||||
}else if (place.get_studyImageset()){
|
||||
imgsets.push(place);
|
||||
}else {
|
||||
results.push(place);
|
||||
//if (place.get_constellation() === 'SolarSystem') {
|
||||
}//if (place.get_constellation() === 'SolarSystem') {
|
||||
// console.log(place.get_name(), placeDist.length());
|
||||
//}
|
||||
}
|
||||
|
|
@ -112,7 +145,8 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
deferred.resolve(results.sort(sortByImagery));
|
||||
ss = ss.sort(sortByImagery);
|
||||
deferred.resolve(ss.concat(imgsets.sort(sortByImagery),results.sort(sortByImagery)));
|
||||
|
||||
} else {
|
||||
deferred.resolve([]);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
formatDecimalHours: formatDecimalHours,
|
||||
formatHms: formatHms,
|
||||
drawCircleOverPlace: drawCircleOverPlace,
|
||||
removeHoverCircle: removeHoverCircle,
|
||||
getIsPlanet: getIsPlanet,
|
||||
secondsToTime: secondsToTime,
|
||||
getQSParam: getQSParam,
|
||||
|
|
@ -154,7 +155,7 @@
|
|||
}
|
||||
var circ = null;
|
||||
function drawCircleOverPlace(place) {
|
||||
wwt.wc.removeAnnotation(circ);
|
||||
removeHoverCircle();
|
||||
if ($('#lstLookAt option:selected').prop('index') === 2) {
|
||||
var circle = wwt.wc.createCircle();
|
||||
circle.set_id('focused');
|
||||
|
|
@ -168,6 +169,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
function removeHoverCircle(){
|
||||
if (circ){
|
||||
wwt.wc.removeAnnotation(circ);
|
||||
}
|
||||
}
|
||||
|
||||
function getIsPlanet(place) {
|
||||
var cls,isPlanet;
|
||||
if (typeof place.get_classification === 'function') {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче