Gitlab CSE Unil

Commit 92c34198 authored by Julien Furrer's avatar Julien Furrer
Browse files

Ajustement pour env anodate

parent 72e0c3f6
......@@ -30,6 +30,7 @@ define(["underscore", "paper", "signals"], function (_, paper, Signal) {
_categories['default'] = _categories[id];
}
});
_categories['default'] = _categories['cat_2'];
}
/**
......
......@@ -23,7 +23,7 @@ define([
var defaultProperties = {
//comment: "",
labelComment: "",
category: ""
category: "cat_2"
};
// Markers management related
......@@ -51,12 +51,17 @@ define([
var curLayer = paper.project.activeLayer;
layer.activate();
// Keep copy of current category
var curCat = defaultProperties.category;
var marker = createMarker(itemData.origin, itemData, listening);
if (itemData.prop.category) {
_setCategory.call(marker, itemData.prop.category);
}
// Restore states
curLayer.activate();
defaultProperties.category = curCat;
return marker;
}
......@@ -310,6 +315,7 @@ define([
var category = Category.getCategory(catId),
color = (category && category.color) || "#000000";
_setColor.call(this, color);
defaultProperties.category = catId;
}
......@@ -483,6 +489,7 @@ define([
var marker = hitOnMarkerTest(event.point);
if (marker) {
debugger;
if (!marker.selected) {
paper.project.deselectAll();
marker.selected = true;
......@@ -504,6 +511,7 @@ define([
itemMouseDown.call(marker, event);
_selectedMarker = marker;
_events.annotationSelected.dispatch(marker);
}
},
......
......@@ -191,7 +191,7 @@ body {
font-family: OpenSans, "Helvetica Neue", Helvetica, Arial, sans-serif;
}
body.theme-light {
background-color: #f2f2f2;
background-color: #F2F2F2;
}
body.theme-dark {
background-color: #424242;
......@@ -216,7 +216,7 @@ body {
padding-top: 33%;
}
.theme-light #page-loader {
background-color: #f2f2f2;
background-color: #F2F2F2;
}
#main-navbar {
margin-bottom: 10px;
......@@ -291,7 +291,7 @@ body {
background-image: none;
}
#main-navbar .dropdown-menu .dropdown-header {
color: #aaaaaa;
color: #aaa;
}
#main-navbar .annot-saved-status .annot-stat {
display: none;
......@@ -396,12 +396,12 @@ body.home.authenticated #home-container #home-action-box .well {
padding: 20px 0 40px;
}
#home-container h1 {
color: #efefef;
color: #EFEFEF;
font-weight: 400;
margin-top: 5px;
}
#home-container h1 small {
color: #efefef;
color: #EFEFEF;
font-weight: 300;
}
#home-container #home-action-box .well {
......@@ -483,7 +483,7 @@ body.home.authenticated #home-container #home-action-box .well {
font-weight: 300;
}
#main-home {
background-color: #eeeeee;
background-color: #EEE;
border-radius: 6px;
padding: 48px 60px;
color: #f2f2f2;
......@@ -538,14 +538,14 @@ body.home.authenticated #home-container #home-action-box .well {
font-size: 12px;
}
#login-mode #login-local-panel input.form-control::-moz-placeholder {
color: #aaaaaa;
color: #aaa;
opacity: 1;
}
#login-mode #login-local-panel input.form-control:-ms-input-placeholder {
color: #aaaaaa;
color: #aaa;
}
#login-mode #login-local-panel input.form-control::-webkit-input-placeholder {
color: #aaaaaa;
color: #aaa;
}
body.home #dlg-about-adim .modal-dialog {
margin-top: 150px;
......@@ -561,7 +561,7 @@ body.home #dlg-about-adim .modal-dialog {
#dlg-about-adim .logo:link,
#dlg-about-adim .logo:active,
#dlg-about-adim .logo:visited {
color: #0096c7;
color: #0096C7;
text-decoration: none;
font-size: 65px;
display: block;
......@@ -577,7 +577,7 @@ body.home #dlg-about-adim .modal-dialog {
#dlg-about-adim .about-links a,
#dlg-about-adim .about-links a:link,
#dlg-about-adim .about-links a:visited {
color: #0096c7;
color: #0096C7;
text-decoration: none;
}
#dlg-about-adim .about-links a:hover,
......@@ -588,7 +588,7 @@ body.home #dlg-about-adim .modal-dialog {
min-height: 180px;
}
#dlg-about-adim .modal-body .row > div:first-child {
border-right: 1px solid #0096c7;
border-right: 1px solid #0096C7;
}
#dlg-about-adim .about-content .panel {
background-color: transparent;
......@@ -645,8 +645,8 @@ body.home #dlg-about-adim .modal-dialog {
#main .tool-top-row .adim-view-mod-tabs.nav-tabs > li.active a:hover,
#main .tool-top-row .adim-view-mod-tabs.nav-tabs > li.active a:focus {
color: #3c3c3c;
background-color: #c9c9c9;
border-color: #c9c9c9 #c9c9c9 #686868;
background-color: #C9C9C9;
border-color: #C9C9C9 #C9C9C9 #686868;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.adim-view.adim-view-review #tools-col,
......@@ -746,17 +746,17 @@ body.home #dlg-about-adim .modal-dialog {
margin: 0 -310px 0 25px;
}
.theme-light #side-col .side-col-collapse-but .btn {
background-color: #d0d0d0;
border-color: #a0a0a0;
background-color: #D0D0D0;
border-color: #A0A0A0;
}
.theme-light .panel.panel-default {
border-color: #a0a0a0;
border-color: #A0A0A0;
}
.theme-light .panel.panel-default > .panel-heading {
background-color: #d0d0d0;
background-color: #D0D0D0;
}
.theme-light .panel.panel-default .panel-tb {
background-color: #d0d0d0;
background-color: #D0D0D0;
}
.panel.panel-dark {
border-color: #6f6f6f;
......@@ -819,13 +819,13 @@ body.home #dlg-about-adim .modal-dialog {
height: 482px;
padding: 0;
position: relative;
background: #aaaaaa url(../img/adim/frame_background.jpg) 0 0;
background: #aaa url(../img/adim/frame_background.jpg) 0 0;
}
.canvas-container.well {
margin-bottom: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-color: #cccccc;
border-color: #CCC;
}
.canvas-container .dropzone {
display: block;
......@@ -859,7 +859,7 @@ canvas {
border-radius: 3px;
}
#canvas-bbar {
background-color: #cccccc;
background-color: #CCC;
padding: 2px 6px 0;
line-height: 1px;
border-radius: 0 0 4px 4px;
......@@ -899,16 +899,16 @@ canvas {
margin-left: -18px;
}
.theme-light canvas {
border-color: #888888;
border-color: #888;
}
.theme-light .canvas-container {
background: #aaaaaa url(../img/adim/frame_background-light.jpg) 0 0;
background: #aaa url(../img/adim/frame_background-light.jpg) 0 0;
}
.theme-light .canvas-container.well {
border-color: #f2f2f2 #f2f2f2 #e0e0e0;
border-color: #F2F2F2 #F2F2F2 #E0E0E0;
}
.theme-light #canvas-bbar {
background-color: #e0e0e0;
background-color: #E0E0E0;
border: solid #bababa;
border-width: 0 1px 1px;
}
......@@ -1049,10 +1049,10 @@ canvas {
}
#annotation-property-container {
padding: 5px 10px;
color: #cacaca;
color: #CACACA;
}
#annotation-property-container label.control-label {
color: #cacaca;
color: #CACACA;
}
#annotation-property-container .property-group {
margin-bottom: 5px;
......@@ -1066,7 +1066,7 @@ canvas {
}
#annotation-property-container .property-group.confidence-prop .rating-input > span.rating-off {
color: rgba(253, 253, 253, 0.67);
box-shadow: 0 1px 2px -1px #555555 inset, 0 -1px 1px -1px #cccccc inset;
box-shadow: 0 1px 2px -1px #555555 inset, 0 -1px 1px -1px #CCCCCC inset;
}
#annotation-property-container .property-group.confidence-prop .rating-input > span.glyphicon-star {
color: #ED9C28;
......@@ -1081,7 +1081,7 @@ canvas {
background-color: #bcbcbc;
}
#annotation-property-container .property-group.processus-prop .processus-list label.btn-default {
color: #333333;
color: #333;
}
#annotation-property-container .property-group.disabled {
color: rgba(202, 202, 202, 0.5);
......@@ -1100,16 +1100,16 @@ canvas {
background-color: #848484;
}
.category-list .btn-cat.active {
color: #ffffff !important;
color: #FFFFFF !important;
box-shadow: 0 0 1px 2px rgba(255, 255, 255, 0.75) inset;
}
.category-list .btn-cat[data-category="cat_0"] {
color: #333333;
background-color: #eeeeee;
background-color: #eee;
border-color: rgba(255, 255, 255, 0.5);
background-image: -webkit-linear-gradient(top, #eeeeee 0%, #cfcfcf 100%);
background-image: -o-linear-gradient(top, #eeeeee 0%, #cfcfcf 100%);
background-image: linear-gradient(to bottom, #eeeeee 0%, #cfcfcf 100%);
background-image: -webkit-linear-gradient(top, #eee 0%, #cfcfcf 100%);
background-image: -o-linear-gradient(top, #eee 0%, #cfcfcf 100%);
background-image: linear-gradient(to bottom, #eee 0%, #cfcfcf 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffcfcfcf', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
......@@ -1169,11 +1169,11 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_0"]:active,
.category-list .btn-cat[data-category="cat_0"].disabled.active,
.category-list .btn-cat[data-category="cat_0"][disabled].active,
fieldset[disabled] .category-list .btn-cat[data-category="cat_0"].active {
background-color: #eeeeee;
background-color: #eee;
border-color: rgba(255, 255, 255, 0.5);
}
.category-list .btn-cat[data-category="cat_0"] .badge {
color: #eeeeee;
color: #eee;
background-color: #333333;
}
.category-list .btn-cat[data-category="cat_0"]:hover,
......@@ -1322,40 +1322,40 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_1"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_1"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_1"] {
color: rgba(255, 255, 255, 0.75) !important;
font-style: normal !important;
}
.category-list .btn-cat[data-category="cat_2"] {
color: rgba(255, 255, 255, 0.75);
background-color: #5e9f73;
color: rgba(64, 64, 64, 0.75);
background-color: #e2e2c2;
border-color: rgba(255, 255, 255, 0.5);
background-image: -webkit-linear-gradient(top, #5e9f73 0%, #477957 100%);
background-image: -o-linear-gradient(top, #5e9f73 0%, #477957 100%);
background-image: linear-gradient(to bottom, #5e9f73 0%, #477957 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5e9f73', endColorstr='#ff477957', GradientType=0);
background-image: -webkit-linear-gradient(top, #e2e2c2 0%, #cfcf98 100%);
background-image: -o-linear-gradient(top, #e2e2c2 0%, #cfcf98 100%);
background-image: linear-gradient(to bottom, #e2e2c2 0%, #cfcf98 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe2e2c2', endColorstr='#ffcfcf98', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #437253;
border-color: #cbcb91;
}
.category-list .btn-cat[data-category="cat_2"]:focus,
.category-list .btn-cat[data-category="cat_2"].focus {
color: rgba(255, 255, 255, 0.75);
background-color: #4b7f5c;
color: rgba(64, 64, 64, 0.75);
background-color: #d2d29f;
border-color: rgba(191, 191, 191, 0.5);
}
.category-list .btn-cat[data-category="cat_2"]:hover {
color: rgba(255, 255, 255, 0.75);
background-color: #4b7f5c;
color: rgba(64, 64, 64, 0.75);
background-color: #d2d29f;
border-color: rgba(224, 224, 224, 0.5);
}
.category-list .btn-cat[data-category="cat_2"]:active,
.category-list .btn-cat[data-category="cat_2"].active,
.open > .dropdown-toggle.category-list .btn-cat[data-category="cat_2"] {
color: rgba(255, 255, 255, 0.75);
background-color: #4b7f5c;
color: rgba(64, 64, 64, 0.75);
background-color: #d2d29f;
border-color: rgba(224, 224, 224, 0.5);
}
.category-list .btn-cat[data-category="cat_2"]:active:hover,
......@@ -1367,8 +1367,8 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_1"].active {
.category-list .btn-cat[data-category="cat_2"]:active.focus,
.category-list .btn-cat[data-category="cat_2"].active.focus,
.open > .dropdown-toggle.category-list .btn-cat[data-category="cat_2"].focus {
color: rgba(255, 255, 255, 0.75);
background-color: #3e694c;
color: rgba(64, 64, 64, 0.75);
background-color: #c7c787;
border-color: rgba(191, 191, 191, 0.5);
}
.category-list .btn-cat[data-category="cat_2"]:active,
......@@ -1394,22 +1394,22 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_2"]:active,
.category-list .btn-cat[data-category="cat_2"].disabled.active,
.category-list .btn-cat[data-category="cat_2"][disabled].active,
fieldset[disabled] .category-list .btn-cat[data-category="cat_2"].active {
background-color: #5e9f73;
background-color: #e2e2c2;
border-color: rgba(255, 255, 255, 0.5);
}
.category-list .btn-cat[data-category="cat_2"] .badge {
color: #5e9f73;
background-color: rgba(255, 255, 255, 0.75);
color: #e2e2c2;
background-color: rgba(64, 64, 64, 0.75);
}
.category-list .btn-cat[data-category="cat_2"]:hover,
.category-list .btn-cat[data-category="cat_2"]:focus {
background-color: #477957;
background-color: #cfcf98;
background-position: 0 -15px;
}
.category-list .btn-cat[data-category="cat_2"]:active,
.category-list .btn-cat[data-category="cat_2"].active {
background-color: #477957;
border-color: #437253;
background-color: #cfcf98;
border-color: #cbcb91;
}
.category-list .btn-cat[data-category="cat_2"].disabled,
.category-list .btn-cat[data-category="cat_2"][disabled],
......@@ -1429,14 +1429,14 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_2"]:active,
.category-list .btn-cat[data-category="cat_2"].disabled.active,
.category-list .btn-cat[data-category="cat_2"][disabled].active,
fieldset[disabled] .category-list .btn-cat[data-category="cat_2"].active {
background-color: #477957;
background-color: #cfcf98;
background-image: none;
}
.category-list .btn-cat[data-category="cat_2"].active {
color: #ffffff !important;
color: rgba(38, 38, 38, 0.75) !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_2"] {
color: rgba(255, 255, 255, 0.75) !important;
color: rgba(64, 64, 64, 0.75) !important;
font-style: normal !important;
}
.category-list .btn-cat[data-category="cat_3"] {
......@@ -1544,7 +1544,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_3"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_3"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_3"] {
color: rgba(255, 255, 255, 0.75) !important;
......@@ -1655,7 +1655,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_4"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_4"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_4"] {
color: rgba(255, 255, 255, 0.85) !important;
......@@ -1766,7 +1766,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_5"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_5"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_5"] {
color: rgba(255, 255, 255, 0.85) !important;
......@@ -1877,7 +1877,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_6"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_6"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_6"] {
color: rgba(255, 255, 255, 0.85) !important;
......@@ -1988,7 +1988,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_7"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_7"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_7"] {
color: rgba(255, 255, 255, 0.85) !important;
......@@ -2099,7 +2099,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_8"].active {
background-image: none;
}
.category-list .btn-cat[data-category="cat_8"].active {
color: #ffffff !important;
color: #FFFFFF !important;
}
.property-group.disabled .category-list .btn-cat[data-category="cat_8"] {
color: rgba(255, 255, 255, 0.85) !important;
......@@ -2109,34 +2109,34 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_8"].active {
color: #333333;
}
.category-list .color-cat-1 {
color: #54848e;
color: #54848E;
}
.category-list .color-cat-2 {
color: #4b7f5c;
color: #D2D29F;
}
.category-list .color-cat-3 {
color: #6d557f;
color: #6D557F;
}
.category-list .color-cat-4 {
color: #d80918;
color: #D80918;
}
.category-list .color-cat-5 {
color: #71b800;
color: #71B800;
}
.category-list .color-cat-6 {
color: #deb709;
color: #DEB709;
}
.category-list .color-cat-7 {
color: #ff8b00;
color: #FF8B00;
}
.category-list .color-cat-8 {
color: #25bfd1;
color: #25BFD1;
}
.category-list.adim-display-type-selector .glyphicon {
text-shadow: 0 0 1px #fff;
}
.theme-light #annotation-property-container label.control-label {
color: #888888;
color: #888;
}
.theme-light #annotation-property-container .property-group.comment-prop textarea[disabled] {
background-color: #ebebeb;
......@@ -2146,7 +2146,7 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_8"].active {
}
#annotation-display-container {
padding: 5px 5px;
color: #cacaca;
color: #CACACA;
}
.btn .tool-text {
display: none;
......@@ -2310,9 +2310,9 @@ fieldset[disabled] .category-list .btn-cat[data-category="cat_8"].active {
}
.btn-group-vertical .sldr.btn-default:active,
.btn-group-vertical .sldr.btn-default:focus {
background-image: -webkit-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
background-image: -o-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
background-image: linear-gradient(to bottom, #ffffff 0%, #e0e0e0 100%);
background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
background-image: -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
box-shadow: none;
......@@ -2589,25 +2589,25 @@ canvas.cursor-tool-arrow2 {
opacity: 0.33;
}
.btn-adim-layertb {
color: #555555;
background-color: #aaaaaa;
border-color: #777777;
color: #555;
background-color: #aaa;
border-color: #777;
}
.btn-adim-layertb:focus,
.btn-adim-layertb.focus {
color: #555555;
color: #555;
background-color: #919191;
border-color: #373737;
}
.btn-adim-layertb:hover {
color: #555555;
color: #555;
background-color: #919191;
border-color: #585858;
}
.btn-adim-layertb:active,
.btn-adim-layertb.active,
.open > .dropdown-toggle.btn-adim-layertb {
color: #555555;
color: #555;
background-color: #919191;
border-color: #585858;
}
......@@ -2620,7 +2620,7 @@ canvas.cursor-tool-arrow2 {
.btn-adim-layertb:active.focus,
.btn-adim-layertb.active.focus,
.open > .dropdown-toggle.btn-adim-layertb.focus {
color: #555555;
color: #555;
background-color: #7f7f7f;
border-color: #373737;
}
......@@ -2647,21 +2647,21 @@ fieldset[disabled] .btn-adim-layertb:active,
.btn-adim-layertb.disabled.active,
.btn-adim-layertb[disabled].active,
fieldset[disabled] .btn-adim-layertb.active {
background-color: #aaaaaa;
border-color: #777777;
background-color: #aaa;
border-color: #777;
}
.btn-adim-layertb .badge {
color: #aaaaaa;
background-color: #555555;
color: #aaa;
background-color: #555;
}
.btn-adim-layertb.active,
.btn-adim-layertb:hover.active {
color: #222222;
color: #222;
}
.theme-light .btn-adim-layertb {
color: #555555;
background-color: #f0f0f0;
border-color: #c0c0c0;
background-color: #F0F0F0;
border-color: #C0C0C0;
}
.theme-light .btn-adim-layertb:focus,
.theme-light .btn-adim-layertb.focus {
......@@ -2717,11 +2717,11 @@ fieldset[disabled] .theme-light .btn-adim-layertb:active,
.theme-light .btn-adim-layertb.disabled.active,
.theme-light .btn-adim-layertb[disabled].active,
fieldset[disabled] .theme-light .btn-adim-layertb.active {
background-color: #f0f0f0;
border-color: #c0c0c0;
background-color: #F0F0F0;
border-color: #C0C0C0;
}
.theme-light .btn-adim-layertb .badge {
color: #f0f0f0;