made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@147 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-02-26 08:34:47 +00:00
parent 642d7d8c74
commit 0682d23abd
9 changed files with 589 additions and 540 deletions

View File

@@ -58,6 +58,7 @@ private:
*/
void AddROIInput(int num);
private slots:
/** Enable/Disable Energy and Calibration Logs
@@ -142,10 +143,6 @@ private slots:
*/
void SetReceiver();
/** Configures mac
*/
void Configuremac();
/** Add ROI Input if the value changed in the last slot
*/
void AddROIInputSlot(){AddROIInput(1);};
@@ -166,10 +163,17 @@ private slots:
*/
void clearROIinDetector();
/** Clears ROI in detector
*/
void SetDetector(int index);
private:
/** The sls detector object */
/** The multi detector object */
multiSlsDetector *myDet;
/** The sls detector object */
slsDetector *det;
/** detector type */
slsDetectorDefs::detectorType detType;
@@ -192,10 +196,6 @@ private:
bool isEnergy;
bool isAngular;
/**sls detector obejct*/
slsDetector *det;
/** ROI */
vector <QLabel*> lblFromX;
vector <QSpinBox*> spinFromX;