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'
Altered the QString.arg() formatting argument in AMCurrentAmplifierView::valueToString() from 'e' to 'g'.
Pulled changes from origin/master, fixed merge conflict in AMDatamanAppController.