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

final commit

Browse Source
This commit is contained in:
Matthieu Baumann
2025-09-04 13:58:06 +02:00
parent e6d57a137e
commit 211e3797f5
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/al-cat-galaxy-shape.html
View File

@@ -26,6 +26,7 @@
limit: 1000, limit: 1000,
//orderBy: 'nb_ref', //orderBy: 'nb_ref',
onClick: 'showTable', onClick: 'showTable',
onlyFootprints: false,
color: (s) => { color: (s) => {
let coo = A.coo(); let coo = A.coo();
coo.parse(s.data['RAJ2000'] + ' ' + s.data['DEJ2000']) coo.parse(s.data['RAJ2000'] + ' ' + s.data['DEJ2000'])

2
src/js/A.js
View File

@@ -575,7 +575,7 @@ A.catalogFromURL = function (url, options, successCallback, errorCallback, usePr
c.setFields(fields); c.setFields(fields);
if (fields.s_region) { if (fields.s_region) {
// for ObsCore tables, show also the (ra, dec) as a source // for ObsCore tables, show also the (ra, dec) as a source
c.onlyFootprint = false; c.onlyFootprints = false;
} }
c.addSources(sources); c.addSources(sources);

6
src/js/Catalog.js
View File

@@ -57,7 +57,7 @@ If a function is given, user can return Image, HTMLImageCanvas, HTMLImageElement
* @property {string} [labelColumn] - The name of the column to be used for the label. * @property {string} [labelColumn] - The name of the column to be used for the label.
* @property {string} [labelColor=color] - The color of the source labels. * @property {string} [labelColor=color] - The color of the source labels.
* @property {string} [labelFont="10px sans-serif"] - The font for the source labels. * @property {string} [labelFont="10px sans-serif"] - The font for the source labels.
* @property {boolean} [onlyFootprint=true] - When shapes/footprints are associated to a source (through a shape function given), decide wheter to show the point source as well. Point source is hidden by default * @property {boolean} [onlyFootprints=true] - When shapes/footprints are associated to a source (through a shape function given), decide wheter to show the point source as well. Point source is hidden by default
*/ */
export let Catalog = (function () { export let Catalog = (function () {
@@ -113,7 +113,7 @@ export let Catalog = (function () {
this.hoverColor = options.hoverColor || undefined; this.hoverColor = options.hoverColor || undefined;
// when footprints are associated to source, do we need to draw the point source as well ? // when footprints are associated to source, do we need to draw the point source as well ?
this.onlyFootprint = options.onlyFootprint ?? true; this.onlyFootprints = options.onlyFootprints ?? true;
this.displayLabel = options.displayLabel || false; this.displayLabel = options.displayLabel || false;
this.labelColor = options.labelColor || undefined; this.labelColor = options.labelColor || undefined;
@@ -1032,7 +1032,7 @@ export let Catalog = (function () {
s.footprint.draw(ctx, this.view) s.footprint.draw(ctx, this.view)
s.tooSmallFootprint = s.footprint.isTooSmall(); s.tooSmallFootprint = s.footprint.isTooSmall();
if (!s.tooSmallFootprint && this.onlyFootprint) { if (!s.tooSmallFootprint && this.onlyFootprints) {
return true; return true;
} }
} }

2
src/js/ProgressiveCat.js
View File

@@ -67,7 +67,7 @@ export let ProgressiveCat = (function() {
this.hoverColor = options.hoverColor || this.color; this.hoverColor = options.hoverColor || this.color;
// when footprints are associated to source, do we need to draw the point source as well ? // when footprints are associated to source, do we need to draw the point source as well ?
this.onlyFootprint = options.onlyFootprint ?? true; this.onlyFootprints = options.onlyFootprints ?? true;
// allows for filtering of sources // allows for filtering of sources

2
src/js/View.js
View File

@@ -2207,7 +2207,7 @@ export let View = (function () {
continue; continue;
} }
if (s.isFootprint() && cat.onlyFootprint && !s.tooSmallFootprint) { if (s.isFootprint() && cat.onlyFootprints && !s.tooSmallFootprint) {
continue; continue;
} }

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

@@ -83,7 +83,7 @@ export class OverlayStackBox extends Box {
sourceSize: 8, sourceSize: 8,
color: "#318d80", color: "#318d80",
hoverColor: 'red', hoverColor: 'red',
onlyFootprint: false, onlyFootprints: false,
onClick: "showTable", onClick: "showTable",
shape: (s) => { shape: (s) => {
let galaxy = ["Seyfert","Seyfert_1", "Seyfert_2","LSB_G","PartofG","RadioG","Gin","GinPair","HII_G","LensedG","BClG","BlueCompG","EmG","GinCl","GinGroup","StarburstG","LINER","AGN", "Galaxy", "GtowardsGroup", "GtowardsCl", "BrightestCG"].some((n) => s.data.main_type.indexOf(n) >= 0); let galaxy = ["Seyfert","Seyfert_1", "Seyfert_2","LSB_G","PartofG","RadioG","Gin","GinPair","HII_G","LensedG","BClG","BlueCompG","EmG","GinCl","GinGroup","StarburstG","LINER","AGN", "Galaxy", "GtowardsGroup", "GtowardsCl", "BrightestCG"].some((n) => s.data.main_type.indexOf(n) >= 0);