Features/bottombar redux #97

Merged
A-Nilfgaardian merged 7 commits from features/bottombar-redux into master 2021-01-20 14:34:28 +00:00
15 changed files with 50 additions and 14 deletions
Showing only changes of commit 0436e85467 - Show all commits

View File

@ -41,15 +41,15 @@ const horizontalTimeBases = [
"100ns/div", "100ns/div",
"200ns/div", "200ns/div",
"500ns/div", "500ns/div",
"1us/div", "1µs/div",
"2us/div", "2µs/div",
"5us/div", "5µs/div",
"10us/div", "10µs/div",
"20us/div", "20µs/div",
"50us/div", "50µs/div",
"100us/div", "100µs/div",
"200us/div", "200µs/div",
"500us/div", "500µs/div",
"1ms/div", "1ms/div",
"2ms/div", "2ms/div",
"5ms/div", "5ms/div",

View File

@ -0,0 +1,8 @@
enum TimeUnit {
NanoSecond = "ns",
MicroSecond = "µs",
MilliSecond = "ms",
Second = "s"
}
export default TimeUnit;

View File

@ -0,0 +1,8 @@
enum VoltageUnit {
NanoVolt = "nV",
MicroVolt = "µV",
MilliVolt = "mV",
Volt = "V"
}
export default VoltageUnit;

View File

@ -11,6 +11,7 @@
height: 2vh; height: 2vh;
background: #4b4b4b; background: #4b4b4b;
z-index: 1000; z-index: 1000;
user-select: none;
} }
.Channel2 { .Channel2 {
@ -31,6 +32,7 @@
height: 2vh; height: 2vh;
background: #4b4b4b; background: #4b4b4b;
z-index: 1000; z-index: 1000;
user-select: none;
} }
.Channel4 { .Channel4 {
@ -41,4 +43,5 @@
height: 2vh; height: 2vh;
background: #4b4b4b; background: #4b4b4b;
z-index: 1000; z-index: 1000;
user-select: none;
} }

View File

@ -12,4 +12,5 @@
height: 2vh; height: 2vh;
background: #4b4b4b; background: #4b4b4b;
z-index: 1000; z-index: 1000;
user-select: none;
} }

View File

@ -12,4 +12,5 @@
height: 2vh; height: 2vh;
background: #4b4b4b; background: #4b4b4b;
z-index: 1000; z-index: 1000;
user-select: none;
} }

View File

@ -20,5 +20,6 @@
color: yellow; color: yellow;
margin-top: 54vh; margin-top: 54vh;
margin-bottom: 0; margin-bottom: 0;
user-select: none;
} }

View File

@ -1,10 +1,12 @@
.Search { .Search {
text-align: center; text-align: center;
display: flex; display: flex;
user-select: none;
} }
.Searchbar { .Searchbar {
position: relative; position: relative;
user-select: none;
top: 10px; top: 10px;
width: 15vw; width: 15vw;
height: 2vh; height: 2vh;

View File

@ -8,6 +8,7 @@
background: #EBFF00; background: #EBFF00;
z-index: 100; z-index: 100;
border: none; border: none;
user-select: none;
} }
.SingleButtonText { .SingleButtonText {
@ -16,4 +17,5 @@
display: flex; display: flex;
position: relative; position: relative;
left: 2vw; left: 2vw;
user-select: none;
} }

View File

@ -8,6 +8,7 @@
background: #FF0000; background: #FF0000;
z-index: 100; z-index: 100;
border: none; border: none;
user-select: none;
} }
.StopButtonText { .StopButtonText {
@ -16,4 +17,5 @@
display: flex; display: flex;
position: relative; position: relative;
left: 2vw; left: 2vw;
user-select: none;
} }

View File

@ -2,6 +2,7 @@
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
user-select: none;
} }
.WidgetTitle { .WidgetTitle {

View File

@ -1,3 +1,7 @@
.MeasurementsWidget {
user-select: none;
}
.MeasurementsWidgetDisplayValueBlock-Value2 { .MeasurementsWidgetDisplayValueBlock-Value2 {
margin-top: 1vh; margin-top: 1vh;
} }

View File

@ -2,6 +2,7 @@
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
user-select: none;
} }
.WidgetTitle { .WidgetTitle {

View File

@ -1,4 +1,5 @@
import DefaultValues from '../../configuration/defaultValues'; import DefaultValues from '../../configuration/defaultValues';
import TimeUnit from '../../configuration/enums/timeUnit';
const initialState = { const initialState = {
horizontalTimeBase: { horizontalTimeBase: {
@ -7,7 +8,7 @@ const initialState = {
}, },
horizontalOffset: { horizontalOffset: {
value: 0, value: 0,
unit: "ms" unit: TimeUnit.MilliSecond
} }
}; };

View File

@ -1,6 +1,7 @@
import DefaultValues from '../../configuration/defaultValues'; import DefaultValues from '../../configuration/defaultValues';
import DefaultChannelColor from '../../configuration/enums/defaultChannelColor'; import DefaultChannelColor from '../../configuration/enums/defaultChannelColor';
import MeasurementType from '../../configuration/enums/measurementType'; import MeasurementType from '../../configuration/enums/measurementType';
import VoltageUnit from '../../configuration/enums/voltageUnit';
const initialState = { const initialState = {
activeChannel: 1, activeChannel: 1,
@ -17,10 +18,10 @@ const initialState = {
{value: DefaultValues.x1ProbeValues[6], index: 6} {value: DefaultValues.x1ProbeValues[6], index: 6}
], ],
verticalOffset: [ verticalOffset: [
{value: 0, unit: "mV"}, {value: 0, unit: VoltageUnit.MilliVolt},
{value: 0, unit: "mV"}, {value: 0, unit: VoltageUnit.MilliVolt},
{value: 0, unit: "mV"}, {value: 0, unit: VoltageUnit.MilliVolt},
{value: 0, unit: "mV"} {value: 0, unit: VoltageUnit.MilliVolt}
], ],
measurementType: [ measurementType: [
MeasurementType.DC, MeasurementType.DC,