Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mario Chirinos Colunga
GeoInt_SIDT
Commits
fda542e3
Commit
fda542e3
authored
Mar 12, 2019
by
Sergio Adrian Gongora Euan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new view in images of reports
parent
669564ce
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
222 additions
and
137 deletions
+222
-137
scldata.css
reports/static/reports/css/scldata.css
+25
-0
reportImg.js
reports/static/reports/js/reportImg.js
+43
-20
L2ASCL_data.html
reports/templates/L2ASCL_data.html
+153
-116
views.py
reports/views.py
+1
-1
No files found.
reports/static/reports/css/scldata.css
View file @
fda542e3
...
@@ -26,11 +26,36 @@ body
...
@@ -26,11 +26,36 @@ body
height
:
550px
;
/*should be the same height as the images*/
height
:
550px
;
/*should be the same height as the images*/
}
}
.listImg
{
z-index
:
4
;
}
.listImg
ul
{
list-style
:
none
;
padding
:
0px
;
margin
:
0px
;
cursor
:
pointer
;
}
.listImg
ul
li
:hover
{
background
:
#87CEFA
;
}
.listImg
ul
.active
{
color
:
red
}
.list
{
max-height
:
220px
;
overflow
:
auto
;
}
.img-comp-img
{
.img-comp-img
{
position
:
absolute
;
position
:
absolute
;
width
:
auto
;
width
:
auto
;
height
:
auto
;
height
:
auto
;
overflow
:
hidden
;
overflow
:
hidden
;
z-index
:
2
;
}
}
.img-comp-img
img
{
.img-comp-img
img
{
...
...
reports/static/reports/js/reportImg.js
View file @
fda542e3
...
@@ -13,9 +13,6 @@ var reportImg = activePoints[0];
...
@@ -13,9 +13,6 @@ var reportImg = activePoints[0];
// 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
)
{
if
(
slider
!=
false
)
{
deleteComparisons
()
}
stop
();
stop
();
console
.
log
(
"on click"
)
console
.
log
(
"on click"
)
...
@@ -44,8 +41,6 @@ document.getElementById("myChart").onclick = function (evt) {
...
@@ -44,8 +41,6 @@ document.getElementById("myChart").onclick = function (evt) {
});
});
var
imagePoint
=
activePoints
[
imageNumber
];
var
imagePoint
=
activePoints
[
imageNumber
];
oldLabel
=
label
.
slice
(
0
,
4
)
+
"/"
+
label
.
slice
(
4
,
6
)
+
"/"
+
label
.
slice
(
6
);
document
.
getElementById
(
"satImageSecond"
).
src
=
"../../static/reports/tmpImages/repsat_test_dev/"
+
image_path
+
label
+
"_TCI_60m.jpg"
updateImage
(
imagePoint
);
updateImage
(
imagePoint
);
//updateImage(firstPoint);
//updateImage(firstPoint);
//alert("{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg");
//alert("{{ IMAGE_PATH }}"+label+"_TCI_60m.jpg");
...
@@ -62,10 +57,6 @@ function play() {
...
@@ -62,10 +57,6 @@ function play() {
// $(".next").hide();
// $(".next").hide();
// $(".prev").hide();
// $(".prev").hide();
// $("#showImage").addClass('col-lg-offset-1');
// $("#showImage").addClass('col-lg-offset-1');
if
(
slider
==
false
)
{
document
.
getElementById
(
"titleMap"
).
innerHTML
=
oldLabel
+
" vs "
+
oldLabel
;
initComparisons
()
}
playImages
=
setInterval
(
function
()
{
next
();
},
4000
);
playImages
=
setInterval
(
function
()
{
next
();
},
4000
);
}
}
...
@@ -128,11 +119,8 @@ function updateImage(imagePoint) {
...
@@ -128,11 +119,8 @@ function updateImage(imagePoint) {
label
=
imagePoint
;
label
=
imagePoint
;
reportImg
=
imagePoint
;
reportImg
=
imagePoint
;
titleLabel
=
label
.
slice
(
0
,
4
)
+
"/"
+
label
.
slice
(
4
,
6
)
+
"/"
+
label
.
slice
(
6
);
titleLabel
=
label
.
slice
(
0
,
4
)
+
"/"
+
label
.
slice
(
4
,
6
)
+
"/"
+
label
.
slice
(
6
);
if
(
slider
!=
false
)
{
document
.
getElementById
(
"titleMap"
).
innerHTML
=
oldLabel
+
" vs "
+
titleLabel
;
}
else
{
document
.
getElementById
(
"titleMap"
).
innerHTML
=
titleLabel
;
document
.
getElementById
(
"titleMap"
).
innerHTML
=
titleLabel
;
}
document
.
getElementById
(
"titleSCL"
).
innerHTML
=
titleLabel
document
.
getElementById
(
"satImage"
).
src
=
"../../static/reports/tmpImages/repsat_test_dev/"
+
image_path
+
label
+
"_TCI_60m.jpg"
document
.
getElementById
(
"satImage"
).
src
=
"../../static/reports/tmpImages/repsat_test_dev/"
+
image_path
+
label
+
"_TCI_60m.jpg"
...
@@ -174,11 +162,11 @@ function change(newType) {
...
@@ -174,11 +162,11 @@ function change(newType) {
let
img
,
imgWidth
=
0
,
slider
=
false
,
clicked
=
0
;
let
img
,
imgWidth
=
0
,
slider
=
false
,
clicked
=
0
;
function
initComparisons
()
{
function
initComparisons
()
{
$
(
"#showSecondImage"
).
show
()
//
$("#showSecondImage").show()
setTimeout
(
function
()
{
//
setTimeout(function() {
img
=
document
.
getElementsByClassName
(
"img-comp-overlay"
)[
0
];
img
=
document
.
getElementsByClassName
(
"img-comp-overlay"
)[
0
];
compareImages
(
img
);
compareImages
(
img
);
});
//
});
// setTimeout(function(){
// setTimeout(function(){
// img = document.getElementsByClassName("img-comp-overlay")[0];
// img = document.getElementsByClassName("img-comp-overlay")[0];
// compareImages(img);
// compareImages(img);
...
@@ -194,7 +182,7 @@ function compareImages(img) {
...
@@ -194,7 +182,7 @@ function compareImages(img) {
img
.
style
.
width
=
((
imgWidth
/
2
))
+
15
+
"px"
;
img
.
style
.
width
=
((
imgWidth
/
2
))
+
15
+
"px"
;
/*create slider:*/
/*create slider:*/
slider
=
document
.
createElement
(
"DIV"
);
slider
=
document
.
createElement
(
"DIV"
);
slider
.
setAttribute
(
"class"
,
"img-comp-slider col-lg-offset-
1 col-md-offset-1
col-xs-offset-2"
);
slider
.
setAttribute
(
"class"
,
"img-comp-slider col-lg-offset-
2 col-md-offset-2
col-xs-offset-2"
);
/*insert slider*/
/*insert slider*/
img
.
parentElement
.
insertBefore
(
slider
,
img
);
img
.
parentElement
.
insertBefore
(
slider
,
img
);
/*position the slider in the middle:*/
/*position the slider in the middle:*/
...
@@ -265,9 +253,44 @@ function deleteComparisons(){
...
@@ -265,9 +253,44 @@ function deleteComparisons(){
window
.
removeEventListener
(
"mousemove"
,
slideMove
);
window
.
removeEventListener
(
"mousemove"
,
slideMove
);
window
.
removeEventListener
(
"touchmove"
,
slideMove
);
window
.
removeEventListener
(
"touchmove"
,
slideMove
);
$
(
".img-comp-slider"
).
remove
();
$
(
".img-comp-slider"
).
remove
();
$
(
"#showSecondImage"
).
hide
()
slider
=
false
;
slider
=
false
;
}
}
//deleteComparisons();
//deleteComparisons();
//initComparisons();
//initComparisons();
function
selectImage1
(
date
,
element
)
{
$
(
"#imageListFirst li"
).
removeClass
(
"active"
);
element
.
classList
.
add
(
"active"
);
let
label
=
date
.
toString
();
label
=
label
.
slice
(
0
,
4
)
+
"/"
+
label
.
slice
(
4
,
6
)
+
"/"
+
label
.
slice
(
6
);
document
.
getElementById
(
"titleImageFirst"
).
innerHTML
=
label
;
document
.
getElementById
(
"satImageFirst"
).
src
=
"../../static/reports/tmpImages/repsat_test_dev/"
+
image_path
+
date
+
"_TCI_60m.jpg"
}
function
selectImage2
(
date
,
element
)
{
$
(
"#imageListSecond li"
).
removeClass
(
"active"
);
element
.
classList
.
add
(
"active"
);
let
label
=
date
.
toString
();
label
=
label
.
slice
(
0
,
4
)
+
"/"
+
label
.
slice
(
4
,
6
)
+
"/"
+
label
.
slice
(
6
);
document
.
getElementById
(
"titleImageSecond"
).
innerHTML
=
label
;
document
.
getElementById
(
"satImageSecond"
).
src
=
"../../static/reports/tmpImages/repsat_test_dev/"
+
image_path
+
date
+
"_TCI_60m.jpg"
}
$
(
'.nav-tabs a'
).
on
(
'shown.bs.tab'
,
function
(
evt
)
{
let
tab
=
$
(
evt
.
target
).
text
();
if
(
tab
==
"Comparison"
){
initComparisons
()
}
});
$
(
'.nav-tabs a'
).
on
(
'hide.bs.tab'
,
function
(
evt
)
{
let
tab
=
$
(
evt
.
target
).
text
();
if
(
tab
==
"Comparison"
)
{
deleteComparisons
();
}
if
(
tab
==
"Images"
)
{
stop
();
}
});
reports/templates/L2ASCL_data.html
View file @
fda542e3
This diff is collapsed.
Click to expand it.
reports/views.py
View file @
fda542e3
...
@@ -123,7 +123,7 @@ def report_L2ASCL(request, report, purchase_id):
...
@@ -123,7 +123,7 @@ def report_L2ASCL(request, report, purchase_id):
"productLevel"
:
dataProduct
[
'productLevel'
],
"IMAGE_PATH"
:
image_path
,
"productLevel"
:
dataProduct
[
'productLevel'
],
"IMAGE_PATH"
:
image_path
,
"SCL_PATH"
:
SCL_path
,
'dafaultLabel'
:
defaultLabel
,
"SCL_PATH"
:
SCL_path
,
'dafaultLabel'
:
defaultLabel
,
'defaultDataSet'
:
defaultDataset
,
"folders"
:
folders
,
'defaultDataSet'
:
defaultDataset
,
"folders"
:
folders
,
"zone"
:
reporteDir
,
"purchaseID"
:
purchase_id
})
"zone"
:
reporteDir
,
"purchaseID"
:
purchase_id
,
"labels"
:
graphData
[
'data'
][
'labels'
]
})
# -------------------------------------------------------------------------------def Reports(request):
# -------------------------------------------------------------------------------def Reports(request):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment