Skip to content

Commit 8f15738

Browse files
charlio23charlio23
committed
Database implemented
1 parent e1d103e commit 8f15738

File tree

6 files changed

+445
-97
lines changed

6 files changed

+445
-97
lines changed

‎src/main/java/dimorphisms/DataEntry.java‎

Lines changed: 89 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ public void onLiquidVaporAddPressed() {
154154

155155
}
156156

157-
float a = Float.parseFloat(liquidVaporA.getText());
158-
float b = Float.parseFloat(liquidVaporB.getText());
159-
float c = Float.parseFloat(liquidVaporC.getText());
157+
double a = Double.parseDouble(liquidVaporA.getText());
158+
double b = Double.parseDouble(liquidVaporB.getText());
159+
double c = Double.parseDouble(liquidVaporC.getText());
160160
boolean isLog = liquidVaporLog.isSelected();
161161
updateInformation(viewController.addLiquidVapor(a, b, c, isLog));
162162
liquidVaporPane.getStyleClass().add("data-entered");
@@ -182,9 +182,9 @@ public void onSolid1VaporAddPressed() {
182182

183183
}
184184

185-
float a = Float.parseFloat(solid1VaporA.getText());
186-
float b = Float.parseFloat(solid1VaporB.getText());
187-
float c = Float.parseFloat(solid1VaporC.getText());
185+
double a = Double.parseDouble(solid1VaporA.getText());
186+
double b = Double.parseDouble(solid1VaporB.getText());
187+
double c = Double.parseDouble(solid1VaporC.getText());
188188
boolean isLog = solid1VaporLog.isSelected();
189189
updateInformation(viewController.addSolid1Vapor(a, b, c, isLog));
190190
solid1VaporPane.getStyleClass().add("data-entered");
@@ -209,9 +209,9 @@ public void onSolid2VaporAddPressed() {
209209
System.out.println("Call to view");
210210
}
211211

212-
float a = Float.parseFloat(solid2VaporA.getText());
213-
float b = Float.parseFloat(solid2VaporB.getText());
214-
float c = Float.parseFloat(solid2VaporC.getText());
212+
double a = Double.parseDouble(solid2VaporA.getText());
213+
double b = Double.parseDouble(solid2VaporB.getText());
214+
double c = Double.parseDouble(solid2VaporC.getText());
215215
boolean isLog = solid2VaporLog.isSelected();
216216
updateInformation(viewController.addSolid2Vapor(a, b, c, isLog));
217217
solid2VaporPane.getStyleClass().add("data-entered");
@@ -228,7 +228,7 @@ public void onLiquidSolid1AddPressed() {
228228
System.out.println("Call to view");
229229
}
230230

231-
float dpdt = Float.parseFloat(liquidSolid1dpdt.getText());
231+
double dpdt = Double.parseDouble(liquidSolid1dpdt.getText());
232232
updateInformation(viewController.addLiquidSolid1(dpdt));
233233
liquidSolid1Pane.getStyleClass().add("data-entered");
234234

@@ -245,7 +245,7 @@ public void onLiquidSolid2AddPressed() {
245245
System.out.println("Call to view");
246246
}
247247

248-
float dpdt = Float.parseFloat(liquidSolid2dpdt.getText());
248+
double dpdt = Double.parseDouble(liquidSolid2dpdt.getText());
249249
updateInformation(viewController.addLiquidSolid2(dpdt));
250250
liquidSolid2Pane.getStyleClass().add("data-entered");
251251

@@ -262,7 +262,7 @@ public void onSolid1Solid2AddPressed() {
262262
System.out.println("Call to view");
263263
}
264264

265-
float dpdt = Float.parseFloat(solid1Solid2dpdt.getText());
265+
double dpdt = Double.parseDouble(solid1Solid2dpdt.getText());
266266
updateInformation(viewController.addSolid1Solid2(dpdt));
267267
solid1Solid2Pane.getStyleClass().add("data-entered");
268268

@@ -273,7 +273,7 @@ public void onSolid1Solid2VaporTempAddPressed() {
273273
if (!checkTextIsCorrect(solid1Solid2VaporTemp.getText())) {
274274
showErrorDialogText(Utils.SOLID_1_SOLID_2_ERR,"Temperature has to be a number.");
275275
}
276-
float temp = Float.parseFloat(solid1Solid2VaporTemp.getText());
276+
double temp = Double.parseDouble(solid1Solid2VaporTemp.getText());
277277
updateInformation(viewController.addSolid1Solid2VaporTemp(temp));
278278
solid1Solid2Pane.getStyleClass().add("data-entered");
279279

@@ -284,7 +284,7 @@ public void onLiquidSolid1VaporTempAddPressed() {
284284
if (!checkTextIsCorrect(liquidSolid1VaporTemp.getText())) {
285285
showErrorDialogText(Utils.LIQUID_SOLID_1_ERR,"Temperature has to be a number.");
286286
}
287-
float temp = Float.parseFloat(liquidSolid1VaporTemp.getText());
287+
double temp = Double.parseDouble(liquidSolid1VaporTemp.getText());
288288
updateInformation(viewController.addLiquidSolid1VaporTemp(temp));
289289
liquidSolid1Pane.getStyleClass().add("data-entered");
290290

@@ -295,7 +295,7 @@ public void onLiquidSolid2VaporTempAddPressed() {
295295
if (!checkTextIsCorrect(liquidSolid2VaporTemp.getText())) {
296296
showErrorDialogText(Utils.LIQUID_SOLID_2_ERR,"Temperature has to be a number.");
297297
}
298-
float temp = Float.parseFloat(liquidSolid2VaporTemp.getText());
298+
double temp = Double.parseDouble(liquidSolid2VaporTemp.getText());
299299
updateInformation(viewController.addLiquidSolid2VaporTemp(temp));
300300
liquidSolid2Pane.getStyleClass().add("data-entered");
301301

@@ -336,6 +336,7 @@ public void onStableDiagramPressed() throws IOException{
336336
*/
337337
@FXML
338338
public void onSavePressed(){
339+
viewController.deleteMaterial(materialName.getText());
339340
if (viewController.saveMaterial()) {
340341
Alert alert = new Alert(Alert.AlertType.INFORMATION);
341342
alert.setTitle("Save successful");
@@ -408,21 +409,26 @@ private void updateInformation(ArrayList<String> information) {
408409
liquidVaporA.setText(values[1]);
409410
liquidVaporB.setText(values[2]);
410411
liquidVaporC.setText(values[3]);
411-
liquidVaporLn.setSelected(true);
412+
liquidVaporLog.setSelected(Boolean.valueOf(values[4]));
413+
liquidVaporLn.setSelected(!(Boolean.valueOf(values[4])));
412414
liquidVaporPane.getStyleClass().add("data-calculated");
413415
break;
414416

415417
case Utils.QUERY_VAPOR_SOLID1:
416418
solid1VaporA.setText(values[1]);
417419
solid1VaporB.setText(values[2]);
418420
solid1VaporC.setText(values[3]);
421+
solid1VaporLog.setSelected(Boolean.valueOf(values[4]));
422+
solid1VaporLn.setSelected(!(Boolean.valueOf(values[4])));
419423
solid1VaporPane.getStyleClass().add("data-calculated");
420424
break;
421425

422426
case Utils.QUERY_VAPOR_SOLID2:
423427
solid2VaporA.setText(values[1]);
424428
solid2VaporB.setText(values[2]);
425429
solid2VaporC.setText(values[3]);
430+
solid1VaporLog.setSelected(Boolean.valueOf(values[4]));
431+
solid1VaporLn.setSelected(!(Boolean.valueOf(values[4])));
426432
solid2VaporPane.getStyleClass().add("data-calculated");
427433
break;
428434

@@ -495,4 +501,71 @@ public void onViewMoreInformationPressed(){
495501
}
496502

497503
}
504+
505+
public void setMaterialInfo(ArrayList<String> information) {
506+
updateInformation(viewController.getUIInformation());
507+
stableDiagramButton.setDisable(!viewController.isMaterialComplete());
508+
for (String info : information) {
509+
String[] values = info.split(";");
510+
switch (values[0]) {
511+
case Utils.QUERY_LIQUID_VAPOR:
512+
liquidVaporA.setText(values[1]);
513+
liquidVaporB.setText(values[2]);
514+
liquidVaporC.setText(values[3]);
515+
liquidVaporLog.setSelected(Boolean.valueOf(values[4]));
516+
liquidVaporLn.setSelected(!(Boolean.valueOf(values[4])));
517+
liquidVaporPane.getStyleClass().add("data-entered");
518+
break;
519+
520+
case Utils.QUERY_VAPOR_SOLID1:
521+
solid1VaporA.setText(values[1]);
522+
solid1VaporB.setText(values[2]);
523+
solid1VaporC.setText(values[3]);
524+
solid1VaporLog.setSelected(Boolean.valueOf(values[4]));
525+
solid1VaporLn.setSelected(!(Boolean.valueOf(values[4])));
526+
solid1VaporPane.getStyleClass().add("data-entered");
527+
break;
528+
529+
case Utils.QUERY_VAPOR_SOLID2:
530+
solid2VaporA.setText(values[1]);
531+
solid2VaporB.setText(values[2]);
532+
solid2VaporC.setText(values[3]);
533+
solid2VaporLog.setSelected(Boolean.valueOf(values[4]));
534+
solid2VaporLn.setSelected(!(Boolean.valueOf(values[4])));
535+
solid2VaporPane.getStyleClass().add("data-entered");
536+
break;
537+
538+
case Utils.QUERY_LIQUID_SOLID1:
539+
liquidSolid1dpdt.setText(values[1]);
540+
liquidSolid1Pane.getStyleClass().add("data-entered");
541+
break;
542+
543+
case Utils.QUERY_LIQUID_SOLID2:
544+
liquidSolid2dpdt.setText(values[1]);
545+
liquidSolid2Pane.getStyleClass().add("data-entered");
546+
break;
547+
548+
case Utils.QUERY_SOLID1_SOLID2:
549+
solid1Solid2dpdt.setText(values[1]);
550+
solid1Solid2Pane.getStyleClass().add("data-entered");
551+
break;
552+
553+
case Utils.QUERY_TLV1:
554+
liquidSolid1VaporTemp.setText(values[1]);
555+
liquidSolid1Pane.getStyleClass().add("data-entered");
556+
break;
557+
558+
case Utils.QUERY_TLV2:
559+
liquidSolid2VaporTemp.setText(values[1]);
560+
liquidSolid2Pane.getStyleClass().add("data-entered");
561+
break;
562+
563+
case Utils.QUERY_TV12:
564+
solid1Solid2VaporTemp.setText(values[1]);
565+
solid1Solid2Pane.getStyleClass().add("data-entered");
566+
break;
567+
}
568+
}
569+
}
570+
498571
}

0 commit comments

Comments
 (0)