Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 550e1b3f authored by Ulises Morales Ramírez's avatar Ulises Morales Ramírez
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	reports/views.py
parents 5245fc8e 43dd87b3
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 27 deletions
reports/templates/L2ASCL_data.html
View file @ 550e1b3f
...@@ -302,14 +302,15 @@ ...@@ -302,14 +302,15 @@
<div class="box box-danger"> <div class="box box-danger">
<div class="box-header with-border"> <div class="box-header with-border">
<div class="pull-left"> <div class="pull-left">
<button type="button" id="play" class="btn btn-block btn-primary btn-xs" style="display: none" onclick="play()"> <button type="button" id="play" class="btn btn-block btn-primary btn-xs" style="" onclick="play()">
<i class="fa fa-play"></i> Play <i class="fa fa-play"></i> Play
</button> </button>
<button type="button" id="stop" class="btn btn-block btn-primary btn-xs" style="display: none; margin: 0px;" onclick="stop()"> <button type="button" id="stop" class="btn btn-block btn-primary btn-xs" style="display: none; margin: 0px;" onclick="stop()">
<i class="fa fa-stop"></i> Stop <i class="fa fa-stop"></i> Stop
</button> </button>
</div> </div>
<h3 class="box-title" id="titleMap">{{dafaultLabel}} - {{defaultDataSet}}</h3> <!-- <h3 class="box-title" id="titleMap">{{dafaultLabel}} - {{defaultDataSet}}</h3> -->
<h3 class="box-title" id="titleMap">{{defaultDataSet}}</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i <button type="button" class="btn btn-box-tool" data-widget="collapse"><i
...@@ -321,15 +322,15 @@ ...@@ -321,15 +322,15 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
<div class="col-lg-1 prev" style="display: none"> <div class="col-lg-1 col-md-1 col-xs-1 prev" style="display: none">
<i class="glyphicon glyphicon-chevron-left" onclick="prev()"></i> <i class="glyphicon glyphicon-chevron-left" onclick="prev()"></i>
</div> </div>
<div class="col-lg-10 col-lg-offset-1" id="showImage"> <div class="col-lg-10 col-md-9 col-xs-10 col-lg-offset-1" id="showImage">
<img onclick="window.open(this.src)" class="img-responsive" id="satImage" width="400" <img onclick="window.open(this.src)" class="img-responsive" id="satImage" width="400"
height="400px" src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}/{{dafaultLabel}}_TCI_60m.jpg" height="400px" src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}{{dafaultLabel}}_TCI_60m.jpg"
style="margin-left: auto; margin-right: auto; display: block;"> style="margin-left: auto; margin-right: auto; display: block;">
</div> </div>
<div class="col-lg-1 next" style="display: none"> <div class="col-lg-1 col-md-1 col-xs-1 next" style="display: none">
<i class="glyphicon glyphicon-chevron-right" onclick="next()"></i> <i class="glyphicon glyphicon-chevron-right" onclick="next()"></i>
</div> </div>
</div> </div>
...@@ -375,7 +376,7 @@ ...@@ -375,7 +376,7 @@
<i class="fa fa-dribbble"> </i> <i class="fa fa-dribbble"> </i>
</a> </a>
</li> </li>
</ul> </ul>-->
<!-- Social buttons --> <!-- Social buttons -->
</div> </div>
...@@ -410,7 +411,8 @@ ...@@ -410,7 +411,8 @@
//ctx.canvas.width = 256; //ctx.canvas.width = 256;
//ctx.canvas.height = 512; //ctx.canvas.height = 512;
var myChart = new Chart(ctx, config); var myChart = new Chart(ctx, config);
var activePoints = []; //var activePoints = [];
var activePoints = config.data.labels;
var imageNumber = 0; var imageNumber = 0;
var playImages; var playImages;
//var myChart; //var myChart;
...@@ -418,18 +420,21 @@ ...@@ -418,18 +420,21 @@
// mostrar imagen al dar click en los puntos // mostrar imagen al dar click en los puntos
document.getElementById("myChart").onclick = function (evt) { document.getElementById("myChart").onclick = function (evt) {
stop(); stop();
activePoints = myChart.getElementsAtEvent(evt); // activePoints = myChart.getElementsAtEvent(evt);
var activePoint = myChart.getElementAtEvent(evt); var activePoint = myChart.getElementAtEvent(evt);
var firstPoint = activePoint[0]; var firstPoint = activePoint[0];
var label = myChart.data.labels[firstPoint._index];
if (!firstPoint) return; //if (!firstPoint) return;
activePoints.forEach(function(value,index){ activePoints.forEach(function(value,index){
if(value==firstPoint){ //if(value==firstPoint){
if (value == label) {
imageNumber=index; imageNumber=index;
} }
}); });
updateImage(firstPoint); var imagePoint = activePoints[imageNumber];
updateImage(imagePoint);
//updateImage(firstPoint);
//alert("{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg"); //alert("{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg");
//document.getElementById("satImage").src = "{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg"; //document.getElementById("satImage").src = "{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg";
}; };
...@@ -437,21 +442,21 @@ ...@@ -437,21 +442,21 @@
function play(){ function play(){
$("#play").hide(); $("#play").hide();
$("#stop").show(); $("#stop").show();
$(".next").hide(); // $(".next").hide();
$(".prev").hide(); // $(".prev").hide();
$("#showImage").addClass('col-lg-offset-1'); // $("#showImage").addClass('col-lg-offset-1');
playImages = setInterval(() => { playImages = setInterval(() => {
next(); next();
}, 2000); }, 4000);
} }
function stop(){ function stop(){
clearInterval(playImages) clearInterval(playImages)
$("#showImage").removeClass('col-lg-offset-1'); // $("#showImage").removeClass('col-lg-offset-1');
$("#play").show(); $("#play").show();
$("#stop").hide(); $("#stop").hide();
$(".next").show(); // $(".next").show();
$(".prev").show(); // $(".prev").show();
} }
// cambiar el tipo de gráfica // cambiar el tipo de gráfica
function next(){ function next(){
...@@ -480,10 +485,13 @@ ...@@ -480,10 +485,13 @@
} }
function updateImage(imagePoint){ function updateImage(imagePoint){
label = myChart.data.labels[imagePoint._index]; //label = myChart.data.labels[imagePoint._index];
datasets = myChart.data.datasets[imagePoint._datasetIndex].label; //datasets = myChart.data.datasets[imagePoint._datasetIndex].label;
document.getElementById("titleMap").innerHTML = label + " - " + datasets; //document.getElementById("titleMap").innerHTML = label + " - " + datasets;
document.getElementById("satImage").src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}/" + label + "_TCI_60m.jpg" label = imagePoint;
titleLabel = label.slice(0,4)+"/"+label.slice(4, 6)+"/"+ label.slice(6);
document.getElementById("titleMap").innerHTML = titleLabel;
document.getElementById("satImage").src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}" + label + "_TCI_60m.jpg"
} }
function change(newType) { function change(newType) {
...@@ -521,8 +529,8 @@ ...@@ -521,8 +529,8 @@
height: reportPageHeight height: reportPageHeight
}); });
// Mantenemos la posicion del canvas // Mantenemos la posicion del canvaslabel
var pdfctx = $(pdfCanvas)[0].getContext('2d'); var pdfctx = $(pdfCanvas)[0].getContlabel
var pdfctxX = 0; var pdfctxX = 0;
var pdfctxY = 0; var pdfctxY = 0;
var buffer = 100; var buffer = 100;
......
reports/views.py
View file @ 550e1b3f
...@@ -75,8 +75,10 @@ def report_L2ASCL(request, report, purchase_id): ...@@ -75,8 +75,10 @@ def report_L2ASCL(request, report, purchase_id):
data['datasets'].sort(key=lambda k: max(k['data'])) data['datasets'].sort(key=lambda k: max(k['data']))
graphData['data'] = data graphData['data'] = data
label = graphData['data']['labels'][0]
defaultLabel = graphData['data']['labels'][0] defaultLabel = graphData['data']['labels'][0]
defaultDataset = graphData['data']['datasets'][0]['label'] defaultDataset = label[0:4]+"/"+label[4:6]+"/"+label[6:]
#defaultDataset = graphData['data']['datasets'][0]['label']
# print(settings.BASE_URL) # print(settings.BASE_URL)
# graphData['options']['responsive']=True # graphData['options']['responsive']=True
# graphData['options']['maintainAspectRatio']=False # graphData['options']['maintainAspectRatio']=False
...@@ -84,6 +86,7 @@ def report_L2ASCL(request, report, purchase_id): ...@@ -84,6 +86,7 @@ def report_L2ASCL(request, report, purchase_id):
return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": "SCL Image Classification Data(Km²)", "IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders }) return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": "SCL Image Classification Data(Km²)", "IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset, "folders" : folders })
# -------------------------------------------------------------------------------def Reports(request): # -------------------------------------------------------------------------------def Reports(request):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment