Voomra/corrector1s
Archived
0
Fork 0
Code Activity

Добавление параметра ФСС в GUI

Browse Source
This commit is contained in:
DmitriyMX
2018-06-07 14:55:04 +03:00
parent b182fe1763
commit 1919da1f3c
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/ru/dmitriymx/corrector1s/gui/MainController.java
View File

@@ -9,7 +9,6 @@ import javafx.scene.layout.VBox;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Stage; import javafx.stage.Stage;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import ru.dmitriymx.corrector1s.Corrector1S; import ru.dmitriymx.corrector1s.Corrector1S;
import java.io.*; import java.io.*;
@@ -38,8 +37,11 @@ public class MainController {
@FXML @FXML
private Button btnStartCorrect; private Button btnStartCorrect;
@FXML @FXML
private Spinner<Integer> gonorar; private Spinner<Double> honorarium;
private SpinnerValueFactory<Integer> gonorarValueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 100, 9); private SpinnerValueFactory<Double> honorariumValueFactory = new SpinnerValueFactory.DoubleSpinnerValueFactory(0.01d, 100.0d, 9.0d);
@FXML
private Spinner<Double> fss;
private SpinnerValueFactory<Double> fssValueFactory = new SpinnerValueFactory.DoubleSpinnerValueFactory(0.01d, 100.0d, 31.0d);
private FileChooser buildFileChooser(TextField textField) { private FileChooser buildFileChooser(TextField textField) {
FileChooser fileChooser = new FileChooser(); FileChooser fileChooser = new FileChooser();
@@ -105,7 +107,8 @@ public class MainController {
@FXML @FXML
public void initialize() { public void initialize() {
gonorar.setValueFactory(gonorarValueFactory); honorarium.setValueFactory(honorariumValueFactory);
fss.setValueFactory(fssValueFactory);
saveAsCheckBox.selectedProperty().addListener((observable, oldValue, newValue) -> { saveAsCheckBox.selectedProperty().addListener((observable, oldValue, newValue) -> {
saveAsFilePath.setDisable(!newValue); saveAsFilePath.setDisable(!newValue);
@@ -140,7 +143,10 @@ public class MainController {
} else { } else {
corrector.setTargetFile(new File(sourceFilePath.getText())); corrector.setTargetFile(new File(sourceFilePath.getText()));
} }
corrector.setHonorarium(gonorar.getValue()); log.info("Honorarium: {}", honorarium.getValue());
corrector.setHonorarium(honorarium.getValue());
log.info("FSS: {}", fss.getValue());
corrector.setFss(fss.getValue());
progressBar.setProgress(0.14d); progressBar.setProgress(0.14d);

6
src/main/resources/ru/dmitriymx/corrector1s/gui/single_layout.fxml
View File

@@ -12,7 +12,7 @@
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="203.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.dmitriymx.corrector1s.gui.MainController"> <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="203.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.dmitriymx.corrector1s.gui.MainController">
<Pane fx:id="mainPane" prefHeight="203.0" prefWidth="350.0"> <Pane fx:id="mainPane" prefHeight="203.0" prefWidth="350.0">
<padding> <padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" /> <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -32,7 +32,9 @@
</font> </font>
</Button> </Button>
<Label layoutX="132.0" layoutY="66.0" text="Гонорар" /> <Label layoutX="132.0" layoutY="66.0" text="Гонорар" />
<Spinner fx:id="gonorar" editable="true" layoutX="186.0" layoutY="62.0" prefHeight="25.0" prefWidth="77.0" /> <Spinner fx:id="honorarium" editable="true" layoutX="186.0" layoutY="62.0" prefHeight="25.0" prefWidth="59.0" />
<Label layoutX="249.0" layoutY="66.0" text="ФСС" />
<Spinner fx:id="fss" editable="true" layoutX="278.0" layoutY="62.0" prefHeight="25.0" prefWidth="59.0" />
</Pane> </Pane>
<Pane fx:id="waitPane" prefHeight="203.0" prefWidth="350.0" visible="false"> <Pane fx:id="waitPane" prefHeight="203.0" prefWidth="350.0" visible="false">
<ProgressIndicator fx:id="progressBar" layoutX="157.0" layoutY="62.0" prefHeight="50.0" prefWidth="36.0" progress="1.0" /> <ProgressIndicator fx:id="progressBar" layoutX="157.0" layoutY="62.0" prefHeight="50.0" prefWidth="36.0" progress="1.0" />