Skip to content

Plot image of comparison stars #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amychan331 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Plot image of comparison stars #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions imageflow/static/imageflow/js/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ function plotImage($container, canvas, imageUrl, opts) {
0, 0, img.width * ratio, img.height * ratio);

// Then plot stars from the data source.
if (window.comparisonStarData) {
plotStars(canvas, window.comparisonStarData, {
color: '#4B008',
radius: 6,
text: function(star) {
return star.id;
}
});
}
if (window.catalogData) {
plotStars(canvas, window.catalogData, {
color: 'red',
Expand Down
2 changes: 2 additions & 0 deletions lightcurve/static/lightcurve/js/lightcurve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ $(function() {
setupFilterSelection();
setupModals();
setupAddAllImages();

setupPlot();
});

})();
4 changes: 4 additions & 0 deletions lightcurve/templates/lightcurve.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ <h2 id="select-comp-stars">Comparison Stars</h2>
Magnitudes shown are from the <a href="/analysis/reference_stars/{{images.0.analysis.id}}">first image</a>.
To review comparison stars in more detail, review the 'Reference Stars' page for each image.
</p>
{% include 'partials/comparison_stars_plot.html' %}
{% include 'partials/comparison_stars.html' %}
{% else %}
<p class="alert alert-danger">Uh oh - there are no common stars. Please tune your photometry to make sure some known stars are picked up, then try again.</p>
Expand Down Expand Up @@ -400,10 +401,13 @@ <h4 class="modal-title">Select Image</h4>
window.lightcurveId = {{lightcurve.id | jsonify}};
window.comparisonStars = {{lightcurve.comparison_stars | jsonify}};
window.commonStars = {{lightcurve.common_stars | jsonify}};
window.originalImageUrl = {{images.0.analysis.original_display_url | jsonify}};
window.comparisonStarData = {{ lightcurve.common_stars | jsonify }};
</script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="{% static "imageflow/js/lib/stupidtable.min.js" %}" type="text/javascript"></script>
<script src="{% static "imageflow/js/csrf.js" %}" type="text/javascript"></script>
<script src="{% static "imageflow/js/shared.js" %}" type="text/javascript"></script>
<script src="{% static "imageflow/js/util.js" %}" type="text/javascript"></script>
<script src="{% static "lightcurve/js/lightcurve.js" %}" type="text/javascript"></script>
<script src="{% static "lightcurve/js/reduction.js" %}" type="text/javascript"></script>
Expand Down
12 changes: 12 additions & 0 deletions lightcurve/templates/partials/comparison_stars_plot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div class="well">
<div>
<p>
Field position:
(<span id="canvas-x-pos">0</span>,
<span id="canvas-y-pos">0</span>)
</p>
<div id="plot-container" style="width: 100%; height: 800px; background-color:#ccc;">
<canvas id="star-plot" style="cursor: crosshair" />
</div>
</div>
</div>