Skip to content

Commit 9be56d5

Browse files
njmillernjmiller
committed
Fixing issues with disappearing search.
Adding logarithmic backgrounds
1 parent 6b7b634 commit 9be56d5

File tree

2 files changed

+90
-37
lines changed

2 files changed

+90
-37
lines changed

‎src/js/Aladin.js‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,9 @@ Aladin = (function() {
443443
var listentry = $("<li>").attr("name", surveys[i].instrument);
444444
var checkboxentry = $("<input type='checkbox'>").attr("name", surveys[i].instrument);
445445
checkboxEntries = checkboxEntries.concat(checkboxentry);
446-
multSelectEntry = $('<select multiple="multiple">').attr("name", surveys[i].instrument);
447-
multSelectEntry.attr("class", "chosen-select").attr("id", surveys[i].instrument);
446+
multSelectEntry = $('<select multiple="multiple">').attr("name", surveys[i].instrument+'multi');
447+
multSelectEntry.attr("class", "chosen-select").attr("id", surveys[i].instrument+'multi');
448+
multSelectEntry.attr("data-placeholder", "Nothing selected for "+surveys[i].instrument);
448449
var selectEntry = $("<option />").attr("value", surveys[i].id).text(surveys[i].name);
449450
if (plotInstr) {
450451
selectEntry.attr("selected", true);
@@ -1245,9 +1246,9 @@ Aladin = (function() {
12451246
var selected = [];
12461247
$('.aladin-footprintSelection2 input:checked').each(function() {
12471248
var instrname = $(this).attr('name');
1248-
var selvals = $("#"+instrname).chosen().val();
1249-
var temp = $("#"+instrname).chosen();
1250-
var temp2 = $("select[name='"+instrname+"']");
1249+
var selvals = $("#"+instrname+'multi').chosen().val();
1250+
//var temp = $("#"+instrname+'multi').chosen();
1251+
//var temp2 = $("select[name='"+instrname+"']");
12511252

12521253
if (selvals === undefined) {
12531254
//This occurs if this checkmark was the change and the multiselect doesn't exist
@@ -1260,10 +1261,9 @@ Aladin = (function() {
12601261
listentry.append(checkboxentry);
12611262

12621263
//Create chosen multi select box
1263-
multSelectEntry = $('<select multiple="multiple">').attr("name", instrname);
1264-
multSelectEntry.attr("class", "chosen-select").attr("id", instrname);
1265-
multSelectEntry.attr("width", "300px");
1266-
multSelectEntry.attr("placeholder_text_multiple", instrname);
1264+
multSelectEntry = $('<select multiple="multiple">').attr("name", instrname+'multi');
1265+
multSelectEntry.attr("class", "chosen-select").attr("id", instrname+'multi');
1266+
multSelectEntry.attr("data-placeholder", "Nothing selected for "+instrname);
12671267

12681268
for (var i=0; i<footprints.length; i++) {
12691269
if (footprints[i].instrument == instrname) {
@@ -1276,26 +1276,31 @@ Aladin = (function() {
12761276

12771277
listentry.append(multSelectEntry);
12781278
} else if (selvals === null) {
1279-
//Remove color select???? (or maybe just leave it)
1280-
//var colorSelect = $("select[name='"+instrname+"color']")[0];
1281-
//if (colorSelect) {
1282-
// colorSelect.remove();
1283-
//}
1279+
console.log("NULL");
12841280
} else {
12851281
for (i=0; i<selvals.length; i++) {
12861282
selected.push(selvals[i]);
12871283
}
12881284
}
1285+
$(function(){
1286+
console.log("CHOSENING");
1287+
$(".chosen-select").chosen({
1288+
width: "300px"
1289+
});
1290+
});
12891291
});
12901292

12911293
$('.aladin-footprintSelection2 input:not(:checked)').each(function() {
12921294

12931295
instrname = $(this).attr('name');
1294-
if (instrname === undefined) {
1295-
$(this).remove();
1296-
}
12971296

1298-
multSelectEntry = $("#"+instrname).chosen().val();
1297+
//Causes multSelect boxes to remove search ability and screws with them
1298+
//if box is checked and nothing is selected
1299+
//if (instrname === undefined) {
1300+
// $(this).remove();
1301+
//}
1302+
1303+
multSelectEntry = $("#"+instrname+'multi').chosen().val();
12991304

13001305
if (multSelectEntry === null || multSelectEntry) {
13011306
var listentry = $("li[name='"+instrname+"']");
@@ -1306,22 +1311,14 @@ Aladin = (function() {
13061311
listentry.append(instrname);
13071312
}
13081313

1309-
//try {
1310-
// colorSelect = $("select[name='"+instrname+"color']")[0];
1311-
// colorSelect.remove();
1312-
// console.log("Removing cs: ", instrname);
1313-
//} catch(err) {
1314-
// //Do nothing
1315-
//}
1316-
13171314
});
13181315

13191316
console.log("Selected: ", selected);
13201317
for (var i=0; i<footprints.length; i++) {
13211318
var found = $.inArray(footprints[i].id, selected) > -1;
13221319
if (found) {
13231320
try {
1324-
var multiSelect = $("select[name='"+footprints[i].instrument+"']");
1321+
var multiSelect = $("select[name='"+footprints[i].instrument+"multi']");
13251322
var colorIndex = $("select[name='"+footprints[i].instrument+"color']")[0].selectedIndex;
13261323
var tmp = $("select[name='"+footprints[i].instrument+"color']")[0];
13271324
} catch(err) {
@@ -1336,7 +1333,6 @@ Aladin = (function() {
13361333
colorselect.append($("<option />").text("Magenta"));
13371334
listentry.append(colorselect);
13381335
}
1339-
console.log("Z1: ", footprints[i].id, colorIndex);
13401336

13411337
if (footprints[i].url) {
13421338
self.setOverlayImageLayer(footprints[i].id);
@@ -1351,7 +1347,6 @@ Aladin = (function() {
13511347
} else if (colorIndex == 4) {
13521348
color = 'magenta';
13531349
}
1354-
//self.getOverlayImageLayer().getColorMap().update(color);
13551350
self.getOverlayImageLayer().setAlpha(1.0);
13561351
self.addOverlayImageLayer(footprints[i].id, color);
13571352
} else {
@@ -1380,12 +1375,7 @@ Aladin = (function() {
13801375

13811376
}
13821377
}
1383-
1384-
$(function(){
1385-
$(".chosen-select").chosen({
1386-
width: "300px"
1387-
});
1388-
});
1378+
13891379
});
13901380

13911381
//// COLOR MAP management ////////////////////////////////////////////

‎src/js/HpxImageSurvey.js‎

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ HpxImageSurvey = (function() {
255255
"maxOrder": 9,
256256
"frame": "equatorial",
257257
"format": "jpeg"
258-
},*/
258+
},
259259
{
260260
"id": "P/Finkbeiner",
261261
"url": "http://alasky.u-strasbg.fr/FinkbeinerHalpha",
@@ -279,7 +279,7 @@ HpxImageSurvey = (function() {
279279
"maxOrder": 3,
280280
"frame": "galactic",
281281
"format": "png fits"
282-
},
282+
},*/
283283
{
284284
"name": "PLANCK-DUSTPOL",
285285
"format": "png fits",
@@ -288,6 +288,69 @@ HpxImageSurvey = (function() {
288288
"id": "PLANCK-DUSTPOL",
289289
"instrument": "Planck",
290290
"maxOrder": 3
291+
},
292+
{
293+
"name": "PLANCK-DUSTPOL-LOG",
294+
"format": "png fits",
295+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_DustPol_Amp_log_256.fitsHiPS",
296+
"frame": "galactic",
297+
"id": "PLANCK-DUSTPOL-LOG",
298+
"instrument": "Planck",
299+
"maxOrder": 3
300+
},
301+
{
302+
"name": "PLANCK-DUST",
303+
"format": "png fits",
304+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_Dust_256.fitsHiPS",
305+
"frame": "galactic",
306+
"id": "PLANCK-DUST",
307+
"instrument": "Planck",
308+
"maxOrder": 3
309+
},
310+
{
311+
"name": "PLANCK-DUST-LOG",
312+
"format": "png fits",
313+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_Dust_log_256.fitsHiPS",
314+
"frame": "galactic",
315+
"id": "PLANCK-DUST-LOG",
316+
"instrument": "Planck",
317+
"maxOrder": 3
318+
},
319+
{
320+
"name": "PLANCK-SYNCH",
321+
"format": "png fits",
322+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_Synch_256.fitsHiPS",
323+
"frame": "galactic",
324+
"id": "PLANCK-SYNCH",
325+
"instrument": "Planck",
326+
"maxOrder": 3
327+
},
328+
{
329+
"name": "PLANCK-SYNCH-LOG",
330+
"format": "png fits",
331+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_Synch_log_256.fitsHiPS",
332+
"frame": "galactic",
333+
"id": "PLANCK-SYNCH-LOG",
334+
"instrument": "Planck",
335+
"maxOrder": 3
336+
},
337+
{
338+
"name": "PLANCK-SYNCHPOL",
339+
"format": "png fits",
340+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_SynchPol_Amp_256.fitsHiPS",
341+
"frame": "galactic",
342+
"id": "PLANCK-SYNCHPOL",
343+
"instrument": "Planck",
344+
"maxOrder": 3
345+
},
346+
{
347+
"name": "PLANCK-SYNCHPOL-LOG",
348+
"format": "png fits",
349+
"url": "http://lambda.gsfc.nasa.gov/data/hips/Planck_SynchPol_Amp_log_256.fitsHiPS",
350+
"frame": "galactic",
351+
"id": "PLANCK-SYNCHPOL-LOG",
352+
"instrument": "Planck",
353+
"maxOrder": 3
291354
}
292355
];
293356

0 commit comments

Comments
 (0)