Skip to content

Commit

Permalink
Added option to read Liebre metrics from the end of the file
Browse files Browse the repository at this point in the history
  • Loading branch information
hej2010 committed May 28, 2021
1 parent 7470e5e commit c11fdc0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
Binary file modified out/artifacts/GUI_jar/GUI.jar
Binary file not shown.
13 changes: 12 additions & 1 deletion src/main/java/gui/controllers/GUIController.java
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,17 @@ private void initButtonListeners(GUI gui) {
return;
}
lastSelectedMetricsDirectory = file;
ButtonType fromStart = new ButtonType("From start", ButtonBar.ButtonData.OK_DONE);
ButtonType fromEnd = new ButtonType("From end", ButtonBar.ButtonData.CANCEL_CLOSE);
Alert alert = new Alert(Alert.AlertType.CONFIRMATION,
"Read metrics from the start or from the end of the file?",
fromStart,
fromEnd);

alert.setTitle("Read stats from");
Optional<ButtonType> result = alert.showAndWait();

final boolean isFromStart = result.orElse(fromEnd) == fromStart;
try {
FXMLLoader fxmlLoader = new FXMLLoader(GUI.class.getResource(GUI.FXML_METRICS_LIEBRE));
Pane main = fxmlLoader.load();
Expand All @@ -725,7 +736,7 @@ private void initButtonListeners(GUI gui) {
controller.setStage(stage);

assert selectedTab.getVisResult() != null;
controller.init(parsedSPE, selectedTab.getVisResult(), file);
controller.init(selectedTab.getVisResult(), file, isFromStart);
} catch (IOException e) {
e.printStackTrace();
}
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/gui/controllers/LiebreMetricsController.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import gui.graph.data.Stream;
import gui.graph.visualisation.VisInfo;
import gui.metrics.liebre.*;
import gui.spe.ParsedSPE;
import gui.utils.Files;
import javafx.fxml.FXML;
import javafx.scene.control.Tab;
Expand All @@ -18,7 +17,6 @@
import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.LinkedList;
import java.util.List;

Expand All @@ -27,13 +25,11 @@ public class LiebreMetricsController implements IOnNewMetricDataListener, IWindo
private TabPane tabPane;
private Stage stage = null;

private ParsedSPE parsedSPE;
private List<Pair<Node<GraphOperator>, VisInfo>> visResult;
private LiebreMetrics liebreMetrics;
private List<MetricsTab> metricsTabs;

public void init(@Nonnull ParsedSPE parsedSPE, @Nonnull List<Pair<Node<GraphOperator>, VisInfo>> visResult, File directory) {
this.parsedSPE = parsedSPE;
public void init(@Nonnull List<Pair<Node<GraphOperator>, VisInfo>> visResult, File directory, boolean isFromStart) {
this.visResult = visResult;

final List<GraphObject> graphObjects = getAllGraphObjects();
Expand All @@ -47,7 +43,7 @@ public void init(@Nonnull ParsedSPE parsedSPE, @Nonnull List<Pair<Node<GraphOper
e.printStackTrace();
}

liebreMetrics.runAndListenAsync(true);
liebreMetrics.runAndListenAsync(!isFromStart);
}

private void setUpTabs(List<File> filesToRead) throws IOException {
Expand Down

0 comments on commit c11fdc0

Please sign in to comment.