v0.0.3
This commit is contained in:
parent
2b4f09bb49
commit
a934520cd9
1 changed files with 180 additions and 36 deletions
98
Main.qml
98
Main.qml
|
|
@ -15,7 +15,7 @@ Window {
|
|||
property color water_color: "#F00F7FAF"
|
||||
Material.accent: root.accent_color
|
||||
property int font_enlarged_text_size: 20
|
||||
property int font_normal_text_size: 18
|
||||
property int font_normal_text_size: 16
|
||||
property double distance: 0
|
||||
property int distance_count: 0
|
||||
// visibility: Window.FullScreen
|
||||
|
|
@ -180,7 +180,7 @@ Window {
|
|||
height: max_thres_input.height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
color: root.accent_color
|
||||
font.pixelSize: root.font_normal_text_size
|
||||
font.pointSize: root.font_normal_text_size
|
||||
}
|
||||
|
||||
TextField {
|
||||
|
|
@ -192,8 +192,9 @@ Window {
|
|||
top: settings_label.bottom
|
||||
topMargin: 20
|
||||
}
|
||||
width: parent.width / 2
|
||||
color: root.accent_color
|
||||
font.pixelSize: root.font_normal_text_size
|
||||
font.pointSize: root.font_normal_text_size
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -208,7 +209,7 @@ Window {
|
|||
height: min_thres_input.height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
color: root.accent_color
|
||||
font.pixelSize: root.font_normal_text_size
|
||||
font.pointSize: root.font_normal_text_size
|
||||
}
|
||||
|
||||
TextField {
|
||||
|
|
@ -220,8 +221,9 @@ Window {
|
|||
top: max_thres_label.bottom
|
||||
topMargin: 20
|
||||
}
|
||||
width: parent.width / 2
|
||||
color: root.accent_color
|
||||
font.pixelSize: root.font_normal_text_size
|
||||
font.pointSize: root.font_normal_text_size
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -236,7 +238,7 @@ Window {
|
|||
height: alert_thres_input.height
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
color: root.accent_color
|
||||
font.pixelSize: root.font_normal_text_size
|
||||
font.pointSize: root.font_normal_text_size
|
||||
}
|
||||
|
||||
TextField {
|
||||
|
|
@ -248,9 +250,29 @@ Window {
|
|||
top: min_thres_label.bottom
|
||||
topMargin: 20
|
||||
}
|
||||
width: parent.width / 2
|
||||
color: root.accent_color
|
||||
font.pixelSize: root.font_normal_text_size
|
||||
font.pointSize: root.font_normal_text_size
|
||||
}
|
||||
CheckBox {
|
||||
id: flip_bits_box
|
||||
text: "Flip Bits"
|
||||
checked: config.flipBits
|
||||
anchors {
|
||||
topMargin: 20
|
||||
top: alert_thres_label.bottom
|
||||
left: parent.left
|
||||
}
|
||||
width: parent.width - 20
|
||||
contentItem: Text {
|
||||
text: flip_bits_box.text
|
||||
font.pointSize: root.font_normal_text_size
|
||||
color: root.accent_color
|
||||
leftPadding: flip_bits_box.indicator.width + flip_bits_box.spacing
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Text {
|
||||
id: settings_error_label
|
||||
|
|
@ -259,7 +281,9 @@ Window {
|
|||
visible: settings_error_text === "" ? false : true
|
||||
anchors {
|
||||
topMargin: 20
|
||||
top: alert_thres_label.bottom
|
||||
top: flip_bits_box.bottom
|
||||
bottom: flip_bits_box.top
|
||||
bottomMargin: 10
|
||||
left: parent.left
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
|
|
@ -268,7 +292,52 @@ Window {
|
|||
font.pixelSize: root.font_normal_text_size
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: reset_averages
|
||||
anchors {
|
||||
topMargin: 10
|
||||
bottom: save_config.top
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
color: "#F0121212"
|
||||
width: parent.width / 2.5
|
||||
height: 60
|
||||
border {
|
||||
width: 1
|
||||
color: root.accent_color
|
||||
}
|
||||
radius: 3
|
||||
|
||||
Text {
|
||||
anchors.centerIn: parent
|
||||
text: "Reset Averages"
|
||||
color: root.accent_color
|
||||
font.pointSize: root.font_enlarged_text_size
|
||||
}
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
property color settings_rect_pressed_prev: "#00000000"
|
||||
property color settings_rect_entered_prev: "#00000000"
|
||||
onEntered: {
|
||||
settings_rect_entered_prev = save_config.color
|
||||
save_config.color = "#5A1F1F1F"
|
||||
}
|
||||
onExited: {
|
||||
save_config.color = settings_rect_entered_prev
|
||||
}
|
||||
onPressed: {
|
||||
settings_rect_pressed_prev = save_config.color
|
||||
save_config.color = "#5A1F4F1F"
|
||||
settings_popup.close();
|
||||
listener.resetAverages();
|
||||
}
|
||||
onReleased: {
|
||||
save_config.color = settings_rect_pressed_prev
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: save_config
|
||||
|
|
@ -310,7 +379,8 @@ Window {
|
|||
let max = parseFloat(min_thres_input.text);
|
||||
let min = parseFloat(min_thres_input.text);
|
||||
let alert = parseFloat(alert_thres_input.text);
|
||||
console.log("Parsed values:", max, min, alert);
|
||||
let flipBits = flip_bits_box.checked;
|
||||
console.log("Parsed values:", max, min, alert, flip_bits_box.checked);
|
||||
if(max < min) {
|
||||
settings_error_label.settings_error_text = "Max cannot be less than min";
|
||||
return;
|
||||
|
|
@ -319,20 +389,19 @@ Window {
|
|||
settings_error_label.settings_error_text = "Alert must be between 0 to 100";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
let current_min_reading = Math.max(0, (parseFloat(min_thres_input.text)));
|
||||
let effective_max_reading = Math.max(0, (parseFloat(max_thres_input.text)) - current_min_reading);
|
||||
let alert_effective_reading = (effective_max_reading * (100 - alert) / 100) + current_min_reading;
|
||||
console.log("Alert effective reading is: " + alert_effective_reading + " for value: " + alert);
|
||||
listener.setAlert(alert_effective_reading);
|
||||
config.saveConfig(max_thres_input.text, min_thres_input.text, alert_thres_input.text);
|
||||
listener.setConfig(alert_effective_reading, flipBits);
|
||||
config.saveConfig(max_thres_input.text, min_thres_input.text, alert_thres_input.text, flip_bits_box.checked);
|
||||
settings_popup.close();
|
||||
}
|
||||
onReleased: {
|
||||
save_config.color = settings_rect_pressed_prev
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -507,7 +576,8 @@ Window {
|
|||
let alert = parseFloat(alert_thres_input.text);
|
||||
let alert_effective_reading = (effective_max_reading * (100 - alert) / 100) + current_min_reading;
|
||||
console.log("Alert effective reading is: " + alert_effective_reading + " for value: " + alert);
|
||||
listener.setAlert(alert_effective_reading);
|
||||
|
||||
listener.setConfig(alert_effective_reading, flip_bits_box.checked);
|
||||
}
|
||||
|
||||
distance_count += 1;
|
||||
|
|
|
|||
Loading…
Reference in a new issue