Skip to content

Commit

Permalink
examples fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@szpetny @bmatthieu3
szpetny authored and bmatthieu3 committed Sep 20, 2023
1 parent 01aff09 commit 43a8bf0
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 45 deletions.
54 changes: 27 additions & 27 deletions examples/al-coronelli.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!--link rel="stylesheet" href="css/grids-responsive-min.css"-->
<link rel="stylesheet" href="https://unpkg.com/purecss@2.0.3/build/buttons.css">
<link rel="stylesheet" href="https://unpkg.com/purecss@2.0.3/build/buttons-core.css">

<!--meta name="viewport" content="initial-scale=1.0, user-scalable=no"-->
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
</head>
Expand Down Expand Up @@ -81,23 +81,23 @@
<div id="coo_epoca">
<a class="pure-button nav-button nav-goto" href="#">De Epoca</a><br>
&nbsp;→&nbsp;<a class="pure-button nav-button nav-flyto" href="#">Move</a>
</div>
</div>
<div id="coo_legende">
<a class="pure-button nav-button nav-goto" href="#">Légende</a><br>
&nbsp;→&nbsp;<a class="pure-button nav-button nav-flyto" href="#">Move</a>
</div>
</div>
<div id="coo_orion">
<a class="pure-button nav-button nav-goto" href="#">Orion</a><br>
&nbsp;→&nbsp;<a class="pure-button nav-button nav-flyto" href="#">Move</a>
</div>
</div>
<div id="coo_magellan">
<a class="pure-button nav-button nav-goto" href="#">Magellan</a><br>
&nbsp;→&nbsp;<a class="pure-button nav-button nav-flyto" href="#">Move</a>
</div>
<div id="coo_halley">
<a class="pure-button nav-button nav-goto" href="#">Halley</a><br>
&nbsp;→&nbsp;<a class="pure-button nav-button nav-flyto" href="#">Move</a>
</div>
</div>
</div>

<style type="text/css"> .aladin-reticleColor { color: rgb(178, 50, 178); font-weight:bold;} </style>
Expand All @@ -106,79 +106,79 @@
html, body {
height: 100%;
}

body {
display: flex;
flex-direction: column;
}

.aladin-zoomControl {
top: 10% !important;
left: unset !important;
right: 4px !important;
}

.aladin-zoomControl a {
font-size: 24px !important;
padding: 22px !important;
}

#aladin{
flex: 1 1 0;
}

#explain {
padding: 4px;
top: 30%;
max-height: 50%;
font-size: 11pt;
overflow: scroll;
}

#explain tbody tr:nth-child(even) {
background-color: #ffffff;
}

#explain tbody tr:nth-child(odd) {
background-color: #ccdaeb;
}

#layersControlLeft {
padding: 10px;
right: unset;
left: 4px;
top: 20vh;
}

#layersCL2 {
padding: 10px;
right: unset;
left: 4px;
top: 90vh;
}

#layersControlRight {
padding: 4px;
left: unset;
right: 4px;
top: 25vh;
}

#layersControlLeft, #layersControlRight, #layersCL2 input {
margin-right: 5px;
}

.img-hips {
padding: 5px;
margin: 5px;
}

#opacity-slider {
-webkit-appearance: none !important; /* Override default CSS styles */
width: 220px;
height: 25px;
}

#opacity-slider::-webkit-slider-thumb {
-webkit-appearance: none !important; /* Override default look */
appearance: none;
Expand All @@ -187,18 +187,18 @@
background: #4CAF50; /* Green background */
cursor: pointer; /* Cursor on hover */
}

#opacity-slider::-moz-range-thumb {
width: 25px; /* Set a specific slider handle width */
height: 25px; /* Slider handle height */
background: #4CAF50; /* Green background */
cursor: pointer; /* Cursor on hover */
}

.aladin-box {
font-size: 12px !important;
}

#calibCircle {
position: fixed;
border: 8px solid red;
Expand All @@ -210,16 +210,16 @@
z-index: 1000;
pointer-events: none;
}

.pure-table {
font-size: small;
}

.catcoro {
display: inline;
vertical-align: middle;
}

.coro-star {
vertical-align: middle;
}
Expand Down Expand Up @@ -360,7 +360,7 @@
});

// listen to click on objects
aladin.on('objectClicked', function(source) {
aladin.on('objectClicked', function(source, xyMouseCoords) {
var html = '<table class="pure-table">';

if (curSelectedSource != null) {
Expand Down Expand Up @@ -509,7 +509,7 @@
points[points.length-1].push(Utils.relMouseCoords(drawOverlayCanvas.imageCanvas, e));

drawOverlayCtx.beginPath();

for (var k=0; k<points.length; k++) {
drawOverlayCtx.moveTo(points[k][0].x, points[k][0].y);
for (var i = 1; i < points[k].length; i++) {
Expand Down
19 changes: 11 additions & 8 deletions examples/al-event-listeners.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,33 @@
var msg;

// define function triggered when a source is hovered
aladin.on('objectHovered', function(object) {
aladin.on('objectHovered', function(object, xyMouseCoords) {
if (object) {
msg = 'You hovered object ' + object.data.name + ' located at ' + object.ra + ', ' + object.dec;
msg = 'You hovered object ' + object.data.name + ' located at ' + object.ra + ', ' + object.dec + '; mouse coords - x: '
+ xyMouseCoords.x + ', y: ' + xyMouseCoords.y;
}
else {
msg = 'No object hovered';
}
$('#infoDiv').html(msg);
});

aladin.on('objectHoveredStop', function(object) {
aladin.on('objectHoveredStop', function(object, xyMouseCoords) {
if (object) {
msg = 'You stopped hove object ' + object.data.name + ' located at ' + object.ra + ', ' + object.dec;
msg = 'You stopped hove object ' + object.data.name + ' located at ' + object.ra + ', ' + object.dec + '; mouse coords - x: '
+ xyMouseCoords.x + ', y: ' + xyMouseCoords.y;
}
$('#infoDiv').html(msg);
});

// define function triggered when an object is clicked
var objClicked;
aladin.on('objectClicked', function(object) {
aladin.on('objectClicked', function(object, xyMouseCoords) {
if (object) {
objClicked = object;
object.select();
msg = 'You clicked object ' + object.data.name + ' located at ' + object.ra + ', ' + object.dec;
object.select();
msg = 'You clicked object ' + object.data.name + ' located at ' + object.ra + ', ' + object.dec + '; mouse coords - x: '
+ xyMouseCoords.x + ', y: ' + xyMouseCoords.y;
}
else {
objClicked.deselect();
Expand All @@ -51,4 +54,4 @@
});
</script>
</body>
</html>
</html>
16 changes: 8 additions & 8 deletions examples/al-footprints.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
]);
overlay.add(A.circle(83.66067, 22.03081, 0.04, {color: 'cyan'})); // radius in degrees

aladin.on("footprintClicked", (footprint) => {
console.log("footprint clicked catched", footprint)
aladin.on("footprintClicked", (footprint, xyMouseCoords) => {
console.log("footprint clicked catched: ", footprint, "mouse coords xy: ", xyMouseCoords.x, xyMouseCoords.y);
})
aladin.on("objectClicked", (object) => {
console.log("object clicked catched", object)
aladin.on("objectClicked", (object, xyMouseCoords) => {
console.log("object clicked catched: ", object, "mouse coords xy: ", xyMouseCoords.x, xyMouseCoords.y);
})
aladin.on("footprintHovered", (footprint) => {
console.log("footprint hovered catched", footprint)
aladin.on("footprintHovered", (footprint, xyMouseCoords) => {
console.log("footprint hovered catched: ", footprint, "mouse coords xy: ", xyMouseCoords.x, xyMouseCoords.y);
})
aladin.on("objectHoveredStop", (object) => {
console.log("Object hovered stopped", object)
aladin.on("objectHoveredStop", (object, xyMouseCoords) => {
console.log("Object hovered stopped: ", object, "mouse coords xy: ", xyMouseCoords.x, xyMouseCoords.y);
})

const cat = A.catalogFromVizieR('B/assocdata/obscore', 'M 1', 100, {onClick: 'showTable', limit: 1000});
Expand Down
4 changes: 2 additions & 2 deletions examples/al-gaiadr3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
});

// listen to click on objects
aladin.on('objectClicked', function (source) {
aladin.on('objectClicked', function (source, xyMouseCoords) {
var html = '<table class="pure-table">';

if (curSelectedSource != null) {
Expand Down Expand Up @@ -142,4 +142,4 @@
});
});
</script>
</html>
</html>

0 comments on commit 43a8bf0

Please sign in to comment.