Removed extra setCancelled() that causes crash, now, suddenly, for some reason when it hasn't up till now...
Removed extra setCancelled() that causes crash, now, suddenly, for some reason when it hasn't up till now...
Merge branch 'master' of github.com:acquaman/acquaman
Adding a 0.25s settling time elimenates the the jaged/steppy data issue.
Works for now, until a real solution can be found.
Also updates scan time computation.
Fixed merge conflict
resulting from @dretrex and @helfrij trying to add differnt code to the
same line in AMDatamanAppController...
Merge branch 'issue677'
Registered two AB classes that should have been registered before: AM0DTimestampAB, AM1DTimedDataAB.
Created new public slot AMCurrentAmplifierView::setViewableValuesMax(), used to set the number of viewable items in values_ QComboBox at a time. This is set to 5 in the constructor.
Altered the QString.arg() formatting argument in AMCurrentAmplifierView::valueToString() from 'e' to 'g'.
Pulled changes from origin/master, fixed merge conflict in AMDatamanAppController.
Created new class STPlotEditor. This class I hope will develop into the main widget through which the user can edit different aspects of the plot as a whole. Right now, I'm trying to implement setting the time to be displayed.
Added setTimeUnits public slot to STPlotEditor, not implemented yet.
Removed two faulty connect statements from CLSSR570 constructor. They are used to emit signals that dont' exist anymore, and that function is fulfilled in onSensitivityChanged().
Merge branch 'master' of https://github.com/acquaman/acquaman into STUpgrade
Created new class STPlotWidget that inherits from MPlotWidget and contains the code so far that has dealt with the plot specifically.
Added plot name to STPlotWidget.
Removed now unnecessary ring current content from STWidget.