Skip to content

[Feature] Added Camera Type to Deploy GUI #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 13, 2024
Merged

[Feature] Added Camera Type to Deploy GUI #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7889c90
Passed in camera type so things aren't hard coded
PotatoPeeler3000 Nov 13, 2024
a8d1695
Added the option to set the camera type from the gui
PotatoPeeler3000 Nov 13, 2024
77589c2
Undo those formatting changes since I'm not touchin the file
PotatoPeeler3000 Nov 13, 2024
9855909
Update LoggerDeployApplication.java
PotatoPeeler3000 Nov 13, 2024
c4dda9e
Make this memory free why don't you
PotatoPeeler3000 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/main/java/us/ihmc/publisher/logger/ui/CameraBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package us.ihmc.publisher.logger.ui;

import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import us.ihmc.robotDataLogger.CameraConfiguration;
import us.ihmc.robotDataLogger.CameraType;

public class CameraBean
{

public final ObjectProperty<CameraType> camera_type = new SimpleObjectProperty<>(CameraType.CAPTURE_CARD_MAGEWELL);
Copy link
Collaborator Author

@PotatoPeeler3000 PotatoPeeler3000 Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the camera type so that it can be saved to the file via the gui

public final SimpleStringProperty camera_name = new SimpleStringProperty();
public final SimpleIntegerProperty camera_id = new SimpleIntegerProperty();
public final SimpleIntegerProperty camera_input = new SimpleIntegerProperty();
Expand All @@ -17,13 +19,17 @@ public CameraBean(byte id)
this.camera_id.set(id);
camera_name.set("");
}

public CameraBean(CameraConfiguration config)
{
camera_id.set(config.getCameraId());
camera_input.set(Integer.valueOf(config.getIdentifierAsString()));
camera_name.set(config.getNameAsString());
}

public CameraType getCamera_type()
{
return camera_type.get();
}

public String getCamera_name()
Expand All @@ -40,13 +46,12 @@ public int getCamera_input()
{
return camera_input.get();
}

public void pack(CameraConfiguration camera)
{
camera.setType(CameraType.CAPTURE_CARD);
camera.setType(getCamera_type());
camera.setName(getCamera_name());
camera.setCameraId((byte) getCamera_id());
camera.setIdentifier(String.valueOf(getCamera_input()));

}
}
12 changes: 12 additions & 0 deletions src/main/java/us/ihmc/publisher/logger/ui/LoggerDeployController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
import javafx.scene.control.cell.ComboBoxTableCell;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.stage.FileChooser;
Expand Down Expand Up @@ -60,6 +61,9 @@ public class LoggerDeployController implements Initializable
@FXML
TableView<CameraBean> camera_table;

@FXML
TableColumn<CameraBean, CameraType> camera_type_column;

@FXML
TableColumn<CameraBean, String> camera_name_col;

Expand Down Expand Up @@ -127,6 +131,14 @@ public void initialize(URL location, ResourceBundle resources)

camera_table.setEditable(true);

ObservableList<CameraType> cameraOptionsList = FXCollections.observableArrayList(CameraType.values);
camera_type_column.setCellFactory(ComboBoxTableCell.forTableColumn(cameraOptionsList));
camera_type_column.setCellValueFactory(new PropertyValueFactory<CameraBean, CameraType>("camera_type"));
camera_type_column.setOnEditCommit(e ->
{
e.getRowValue().camera_type.set(e.getNewValue());
});

camera_id_col.setCellValueFactory(new PropertyValueFactory<CameraBean, Integer>("camera_id"));

camera_name_col.setCellFactory(TextFieldTableCell.forTableColumn());
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/us/ihmc/publisher/logger/ui/LoggerSetup.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,10 @@
<children>
<TableView fx:id="camera_table" prefHeight="480.0" prefWidth="1234.0" VBox.vgrow="ALWAYS">
<columns>
<TableColumn fx:id="camera_id_col" prefWidth="244.5" text="ID"/>
<TableColumn fx:id="camera_name_col" prefWidth="318.0" text="Name"/>
<TableColumn fx:id="camera_input_col" prefWidth="193.0" text="Input Number"/>
<TableColumn fx:id="camera_type_column" prefWidth="250.0" text="Type"/>
Copy link
Collaborator Author

@PotatoPeeler3000 PotatoPeeler3000 Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a new column to javaFX

<TableColumn fx:id="camera_id_col" prefWidth="50.0" text="ID"/>
<TableColumn fx:id="camera_name_col" prefWidth="325.0" text="Name"/>
<TableColumn fx:id="camera_input_col" prefWidth="125.0" text="Input Number"/>
</columns>
</TableView>
<HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0">
Expand Down
Loading