7
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-14 23:59:19 +00:00

Make sure initial window size consistent with horizontal widget

This commit is contained in:
Ratan Varghese 2021-03-24 15:27:42 -04:00
parent d12c9d8c30
commit 3f9e46eb67
2 changed files with 12 additions and 5 deletions
Software/waveview/src/redux/initialStates

View File

@ -1,13 +1,20 @@
import GraphStatus from "../../configuration/enums/graphStatus";
import HorizontalWidgetInitialState from "./horizontalWidgetInitialState";
import TimeUnit from "../../configuration/enums/timeUnit";
import { convertTime } from "../../util/convert";
let defaultTimeDivisions = 10;
let coarse = HorizontalWidgetInitialState.horizontalTimeBase.course;
let xLimit = convertTime(coarse.value, coarse.unit, TimeUnit.NanoSecond) * defaultTimeDivisions;
const GraphInitialState = {
currentStatus: GraphStatus.On,
singleMode: false,
xDomain: [0,1000],
xDomain: [0,xLimit],
yDomain: [-128,128],
tickCount: 0,
voltageDivisions: 10, //TODO: change graph to 8, make this 8
timeDivisons: 10
timeDivisons: defaultTimeDivisions
};
export default GraphInitialState;

View File

@ -7,8 +7,8 @@ const HorizontalWidgetInitialState = {
mode: ControlMode.Course,
index: 15,
course: {
value: DefaultValues.horizontalTimeBases[15].value,
unit: DefaultValues.horizontalTimeBases[15].unit
value: DefaultValues.horizontalTimeBases[3].value, //originally index 15
unit: DefaultValues.horizontalTimeBases[3].unit //originally index 15
},
fine: {
value: 0,
@ -16,7 +16,7 @@ const HorizontalWidgetInitialState = {
}
},
horizontalOffset: {
value: 0,
value: 0,
unit: TimeUnit.MicroSecond
}
};