From 6ff9e8eb30e318773711020a2575324947757926 Mon Sep 17 00:00:00 2001 From: Jim Bowring Date: Tue, 19 Sep 2017 06:35:02 -0400 Subject: [PATCH] Maintenance release. (#158) * fixes issues reported by noah and terry * new version - maintenance --- pom.xml | 2 +- .../earthtime/Tripoli/sessions/TripoliSession.java | 12 +++++------- .../fractionManagers/UPbFractionEditorDialog.java | 10 ++++++++-- .../SampleAnalysisWorkflowManagerIDTIMS.java | 3 +++ .../earthtime/UPb_Redux/reports/ReportSettings.java | 3 +++ 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index f79b4ea0..e77bcf93 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.cirdles ET_Redux ET_Redux - 3.6.25 + 3.6.26 Successor to U-Pb_Redux https://cirdles.org 2006 diff --git a/src/main/java/org/earthtime/Tripoli/sessions/TripoliSession.java b/src/main/java/org/earthtime/Tripoli/sessions/TripoliSession.java index 90883059..dda0ae27 100644 --- a/src/main/java/org/earthtime/Tripoli/sessions/TripoliSession.java +++ b/src/main/java/org/earthtime/Tripoli/sessions/TripoliSession.java @@ -1354,7 +1354,7 @@ private void applyFractionationCorrectionsForDownhole() { private void fractionationCorrectFractionSetForDownholeSessionRatio(// FractionSelectionTypeEnum fractionSelectionTypeEnum, AbstractFunctionOfX sessionFofX, double sessionStandardValue, RawRatioNames rrName) { - + if (prepareMatrixJfMapFractionsByType(fractionSelectionTypeEnum)) { SortedSet selectedFractions = FractionsFilterInterface.getTripoliFractionsFiltered(tripoliFractions, fractionSelectionTypeEnum, IncludedTypeEnum.INCLUDED); @@ -1423,11 +1423,11 @@ private void fractionationCorrectFractionSetForDownholeSessionRatio(// for (int i = 0; i < countOfSelectedFractions; i++) { diagonalOfSessionUnknownsAnalyticalCovarianceSu[i] = selectedFractionsAnalyticalCovarianceSu.get(i, i); } - + if (fractionSelectionTypeEnum.compareTo(FractionSelectionTypeEnum.UNKNOWN) == 0) { sessionFofX.setDiagonalOfSessionUnknownsAnalyticalCovarianceSu(diagonalOfSessionUnknownsAnalyticalCovarianceSu); - applyDownholeFractionationCorrectionToUnknownRatios(FractionSelectionTypeEnum.UNKNOWN, // - sessionFofX, selectedFractionIDs, countOfSelectedFractions, selectedFractionsAnalyticalCovarianceSu, sessionStandardValue, rrName, rrName.getName()); + applyDownholeFractionationCorrectionToUnknownRatios(FractionSelectionTypeEnum.UNKNOWN, // + sessionFofX, selectedFractionIDs, countOfSelectedFractions, selectedFractionsAnalyticalCovarianceSu, sessionStandardValue, rrName, rrName.getName()); } else { sessionFofX.setDiagonalOfSessionStandardsAnalyticalCovarianceSu(diagonalOfSessionUnknownsAnalyticalCovarianceSu); } @@ -1438,7 +1438,6 @@ private void fractionationCorrectFractionSetForDownholeSessionRatio(// // sessionFofX, selectedFractionIDs, countOfSelectedFractions, selectedFractionsAnalyticalCovarianceSu, sessionStandardValue, rrName, rrName.getName()); // // } // } - } // end test if any unknowns } } @@ -1651,8 +1650,7 @@ public void setTripoliFractions(SortedSet tripoliFractions) { @Override public void includeAllFractions(FractionSelectionTypeEnum fractionSelectionType) { SortedSet excludedTripoliFractions - = // - FractionsFilterInterface.getTripoliFractionsFiltered(tripoliFractions, fractionSelectionType, IncludedTypeEnum.EXCLUDED); + = FractionsFilterInterface.getTripoliFractionsFiltered(tripoliFractions, fractionSelectionType, IncludedTypeEnum.EXCLUDED); excludedTripoliFractions.stream().forEach((f) -> { f.toggleAllDataExceptShaded(true); }); diff --git a/src/main/java/org/earthtime/UPb_Redux/dialogs/fractionManagers/UPbFractionEditorDialog.java b/src/main/java/org/earthtime/UPb_Redux/dialogs/fractionManagers/UPbFractionEditorDialog.java index 5075096b..d8711982 100644 --- a/src/main/java/org/earthtime/UPb_Redux/dialogs/fractionManagers/UPbFractionEditorDialog.java +++ b/src/main/java/org/earthtime/UPb_Redux/dialogs/fractionManagers/UPbFractionEditorDialog.java @@ -66,6 +66,7 @@ import org.earthtime.UPb_Redux.dateInterpretation.kwiki.KwikiDateModesSelectorPanel; import org.earthtime.UPb_Redux.dateInterpretation.kwiki.KwikiSynopticOutputPanel; import org.earthtime.UPb_Redux.exceptions.BadLabDataException; +import org.earthtime.UPb_Redux.expressions.MathMachineII; import org.earthtime.UPb_Redux.filters.XMLFileFilter; import org.earthtime.UPb_Redux.fractions.FractionI; import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.UPbFraction; @@ -74,6 +75,7 @@ import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.fractionReduction.UPbFractionReducer; import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.fractionReduction.UncertaintyGraphPanel; import org.earthtime.UPb_Redux.fractions.UPbReduxFractions.fractionReduction.UncertaintyZoomLayer; +import org.earthtime.UPb_Redux.utilities.BrowserControl; import org.earthtime.UPb_Redux.utilities.Thumbnail; import org.earthtime.UPb_Redux.valueModels.MeasuredRatioModel; import org.earthtime.UPb_Redux.valueModels.ValueModel; @@ -4589,8 +4591,12 @@ private void r18O_16OUsed_textOnUTabKeyReleased (java.awt.event.KeyEvent evt) {/ }//GEN-LAST:event_r18O_16OUsed_textOnUTabKeyReleased private void testMathMachineAlphaUActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_testMathMachineAlphaUActionPerformed -// MathMachineII.outputExpressionFilesXML( ((UPbFraction) myFraction).getAnalysisMeasure( AnalysisMeasures.alphaU.getName() ), "MathMachine", true ); -// BrowserControl.displayURL( "./MathMachine/alphaU.html" );//xml" ); + try { + MathMachineII.outputExpressionFilesXML(((UPbFraction) myFraction).getAnalysisMeasure(AnalysisMeasures.alphaPb.getName()), "MathMachine", true); + + } catch (IOException iOException) { + } +BrowserControl.displayURL( "./MathMachine/alphaU.html" );//xml" ); }//GEN-LAST:event_testMathMachineAlphaUActionPerformed private void r18O_16OUsed_textOnUTabFocusLost (java.awt.event.FocusEvent evt) {//GEN-FIRST:event_r18O_16OUsed_textOnUTabFocusLost diff --git a/src/main/java/org/earthtime/UPb_Redux/dialogs/sampleManagers/analysisManagers/SampleAnalysisWorkflowManagerIDTIMS.java b/src/main/java/org/earthtime/UPb_Redux/dialogs/sampleManagers/analysisManagers/SampleAnalysisWorkflowManagerIDTIMS.java index 277a9c9a..6fe4d774 100644 --- a/src/main/java/org/earthtime/UPb_Redux/dialogs/sampleManagers/analysisManagers/SampleAnalysisWorkflowManagerIDTIMS.java +++ b/src/main/java/org/earthtime/UPb_Redux/dialogs/sampleManagers/analysisManagers/SampleAnalysisWorkflowManagerIDTIMS.java @@ -2207,6 +2207,9 @@ private void saveSaveAsOK(boolean doSaveAs) { // dec 2011 update sample date models SampleInterface.updateAndSaveSampleDateModelsByAliquot(mySample); + + // Sept 2017 + mySample.initFilteredFractionsToAll(); close(); } diff --git a/src/main/java/org/earthtime/UPb_Redux/reports/ReportSettings.java b/src/main/java/org/earthtime/UPb_Redux/reports/ReportSettings.java index 3207d0be..2519ced0 100644 --- a/src/main/java/org/earthtime/UPb_Redux/reports/ReportSettings.java +++ b/src/main/java/org/earthtime/UPb_Redux/reports/ReportSettings.java @@ -555,6 +555,9 @@ public void setFractionCategory2(ReportCategoryInterface fractionCategory2) { @Override public boolean isOutOfDate() { boolean retVal = false; + if (defaultReportSpecsType == null){ + defaultReportSpecsType = "UPb"; + } switch (defaultReportSpecsType) { case "UPb": retVal = isOutOfDateUPb();