Maintenance release. (#158)

* fixes issues reported by noah and terry * new version - maintenance
CIRDLES · Sep 19, 2017 · 6ff9e8e · 6ff9e8e
1 parent 6489e0f
commit 6ff9e8e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.cirdles</groupId>
     <artifactId>ET_Redux</artifactId>
     <name>ET_Redux</name>
-    <version>3.6.25</version>
+    <version>3.6.26</version>
     <description>Successor to U-Pb_Redux</description>
     <url>https://cirdles.org</url>
     <inceptionYear>2006</inceptionYear>

diff --git 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<TripoliFraction> 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<TripoliFraction> tripoliFractions) {
     @Override
     public void includeAllFractions(FractionSelectionTypeEnum fractionSelectionType) {
         SortedSet<TripoliFraction> 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
@@ -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/...Pb_Redux/dialogs/sampleManagers/analysisManagers/SampleAnalysisWorkflowManagerIDTIMS.java b/...Pb_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
@@ -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();