BioXAS fiddling on IDEAS???
Tweaking cleanup behavior to try to get scaler into good state when cancelling scan
Add XAS scan time prediction to XASScanConfigurationView
Add one picoammeter back in to monitor vac cross
Push max energy to highest allowed by energy PV
clean up code
Add scan time estimate to view
Merge branch 'newXRFDetector' of github.com:acquaman/acquaman into newXRFDetector
Fixed a problem where the profile for BioXASSideAcquaman had two copies.
Fixed merge conflicts
Altered:
AMScanViewSingleSpectrumView::setDataSources() to update the plots after
setting new sources.  This way you don't have to know to click on the
spectrum inside AMScanView just to get the same spectrum.  Should make
the user experience better for 0D XRF scans.
Merge branch 'master' of github.com:acquaman/acquaman
Added onScanEditorCreated, onScanAddedToEditor, configureSingleSpectrumView to improve user experience viewing scans.  That plus Darren's commit fed9122a4c1ff16315a923dcb703338e6db2eb29 closes #issue643
Merge branch 'master' of https://github.com/acquaman/acquaman into master-BioXASSide
Removed all instances of CLSKeithley428::unitsIndex_ class variable. Prepping to remove/replace/investigate CLSKeithley428ValueMap helper class.
Removed dependency on separate helper class to manage amplifier values in CLSKeithley428 class. Using instead a QList<double> member variable to keep track of the gains, and a toSensitivity() method to translate these values into sensitivities. Added a pure virtual function values() to AMCurrentAmplifier superclass that returns the list of possible values, implemented this function in both CLSKeithley428 and CLSSR570. View elements in AMCurrentAmplifierView are commented outwhile a new way to visualize the values/units combo is being built.
Commented out all references to units_ combo box in AMCurrentAmplifierView. Changed contents of method AMCurrentAmplifierView::refreshDisplayValues() to make use of new AMCurrentAmplifier interface for accessing all values and units an amplifier has available. These values seem to be correctly loaded for a Keithley amplifier. They are not representative of the amplifier's current state, nor does the combo box have the ability to change the amplifier's value, yet.
Changed CLSKeithley428::setValueImplementation(const QString&) to make use of new arguments from AMCurrentAmplifierView to set the amplifier value.
Changed CLSSR570::setValueImplementation to make use of the new AMCurrentAmplifierView arguments.
Added two helper functions to AMCurrentAmplifier to help in switching amplifier mode: toGainMode() and toSensitivityMode. The AMCurrentAmplifierView uses these to switch modes, if this functionality is supported.