Merge pull request #96 from bowring/tra2

Improvements for Laserchron ElementII live and U-Series.
CIRDLES · Jul 30, 2016 · de0e5a2 · de0e5a2
2 parents 8938c2b + a79619f
commit de0e5a2
Show file tree

Hide file tree

Showing 42 changed files with 874 additions and 465 deletions.
diff --git a/pom.xml b/pom.xml
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>com.github.bowring</groupId>
             <artifactId>Calamari</artifactId>
-            <version>v1.0.5</version>
+            <version>-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/src/main/java/org/earthtime/ETReduxFrame.java b/src/main/java/org/earthtime/ETReduxFrame.java
@@ -1456,24 +1456,25 @@ private void customizeReduxSkin() {
     public void rebuildFractionDisplays(boolean performReduction, boolean inLiveMode) {
         ((TabbedReportViews) getReportTableTabbedPane()).setSample(theSample);
 
-        updateReportTable(performReduction, inLiveMode);
+        updateReportTable(performReduction, inLiveMode, "");
     }
 
     /**
      *
      */
     @Override
     public void updateReportTable() {
-        updateReportTable(false, false);
+        updateReportTable(false, false, "");
     }
 
     /**
      *
      * @param performReduction
      * @param inLiveMode the value of inLiveMode
+     * @param fractionIdToFocus the value of fractionIdToFocus
      */
     @Override
-    public void updateReportTable(boolean performReduction, boolean inLiveMode) {
+    public void updateReportTable(boolean performReduction, boolean inLiveMode, String fractionIdToFocus) {
         // march 2013
         try {
             UPbFractionReducer.getInstance().setSessionCorrectedUnknownsSummaries(//
@@ -1485,7 +1486,7 @@ public void updateReportTable(boolean performReduction, boolean inLiveMode) {
             theSample.reduceSampleData(inLiveMode);
         }
 
-        loadAndShowReportTableData();
+        loadAndShowReportTableData(fractionIdToFocus);
 
         // oct 2014
         // this statement makes a difference if user went back to project manager and changed things
@@ -1502,9 +1503,10 @@ public void updateReportTable(boolean performReduction, boolean inLiveMode) {
 
     /**
      *
+     * @param fractionIdToFocus the value of fractionIdToFocus
      */
     @Override
-    public void loadAndShowReportTableData() {
+    public void loadAndShowReportTableData(String fractionIdToFocus) {
 
         ((TabbedReportViews) getReportTableTabbedPane()).prepareTabs();
     }
@@ -3501,7 +3503,7 @@ private void LAICPMS_LegacyAnalysis_MC_UA_menuItemActionPerformed(java.awt.event
 }//GEN-LAST:event_LAICPMS_LegacyAnalysis_MC_UA_menuItemActionPerformed
 
 private void reduceAll_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_reduceAll_buttonActionPerformed
-    updateReportTable(true, false);
+    updateReportTable(true, false, "");
 }//GEN-LAST:event_reduceAll_buttonActionPerformed
 
 private void reportResultsTableAsStringsInExcel_menuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_reportResultsTableAsStringsInExcel_menuItemActionPerformed
@@ -3512,14 +3514,14 @@ private void loadReportSettingsModelFromLocalXMLFileActionPerformed(java.awt.eve
     myState.setMRUReportSettingsModelFolder(//
             setReportSettingsModelFromXMLFile(myState.getMRUReportSettingsModelFolder()));
 
-    updateReportTable(false, false);
+    updateReportTable(false, false, "");
 
 }//GEN-LAST:event_loadReportSettingsModelFromLocalXMLFileActionPerformed
 
 private void editCurrentReportSettingsModel_menuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editCurrentReportSettingsModel_menuItemActionPerformed
 
     ReportSettingsInterface.EditReportSettings(theSample.getReportSettingsModel(), this);
-    updateReportTable(false, false);
+    updateReportTable(false, false, "");
 }//GEN-LAST:event_editCurrentReportSettingsModel_menuItemActionPerformed
 
 private void reportResultsTableAsPDF_menuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_reportResultsTableAsPDF_menuItemActionPerformed
@@ -3892,12 +3894,12 @@ private void updateData_buttonActionPerformed(java.awt.event.ActionEvent evt) {/
 
 private void selectAllFractions_menuItemActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectAllFractions_menuItemActionPerformed
     theSample.selectAllFractions();
-    updateReportTable(false, false);
+    updateReportTable(false, false, "");
 }//GEN-LAST:event_selectAllFractions_menuItemActionPerformed
 
 private void deSelectAllFractions_menuItemActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deSelectAllFractions_menuItemActionPerformed
     theSample.deSelectAllFractions();
-    updateReportTable(false, false);
+    updateReportTable(false, false, "");
 }//GEN-LAST:event_deSelectAllFractions_menuItemActionPerformed
 
 private void credits_menuItemActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_credits_menuItemActionPerformed
@@ -3916,7 +3918,7 @@ private void saveCurrentReportSettingsModelAsLocalXMLFileActionPerformed(java.aw
 private void loadDefaultReportSettingsModelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loadDefaultReportSettingsModelActionPerformed
     theSample.restoreDefaultReportSettingsModel();
     theSample.setLegacyStatusForReportTable();
-    updateReportTable(false, false);
+    updateReportTable(false, false, "");
 }//GEN-LAST:event_loadDefaultReportSettingsModelActionPerformed
 
 private void writeCSVFileOfLAICPMSLegacyDataSampleFieldNames_SC_WSU_vBActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_writeCSVFileOfLAICPMSLegacyDataSampleFieldNames_SC_WSU_vBActionPerformed
@@ -4023,7 +4025,7 @@ private void saveCurrentReportSettingsAsDefault_menuItemActionPerformed ( java.a
     private void loadEARTHTIMEDefaultReportSettingsModel_menuItemActionPerformed ( java.awt.event.ActionEvent evt ) {//GEN-FIRST:event_loadEARTHTIMEDefaultReportSettingsModel_menuItemActionPerformed
         SampleInterface.loadDefaultEARTHTIMEReportSettingsModel(theSample);
         theSample.setLegacyStatusForReportTable();
-        updateReportTable(false, false);
+        updateReportTable(false, false, "");
     }//GEN-LAST:event_loadEARTHTIMEDefaultReportSettingsModel_menuItemActionPerformed
 
     private void exit_menuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exit_menuItemActionPerformed

diff --git a/src/main/java/org/earthtime/Tripoli/dataModels/RawIntensityDataModel.java b/src/main/java/org/earthtime/Tripoli/dataModels/RawIntensityDataModel.java
@@ -107,6 +107,7 @@ public class RawIntensityDataModel //
     private int peakWidth;
     private int backgroundRightShade;
     private int backgroundWidth;
+    private int timeToNextTimeZero;
 
     /**
      *
@@ -1348,4 +1349,18 @@ public int getBackgroundWidth() {
     public void setBackgroundWidth(int backgroundWidth) {
         this.backgroundWidth = backgroundWidth;
     }
+
+    /**
+     * @return the timeToNextTimeZero
+     */
+    public int getTimeToNextTimeZero() {
+        return timeToNextTimeZero;
+    }
+
+    /**
+     * @param timeToNextTimeZero the timeToNextTimeZero to set
+     */
+    public void setTimeToNextTimeZero(int timeToNextTimeZero) {
+        this.timeToNextTimeZero = timeToNextTimeZero;
+    }
 }
diff --git a/src/main/java/org/earthtime/Tripoli/dataViews/AbstractRawDataView.java b/src/main/java/org/earthtime/Tripoli/dataViews/AbstractRawDataView.java
@@ -1173,7 +1173,7 @@ public void updateReportTableView() {
         if (uPbReduxFrame == null) {
             uPbReduxFrame = ((AbstractRawDataView) sampleSessionDataView).getuPbReduxFrame();
         }
-        uPbReduxFrame.updateReportTable(true, false);
+        uPbReduxFrame.updateReportTable(true, false, "");
 
     }