Altered:
- All of the VESPERS scan configurations to properly read in the regions
of interest list now that regions of interest have changed.
- Got VESPERSScanConfigurationDbObject to add and remove regions and
load the regions from the database properly.
Merge branch 'master' of github.com:acquaman/acquaman
Found old version of amplifier signal being emitted in CLSSR570, it has been updated to the new AMCurrentAmplifier interface version. Replaced connect statement signal argument in CLSSIS3820Scaler with new signal version.
Replaced instances of CLSSR570View in CLSSIS3820ScalerChannelView with new amplifier view AMCurrentAmplifierView. Commented out public slot CLSSIS3820ScalerChannelView::setSR570ViewMode(...) and signal CLSSIS3820ScalerChannelView::sr570ViewModeChanged(...) as this functionality isn't supported with the new amplifier view right now.
Commented out protected slot CLSSIS3820ScalerView::onSR570ViewChanged(...) as view modes are not supported by AMCurrentAmplifierView (yet?). Commented out section of code in both versions of VESPERSScalerView::onSR570ViewChanged(...), and both versions of IDEASScalerView::onSR570ViewChanged(...)--they set a view mode, unsupported functionality.
Commented out connect statement in CLSSIS3820ScalerView constructor: both the signal and the slot are commented out/nonexistant as a result of the previous changes.
Merge branch 'master' of https://github.com/acquaman/acquaman into master-BioXASSide