Skip to content

Commit 119d63a

Browse files
bowringbowring
authored
Ver170 and speedup of sample mgmt (#573)
* Updated version to 1.7.0 * Tweaked sample management speed
1 parent bb7c3e6 commit 119d63a

File tree

6 files changed

+50
-54
lines changed

6 files changed

+50
-54
lines changed

‎common.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'java'
66
apply plugin: 'maven'
77

88
String mavenGroupId = 'org.cirdles'
9-
String mavenVersion = '1.6.8'
9+
String mavenVersion = '1.7.0'
1010

1111
sourceCompatibility = '1.8'
1212
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

‎squidApp/src/main/java/org/cirdles/squid/gui/SpotManagerController.java

+49-45
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void initialize(URL url, ResourceBundle rb) {
188188
setUpParametersModelsComboBoxes();
189189

190190
try {
191-
setUpPrawnFile();
191+
setUpDataFile();
192192
} catch (SquidException squidException) {
193193
}
194194

@@ -230,7 +230,7 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
230230
sampleNameComboBox.getSelectionModel().selectFirst();
231231
}
232232

233-
private void setUpPrawnFile() throws SquidException {
233+
private void setUpDataFile() throws SquidException {
234234

235235
shrimpRuns = FXCollections.observableArrayList(squidProject.getPrawnFileRuns());
236236

@@ -312,7 +312,7 @@ private ContextMenu createAllSpotsViewContextMenu()
312312
squidProject.removeRunsFromPrawnFile(selectedRuns);
313313

314314
try {
315-
setUpPrawnFile();
315+
setUpDataFile();
316316
} catch (SquidException squidException) {
317317

318318
}
@@ -409,7 +409,7 @@ public void handle(MouseEvent mouseEvent) {
409409
restoreAllSpotMenuItem.setOnAction((evt) -> {
410410
squidProject.restoreAllRunsToPrawnFile();
411411
try {
412-
setUpPrawnFile();
412+
setUpDataFile();
413413
} catch (SquidException squidException) {
414414
//TODO: need message here
415415
}
@@ -423,7 +423,7 @@ public void handle(MouseEvent mouseEvent) {
423423
restoreSpotMenuItem.setOnAction((evt) -> {
424424
squidProject.restoreRunToPrawnFile(run);
425425
try {
426-
setUpPrawnFile();
426+
setUpDataFile();
427427
} catch (SquidException squidException) {
428428
//TODO: need message here
429429
}
@@ -522,49 +522,52 @@ public ParametersModel fromString(String userId) {
522522

523523
refMatModelComboBox.valueProperty()
524524
.addListener((ObservableValue<? extends ParametersModel> observable, ParametersModel oldValue, ParametersModel newValue) -> {
525-
if (newValue != null) {
525+
if ((oldValue != null) && (newValue != null) && (newValue.compareTo(oldValue) != 0)) {
526+
squidProject.setReferenceMaterialModel(newValue);
527+
squidProject.getTask().setChanged(true);
528+
squidProject.getTask().refreshParametersFromModels(false, false, true);
529+
530+
alertForZeroNaturalUranium();
531+
}
532+
533+
ParametersModel curValue = (newValue != null) ? newValue : oldValue;
526534

527-
String[] audit = ((ReferenceMaterialModel) newValue).auditAndTempUpdateRefMatModel().split("Audit:");
528-
String[] flags = audit[0].split(";");
535+
String[] audit = ((ReferenceMaterialModel) curValue).auditAndTempUpdateRefMatModel().split("Audit:");
536+
String[] flags = audit[0].split(";");
529537

530-
if (flags[0].contains("F")) {
538+
if (flags[0].contains("F")) {
539+
SquidMessageDialog.showInfoDialog(
540+
"This reference material model is missing meaningful age data. \n"
541+
+ "Please choose another model.\n\n",
542+
primaryStageWindow);
543+
} else {
544+
if (audit[0].contains("1")) {
531545
SquidMessageDialog.showInfoDialog(
532-
"This reference material model is missing meaningful age data. \n"
533-
+ "Please choose another model.\n\n",
546+
"This reference material model is missing key age(s), so Squid3 is \n"
547+
+ "temporarily substituting values (shown in red) and refreshing as follows:\n\n"
548+
+ audit[1],
534549
primaryStageWindow);
535-
} else {
536-
if (audit[0].contains("1")) {
537-
SquidMessageDialog.showInfoDialog(
538-
"This reference material model is missing key age(s), so Squid3 is \n"
539-
+ "temporarily substituting values (shown in red) and refreshing as follows:\n\n"
540-
+ audit[1],
541-
primaryStageWindow);
542-
}
543550
}
551+
}
544552

545-
BigDecimal age206_238rModel = ((ReferenceMaterialModel) newValue).getDateByName(age206_238r.getName()).getValue();
546-
BigDecimal age207_206rModel = ((ReferenceMaterialModel) newValue).getDateByName(age207_206r.getName()).getValue();
547-
BigDecimal age208_232rModel = ((ReferenceMaterialModel) newValue).getDateByName(age208_232r.getName()).getValue();
548-
549-
pbb206U238AgeLabel.setText(age206_238rModel.movePointLeft(6).setScale(3, RoundingMode.HALF_UP).toString());
550-
pbb206U238AgeLabel.setStyle((flags[0].equals("1") ? savedAgeLabelStyleWithRed : savedAgeLabelStyle));
553+
BigDecimal age206_238rModel = ((ReferenceMaterialModel) curValue).getDateByName(age206_238r.getName()).getValue();
554+
BigDecimal age207_206rModel = ((ReferenceMaterialModel) curValue).getDateByName(age207_206r.getName()).getValue();
555+
BigDecimal age208_232rModel = ((ReferenceMaterialModel) curValue).getDateByName(age208_232r.getName()).getValue();
551556

552-
pb207Pb206AgeLabel.setText(age207_206rModel.movePointLeft(6).setScale(3, RoundingMode.HALF_UP).toString());
553-
pb207Pb206AgeLabel.setStyle((flags[1].equals("1") ? savedAgeLabelStyleWithRed : savedAgeLabelStyle));
557+
pbb206U238AgeLabel.setText(age206_238rModel.movePointLeft(6).setScale(3, RoundingMode.HALF_UP).toString());
558+
pbb206U238AgeLabel.setStyle((flags[0].equals("1") ? savedAgeLabelStyleWithRed : savedAgeLabelStyle));
554559

555-
pb208Th232AgeLabel.setText(age208_232rModel.movePointLeft(6).setScale(3, RoundingMode.HALF_UP).toString());
556-
pb208Th232AgeLabel.setStyle((flags[2].equals("1") ? savedAgeLabelStyleWithRed : savedAgeLabelStyle));
560+
pb207Pb206AgeLabel.setText(age207_206rModel.movePointLeft(6).setScale(3, RoundingMode.HALF_UP).toString());
561+
pb207Pb206AgeLabel.setStyle((flags[1].equals("1") ? savedAgeLabelStyleWithRed : savedAgeLabelStyle));
557562

558-
u238u235NatAbunLabel.setText(
559-
((ReferenceMaterialModel) newValue).getDatumByName(r238_235s.getName())
560-
.getValue().setScale(3, RoundingMode.HALF_UP).toString());
563+
pb208Th232AgeLabel.setText(age208_232rModel.movePointLeft(6).setScale(3, RoundingMode.HALF_UP).toString());
564+
pb208Th232AgeLabel.setStyle((flags[2].equals("1") ? savedAgeLabelStyleWithRed : savedAgeLabelStyle));
561565

562-
alertForZeroNaturalUranium();
566+
u238u235NatAbunLabel.setText(
567+
((ReferenceMaterialModel) curValue).getDatumByName(r238_235s.getName())
568+
.getValue().setScale(3, RoundingMode.HALF_UP).toString());
563569

564-
squidProject.setReferenceMaterialModel(newValue);
565-
squidProject.getTask().setChanged(true);
566-
squidProject.getTask().refreshParametersFromModels(false, false, true);
567-
}
570+
568571
});
569572

570573
// ConcentrationReferenceMaterials
@@ -589,18 +592,19 @@ public ParametersModel fromString(String userId) {
589592

590593
concRefMatModelComboBox.valueProperty()
591594
.addListener((ObservableValue<? extends ParametersModel> observable, ParametersModel oldValue, ParametersModel newValue) -> {
592-
if (newValue != null) {
593-
uPpmLabel.setText(
594-
((ReferenceMaterialModel) newValue).getConcentrationByName("concU")
595-
.getValue().setScale(3, RoundingMode.HALF_UP).toString());
596-
thPpmLabel.setText(
597-
((ReferenceMaterialModel) newValue).getConcentrationByName("concTh")
598-
.getValue().setScale(3, RoundingMode.HALF_UP).toString());
599-
595+
if ((oldValue != null) && (newValue != null) && (newValue.compareTo(oldValue) != 0)) {
600596
squidProject.setConcentrationReferenceMaterialModel(newValue);
601597
squidProject.getTask().setChanged(true);
602598
squidProject.getTask().refreshParametersFromModels(false, false, true);
603599
}
600+
601+
ParametersModel curValue = (newValue != null) ? newValue : oldValue;
602+
uPpmLabel.setText(
603+
((ReferenceMaterialModel) curValue).getConcentrationByName("concU")
604+
.getValue().setScale(3, RoundingMode.HALF_UP).toString());
605+
thPpmLabel.setText(
606+
((ReferenceMaterialModel) curValue).getConcentrationByName("concTh")
607+
.getValue().setScale(3, RoundingMode.HALF_UP).toString());
604608
});
605609
}
606610

‎squidCore/src/main/java/org/cirdles/squid/parameters/parameterModels/referenceMaterialModels/ReferenceMaterialModel.java

-4
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ public String auditAndTempUpdateRefMatModel() {
124124
// if 6/38 AND 7/6 = 0, use 8/32 age
125125
// if 7/6 = 0, use 6/38 age
126126
//
127-
// dates[0] = new Age206_238r();
128-
// dates[1] = new Age207_206r();
129-
// dates[2] = new Age207_235r();
130-
// dates[3] = new Age208_232r();
131127
if (dates[0].hasPositiveValue()) {
132128
flagsArray[0] = "0;";
133129
if (!dates[1].hasPositiveValue()) {

‎squidCore/src/main/java/org/cirdles/squid/tasks/Task.java

-4
Original file line numberDiff line numberDiff line change
@@ -1049,11 +1049,7 @@ public void refreshParametersFromModels(
10491049
}
10501050

10511051
if (refreshReferenceMaterialsModel) {
1052-
// models = SquidLabData.getExistingSquidLabData().getReferenceMaterials();
1053-
// referenceMaterialModel = findModelByName(models, referenceMaterialModel);
10541052
referenceMaterialModelChanged = true;
1055-
1056-
//// concentrationReferenceMaterialModel = findModelByName(models, concentrationReferenceMaterialModel);
10571053
concentrationReferenceMaterialModelChanged = true;
10581054
}
10591055

‎squidCore/src/main/resources/org/cirdles/squid/projects/SQUID3_demo_file.squid

0 Bytes
Binary file not shown.

‎squidCore/src/main/resources/org/cirdles/squid/projects/Z626611PKPERM1.squid

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)