meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed printing auditing. Added separator.

voting-booth-gui
Laura Radaelli 2017-07-03 08:14:59 +03:00
parent 9db8d8708a
commit 95700f360e
4 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/PrinterController.java
View File

@ -6,16 +6,19 @@ package meerkat.voting.gui.controllersFX;
import javafx.embed.swing.SwingFXUtils;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.control.ScrollPane;
import javafx.scene.text.Text;
import meerkat.voting.gui.ui.CommandPend;
import meerkat.voting.gui.ui.uicommands.UICommand;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
@ -26,10 +29,9 @@ import java.io.InputStream;
public class PrinterController {
/** Holder of vista. */
@FXML
private VBox vBox;
@FXML
private Text content;
@FXML private VBox vBox;
@FXML private ScrollPane scrollPane;
@FXML private Text content;
public void clean() {
@ -40,6 +42,7 @@ public class PrinterController {
Text txt = new Text(s);
vBox.getChildren().add(txt);
vBox.getScene().getWindow().sizeToScene();
adjustScrolling(vBox);
}
public void addContent(BufferedImage i) {
@ -50,6 +53,20 @@ public class PrinterController {
// String old_content = content.getText();
// content.setText(old_content+"\n"+s);
vBox.getScene().getWindow().sizeToScene();
adjustScrolling(vBox);
}
private void adjustScrolling(VBox content) {
scrollPane.setContent(content);
scrollPane.setFitToHeight(true);
}
public void addSeparator() {
Separator sep = new Separator();
sep.setMaxWidth(vBox.getPrefWidth());
vBox.getChildren().add(sep);
adjustScrolling(vBox);
}
}

13
voting-booth-gui/src/main/java/meerkat/voting/gui/controllersFX/VistaNavigator.java
View File

@ -170,6 +170,19 @@ public class VistaNavigator {
);
}
/**
* Prints an horizontal separator into the printer application layout.
*/
public static void printFXSeparator() {
Platform.runLater(new Runnable() {
@Override
public void run() {
printerController.addSeparator();
}
}
);
}
/**
* Loads the 'LOADING' vista
* vistaHolder pane of the main application layout.

1
voting-booth-gui/src/main/java/meerkat/voting/gui/output/FXWindowOutputDevice.java
View File

@ -60,6 +60,7 @@ public class FXWindowOutputDevice extends AsyncRunnableOutputDevice {
*/
public void doAudit(AuditOutputCommand command) {
logger.debug("entered method doAudit");
VistaNavigator.printFXSeparator();
String msg = "Auditing";
VistaNavigator.printFX(msg);
BallotSecrets ballotSecrets = command.getBallotSecrets();

16
voting-booth-gui/src/main/resources/views/printer.fxml
View File

@ -1,10 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?scenebuilder-stylesheet vista.css?>
<VBox fx:id="vBox" prefHeight="200.0" prefWidth="350.0" style="-fx-background-color: white;" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.PrinterController">
<children>
<Pane prefHeight="486.0" prefWidth="352.0" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.controllersFX.PrinterController">
<children>
<ScrollPane fx:id="scrollPane" prefHeight="486.0" prefWidth="352.0">
<content>
<VBox fx:id="vBox" prefHeight="479.0" prefWidth="350.0" style="-fx-background-color: white;">
<children>
</children>
</VBox>
</VBox>
</content>
</ScrollPane>
</children>
</Pane>