master with all recent fixes into the raisor branch for work this week #1

Open
calemhoffman wants to merge 35 commits from master into raisor
Showing only changes of commit 8b7d93a9fe - Show all commits

View File

@ -1791,6 +1791,7 @@ void FSUDAQ::OpenScope(){
scope->show();
}else{
scope->show();
scope->UpdatePanelFromMomeory();
scope->activateWindow();
}
@ -1815,6 +1816,7 @@ void FSUDAQ::OpenDigiSettings(){
digiSettings->show();
}else{
digiSettings->show();
digiSettings->UpdatePanelFromMemory();
digiSettings->activateWindow();
}
}