Skip to content

Commit

Permalink
Updated all Add and Edit Panes
Browse files Browse the repository at this point in the history
  • Loading branch information
d.emmel authored and d.emmel committed Aug 14, 2023
1 parent c9b45e0 commit 972c89f
Show file tree
Hide file tree
Showing 45 changed files with 1,977 additions and 243 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.dominikemmel.reflowlab</groupId>
<artifactId>ReFlowLab</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
<packaging>jar</packaging>

<properties>
Expand Down
12 changes: 3 additions & 9 deletions .../java/de/dominikemmel/reflowlab/controller/activematerials/ActiveMaterialsController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,8 @@ private void addColumnNames() {
M1.setStyle("-fx-font-style: italic");
Text M2 = new Text(" / g mol");
M2.setStyle("-fx-font-weight: bold");
Text M3 = new Text("-1");
Text M3 = new Text("⁻¹");
M3.setStyle("-fx-font-weight: bold");
M3.setTranslateY(M1.getFont().getSize() * -0.3);
M3.setFont(Font.font(M2.getFont().getStyle(),M2.getFont().getSize()*0.75));

M_TextFlow.getChildren().addAll(M1,M2,M3);

Expand Down Expand Up @@ -246,10 +244,8 @@ private void addColumnNames() {
C_AM2.setFont(Font.font(C_AM1.getFont().getStyle(),C_AM1.getFont().getSize()*0.75));
Text C_AM3 = new Text(" / $ kg");
C_AM3.setStyle("-fx-font-weight: bold");
Text C_AM4 = new Text("-1");
Text C_AM4 = new Text("⁻¹");
C_AM4.setStyle("-fx-font-weight: bold");
C_AM4.setTranslateY(C_AM1.getFont().getSize() * -0.3);
C_AM4.setFont(Font.font(C_AM1.getFont().getStyle(),C_AM1.getFont().getSize()*0.75));

CAM_TextFlow.getChildren().addAll(C_AM1,C_AM2,C_AM3,C_AM4);

Expand All @@ -275,10 +271,8 @@ private void addColumnNames() {
SaltC2.setFont(Font.font(SaltC1.getFont().getStyle(),SaltC1.getFont().getSize()*0.75));
Text SaltC3 = new Text(" / mol L");
SaltC3.setStyle("-fx-font-weight: bold");
Text SaltC4 = new Text("-1");
Text SaltC4 = new Text("⁻¹");
SaltC4.setStyle("-fx-font-weight: bold");
SaltC4.setTranslateY(SaltC1.getFont().getSize() * -0.3);
SaltC4.setFont(Font.font(SaltC1.getFont().getStyle(),SaltC1.getFont().getSize()*0.75));

SaltC_TextFlow.getChildren().addAll(SaltC1,SaltC2,SaltC3,SaltC4);

Expand Down
91 changes: 90 additions & 1 deletion ...ava/de/dominikemmel/reflowlab/controller/activematerials/AddActiveMaterialController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Font;
import javafx.scene.text.Text;
import javafx.scene.text.TextFlow;
import javafx.stage.Stage;
import de.dominikemmel.reflowlab.Database;
import de.dominikemmel.reflowlab.VariousMethods;
Expand Down Expand Up @@ -54,6 +57,13 @@ public class AddActiveMaterialController implements javafx.fxml.Initializable {
@FXML private Button btnInputRefN;
@FXML private Button btnInputRefNumberH;
@FXML private Button btnInputRefCAM;

@FXML private TextFlow M_TextFlow;
@FXML private TextFlow N_TextFlow;
@FXML private TextFlow NumberH_TextFlow;
@FXML private TextFlow CAM_TextFlow;
@FXML private TextFlow SaltC_TextFlow;
@FXML private TextFlow E_TextFlow;

String table = "activeMaterial";

Expand All @@ -67,7 +77,86 @@ public void run() {
}
});

Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/1x/arrowDownmdpi.png"));
//M:
Text M1 = new Text("M");
M1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text M2 = new Text(" / g mol");
M2.setStyle("-fx-font-weight: bold");
Text M3 = new Text("⁻¹");
M3.setStyle("-fx-font-weight: bold");
Text M4 = new Text(":");
M4.setStyle("-fx-font-weight: bold");

M_TextFlow.getChildren().addAll(M1,M2,M3,M4);

//N:
Text N1 = new Text("n");
N1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text N2 = new Text("e-");
N2.setStyle("-fx-font-weight: bold");
N2.setTranslateY(N1.getFont().getSize() * 0.3);
N2.setFont(Font.font(N1.getFont().getStyle(),N1.getFont().getSize()*0.75));
Text N3 = new Text(":");
N3.setStyle("-fx-font-weight: bold");

N_TextFlow.getChildren().addAll(N1,N2,N3);

//NumberH:
Text NumberH1 = new Text("n");
NumberH1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text NumberH2 = new Text("H+");
NumberH2.setStyle("-fx-font-weight: bold");
NumberH2.setTranslateY(NumberH1.getFont().getSize() * 0.3);
NumberH2.setFont(Font.font(NumberH1.getFont().getStyle(),NumberH1.getFont().getSize()*0.75));
Text NumberH3 = new Text(":");
NumberH3.setStyle("-fx-font-weight: bold");

NumberH_TextFlow.getChildren().addAll(NumberH1,NumberH2,NumberH3);

//C_AM:
Text C_AM1 = new Text("C");
C_AM1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text C_AM2 = new Text("AM");
C_AM2.setStyle("-fx-font-weight: bold");
C_AM2.setTranslateY(C_AM1.getFont().getSize() * 0.3);
C_AM2.setFont(Font.font(C_AM1.getFont().getStyle(),C_AM1.getFont().getSize()*0.75));
Text C_AM3 = new Text(" / $ kg");
C_AM3.setStyle("-fx-font-weight: bold");
Text C_AM4 = new Text("⁻¹");
C_AM4.setStyle("-fx-font-weight: bold");
Text C_AM5 = new Text(":");
C_AM5.setStyle("-fx-font-weight: bold");

CAM_TextFlow.getChildren().addAll(C_AM1,C_AM2,C_AM3,C_AM4,C_AM5);

//Saltc:
Text SaltC1 = new Text("c");
SaltC1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text SaltC2 = new Text("salt");
SaltC2.setStyle("-fx-font-weight: bold");
SaltC2.setTranslateY(SaltC1.getFont().getSize() * 0.3);
SaltC2.setFont(Font.font(SaltC1.getFont().getStyle(),SaltC1.getFont().getSize()*0.75));
Text SaltC3 = new Text(" / mol L");
SaltC3.setStyle("-fx-font-weight: bold");
Text SaltC4 = new Text("⁻¹");
SaltC4.setStyle("-fx-font-weight: bold");
Text SaltC5 = new Text(":");
SaltC5.setStyle("-fx-font-weight: bold");

SaltC_TextFlow.getChildren().addAll(SaltC1,SaltC2,SaltC3,SaltC4,SaltC5);

//E:
Text E1 = new Text("E");
E1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text E2 = new Text(" vs NHE / V");
E2.setStyle("-fx-font-weight: bold");
Text E3 = new Text(":");
E3.setStyle("-fx-font-weight: bold");

E_TextFlow.getChildren().addAll(E1,E2,E3);


Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/0.5x/Asset [email protected]"));
ImageView imgViewBtnInputRefN = new ImageView(img);
imgViewBtnInputRefN.setFitHeight(10);
imgViewBtnInputRefN.setFitWidth(12);
Expand Down
90 changes: 89 additions & 1 deletion ...va/de/dominikemmel/reflowlab/controller/activematerials/EditActiveMaterialController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Font;
import javafx.scene.text.Text;
import javafx.scene.text.TextFlow;
import javafx.stage.Stage;
import de.dominikemmel.reflowlab.Database;
import de.dominikemmel.reflowlab.VariousMethods;
Expand Down Expand Up @@ -55,6 +58,13 @@ public class EditActiveMaterialController implements javafx.fxml.Initializable
@FXML private Button btnInputRefN;
@FXML private Button btnInputRefNumberH;
@FXML private Button btnInputRefCAM;

@FXML private TextFlow M_TextFlow;
@FXML private TextFlow N_TextFlow;
@FXML private TextFlow NumberH_TextFlow;
@FXML private TextFlow CAM_TextFlow;
@FXML private TextFlow SaltC_TextFlow;
@FXML private TextFlow E_TextFlow;

String table = "activeMaterial";

Expand Down Expand Up @@ -110,7 +120,85 @@ public void run() {
}
});

Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/1x/arrowDownmdpi.png"));
//M:
Text M1 = new Text("M");
M1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text M2 = new Text(" / g mol");
M2.setStyle("-fx-font-weight: bold");
Text M3 = new Text("⁻¹");
M3.setStyle("-fx-font-weight: bold");
Text M4 = new Text(":");
M4.setStyle("-fx-font-weight: bold");

M_TextFlow.getChildren().addAll(M1,M2,M3,M4);

//N:
Text N1 = new Text("n");
N1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text N2 = new Text("e-");
N2.setStyle("-fx-font-weight: bold");
N2.setTranslateY(N1.getFont().getSize() * 0.3);
N2.setFont(Font.font(N1.getFont().getStyle(),N1.getFont().getSize()*0.75));
Text N3 = new Text(":");
N3.setStyle("-fx-font-weight: bold");

N_TextFlow.getChildren().addAll(N1,N2,N3);

//NumberH:
Text NumberH1 = new Text("n");
NumberH1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text NumberH2 = new Text("H+");
NumberH2.setStyle("-fx-font-weight: bold");
NumberH2.setTranslateY(NumberH1.getFont().getSize() * 0.3);
NumberH2.setFont(Font.font(NumberH1.getFont().getStyle(),NumberH1.getFont().getSize()*0.75));
Text NumberH3 = new Text(":");
NumberH3.setStyle("-fx-font-weight: bold");

NumberH_TextFlow.getChildren().addAll(NumberH1,NumberH2,NumberH3);

//C_AM:
Text C_AM1 = new Text("C");
C_AM1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text C_AM2 = new Text("AM");
C_AM2.setStyle("-fx-font-weight: bold");
C_AM2.setTranslateY(C_AM1.getFont().getSize() * 0.3);
C_AM2.setFont(Font.font(C_AM1.getFont().getStyle(),C_AM1.getFont().getSize()*0.75));
Text C_AM3 = new Text(" / $ kg");
C_AM3.setStyle("-fx-font-weight: bold");
Text C_AM4 = new Text("⁻¹");
C_AM4.setStyle("-fx-font-weight: bold");
Text C_AM5 = new Text(":");
C_AM5.setStyle("-fx-font-weight: bold");

CAM_TextFlow.getChildren().addAll(C_AM1,C_AM2,C_AM3,C_AM4,C_AM5);

//Saltc:
Text SaltC1 = new Text("c");
SaltC1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text SaltC2 = new Text("salt");
SaltC2.setStyle("-fx-font-weight: bold");
SaltC2.setTranslateY(SaltC1.getFont().getSize() * 0.3);
SaltC2.setFont(Font.font(SaltC1.getFont().getStyle(),SaltC1.getFont().getSize()*0.75));
Text SaltC3 = new Text(" / mol L");
SaltC3.setStyle("-fx-font-weight: bold");
Text SaltC4 = new Text("⁻¹");
SaltC4.setStyle("-fx-font-weight: bold");
Text SaltC5 = new Text(":");
SaltC5.setStyle("-fx-font-weight: bold");

SaltC_TextFlow.getChildren().addAll(SaltC1,SaltC2,SaltC3,SaltC4,SaltC5);

//E:
Text E1 = new Text("E");
E1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text E2 = new Text(" vs NHE / V");
E2.setStyle("-fx-font-weight: bold");
Text E3 = new Text(":");
E3.setStyle("-fx-font-weight: bold");

E_TextFlow.getChildren().addAll(E1,E2,E3);

Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/0.5x/Asset [email protected]"));
ImageView imgViewBtnInputRefN = new ImageView(img);
imgViewBtnInputRefN.setFitHeight(10);
imgViewBtnInputRefN.setFitWidth(12);
Expand Down
34 changes: 33 additions & 1 deletion src/main/java/de/dominikemmel/reflowlab/controller/costs/AddCostsSaltController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Text;
import javafx.scene.text.TextFlow;
import javafx.stage.Stage;
import de.dominikemmel.reflowlab.Database;
import de.dominikemmel.reflowlab.VariousMethods;
Expand All @@ -39,6 +41,11 @@ public class AddCostsSaltController implements javafx.fxml.Initializable {
@FXML
private TextField inputRefCSalt;

@FXML
private TextFlow MSalt_TextFlow;
@FXML
private TextFlow CSalt_TextFlow;

@FXML
private Button btnInputRefMSalt;

Expand All @@ -53,8 +60,33 @@ public void run() {
inputSalt.requestFocus();
}
});

//MSalt:
Text MSalt1 = new Text("M");
MSalt1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text MSalt2 = new Text(" / g mol");
MSalt2.setStyle("-fx-font-weight: bold");
Text MSalt3 = new Text("⁻¹");
MSalt3.setStyle("-fx-font-weight: bold");
Text MSalt4 = new Text(":");
MSalt4.setStyle("-fx-font-weight: bold");

MSalt_TextFlow.getChildren().addAll(MSalt1,MSalt2,MSalt3,MSalt4);

//CSalt:
Text CSalt1 = new Text("C");
CSalt1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text CSalt2 = new Text(" / $ kg");
CSalt2.setStyle("-fx-font-weight: bold");
Text CSalt3 = new Text("⁻¹");
CSalt3.setStyle("-fx-font-weight: bold");
Text CSalt4 = new Text(":");
CSalt4.setStyle("-fx-font-weight: bold");

CSalt_TextFlow.getChildren().addAll(CSalt1,CSalt2,CSalt3,CSalt4);


Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/1x/arrowDownmdpi.png"));
Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/0.5x/Asset [email protected].png"));
ImageView imgView = new ImageView(img);
imgView.setFitHeight(10);
imgView.setFitWidth(12);
Expand Down
34 changes: 33 additions & 1 deletion src/main/java/de/dominikemmel/reflowlab/controller/costs/AddCostsSolventController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Text;
import javafx.scene.text.TextFlow;
import javafx.stage.Stage;
import de.dominikemmel.reflowlab.Database;
import de.dominikemmel.reflowlab.VariousMethods;
Expand All @@ -39,6 +41,11 @@ public class AddCostsSolventController implements javafx.fxml.Initializable {
@FXML
private TextField inputRefCSolvent;

@FXML
private TextFlow MSolvent_TextFlow;
@FXML
private TextFlow CSolvent_TextFlow;

@FXML
private Button btnInputRefMSolvent;

Expand All @@ -54,7 +61,32 @@ public void run() {
}
});

Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/1x/arrowDownmdpi.png"));
//CSolvent:
Text CSolvent1 = new Text("C");
CSolvent1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text CSolvent2 = new Text(" / $ kg");
CSolvent2.setStyle("-fx-font-weight: bold");
Text CSolvent3 = new Text("⁻¹");
CSolvent3.setStyle("-fx-font-weight: bold");
Text CSolvent4 = new Text(":");
CSolvent4.setStyle("-fx-font-weight: bold");

CSolvent_TextFlow.getChildren().addAll(CSolvent1,CSolvent2,CSolvent3,CSolvent4);

//MSolvent:
Text MSolvent1 = new Text("M");
MSolvent1.setStyle("-fx-font-weight: bold; -fx-font-style: italic");
Text MSolvent2 = new Text(" / g mol");
MSolvent2.setStyle("-fx-font-weight: bold");
Text MSolvent3 = new Text("⁻¹");
MSolvent3.setStyle("-fx-font-weight: bold");
Text MSolvent4 = new Text(":");
MSolvent4.setStyle("-fx-font-weight: bold");

MSolvent_TextFlow.getChildren().addAll(MSolvent1,MSolvent2,MSolvent3,MSolvent4);


Image img = new Image(getClass().getResourceAsStream("/de/dominikemmel/reflowlab/img/ArrowDown/0.5x/Asset [email protected]"));
ImageView imgView = new ImageView(img);
imgView.setFitHeight(10);
imgView.setFitWidth(12);
Expand Down
Loading

0 comments on commit 972c89f

Please sign in to comment.