Skip to content

Commit 465a5a2

Browse files
cwang2016cwang2016
authored
Merge pull request #440 from Caltech-IPAC/DM-11556-ffapislatetest2
DM-11556 Update chart content of grid-view sample, ffapi-slate-test2.html
2 parents 815444b + c51f109 commit 465a5a2

File tree

1 file changed

+77
-25
lines changed

1 file changed

+77
-25
lines changed

‎src/firefly/html/demo/ffapi-slate-test2.html

Lines changed: 77 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@
5353
</div>
5454
<pre>
5555
try:
56-
148.88822;69.06529;EQ_J2000
57-
202.48417;47.23056;EQ_J2000
56+
148.88822;69.06529;EQ_J2000 # Galaxy M81
57+
202.48417;47.23056;EQ_J2000 # Galaxy M51
58+
136.9316774;+1.1195886;galactic # W5 star-forming region
59+
10.68479;41.26906;EQ_J2000 # Galaxy M31
5860
</pre>
5961

6062

@@ -94,7 +96,7 @@
9496
<a href="javascript:load3C(getSTarget(),0,2,2,2)">3 Color</a> in cell <span class='smallCoords'>at row: 0, col: 2, w:2 h: 2</span>
9597
</li>
9698
</ul>
97-
99+
</body>
98100

99101

100102
<script type="text/javascript">
@@ -147,7 +149,7 @@
147149
WorldPt : sTarget,
148150
RangeValues : firefly.util.image.RangeValues.serializeSimple('Sigma',-2,8,'Linear'),
149151
SizeInDeg : '1'
150-
},
152+
}
151153
];
152154

153155

@@ -160,15 +162,23 @@
160162
function loadNewCharts(r,c,w,h) {
161163
firefly.getViewer().addCell(r,c,w,h, 'xyPlots', 'newChartContainer');
162164

163-
trace1 = {
164-
x: "tables::wiseCatTbl,ra",
165-
y: "tables::wiseCatTbl,dec",
165+
var trace1 = {
166+
x: "tables::wiseCatTbl,w1mpro-w2mpro",
167+
y: "tables::wiseCatTbl,w2mpro-w3mpro",
166168
mode: 'markers',
167-
type: 'scatter'
169+
type: 'scatter',
170+
marker: {size: 4}
171+
};
172+
173+
var layoutS = {
174+
title: 'Color-Color',
175+
xaxis: {title: 'w1mpro-w2mpro (mag)'},
176+
yaxis: {title: 'w2mpro-w3mpro (mag)'}
168177
};
169178

170-
firefly.getViewer().showPlot({chartId: 'newChart1', data: [trace1], fireflyData: [{dataType: 'fireflyScatter'}]},
171-
'newChartContainer');
179+
firefly.getViewer().showPlot(
180+
{chartId: 'newChart1', layout: layoutS, data: [trace1], fireflyData: [{dataType: 'fireflyScatter'}]},
181+
'newChartContainer');
172182
}
173183

174184
function loadNewHeatmapCharts(r,c,w,h) {
@@ -205,16 +215,23 @@
205215
{dataType: 'fireflyHeatmap'}
206216
];
207217

208-
firefly.getViewer().showPlot({chartId: 'newChart2', data: dataHM, fireflyData:fireflyDataHM },
209-
'heatMapContainer');
218+
var layoutHM = {
219+
title: 'Magnitude-magnitude densities',
220+
xaxis: {title: 'w1 photometry (mag)'},
221+
yaxis: {title: ''}
222+
};
223+
224+
firefly.getViewer().showPlot(
225+
{chartId: 'newChart2', layout: layoutHM, data: dataHM, fireflyData:fireflyDataHM },
226+
'heatMapContainer');
210227
}
211228

212229
function loadHistogramCharts(r,c,w,h) {
213230
firefly.getViewer().addCell(r,c,w,h, 'xyPlots', 'histContainer');
214231

215232
var dataH = [
216-
{name: 'dec-0.02', marker: {color: 'rgba(153, 51, 153, 0.8)'}},
217-
{name: 'dec+0.02', marker: {color: 'rgba(102,153,0, 0.7)'}}
233+
{name: 'w1mpro', marker: {color: 'rgba(153, 51, 153, 0.8)'}},
234+
{name: 'w2mpro', marker: {color: 'rgba(102,153,0, 0.7)'}}
218235
];
219236

220237
var fireflyDataH = [
@@ -225,7 +242,7 @@
225242
algorithm: 'fixedSizeBins',
226243
fixedBinSizeSelection: 'numBins',
227244
numBins: 30,
228-
columnOrExpr: 'dec-0.02'
245+
columnOrExpr: 'w1mpro'
229246
}
230247
},
231248
{
@@ -235,12 +252,20 @@
235252
algorithm: 'fixedSizeBins',
236253
fixedBinSizeSelection: 'numBins',
237254
numBins: 40,
238-
columnOrExpr: 'dec+0.02' // same column but shifted
255+
columnOrExpr: 'w2mpro' // same column but shifted
239256
}
240257
}
241258
];
242-
firefly.getViewer().showPlot({chartId: 'firefly-hist-tbl', data: dataH, fireflyData: fireflyDataH},
243-
'histContainer');
259+
260+
var layoutHist = {
261+
title: 'Photometry histogram',
262+
xaxis: {title: 'photometry (mag)'},
263+
yaxis: {title: ''}
264+
};
265+
266+
firefly.getViewer().showPlot(
267+
{chartId: 'firefly-hist-tbl', layout: layoutHist, data: dataH, fireflyData: fireflyDataH},
268+
'histContainer');
244269
}
245270

246271
function load3DChart(r,c,w,h) {
@@ -250,26 +275,52 @@
250275
var data3d = [
251276
{
252277
type: 'scatter3d',
253-
name: 'w1-w2',
278+
name: 'w1-w2-w3',
254279
x: "tables::wiseCatTbl,w1mpro",
255280
y: "tables::wiseCatTbl,w2mpro",
256281
z: "tables::wiseCatTbl,w3mpro",
257282
mode : 'markers',
258283
marker : {
259-
size: 5,
260-
opacity: 0.6
261-
}
284+
size: 3,
285+
line: {
286+
color: 'rgb(127, 127, 127, 0.14)',
287+
width: 1
288+
}
289+
},
290+
hoverinfo: 'x+y+z'
262291
}
263292
];
264293

265-
firefly.getViewer().showPlot({chartId: 'newChart3', data: data3d },
266-
'3dChartContainer');
294+
var tfont = {size: 11};
295+
var layout3d = {
296+
title: 'Photometry in band 1, 2, 3',
297+
xaxis: {visible: false},
298+
yaxis: {visible: false},
299+
scene:{
300+
xaxis: {
301+
title: 'w1 (mag)',
302+
titlefont: tfont
303+
},
304+
yaxis: {
305+
title: 'w2 (mag)',
306+
titlefont: tfont
307+
},
308+
zaxis: {
309+
title: 'w3 (mag)',
310+
titlefont: tfont
311+
}
312+
}
313+
};
314+
315+
firefly.getViewer().showPlot(
316+
{chartId: 'newChart3', layout: layout3d, data: data3d },
317+
'3dChartContainer');
267318
}
268319

269320

270321
function showATable(sTarget,r,c,w,h) {
271322
firefly.getViewer().addCell(r,c,w,h, 'tables');
272-
var req= firefly.util.table.makeIrsaCatalogRequest('another wise catalog', 'WISE', 'allwise_p3as_psd',
323+
var req= firefly.util.table.makeIrsaCatalogRequest('WISE catalog', 'WISE', 'allwise_p3as_psd',
273324
{ position: sTarget,
274325
SearchMethod: 'Cone',
275326
radius: 1200,
@@ -333,3 +384,4 @@
333384
<script type="text/javascript" src="../firefly_loader.js"></script>
334385

335386

387+
</html>

0 commit comments

Comments
 (0)