gitea-mirror/aladin-lite
1
0
Fork 0
mirror of https://github.com/cds-astro/aladin-lite.git synced 2025-12-12 15:49:18 -08:00
Code Issues Packages Projects Releases Wiki Activity

remove view.idx zoom

Browse Source
This commit is contained in:
Matthieu Baumann
2024-04-25 08:52:53 +02:00
parent 027a76f2ab
commit d655d8f8bd
5 changed files with 712 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -2,7 +2,7 @@
"homepage": "https://aladin.u-strasbg.fr/", "homepage": "https://aladin.u-strasbg.fr/",
"name": "aladin-lite", "name": "aladin-lite",
"type": "module", "type": "module",
"version": "3.3.3", "version": "3.3.3-beta",
"description": "An astronomical HiPS visualizer in the browser", "description": "An astronomical HiPS visualizer in the browser",
"author": "Thomas Boch and Matthieu Baumann", "author": "Thomas Boch and Matthieu Baumann",
"license": "GPL-3", "license": "GPL-3",

4
src/js/Aladin.js
View File

@@ -452,8 +452,6 @@ export let Aladin = (function () {
} }
} }
console.log('cache', ImageSurvey.cache)
ALEvent.HIPS_LIST_UPDATED.dispatchedTo(this.aladinDiv); ALEvent.HIPS_LIST_UPDATED.dispatchedTo(this.aladinDiv);
} }
@@ -482,8 +480,6 @@ export let Aladin = (function () {
}) })
}); });
console.log(hipsList);
fillHiPSCache(); fillHiPSCache();
}); });

19
src/js/Zoom.js
View File

@@ -48,34 +48,31 @@ import { requestAnimFrame } from "./libs/RequestAnimationFrame.js";
9/3600, 8/3600, 7/3600, 6/3600, 5/3600, 4/3600, 3/3600, 2/3600, 1/3600, 9/3600, 8/3600, 7/3600, 6/3600, 5/3600, 4/3600, 3/3600, 2/3600, 1/3600,
9/36000, 8/36000, 7/36000, 6/36000, 5/36000, 4/36000, 3/36000, 2/36000, 1/36000 9/36000, 8/36000, 7/36000, 6/36000, 5/36000, 4/36000, 3/36000, 2/36000, 1/36000
]; ];
Zoom.MAX_IDX_DELTA_PER_TROTTLE = 2; Zoom.MAX_IDX_DELTA_PER_TROTTLE = 6;
Zoom.determineNextFov = function(view, amount) { Zoom.determineNextFov = function(view, amount) {
if (!view.idx) const currIdx = Utils.binarySearch(Zoom.LEVELS, view.fov);
view.idx = Utils.binarySearch(Zoom.LEVELS, view.fov);
let deltaIdx = amount; let deltaIdx = amount;
view.idx += deltaIdx; let nextIdx = currIdx + deltaIdx;
// clamp to the array indices // clamp to the array indices
if (view.idx < 0) { if (nextIdx < 0) {
view.idx = 0 nextIdx = 0
} }
if (view.idx >= Zoom.LEVELS.length) { if (nextIdx >= Zoom.LEVELS.length) {
view.idx = Zoom.LEVELS.length - 1 nextIdx = Zoom.LEVELS.length - 1
} }
let nextFov = Zoom.LEVELS[view.idx]; let nextFov = Zoom.LEVELS[nextIdx];
if (view.minFoV) { if (view.minFoV) {
nextFov = Math.max(nextFov, view.minFoV) nextFov = Math.max(nextFov, view.minFoV)
view.idx = Utils.binarySearch(Zoom.LEVELS, nextFov);
} }
if (view.maxFoV) { if (view.maxFoV) {
nextFov = Math.min(nextFov, view.maxFoV) nextFov = Math.min(nextFov, view.maxFoV)
view.idx = Utils.binarySearch(Zoom.LEVELS, nextFov);
} }
return nextFov; return nextFov;

1108
src/js/gui/Box/StackBox.js
View File

File diff suppressed because it is too large Load Diff

10
src/js/gui/Input/HiPSSearch.js
View File

@@ -90,7 +90,13 @@ import { Utils } from "../../Utils.ts";
cursor: "help", cursor: "help",
}, },
})]; })];
content.push('<a style="color: white;" href="' + layer.url + '" target="_blank">See more...</a>') let link;
if (layer.subtype === "fits") {
link = 'Download file...'
} else {
link = 'See more...'
}
content.push('<a style="color: white;" href="' + layer.url + '" target="_blank">' + link + '</a>')
let tooltip = { let tooltip = {
content: new Layout({layout: content, orientation: 'horizontal'}), content: new Layout({layout: content, orientation: 'horizontal'}),
hoverable: true, hoverable: true,
@@ -146,8 +152,6 @@ import { Utils } from "../../Utils.ts";
self = this; self = this;
this.layer = layer; this.layer = layer;
console.log(this.el)
this._addEventListeners(aladin); this._addEventListeners(aladin);
} }