Merge branch 'master' of https://github.com/nasa/openmctweb into open445

Conflicts:
	platform/features/plot/res/templates/plot.html
This commit is contained in:
Charles Hacskaylo 2016-01-13 16:01:02 -08:00
commit 442229fd42
5 changed files with 195 additions and 130 deletions

View File

@ -25,6 +25,7 @@
margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers
}
padding: 0 $interiorMargin;
overflow: hidden;
position: relative;
line-height: $formInputH;
select {
@ -35,7 +36,7 @@
cursor: pointer;
border: none !important;
padding: 4px 25px 2px 0px;
width: 120%;
width: 130%;
option {
margin: $interiorMargin 0; // Firefox
}

View File

@ -33,7 +33,22 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
width: 100%;
height: 100%;
.gl-plot-local-controls {
@include trans-prop-nice(opacity, 150ms);
opacity: 0;
pointer-events: none;
}
.gl-plot-display-area,
.gl-plot-axis-area {
&:hover .gl-plot-local-controls {
opacity: 1;
pointer-events: inherit;
}
}
.gl-plot-axis-area {
//@include test();
position: absolute;
&.gl-plot-x {
top: auto;
@ -114,15 +129,17 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
.gl-plot-x-options,
.gl-plot-y-options {
$h: 32px;
$h: 24px;
position: absolute;
height: auto;
height: $h;
min-height: $h;
z-index: 2;
}
.gl-plot-x-options {
top: $interiorMargin;
@include transform(translateX(-50%));
bottom: 0;
left: 50%;
}
.gl-plot-y-options {
@ -132,6 +149,12 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
left: $yLabelW + $interiorMargin * 2;
}
.t-plot-display-controls {
position: absolute;
top: $interiorMargin;
right: $interiorMargin;
}
.gl-plot-hash {
position: absolute;
border: 0 $colorPlotHash $stylePlotHash;

View File

@ -4001,6 +4001,7 @@ textarea {
text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
margin: 0 0 2px 0;
padding: 0 5px;
overflow: hidden;
position: relative;
line-height: 22px; }
/* line 297, ../../../../general/res/sass/_mixins.scss */
@ -4018,7 +4019,7 @@ textarea {
/* line 304, ../../../../general/res/sass/_mixins.scss */
.select:not(.disabled):hover > .icon, .select:not(.disabled):hover > .t-item-icon {
color: #33ccff; } }
/* line 30, ../../../../general/res/sass/forms/_selects.scss */
/* line 31, ../../../../general/res/sass/forms/_selects.scss */
.select select {
-moz-appearance: none;
-webkit-appearance: none;
@ -4030,11 +4031,11 @@ textarea {
cursor: pointer;
border: none !important;
padding: 4px 25px 2px 0px;
width: 120%; }
/* line 39, ../../../../general/res/sass/forms/_selects.scss */
width: 130%; }
/* line 40, ../../../../general/res/sass/forms/_selects.scss */
.select select option {
margin: 5px 0; }
/* line 43, ../../../../general/res/sass/forms/_selects.scss */
/* line 44, ../../../../general/res/sass/forms/_selects.scss */
.select:after {
text-shadow: none;
content: '\76';
@ -6566,9 +6567,34 @@ table {
height: 100%;
/****************************** Limits and Out-of-Bounds data */ }
/* line 36, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-local-controls {
-moz-transition-property: opacity;
-o-transition-property: opacity;
-webkit-transition-property: opacity;
transition-property: opacity;
-moz-transition-duration: 150ms;
-o-transition-duration: 150ms;
-webkit-transition-duration: 150ms;
transition-duration: 150ms;
-moz-transition-timing-function: ease-in-out;
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
transition-timing-function: ease-in-out;
-moz-transition-delay: 0;
-o-transition-delay: 0;
-webkit-transition-delay: 0;
transition-delay: 0;
opacity: 0;
pointer-events: none; }
/* line 44, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-display-area:hover .gl-plot-local-controls,
.gl-plot .gl-plot-axis-area:hover .gl-plot-local-controls {
opacity: 1;
pointer-events: inherit; }
/* line 50, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-axis-area {
position: absolute; }
/* line 38, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 53, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-axis-area.gl-plot-x {
top: auto;
right: 0;
@ -6577,14 +6603,14 @@ table {
height: 32px;
width: auto;
overflow: hidden; }
/* line 47, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 62, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-axis-area.gl-plot-y {
top: 25px;
right: auto;
bottom: 37px;
left: 0;
width: 60px; }
/* line 56, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 71, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-coords {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@ -6601,10 +6627,10 @@ table {
bottom: auto;
left: 70px;
z-index: 10; }
/* line 68, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 83, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-coords:empty {
display: none; }
/* line 73, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 88, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-display-area {
background-color: rgba(0, 0, 0, 0.1);
position: absolute;
@ -6614,13 +6640,13 @@ table {
left: 60px;
cursor: crosshair;
border: 1px solid rgba(153, 153, 153, 0.1); }
/* line 86, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 101, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-label,
.gl-plot .l-plot-label {
color: #666666;
position: absolute;
text-align: center; }
/* line 92, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 107, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label,
.gl-plot .l-plot-label.gl-plot-x-label,
.gl-plot .l-plot-label.l-plot-x-label {
@ -6629,7 +6655,7 @@ table {
bottom: 0;
left: 0;
height: auto; }
/* line 101, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 116, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label,
.gl-plot .l-plot-label.gl-plot-y-label,
.gl-plot .l-plot-label.l-plot-y-label {
@ -6646,17 +6672,22 @@ table {
left: 0;
top: 50%;
white-space: nowrap; }
/* line 115, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 130, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-x-options,
.gl-plot .gl-plot-y-options {
position: absolute;
height: auto;
min-height: 32px;
height: 24px;
min-height: 24px;
z-index: 2; }
/* line 124, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 139, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-x-options {
top: 5px; }
/* line 128, ../../../../general/res/sass/plots/_plots-main.scss */
-moz-transform: translateX(-50%);
-ms-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
bottom: 0;
left: 50%; }
/* line 145, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-y-options {
-moz-transform: translateY(-50%);
-ms-transform: translateY(-50%);
@ -6665,19 +6696,24 @@ table {
min-width: 150px;
top: 50%;
left: 20px; }
/* line 135, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 152, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .t-plot-display-controls {
position: absolute;
top: 5px;
right: 5px; }
/* line 158, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-hash {
position: absolute;
border: 0 rgba(255, 255, 255, 0.2) dashed; }
/* line 138, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 161, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-hash.hash-v {
border-right-width: 1px;
height: 100%; }
/* line 142, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 165, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-hash.hash-h {
border-bottom-width: 1px;
width: 100%; }
/* line 148, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 171, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-legend {
position: absolute;
top: 0;
@ -6687,24 +6723,24 @@ table {
height: 20px;
overflow-x: hidden;
overflow-y: auto; }
/* line 161, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 184, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar,
.gl-plot .l-oob-data {
position: absolute;
left: 0;
right: 0;
width: auto; }
/* line 169, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 192, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar {
height: auto;
z-index: 0; }
/* line 177, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 200, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar.s-limit-yellow {
background: rgba(255, 170, 0, 0.2); }
/* line 178, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 201, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar.s-limit-red {
background: rgba(255, 0, 0, 0.2); }
/* line 181, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 204, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-oob-data {
overflow: hidden;
position: absolute;
@ -6717,7 +6753,7 @@ table {
pointer-events: none;
height: 10px;
z-index: 1; }
/* line 189, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 212, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-oob-data.l-oob-data-up {
top: 0;
bottom: auto;
@ -6726,7 +6762,7 @@ table {
background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); }
/* line 194, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 217, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-oob-data.l-oob-data-dwn {
bottom: 0;
top: auto;
@ -6736,7 +6772,7 @@ table {
background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); }
/* line 204, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 227, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item,
.gl-plot-legend .legend-item,
.legend .plot-legend-item,
@ -6744,13 +6780,13 @@ table {
display: inline-block;
margin-right: 10px;
margin-bottom: 3px; }
/* line 209, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 232, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item span,
.gl-plot-legend .legend-item span,
.legend .plot-legend-item span,
.legend .legend-item span {
vertical-align: middle; }
/* line 212, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 235, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item .plot-color-swatch,
.gl-plot-legend .plot-legend-item .color-swatch,
.gl-plot-legend .legend-item .plot-color-swatch,
@ -6766,29 +6802,29 @@ table {
height: 8px;
width: 8px; }
/* line 223, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 246, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item {
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px;
line-height: 1.5em;
padding: 0px 5px; }
/* line 227, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 250, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item .plot-color-swatch {
border: 1px solid #333;
height: 9px;
width: 9px; }
/* line 235, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 258, ../../../../general/res/sass/plots/_plots-main.scss */
.tick {
position: absolute;
border: 0 rgba(255, 255, 255, 0.2) solid; }
/* line 238, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 261, ../../../../general/res/sass/plots/_plots-main.scss */
.tick.tick-x {
border-right-width: 1px;
height: 100%; }
/* line 244, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 267, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick,
.tick-label {
font-size: 0.7rem;
@ -6796,7 +6832,7 @@ table {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; }
/* line 251, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 274, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x,
.tick-label.gl-plot-x-tick-label,
.tick-label.tick-label-x {
@ -6807,7 +6843,7 @@ table {
width: 20%;
margin-left: -10%;
text-align: center; }
/* line 261, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 284, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y,
.tick-label.gl-plot-y-tick-label,
.tick-label.tick-label-y {
@ -6817,18 +6853,18 @@ table {
margin-bottom: -0.5em;
text-align: right; }
/* line 272, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 295, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label {
top: 5px; }
/* line 275, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 298, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label {
right: 5px;
left: 5px; }
/* line 282, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 305, ../../../../general/res/sass/plots/_plots-main.scss */
.tick-label.tick-label-x {
top: 0; }
/* line 285, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 308, ../../../../general/res/sass/plots/_plots-main.scss */
.tick-label.tick-label-y {
right: 0;
left: 0; }

View File

@ -3910,12 +3910,13 @@ textarea {
transition: background, 0.25s;
text-shadow: none;
padding: 0 5px;
overflow: hidden;
position: relative;
line-height: 22px; }
/* line 297, ../../../../general/res/sass/_mixins.scss */
.select .icon, .select .t-item-icon {
color: #eee; }
/* line 30, ../../../../general/res/sass/forms/_selects.scss */
/* line 31, ../../../../general/res/sass/forms/_selects.scss */
.select select {
-moz-appearance: none;
-webkit-appearance: none;
@ -3927,11 +3928,11 @@ textarea {
cursor: pointer;
border: none !important;
padding: 4px 25px 2px 0px;
width: 120%; }
/* line 39, ../../../../general/res/sass/forms/_selects.scss */
width: 130%; }
/* line 40, ../../../../general/res/sass/forms/_selects.scss */
.select select option {
margin: 5px 0; }
/* line 43, ../../../../general/res/sass/forms/_selects.scss */
/* line 44, ../../../../general/res/sass/forms/_selects.scss */
.select:after {
text-shadow: none;
content: '\76';
@ -6439,9 +6440,34 @@ table {
height: 100%;
/****************************** Limits and Out-of-Bounds data */ }
/* line 36, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-local-controls {
-moz-transition-property: opacity;
-o-transition-property: opacity;
-webkit-transition-property: opacity;
transition-property: opacity;
-moz-transition-duration: 150ms;
-o-transition-duration: 150ms;
-webkit-transition-duration: 150ms;
transition-duration: 150ms;
-moz-transition-timing-function: ease-in-out;
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
transition-timing-function: ease-in-out;
-moz-transition-delay: 0;
-o-transition-delay: 0;
-webkit-transition-delay: 0;
transition-delay: 0;
opacity: 0;
pointer-events: none; }
/* line 44, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-display-area:hover .gl-plot-local-controls,
.gl-plot .gl-plot-axis-area:hover .gl-plot-local-controls {
opacity: 1;
pointer-events: inherit; }
/* line 50, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-axis-area {
position: absolute; }
/* line 38, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 53, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-axis-area.gl-plot-x {
top: auto;
right: 0;
@ -6450,14 +6476,14 @@ table {
height: 32px;
width: auto;
overflow: hidden; }
/* line 47, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 62, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-axis-area.gl-plot-y {
top: 25px;
right: auto;
bottom: 37px;
left: 0;
width: 60px; }
/* line 56, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 71, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-coords {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@ -6474,10 +6500,10 @@ table {
bottom: auto;
left: 70px;
z-index: 10; }
/* line 68, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 83, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-coords:empty {
display: none; }
/* line 73, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 88, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-display-area {
background-color: rgba(0, 0, 0, 0.05);
position: absolute;
@ -6487,13 +6513,13 @@ table {
left: 60px;
cursor: crosshair;
border: 1px solid rgba(102, 102, 102, 0.2); }
/* line 86, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 101, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-label,
.gl-plot .l-plot-label {
color: #999999;
position: absolute;
text-align: center; }
/* line 92, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 107, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label,
.gl-plot .l-plot-label.gl-plot-x-label,
.gl-plot .l-plot-label.l-plot-x-label {
@ -6502,7 +6528,7 @@ table {
bottom: 0;
left: 0;
height: auto; }
/* line 101, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 116, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label,
.gl-plot .l-plot-label.gl-plot-y-label,
.gl-plot .l-plot-label.l-plot-y-label {
@ -6519,17 +6545,22 @@ table {
left: 0;
top: 50%;
white-space: nowrap; }
/* line 115, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 130, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-x-options,
.gl-plot .gl-plot-y-options {
position: absolute;
height: auto;
min-height: 32px;
height: 24px;
min-height: 24px;
z-index: 2; }
/* line 124, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 139, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-x-options {
top: 5px; }
/* line 128, ../../../../general/res/sass/plots/_plots-main.scss */
-moz-transform: translateX(-50%);
-ms-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
bottom: 0;
left: 50%; }
/* line 145, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-y-options {
-moz-transform: translateY(-50%);
-ms-transform: translateY(-50%);
@ -6538,19 +6569,24 @@ table {
min-width: 150px;
top: 50%;
left: 20px; }
/* line 135, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 152, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .t-plot-display-controls {
position: absolute;
top: 5px;
right: 5px; }
/* line 158, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-hash {
position: absolute;
border: 0 rgba(0, 0, 0, 0.2) dashed; }
/* line 138, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 161, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-hash.hash-v {
border-right-width: 1px;
height: 100%; }
/* line 142, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 165, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-hash.hash-h {
border-bottom-width: 1px;
width: 100%; }
/* line 148, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 171, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .gl-plot-legend {
position: absolute;
top: 0;
@ -6560,24 +6596,24 @@ table {
height: 20px;
overflow-x: hidden;
overflow-y: auto; }
/* line 161, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 184, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar,
.gl-plot .l-oob-data {
position: absolute;
left: 0;
right: 0;
width: auto; }
/* line 169, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 192, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar {
height: auto;
z-index: 0; }
/* line 177, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 200, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar.s-limit-yellow {
background: rgba(255, 170, 0, 0.2); }
/* line 178, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 201, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-limit-bar.s-limit-red {
background: rgba(255, 0, 0, 0.2); }
/* line 181, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 204, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-oob-data {
overflow: hidden;
position: absolute;
@ -6590,7 +6626,7 @@ table {
pointer-events: none;
height: 10px;
z-index: 1; }
/* line 189, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 212, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-oob-data.l-oob-data-up {
top: 0;
bottom: auto;
@ -6599,7 +6635,7 @@ table {
background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); }
/* line 194, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 217, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot .l-oob-data.l-oob-data-dwn {
bottom: 0;
top: auto;
@ -6609,7 +6645,7 @@ table {
background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); }
/* line 204, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 227, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item,
.gl-plot-legend .legend-item,
.legend .plot-legend-item,
@ -6617,13 +6653,13 @@ table {
display: inline-block;
margin-right: 10px;
margin-bottom: 3px; }
/* line 209, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 232, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item span,
.gl-plot-legend .legend-item span,
.legend .plot-legend-item span,
.legend .legend-item span {
vertical-align: middle; }
/* line 212, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 235, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item .plot-color-swatch,
.gl-plot-legend .plot-legend-item .color-swatch,
.gl-plot-legend .legend-item .plot-color-swatch,
@ -6639,29 +6675,29 @@ table {
height: 8px;
width: 8px; }
/* line 223, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 246, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
line-height: 1.5em;
padding: 0px 5px; }
/* line 227, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 250, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-legend .plot-legend-item .plot-color-swatch {
border: 1px solid #fcfcfc;
height: 9px;
width: 9px; }
/* line 235, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 258, ../../../../general/res/sass/plots/_plots-main.scss */
.tick {
position: absolute;
border: 0 rgba(0, 0, 0, 0.2) solid; }
/* line 238, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 261, ../../../../general/res/sass/plots/_plots-main.scss */
.tick.tick-x {
border-right-width: 1px;
height: 100%; }
/* line 244, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 267, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick,
.tick-label {
font-size: 0.7rem;
@ -6669,7 +6705,7 @@ table {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; }
/* line 251, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 274, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x,
.tick-label.gl-plot-x-tick-label,
.tick-label.tick-label-x {
@ -6680,7 +6716,7 @@ table {
width: 20%;
margin-left: -10%;
text-align: center; }
/* line 261, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 284, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y,
.tick-label.gl-plot-y-tick-label,
.tick-label.tick-label-y {
@ -6690,18 +6726,18 @@ table {
margin-bottom: -0.5em;
text-align: right; }
/* line 272, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 295, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-x-tick-label {
top: 5px; }
/* line 275, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 298, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick.gl-plot-y-tick-label {
right: 5px;
left: 5px; }
/* line 282, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 305, ../../../../general/res/sass/plots/_plots-main.scss */
.tick-label.tick-label-x {
top: 0; }
/* line 285, ../../../../general/res/sass/plots/_plots-main.scss */
/* line 308, ../../../../general/res/sass/plots/_plots-main.scss */
.tick-label.tick-label-y {
right: 0;
left: 0; }

View File

@ -19,9 +19,7 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<span ng-controller="PlotController as plot"
ng-mouseleave="representation.showControls = false">
<span ng-controller="PlotController as plot">
<div class="gl-plot"
ng-style="{ height: 100 / plot.getSubPlots().length + '%'}"
ng-repeat="subplot in plot.getSubPlots()">
@ -30,37 +28,28 @@
<span
class='plot-legend-item'
ng-repeat="telemetryObject in subplot.getTelemetryObjects()"
ng-class="plot.getLegendClass(telemetryObject)"
>
ng-class="plot.getLegendClass(telemetryObject)">
<span class='plot-color-swatch'
ng-style="{ 'background-color': plot.getColor($index) }">
</span>
<span class='title-label'>{{telemetryObject.getModel().name}}</span>
</span>
</div>
<div
class="gl-plot-coords"
ng-if="subplot.isHovering() && subplot.getHoverCoordinates()"
>
<div class="gl-plot-coords"
ng-if="subplot.isHovering() && subplot.getHoverCoordinates()">
{{subplot.getHoverCoordinates()}}
</div>
<div class="gl-plot-axis-area gl-plot-y">
<div class="gl-plot-label gl-plot-y-label">
{{axes[1].active.name}}
</div>
<div ng-repeat="tick in subplot.getRangeTicks()"
class="gl-plot-tick gl-plot-y-tick-label"
ng-style="{ bottom: (100 * $index / (subplot.getRangeTicks().length - 1)) + '%' }">
{{tick.label}}
</div>
<div class="gl-plot-y-options gl-plot-local-controls"
ng-show="representation.showControls"
ng-if="axes[1].options.length > 0">
ng-if="axes[1].options.length > 1">
<div class='form-control shell select'>
<select class="form-control input shell"
ng-model="axes[1].active"
@ -68,19 +57,15 @@
</select>
</div>
</div>
</div>
<div class="gl-plot-display-area"
ng-mouseenter="subplot.isHovering(true); representation.showControls = true;"
ng-mouseenter="subplot.isHovering(true);"
ng-mouseleave="subplot.isHovering(false)"
ng-class="{ loading: plot.isRequestPending() }">
<!-- Out-of-bounds data indicators -->
<!-- ng-show is temporarily hard-coded in next element -->
<div ng-show="false" class="l-oob-data l-oob-data-up"></div>
<div ng-show="false" class="l-oob-data l-oob-data-dwn"></div>
<div class="gl-plot-hash hash-v"
ng-repeat="tick in subplot.getDomainTicks()"
ng-style="{ left: (100 * $index / (subplot.getDomainTicks().length - 1)) + '%', height: '100%' }"
@ -91,7 +76,6 @@
ng-style="{ bottom: (100 * $index / (subplot.getRangeTicks().length - 1)) + '%', width: '100%' }"
ng-show="$index > 0 && $index < (subplot.getRangeTicks().length - 1)">
</div>
<mct-chart draw="subplot.getDrawingObject()"
ng-if="subplot.getTelemetryObjects().length > 0"
ng-mousemove="subplot.hover($event)"
@ -99,36 +83,27 @@
mct-drag-down="subplot.startDrag($event)"
mct-drag-up="subplot.endDrag($event); plot.update()">
</mct-chart>
<!-- TODO: Move into correct position; make part of group; infer from set of actions -->
<div class="l-local-controls gl-plot-local-controls"
ng-if="$first"
ng-show="representation.showControls"
style="position: absolute; top: 8px; right: 8px;">
<div class="l-local-controls gl-plot-local-controls t-plot-display-controls"
ng-if="$first">
<a class="s-btn"
ng-click="plot.stepBackPanZoom()"
ng-show="plot.isZoomed()"
title="Restore previous pan/zoom">
<span class="ui-symbol icon">&lt;</span>
</a>
<a class="s-btn"
ng-click="plot.unzoom()"
ng-show="plot.isZoomed()"
title="Reset pan/zoom">
<span class="ui-symbol icon">I</span>
</a>
<div class="menu-element s-menu-btn menus-to-left"
ng-if="plot.getModeOptions().length > 1"
ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span>
<span class="ui-symbol icon type-icon">{{plot.getMode().glyph}}</span>
<span>{{plot.getMode().name}}</span>
<div class="menu" ng-show="toggle.isActive()">
<ul>
<li ng-repeat="option in plot.getModeOptions()">
@ -142,25 +117,20 @@
</ul>
</div>
</div>
</div>
</div>
<div ng-if="$last" class="gl-plot-axis-area gl-plot-x">
<div ng-repeat="tick in subplot.getDomainTicks()"
class="gl-plot-tick gl-plot-x-tick-label"
ng-show="$index > 0 && $index < (subplot.getDomainTicks().length - 1)"
ng-style="{ left: (100 * $index / (subplot.getDomainTicks().length - 1)) + '%' }">
{{tick.label}}
</div>
<div class="gl-plot-label gl-plot-x-label">
{{axes[0].active.name}}
</div>
<div class="gl-plot-x-options gl-plot-local-controls"
ng-show="representation.showControls"
ng-if="axes[0].options.length > 0">
ng-if="axes[0].options.length > 1">
<div class='form-control shell select'>
<select class="form-control input shell"
ng-model="axes[0].active"
@ -172,4 +142,3 @@
</div>
</div>
</span>