Skip to content

Add go to tick button, fix issues on windows. #30

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

Open
dellis23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add go to tick button, fix issues on windows. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ repositories {
mavenCentral()
}

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
}

tasks.withType<Javadoc> {
(options as StandardJavadocDocletOptions).encoding = "UTF-8"
(options as StandardJavadocDocletOptions).charSet = "UTF-8"
(options as StandardJavadocDocletOptions).locale = "en"
}

dependencies {
implementation("com.skadistats:clarity:3.1.1")
implementation("com.tobiasdiez:easybind:2.2")
Expand Down
175 changes: 103 additions & 72 deletions src/main/java/skadistats/clarity/analyzer/main/MainView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
package skadistats.clarity.analyzer.main;

import static javafx.beans.binding.Bindings.createBooleanBinding;
import static javafx.beans.binding.Bindings.createObjectBinding;
import static javafx.beans.binding.Bindings.createStringBinding;
import static javafx.beans.binding.Bindings.valueAt;

import java.io.File;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.prefs.Preferences;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.tobiasdiez.easybind.EasyBind;
import javafx.beans.binding.BooleanBinding;

import javafx.beans.binding.ObjectBinding;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
Expand All @@ -11,39 +25,28 @@
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.MenuItem;
import javafx.scene.control.Label;
import javafx.scene.control.SelectionMode;
import javafx.scene.control.Slider;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.TextField;
import javafx.scene.control.TextInputDialog;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
import javafx.stage.FileChooser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import skadistats.clarity.analyzer.Analyzer;
import skadistats.clarity.analyzer.map.MapControl;
import skadistats.clarity.analyzer.replay.ObservableEntity;
import skadistats.clarity.analyzer.replay.ObservableEntityList;
import skadistats.clarity.analyzer.replay.ObservableEntityProperty;
import skadistats.clarity.analyzer.replay.ReplayController;
import skadistats.clarity.analyzer.util.TickHelper;

import java.io.File;
import java.util.function.Consumer;
import java.util.prefs.Preferences;
import java.util.stream.Collectors;

import static javafx.beans.binding.Bindings.createBooleanBinding;
import static javafx.beans.binding.Bindings.createObjectBinding;
import static javafx.beans.binding.Bindings.createStringBinding;
import static javafx.beans.binding.Bindings.valueAt;

public class MainView implements Initializable {

protected final Logger log = LoggerFactory.getLogger(getClass());
Expand Down Expand Up @@ -81,6 +84,9 @@ public class MainView implements Initializable {
@FXML
private MapControl mapControl;

@FXML
private MenuItem menuGoToTick;

private Preferences preferences;

private ReplayController replayController;
Expand All @@ -90,88 +96,83 @@ public class MainView implements Initializable {
public void initialize(java.net.URL location, java.util.ResourceBundle resources) {
preferences = Preferences.userNodeForPackage(this.getClass());
replayController = new ReplayController(slider);
menuGoToTick.setDisable(true);

var runnerIsNull = createBooleanBinding(() -> replayController.getRunner() == null, replayController.runnerProperty());
var runnerIsNull = createBooleanBinding(() -> replayController.getRunner() == null,
replayController.runnerProperty());
buttonPlay.disableProperty().bind(runnerIsNull);
buttonPlay.textProperty().bind(EasyBind.map(replayController.playingProperty(), playing -> playing ? "⏸" : "⏵"));
buttonPlay.textProperty()
.bind(EasyBind.map(replayController.playingProperty(), playing -> playing ? "⏸" : "⏵"));
slider.disableProperty().bind(runnerIsNull);

labelTick.textProperty().bind(replayController.tickProperty().asString());
labelLastTick.textProperty().bind(replayController.lastTickProperty().asString());

// filtered entity list
filteredEntityList.bind(createObjectBinding(() -> {
var src = replayController.getEntityList();
if (src == null) return null;
var filteredList = new FilteredList<ObservableEntity>(src);
filteredList.predicateProperty().bind(createObjectBinding(() -> {
var filter = entityNameFilter.getText();
return e ->
(!hideEmptySlots.isSelected() || e.getDtClass() != null)
&& (filter.isEmpty() || e.getName().toLowerCase().contains(filter.toLowerCase()));
},
entityNameFilter.textProperty(), hideEmptySlots.selectedProperty()
));
return filteredList;
var src = replayController.getEntityList();
if (src == null)
return null;
var filteredList = new FilteredList<ObservableEntity>(src);
filteredList.predicateProperty().bind(createObjectBinding(() -> {
var filter = entityNameFilter.getText();
return e -> (!hideEmptySlots.isSelected() || e.getDtClass() != null)
&& (filter.isEmpty() || e.getName().toLowerCase().contains(filter.toLowerCase()));
},
replayController.entityListProperty()
));
entityNameFilter.textProperty(), hideEmptySlots.selectedProperty()));
return filteredList;
},
replayController.entityListProperty()));

// filtered property list
filteredPropertyList.bind(createObjectBinding(() -> {
var src = entityTable.getSelectionModel().selectedItemProperty().get();
if (src == null) return null;
var filteredList = new FilteredList<ObservableEntityProperty>(src);
filteredList.predicateProperty().bind(createObjectBinding(() -> {
var filter = propertyNameFilter.getText();
return oe ->
(!onlyRecentlyUpdated.isSelected() || TickHelper.isRecent(oe.getLastChangedAtTick()))
&& (filter.isEmpty() || oe.getName().toLowerCase().contains(filter.toLowerCase()));
},
propertyNameFilter.textProperty(), onlyRecentlyUpdated.selectedProperty(), src.recentChangesHashProperty()
));
return filteredList;
var src = entityTable.getSelectionModel().selectedItemProperty().get();
if (src == null)
return null;
var filteredList = new FilteredList<ObservableEntityProperty>(src);
filteredList.predicateProperty().bind(createObjectBinding(() -> {
var filter = propertyNameFilter.getText();
return oe -> (!onlyRecentlyUpdated.isSelected() || TickHelper.isRecent(oe.getLastChangedAtTick()))
&& (filter.isEmpty() || oe.getName().toLowerCase().contains(filter.toLowerCase()));
},
entityTable.getSelectionModel().selectedItemProperty()
));
propertyNameFilter.textProperty(), onlyRecentlyUpdated.selectedProperty(),
src.recentChangesHashProperty()));
return filteredList;
},
entityTable.getSelectionModel().selectedItemProperty()));

entityTable.itemsProperty().bind(filteredEntityList);
detailTable.itemsProperty().bind(filteredPropertyList);

// entity table
createTableCell(entityTable, "#", String.class, col ->
col.setCellValueFactory(f -> f.getValue().indexProperty().asString())
);
createTableCell(entityTable, "class", String.class, col ->
col.setCellValueFactory(f -> {
ObjectBinding<? extends ObservableEntity> src = valueAt(replayController.getEntityList(), f.getValue().getIndex());
return createStringBinding(() -> src.get().getName(), src);
})
);
createTableCell(entityTable, "#", String.class,
col -> col.setCellValueFactory(f -> f.getValue().indexProperty().asString()));
createTableCell(entityTable, "class", String.class, col -> col.setCellValueFactory(f -> {
ObjectBinding<? extends ObservableEntity> src = valueAt(replayController.getEntityList(),
f.getValue().getIndex());
return createStringBinding(() -> src.get().getName(), src);
}));

// detail table
createTableCell(detailTable, "#", String.class, col ->
col.setCellValueFactory(f -> f.getValue().fieldPathProperty().asString())
);
createTableCell(detailTable, "type", String.class, col ->
col.setCellValueFactory(f -> f.getValue().typeProperty())
);
createTableCell(detailTable, "name", String.class, col ->
col.setCellValueFactory(f -> f.getValue().nameProperty())
);
createTableCell(detailTable, "#", String.class,
col -> col.setCellValueFactory(f -> f.getValue().fieldPathProperty().asString()));
createTableCell(detailTable, "type", String.class,
col -> col.setCellValueFactory(f -> f.getValue().typeProperty()));
createTableCell(detailTable, "name", String.class,
col -> col.setCellValueFactory(f -> f.getValue().nameProperty()));
createTableCell(detailTable, "value", String.class, col -> {
col.setCellValueFactory(f -> f.getValue().valueAsStringProperty());
col.setCellFactory(v -> new EntityValueTableCell());
}
);
col.setCellValueFactory(f -> f.getValue().valueAsStringProperty());
col.setCellFactory(v -> new EntityValueTableCell());
});
detailTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
detailTable.setOnKeyPressed(this::handleDetailTableKeyPressed);

// map control
mapControl.entityListProperty().bind(replayController.entityListProperty());
}

private <S, V> void createTableCell(TableView<S> tableView, String header, Class<V> valueClass, Consumer<TableColumn<S, V>> columnInitializer) {
private <S, V> void createTableCell(TableView<S> tableView, String header, Class<V> valueClass,
Consumer<TableColumn<S, V>> columnInitializer) {
var column = new TableColumn<S, V>(header);
tableView.getColumns().add(column);
columnInitializer.accept(column);
Expand All @@ -186,9 +187,8 @@ public void actionOpen(ActionEvent actionEvent) {
var fileChooser = new FileChooser();
fileChooser.setTitle("Load a replay");
fileChooser.getExtensionFilters().addAll(
new FileChooser.ExtensionFilter("Replay files", "*.dem"),
new FileChooser.ExtensionFilter("All files", "*")
);
new FileChooser.ExtensionFilter("Replay files", "*.dem"),
new FileChooser.ExtensionFilter("All files", "*"));
var dir = new File(preferences.get("fileChooserPath", "."));
if (!dir.isDirectory()) {
dir = new File(".");
Expand All @@ -200,6 +200,38 @@ public void actionOpen(ActionEvent actionEvent) {
}
preferences.put("fileChooserPath", replayFile.getParent());
replayController.load(replayFile);
menuGoToTick.setDisable(false);
}

public void actionGoToTick(ActionEvent actionEvent) {
// Show an input dialog to ask for the tick number
TextInputDialog dialog = new TextInputDialog();
dialog.setTitle("Go to Tick");
dialog.setHeaderText("Enter the tick number");
dialog.setContentText("Tick:");

// Get the user's input
Optional<String> result = dialog.showAndWait();

result.ifPresent(input -> {
// Remove everything but digits
String sanitizedInput = input.replaceAll("\\D", "");
if (!sanitizedInput.isEmpty()) {
try {
// Parse the sanitized input as an integer, defaulting to
// the last tick if the input integer is too high
int tickNumber = Math.min(
Integer.parseInt(sanitizedInput),
replayController.getRunner().getLastTick());
System.out.println("Going to tick: " + tickNumber);
replayController.getRunner().setDemandedTick(tickNumber);
} catch (NumberFormatException e) {
System.err.println("Error: Could not parse tick number.");
}
} else {
System.err.println("No valid tick number entered.");
}
});
}

public void clickPlay(ActionEvent actionEvent) {
Expand All @@ -213,8 +245,7 @@ private void handleDetailTableKeyPressed(KeyEvent e) {
cbc.putString(detailTable.getSelectionModel().getSelectedIndices().stream()
.map(i -> detailTable.getItems().get(i))
.map(p -> String.format("%s %s %s", p.getFieldPath(), p.getName(), p.getValue()))
.collect(Collectors.joining("\n"))
);
.collect(Collectors.joining("\n")));
Clipboard.getSystemClipboard().setContent(cbc);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/fx/main.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
<KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
</accelerator>
</MenuItem>
<MenuItem fx:id="menuGoToTick" mnemonicParsing="false" onAction="#actionGoToTick" text="Go to Tick">
<accelerator>
<KeyCodeCombination alt="UP" code="T" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
</accelerator>
</MenuItem>
<MenuItem mnemonicParsing="false" onAction="#actionQuit" text="Quit">
<accelerator>
<KeyCodeCombination alt="UP" code="Q" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
Expand Down