iut/Ebullition
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also add newly created sensors to the selected virtual sensor

Browse Source
This commit is contained in:
Clément Fréville
2023-01-22 20:58:48 +01:00
parent 564ac6759b
commit 812fbfb87a
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fr/uca/iut/clfreville2/gui/MainWindows.java
View File

@@ -28,7 +28,9 @@ import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.ButtonType;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.ChoiceBox; import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Slider; import javafx.scene.control.Slider;
@@ -139,7 +141,16 @@ public class MainWindows {
@FXML @FXML
public void onCreateClick() { public void onCreateClick() {
createType.getSelectionModel().getSelectedItem().create(registry, newName.getText()); if (createType.getSelectionModel().getSelectedItem() == null || newName.getText().isEmpty()) {
Alert alert = new Alert(Alert.AlertType.ERROR, "Empty form", ButtonType.CANCEL);
alert.showAndWait();
return;
}
Sensor sensor = createType.getSelectionModel().getSelectedItem().create(registry, newName.getText());
Sensor selected = getSelectedSensor();
if (selected instanceof VirtualSensor virtual) {
virtual.addSource(sensor, 1D);
}
} }
@FXML @FXML
@@ -232,6 +243,7 @@ public class MainWindows {
new VirtualSensorFactory() new VirtualSensorFactory()
); );
createType.setConverter(new NameableStringConverter<>(createType.getItems())); createType.setConverter(new NameableStringConverter<>(createType.getItems()));
createType.getSelectionModel().selectFirst();
} }
@FXML @FXML