Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements for Laserchron ElementII live and U-Series. #96

Merged
merged 8 commits into from
Jul 30, 2016
Merged

Improvements for Laserchron ElementII live and U-Series. #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35fffaa
further refinements to TRA
bowring Jul 11, 2016
a393708
added fration names tor TRA view
bowring Jul 11, 2016
5f512b4
added ignore fraction functionallity to TRA
bowring Jul 11, 2016
9a15aa1
updated Calamari useage
bowring Jul 28, 2016
57574bc
updated automatic handling of secondary reference materials for LASER…
bowring Jul 28, 2016
3c9e85d
refined behavior of data table so vertical scroll bar hugs last column
bowring Jul 28, 2016
2b154c9
various improvements for Laserchron ElementII per Noah and Dan
bowring Jul 30, 2016
a79619f
improved date logic for U-series to allow for missing values
bowring Jul 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
<dependency>
<groupId>com.github.bowring</groupId>
<artifactId>Calamari</artifactId>
<version>v1.0.5</version>
<version>-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
26 changes: 14 additions & 12 deletions src/main/java/org/earthtime/ETReduxFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(//
Expand All @@ -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
Expand All @@ -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();
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/org/earthtime/Tripoli/dataModels/RawIntensityDataModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public class RawIntensityDataModel //
private int peakWidth;
private int backgroundRightShade;
private int backgroundWidth;
private int timeToNextTimeZero;

/**
*
Expand Down Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion src/main/java/org/earthtime/Tripoli/dataViews/AbstractRawDataView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ public void updateReportTableView() {
if (uPbReduxFrame == null) {
uPbReduxFrame = ((AbstractRawDataView) sampleSessionDataView).getuPbReduxFrame();
}
uPbReduxFrame.updateReportTable(true, false);
uPbReduxFrame.updateReportTable(true, false, "");

}

Expand Down
Loading