separated start gui button into start and stop to prevent multiple click syndrome

This commit is contained in:
2018-03-27 17:49:01 +02:00
parent fe2ba8621b
commit 252e924f92
8 changed files with 153 additions and 125 deletions

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "b8bdbf4da61f95b88893b02ddabc2491b16fa10f"
#define GITREPUUID "fe2ba8621b33bc00f51c8cd4d33e98b7d4ebfa41"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3746
#define GITDATE 0x20180326
#define GITREV 0x3747
#define GITDATE 0x20180327
#define GITBRANCH "developer"

View File

@ -617,7 +617,6 @@ void saveErrorSignal(QString);
void AcquisitionErrorSignal(QString);
void UpdatePlotSignal();
void GainPlotSignal(bool);
void AcquisitionFinishedSignal();
};

View File

@ -50,14 +50,14 @@ public:
*/
void SetExpertMode(bool enable);
/** Returns the status of the Start/Stop Acquisition button
/** Returns the status of the acquisition in gui
*/
bool GetStartStatus(){return btnStartStop->isChecked();};
bool GetStartStatus(){return (!btnStart->isEnabled());};
/** Click the Start/Stop Acquisition button
* This is used if this command came from gui client
*/
void ClickStartStop(){btnStartStop->click();myPlot->SetClientInitiated();};
void ClickStartStop(){startAcquisition();myPlot->SetClientInitiated();};
/** Returns progress bar value */
int GetProgress(){return progressBar->value();};
@ -65,10 +65,6 @@ public:
public slots:
/** Unconnects start/stop button when acquisition is finished
*/
void AcquisitionFinished();
/** update plot is finished,
* changes start/stop text and enables/disables all widgets
*/
@ -131,9 +127,13 @@ private slots:
*/
void setRunIndex(int index);
/** starts/stops Acquisition
/** starts Acquisition
*/
void startStopAcquisition();
void startAcquisition();
/** stops Acquisition
*/
void stopAcquisition();
/** Set number of frames
* @param val number of frames to be set
@ -193,8 +193,6 @@ private:
QPalette red;
/** expert mode */
bool expertMode;
QIcon *iconStart;
QIcon *iconStop;
/** to access items in settings combobox */
QStandardItemModel* model;