Skip to content

GeoInt_SIDT
GeoInt_SIDT
Commit 2c4ffb0c authored by Emmanuel René Huchim Puc's avatar Emmanuel René Huchim Puc
Browse files
Options

Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev

parents 8dc6efe8 59af888a
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 37 deletions
catalog/views.py
View file @ 2c4ffb0c
......@@ -495,23 +495,23 @@ def Pay(request):
# ---------------test process----------------------
print("PAGAR!!!!")
user = User.objects.get(id=request.user.id)
query = []
query = Purchase.objects.values('id', 'search__area', 'user', 'user__username', 'user__email', 'search_id',
product_list = []
product_list = Purchase.objects.values('id', 'search__area', 'user', 'user__username', 'user__email', 'search_id',
'search__clouds', 'search__startDate', 'search__endDate').filter(user=user,
purchased=0)
for values in query:
for product in product_list:
# print(values['user__username'])
# print(values['user__email'])
# print(values['search_id'])
# print(str(values['search__startDate'].date()).replace("-", ""))
# print(str(values['search__endDate'].date()).replace("-", ""))
# print(values['search__clouds'])
# print(values['search__area'])
print(values['id'])
username = values['user__username']
useremail = values['user__email']
# print(product['user__username'])
# print(product['user__email'])
# print(product['search_id'])
# print(str(product['search__startDate'].date()).replace("-", ""))
# print(str(product['search__endDate'].date()).replace("-", ""))
# print(product['search__clouds'])
# print(product['search__area'])
print(product['id'])
username = product['user__username']
useremail = product['user__email']
# userdir = NAS_PATH + "repsat_test_dev/"+useremail ##crea el directorio del usuario
userdir = USERS_PATH + useremail
......@@ -519,21 +519,21 @@ def Pay(request):
if not os.path.exists(userdir):
os.makedirs(userdir)
search_dir = userdir + "/" + str(values['id'])
if not os.path.exists(search_dir):
os.makedirs(search_dir)
purchase_dir = userdir + "/" + str(product['id'])
if not os.path.exists(purchase_dir):
os.makedirs(purchase_dir)
products_dir = NAS_PATH + "sentinelImages/L2A/"
linksDir = search_dir + "/L2A/"
linksDir = purchase_dir + "/L2A/"
# obtiene los datos para el json
data = {}
data['wkt'] = values['search__area']
data['wkt'] = product['search__area']
data['platform'] = 'Sentinel-2'
data['productLevel'] = 'L2A'
data['startDate'] = str(values['search__startDate'].date()).replace("-", "") # quita los guiones de la fecha
data['endDate'] = str(values['search__endDate'].date()).replace("-", "") # quita los guiones de la fecha
data['clouds'] = values['search__clouds']
data['startDate'] = str(product['search__startDate'].date()).replace("-", "") # quita los guiones de la fecha
data['endDate'] = str(product['search__endDate'].date()).replace("-", "") # quita los guiones de la fecha
data['clouds'] = product['search__clouds']
data['productsDir'] = products_dir
data['linksDir'] = linksDir
data['username'] = API_SENTINEL_USER
......@@ -544,12 +544,11 @@ def Pay(request):
json_data = json.dumps(data, indent=4)
# print(json_data)
# escribe el json en el archivo
fidProductsFile = open(search_dir + "/findProducts.json", "w")
fidProductsFile = open(purchase_dir + "/findProducts.json", "w")
fidProductsFile.write(json_data)
fidProductsFile.close()
os.system(
"L2ASCL_AreaProcessing.sh " + search_dir + "/ 1 > " + search_dir + "/L2ASCL_AreaProcessing.log") ###ejecuta el proceso
os.system(SENTINEL_PATH+"/tools/L2ASCL_AreaProcessing.sh " + purchase_dir + "/ 1 &> " + purchase_dir + "/L2ASCL_AreaProcessing.log") ###ejecuta el proceso
......
reports/static/reports/css/scldata.css
View file @ 2c4ffb0c
......@@ -2,3 +2,17 @@ body
{
background-color:White;
}
.next{
padding: 0px;
padding-top: 50%;
cursor: pointer;
font-size: 20px;
}
.prev{
padding-left: 20px;
padding-top: 50%;
cursor: pointer;
font-size: 20px;
}
reports/templates/L2ASCL_data.html
View file @ 2c4ffb0c
......@@ -5,6 +5,7 @@
<link rel="stylesheet" href="{% static 'catalog/css/map.css' %}" type="text/css">
<link rel="stylesheet" href="{% static 'catalog/css/body.css' %}" type="text/css">
<link rel="stylesheet" href="{% static 'catalog/css/modal1.css' %}" type="text/css">
<link rel="stylesheet" href="{% static 'reports/css/scldata.css' %}" type="text/css">
<!-- <link rel="stylesheet" href="https://openlayers.org/en/v4.6.4/css/ol.css" type="text/css">-->
<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.3.0/css/ol.css">
......@@ -248,7 +249,7 @@
<!-- AREA CHART -->
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title"> {{ type }} Chart Km²</h3>
<h3 class="box-title"> {{ title }} SCL Image Classification Data(Km²)</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i
......@@ -275,7 +276,7 @@
<!-- DONUT CHART -->
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title">Map Image</h3>
<h3 class="box-title" id="titleMap">{{dafaultLabel}} - {{defaultDataSet}}</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i
......@@ -286,10 +287,20 @@
</div>
</div>
<div class="box-body">
<div class="row">
<div class="col-lg-1 prev" style="display: none">
<i class="glyphicon glyphicon-chevron-left" onclick="prev()"></i>
</div>
<div class="col-lg-10 col-lg-offset-1" id="showImage">
<img onclick="window.open(this.src)" class="img-responsive" id="satImage" width="400"
height="400px"
height="400px" src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}/{{dafaultLabel}}_TCI_60m.jpg"
style="margin-left: auto; margin-right: auto; display: block;">
</div>
<div class="col-lg-1 next" style="display: none">
<i class="glyphicon glyphicon-chevron-right" onclick="next()"></i>
</div>
</div>
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
......@@ -358,8 +369,7 @@
config.options = {
responsive: true,
maintainAspectRatio: false,
<!-- scales: {xAxes: [{stacked: true}],yAxes: [{stacked: true}]},-->
title: {text: "SCL Image Classification Data (Km²)", display: true},
// scales: { xAxes: [{ stacked: true }], yAxes: [{ stacked: true }] },
};
{% endautoescape %}
// Creamos una gráfica con los datos al macenados en config
......@@ -367,22 +377,63 @@
//ctx.canvas.width = 256;
//ctx.canvas.height = 512;
var myChart = new Chart(ctx, config);
var activePoints = [];
var imageNumber = 0;
//var myChart;
// mostrar imagen al dar click en los puntos
document.getElementById("myChart").onclick = function (evt) {
var activePoints = myChart.getElementsAtEvent(evt);
var firstPoint = activePoints[0];
$("#showImage").removeClass('col-lg-offset-1');
$(".next").show()
$(".prev").show()
activePoints = myChart.getElementsAtEvent(evt);
var activePoint = myChart.getElementAtEvent(evt);
var firstPoint = activePoint[0];
if (!firstPoint) return;
activePoints.forEach(function(value,index){
if(value==firstPoint){
imageNumber=index;
}
});
label = myChart.data.labels[firstPoint._index];
updateImage(firstPoint);
//alert("{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg");
//document.getElementById("satImage").src = "{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg";
document.getElementById("satImage").src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}/" + label + "_TCI_60m.jpg"
};
// cambiar el tipo de gráfica
function next(){
if(imageNumber==(activePoints.length-1)){
imageNumber=0;
}else {
imageNumber++;
}
var imagePoint = activePoints[imageNumber];
if (!imagePoint) return;
updateImage(imagePoint);
}
function prev() {
if (imageNumber == 0) {
imageNumber = activePoints.length - 1;
} else {
imageNumber--;
}
var imagePoint = activePoints[imageNumber];
if (!imagePoint) return;
updateImage(imagePoint);
}
function updateImage(imagePoint){
label = myChart.data.labels[imagePoint._index];
datasets = myChart.data.datasets[imagePoint._datasetIndex].label;
document.getElementById("titleMap").innerHTML = label + " - " + datasets;
document.getElementById("satImage").src = "../../static/reports/tmpImages/repsat_test_dev/{{IMAGE_PATH}}/" + label + "_TCI_60m.jpg"
}
function change(newType) {
var ctx = document.getElementById("myChart").getContext("2d");
......
reports/views.py
View file @ 2c4ffb0c
......@@ -67,12 +67,14 @@ def report_L2ASCL(request, report,purchase_id):
data['datasets'].sort(key=lambda k: max(k['data']))
graphData['data'] = data
defaultLabel = graphData['data']['labels'][0]
defaultDataset = graphData['data']['datasets'][0]['label']
# print(settings.BASE_URL)
# graphData['options']['responsive']=True
# graphData['options']['maintainAspectRatio']=False
# print(json.dumps(graphData).encode("utf-8"))
return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": report, "IMAGE_PATH": image_path})
return render(request, 'L2ASCL_data.html', {"graphData": json.dumps(graphData), "report_name": report, "IMAGE_PATH": image_path, 'dafaultLabel': defaultLabel, 'defaultDataSet': defaultDataset})
# -------------------------------------------------------------------------------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