From c9db2c42727fa3b1f32aab641b33ef477afce204 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 7 Sep 2012 16:29:32 +0000 Subject: [PATCH] included images git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@52 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/forms/form_action.ui | 8 +- slsDetectorGui/forms/form_scan.ui | 8 +- slsDetectorGui/forms/form_tab_advanced.ui | 209 +++++++++++-------- slsDetectorGui/forms/form_tab_dataoutput.ui | 12 +- slsDetectorGui/forms/form_tab_debugging.ui | 16 +- slsDetectorGui/forms/form_tab_measurement.ui | 14 +- slsDetectorGui/forms/form_tab_plot.ui | 50 +++-- slsDetectorGui/forms/form_tab_settings.ui | 4 +- slsDetectorGui/include/icons.qrc | 12 ++ slsDetectorGui/include/qActionsWidget.h | 2 +- slsDetectorGui/include/qScanWidget.h | 1 + slsDetectorGui/include/qTabActions.h | 4 + slsDetectorGui/include/qTabAdvanced.h | 4 + slsDetectorGui/include/qTabDataOutput.h | 6 +- slsDetectorGui/include/qTabMeasurement.h | 3 +- slsDetectorGui/include/qTabSettings.h | 6 +- slsDetectorGui/src/qActionsWidget.cpp | 1 + slsDetectorGui/src/qDetectorMain.cpp | 4 +- slsDetectorGui/src/qScanWidget.cpp | 3 +- slsDetectorGui/src/qTabActions.cpp | 41 +++- slsDetectorGui/src/qTabAdvanced.cpp | 18 +- slsDetectorGui/src/qTabDataOutput.cpp | 16 +- slsDetectorGui/src/qTabMeasurement.cpp | 12 +- slsDetectorGui/src/qTabMessages.cpp | 12 +- slsDetectorGui/src/qTabSettings.cpp | 12 +- 25 files changed, 331 insertions(+), 147 deletions(-) diff --git a/slsDetectorGui/forms/form_action.ui b/slsDetectorGui/forms/form_action.ui index 65973ed65..33d93c35e 100644 --- a/slsDetectorGui/forms/form_action.ui +++ b/slsDetectorGui/forms/form_action.ui @@ -109,6 +109,10 @@ Browse + + + :/icons/images/browse.png:/icons/images/browse.png + @@ -158,6 +162,8 @@ - + + + diff --git a/slsDetectorGui/forms/form_scan.ui b/slsDetectorGui/forms/form_scan.ui index 6088a7396..f01e88cb0 100644 --- a/slsDetectorGui/forms/form_scan.ui +++ b/slsDetectorGui/forms/form_scan.ui @@ -428,6 +428,10 @@ Defines scan range for a <b>Constant Step Size</b> with the followin Browse + + + :/icons/images/browse.png:/icons/images/browse.png + @@ -466,6 +470,8 @@ Defines scan range for a <b>Constant Step Size</b> with the followin - + + + diff --git a/slsDetectorGui/forms/form_tab_advanced.ui b/slsDetectorGui/forms/form_tab_advanced.ui index f629631ec..60e3ed53a 100644 --- a/slsDetectorGui/forms/form_tab_advanced.ui +++ b/slsDetectorGui/forms/form_tab_advanced.ui @@ -31,6 +31,10 @@ Form + + + :/icons/images/refresh.png:/icons/images/refresh.png + true @@ -38,8 +42,8 @@ 25 - 90 - 721 + 100 + 726 226 @@ -63,7 +67,7 @@ 15 25 - 691 + 696 195 @@ -302,6 +306,10 @@ An extension given by the modules serial number will be attached. Browse + + + :/icons/images/browse.png:/icons/images/browse.png + @@ -320,7 +328,11 @@ An extension given by the modules serial number will be attached. - Start Trimming + Start Trimming + + + + :/icons/images/start.png:/icons/images/start.png @@ -540,70 +552,101 @@ An extension given by the modules serial number will be attached. - + 25 10 341 - 61 + 76 - Trimbits Plot Mode + Trimbits Plot + + + true - 15 - 20 - 311 - 31 + 120 + 22 + 211 + 44 - 34 + 17 - - - - 0 - 0 - + + + <nobr> +Updates plot with Trimbits from Shared Memory, not from Detector. +</nobr> + + + false - No Plot + Refresh - - true + + + :/icons/images/refresh.png:/icons/images/refresh.png + + + + 16 + 16 + - - - - 0 - 0 - + + + <nobr> +Plots Trimbits from Detector. This will take time. +</nobr> + + Get Trimbits + + + + :/icons/images/download.png:/icons/images/download.png + + + + + + + + + 15 + 20 + 101 + 46 + + + + + + + Histogram + + + + + Data Graph - - - - - - - 0 - 0 - - - - Histogram + + true @@ -615,56 +658,58 @@ An extension given by the modules serial number will be attached. 405 10 - 341 - 61 + 346 + 76 Calibration Logs - - - - 15 - 20 - 311 - 31 - + + + + + 420 + 37 + 313 + 31 + + + + + 42 - - - 42 - - - - - - 0 - 0 - - - - Energy Calibration - - - - - - - - 0 - 0 - - - - Angular Calibration - - - - - + + + + + 0 + 0 + + + + Energy Calibration + + + + + + + + 0 + 0 + + + + Angular Calibration + + + + - + + + diff --git a/slsDetectorGui/forms/form_tab_dataoutput.ui b/slsDetectorGui/forms/form_tab_dataoutput.ui index e2da366fb..104a296ee 100644 --- a/slsDetectorGui/forms/form_tab_dataoutput.ui +++ b/slsDetectorGui/forms/form_tab_dataoutput.ui @@ -234,6 +234,10 @@ Browse + + + :/icons/images/browse.png:/icons/images/browse.png + @@ -309,12 +313,18 @@ Browse + + + :/icons/images/browse.png:/icons/images/browse.png + - + + + diff --git a/slsDetectorGui/forms/form_tab_debugging.ui b/slsDetectorGui/forms/form_tab_debugging.ui index bd8703d92..4817294f8 100644 --- a/slsDetectorGui/forms/form_tab_debugging.ui +++ b/slsDetectorGui/forms/form_tab_debugging.ui @@ -87,6 +87,10 @@ Run + + + :/icons/images/start.png:/icons/images/start.png + @@ -145,6 +149,10 @@ Run + + + :/icons/images/start.png:/icons/images/start.png + @@ -234,11 +242,17 @@ Get Information + + + :/icons/images/download.png:/icons/images/download.png + - + + + diff --git a/slsDetectorGui/forms/form_tab_measurement.ui b/slsDetectorGui/forms/form_tab_measurement.ui index b9ea4b54d..4832f0138 100644 --- a/slsDetectorGui/forms/form_tab_measurement.ui +++ b/slsDetectorGui/forms/form_tab_measurement.ui @@ -157,6 +157,16 @@ Start + + + :/icons/images/start.png:/icons/images/start.png + + + true + + + false + @@ -930,6 +940,8 @@ p, li { white-space: pre-wrap; } - + + + diff --git a/slsDetectorGui/forms/form_tab_plot.ui b/slsDetectorGui/forms/form_tab_plot.ui index 12a77f896..3b8c0f53d 100644 --- a/slsDetectorGui/forms/form_tab_plot.ui +++ b/slsDetectorGui/forms/form_tab_plot.ui @@ -377,7 +377,7 @@ - 30 + 18 20 @@ -409,7 +409,7 @@ - 18 + 15 20 @@ -495,7 +495,17 @@ Qt::NoFocus - Save + Save + + + + :/icons/images/save.png:/icons/images/save.png + + + + 16 + 16 + @@ -1315,7 +1325,7 @@ 10 15 - 336 + 331 31 @@ -1323,7 +1333,7 @@ - + 0 0 @@ -1369,7 +1379,11 @@ Qt::NoFocus - Create + Create + + + + :/icons/images/new.png:/icons/images/new.png false @@ -1379,7 +1393,7 @@ - + 0 0 @@ -1425,7 +1439,11 @@ Qt::NoFocus - Close All + Close All + + + + :/icons/images/close.png:/icons/images/close.png false @@ -1442,7 +1460,7 @@ - 40 + 20 20 @@ -1458,7 +1476,7 @@ - 40 + 20 20 @@ -1470,7 +1488,7 @@ true - + 0 0 @@ -1516,7 +1534,11 @@ Qt::NoFocus - Save All + Save All + + + + :/icons/images/saveAll.png:/icons/images/saveAll.png false @@ -1527,6 +1549,8 @@ - + + + diff --git a/slsDetectorGui/forms/form_tab_settings.ui b/slsDetectorGui/forms/form_tab_settings.ui index c95ddb9b2..e6419b58a 100644 --- a/slsDetectorGui/forms/form_tab_settings.ui +++ b/slsDetectorGui/forms/form_tab_settings.ui @@ -200,6 +200,8 @@ - + + + diff --git a/slsDetectorGui/include/icons.qrc b/slsDetectorGui/include/icons.qrc index 7ae9757eb..071da30c4 100644 --- a/slsDetectorGui/include/icons.qrc +++ b/slsDetectorGui/include/icons.qrc @@ -1,5 +1,17 @@ ../images/mountain.png + ../images/refresh.png + ../images/save.png + ../images/saveAll.png + ../images/close.png + ../images/add.png + ../images/new.png + ../images/download.png + ../images/browse.png + ../images/start.png + ../images/erase.png + ../images/remove.png + ../images/stop.png diff --git a/slsDetectorGui/include/qActionsWidget.h b/slsDetectorGui/include/qActionsWidget.h index 23ff9f3df..f10d02abf 100644 --- a/slsDetectorGui/include/qActionsWidget.h +++ b/slsDetectorGui/include/qActionsWidget.h @@ -35,6 +35,7 @@ public: /**to update the widgets*/ void Refresh(); + /**number of action widgets*/ static int NUM_ACTION_WIDGETS; @@ -46,7 +47,6 @@ private: /**id of the action widget*/ int id; - /** Sets up the widget */ void SetupWidgetWindow(); diff --git a/slsDetectorGui/include/qScanWidget.h b/slsDetectorGui/include/qScanWidget.h index 1aa7d632a..317d1e21c 100644 --- a/slsDetectorGui/include/qScanWidget.h +++ b/slsDetectorGui/include/qScanWidget.h @@ -35,6 +35,7 @@ public: /**to update the widgets*/ void Refresh(); + /**number of scan widgets*/ static int NUM_SCAN_WIDGETS; diff --git a/slsDetectorGui/include/qTabActions.h b/slsDetectorGui/include/qTabActions.h index 77ad9be44..0add44491 100644 --- a/slsDetectorGui/include/qTabActions.h +++ b/slsDetectorGui/include/qTabActions.h @@ -48,6 +48,7 @@ public: */ void Refresh(); + public slots: /** Disable Positions * @param enable true if to disable @@ -83,6 +84,7 @@ private: slsDetectorDefs::detectorType detType; + enum actionIndex{Scan0=1, Scan1, NumPositions=4, NumTotalActions=9}; QGridLayout *gridLayout; @@ -109,6 +111,8 @@ private: double *positions; QPalette normal; + QIcon *iconPlus; + QIcon *iconMinus; private slots: /** To Expand the Action Widget diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index 6621efa37..ec1afa5e7 100644 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -90,6 +90,10 @@ private slots: */ void StartTrimming(); + /**Updates plot from shared memory + */ + void UpdatePlot(); + private: /** The sls detector object */ multiSlsDetector *myDet; diff --git a/slsDetectorGui/include/qTabDataOutput.h b/slsDetectorGui/include/qTabDataOutput.h index a0c3cb1f4..a0bee6f67 100644 --- a/slsDetectorGui/include/qTabDataOutput.h +++ b/slsDetectorGui/include/qTabDataOutput.h @@ -27,9 +27,8 @@ public: /** \short The constructor * @param parent is the parent tab widget * @param detector is the detector returned from the detector tab - * @param detID is the id of the detector */ - qTabDataOutput(QWidget *parent,multiSlsDetector*& detector,int detID); + qTabDataOutput(QWidget *parent,multiSlsDetector*& detector); /** Destructor */ @@ -45,9 +44,6 @@ private: /** The sls detector object */ multiSlsDetector *myDet; - /**detector id */ - int detID; - /** detector type */ slsDetectorDefs::detectorType detType; diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index eda4f5373..aa46f6477 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -173,7 +173,8 @@ private: QPalette red; /** expert mode */ bool expertMode; - + QIcon *iconStart; + QIcon *iconStop; signals: diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index 77d867180..e65c3e74a 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -26,9 +26,8 @@ public: /** \short The constructor * @param parent is the parent tab widget * @param detector is the detector returned from the detector tab - * @param detID is the id of the detector */ - qTabSettings(QWidget *parent,multiSlsDetector*& detector,int detID); + qTabSettings(QWidget *parent,multiSlsDetector*& detector); /** Destructor */ @@ -43,9 +42,6 @@ private: /** The sls detector object */ multiSlsDetector *myDet; - /**detector id */ - int detID; - /** detector type */ slsDetectorDefs::detectorType detType; diff --git a/slsDetectorGui/src/qActionsWidget.cpp b/slsDetectorGui/src/qActionsWidget.cpp index 7464227da..75a6d3b62 100644 --- a/slsDetectorGui/src/qActionsWidget.cpp +++ b/slsDetectorGui/src/qActionsWidget.cpp @@ -45,6 +45,7 @@ void qActionsWidget::SetupWidgetWindow(){ NUM_ACTION_WIDGETS++; setFixedHeight(25); + } diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 803d08b8e..16f876b13 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -99,10 +99,10 @@ void qDetectorMain::SetUpWidgetWindow(){ // creating all the tab widgets tab_messages = new qTabMessages (this, myDet); cout<<"Messages ready"<setContentsMargins(0, 0, 0, 0); comboCustom = new QComboBox(widgetCustom); - btnCustom = new QPushButton("Delete",widgetCustom); + btnCustom = new QPushButton("Delete ",widgetCustom); + btnCustom->setIcon(QIcon( ":/icons/images/close.png" )); comboCustom->setEditable(true); comboCustom->setCompleter(false); comboCustom->setValidator(new QDoubleValidator(comboCustom)); diff --git a/slsDetectorGui/src/qTabActions.cpp b/slsDetectorGui/src/qTabActions.cpp index daf760546..e16dc3eef 100644 --- a/slsDetectorGui/src/qTabActions.cpp +++ b/slsDetectorGui/src/qTabActions.cpp @@ -56,8 +56,13 @@ void qTabActions::SetupWidgetWindow(){ // Buttongroup to know which +/- button was clicked group = new QButtonGroup(this); + group->setExclusive(false); palette = new QPalette(); + QPalette p; + p.setColor(QPalette::Shadow,QColor(0,0,0,0)); + p.setColor(QPalette::Button,QColor(0,0,0,0)); + char names[NumTotalActions][200] = { "Action at Start", "Scan Level 0", @@ -70,15 +75,30 @@ void qTabActions::SetupWidgetWindow(){ "Action at Stop" }; + //creating the icons for the buttons + iconPlus = new QIcon(":/icons/images/add.png"); + iconMinus = new QIcon(":/icons/images/remove.png"); + + QString tip = "Click on the \"+\" to Expand or \"-\" to Collapse."; + // For each level of Actions for(int i=0;isetFixedSize(20,20); - QString tip = "Click on the \"+\" to Expand or \"-\" to Collapse."; + btnExpand[i] = new QPushButton(); + lblName[i]->setToolTip(tip); + + btnExpand[i]->setCheckable(true); + btnExpand[i]->setChecked(false); + btnExpand[i]->setFixedSize(16,16); btnExpand[i]->setToolTip(tip); + btnExpand[i]->setIcon(*iconPlus); + btnExpand[i]->setFocusPolicy(Qt::NoFocus); + btnExpand[i]->setFlat(true); + btnExpand[i]->setIconSize(QSize(16,16)); + btnExpand[i]->setPalette(p); + group->addButton(btnExpand[i],i); //add the widgets to the layout , depending on the type create the widgets @@ -157,7 +177,9 @@ void qTabActions::CreatePositionsWidget(){ comboPos->setValidator(validate); layout->addWidget(comboPos,0,5); layout->addItem(new QSpacerItem(5,20,QSizePolicy::Fixed,QSizePolicy::Fixed),0,6); - btnDelete = new QPushButton("Delete"); + btnDelete = new QPushButton("Delete "); + btnDelete->setEnabled(false); + btnDelete->setIcon(QIcon( ":/icons/images/close.png" )); btnDelete->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); layout->addWidget(btnDelete,0,7); @@ -202,11 +224,12 @@ void qTabActions::Initialization(){ void qTabActions::Expand(QAbstractButton *button ){ int index = group->id(button); + // Collapse - if(!QString::compare(button->text(), "-")){ + if(!button->isChecked()){ palette->setColor(QPalette::WindowText,Qt::black); lblName[index]->setPalette(*palette); - button->setText("+"); + button->setIcon(*iconPlus); if(index==NumPositions) { positionWidget->hide(); @@ -234,9 +257,11 @@ void qTabActions::Expand(QAbstractButton *button ){ } }else{ // Expand + //always set title color to blue for expan\d palette->setColor(QPalette::WindowText,QColor(0,0,200,255)); lblName[index]->setPalette(*palette); - button->setText("-"); + button->setIcon(*iconMinus); + if(index==NumPositions){ positionWidget->show(); setFixedHeight(height()+30);//+80 if the checkboxes are included @@ -265,6 +290,7 @@ void qTabActions::SetPosition(){ comboPos->setMaxCount(numPos); comboPos->setEnabled(numPos); lblPosList->setEnabled(numPos); + btnDelete->setEnabled(numPos); //deleting too many or not entering enough if(numPos>comboPos->count()){ @@ -378,6 +404,7 @@ void qTabActions::Refresh(){ disconnect(comboPos,SIGNAL(currentIndexChanged(int)), this, SLOT(SetPosition())); comboPos->setEnabled(numPos); lblPosList->setEnabled(numPos); + btnDelete->setEnabled(numPos); lblPosList->setText("List of Positions: "); lblPosList->setPalette(normal); for(int i=0;icount();i++) diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index 0b27e904b..39af2c33e 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -87,6 +87,9 @@ void qTabAdvanced::Initialization(){ //start Trimming connect(btnStart, SIGNAL(clicked()), this, SLOT(StartTrimming())); + //refresh + connect(btnRefresh, SIGNAL(clicked()), this, SLOT(UpdatePlot())); + } @@ -319,9 +322,6 @@ void qTabAdvanced::StartTrimming(){ break; } -#ifdef VERBOSE - -#endif //execute int ret = myDet->executeTrimming(trimmingMode,parameter1,parameter2,-1); if((ret!=slsDetectorDefs::FAIL)&&(ret!=-1)){ @@ -330,6 +330,8 @@ void qTabAdvanced::StartTrimming(){ if((ret!=slsDetectorDefs::FAIL)&&(ret!=-1)) qDefs::Message(qDefs::INFORMATION,"The Trimbits have been saved successfully.","Advanced"); else qDefs::Message(qDefs::WARNING,string("Could not Save the Trimbits to file:\n")+dispFile->text().toAscii().constData(),"Advanced"); + //updates plots + UpdatePlot(); } else qDefs::Message(qDefs::WARNING,"Atleast 1 channel could not be trimmed.","Advanced"); @@ -339,6 +341,16 @@ void qTabAdvanced::StartTrimming(){ //------------------------------------------------------------------------------------------------------------------------------------------------- +void qTabAdvanced::UpdatePlot(){ +#ifdef VERBOSE + cout << "Updating Plot" << endl; +#endif + +} + + +//------------------------------------------------------------------------------------------------------------------------------------------------- + void qTabAdvanced::Refresh(){ //disconnect disconnect(chkEnergyLog, SIGNAL(toggled(bool)), this, SLOT(SetLogs())); diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index fbe623c51..fee9b331e 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -25,8 +25,9 @@ using namespace std; //------------------------------------------------------------------------------------------------------------------------------------------------- -qTabDataOutput::qTabDataOutput(QWidget *parent,multiSlsDetector*& detector,int detID): - QWidget(parent),myDet(detector),detID(detID){ + +qTabDataOutput::qTabDataOutput(QWidget *parent,multiSlsDetector*& detector): + QWidget(parent),myDet(detector){ setupUi(this); SetupWidgetWindow(); Initialization(); @@ -241,7 +242,7 @@ void qTabDataOutput::SetRateCorrection(){ #ifdef VERBOSE cout << "Entering Set Rate Correction function" << endl; #endif - slsDetector *s = myDet->getSlsDetector(detID); + if(chkRate->isChecked()){ radioAuto->setEnabled(true); radioDeadTime->setEnabled(true); @@ -251,14 +252,14 @@ void qTabDataOutput::SetRateCorrection(){ //auto if(radioAuto->isChecked()){ spinDeadTime->setEnabled(false); - s->setRateCorrection(-1); + myDet->setRateCorrection(-1); #ifdef VERBOSE cout << "Setting rate corrections with default dead time" << endl; #endif }//custom dead time else{ spinDeadTime->setEnabled(true); - s->setRateCorrection((double)spinDeadTime->value()); + myDet->setRateCorrection((double)spinDeadTime->value()); #ifdef VERBOSE cout << "Setting rate corrections with dead time "<< spinDeadTime->value() << endl; #endif @@ -270,7 +271,7 @@ void qTabDataOutput::SetRateCorrection(){ spinDeadTime->setEnabled(false); //Unsetting rate correction - s->setRateCorrection(0); + myDet->setRateCorrection(0); #ifdef VERBOSE cout << "Unsetting rate correction" << endl; #endif @@ -291,8 +292,7 @@ void qTabDataOutput::UpdateRateCorrectionFromServer(){ disconnect(spinDeadTime, SIGNAL(valueChanged(double)), this, SLOT(SetRateCorrection())); double rate; - slsDetector *s = myDet->getSlsDetector(detID); - rate = (double)s->getRateCorrectionTau(); + rate = (double)myDet->getRateCorrectionTau(); #ifdef VERBOSE cout << "Getting rate correction from server:" << rate << " : "; #endif diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index ec5dce44a..3e6b30b2f 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -81,6 +81,11 @@ void qTabMeasurement::SetupWidgetWindow(){ //file write enabled/disabled chkFile->setChecked(myDet->enableWriteToFile()); + + //creating the icons for the buttons + iconStart = new QIcon(":/icons/images/start.png"); + iconStop = new QIcon(":/icons/images/stop.png"); + } @@ -278,12 +283,13 @@ void qTabMeasurement::setRunIndex(int index){ void qTabMeasurement::startStopAcquisition(){ - if(!btnStartStop->text().compare("Start")){ + if(btnStartStop->isChecked()){ #ifdef VERBOSE cout << endl << endl << "Starting Acquisition" << endl; #endif //btnStartStop->setStyleSheet("color:red"); btnStartStop->setText("Stop"); + btnStartStop->setIcon(*iconStop); Enable(0); progressBar->setValue(0); //the progress which keeps adding up for all the measurements @@ -301,6 +307,8 @@ void qTabMeasurement::startStopAcquisition(){ //btnStartStop->setStyleSheet("background:rgb(239,239,239)"); progressTimer->stop(); btnStartStop->setText("Start"); + btnStartStop->setIcon(*iconStart); + btnStartStop->setChecked(false); Enable(1); emit StopSignal(); } @@ -313,6 +321,8 @@ void qTabMeasurement::startStopAcquisition(){ void qTabMeasurement::UpdateFinished(){ disconnect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition())); btnStartStop->setText("Start"); + btnStartStop->setIcon(*iconStart); + btnStartStop->setChecked(false); //btnStartStop->setStyleSheet("color:green"); //btnStartStop->setStyleSheet("background:rgb(239,239,239)"); Enable(1); diff --git a/slsDetectorGui/src/qTabMessages.cpp b/slsDetectorGui/src/qTabMessages.cpp index 3b50e616c..fc7836462 100644 --- a/slsDetectorGui/src/qTabMessages.cpp +++ b/slsDetectorGui/src/qTabMessages.cpp @@ -16,7 +16,6 @@ #include #include #include -#include /** C++ Include Headers */ #include #include @@ -47,15 +46,16 @@ void qTabMessages::SetupWidgetWindow(){ dispLog->setFocusPolicy(Qt::NoFocus); dispLog->setTextColor(Qt::darkBlue); - QSizePolicy sizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); - btnSave = new QPushButton("Save Log",this); + btnSave = new QPushButton("Save Log ",this); btnSave->setFocusPolicy(Qt::NoFocus); - btnSave->setSizePolicy(sizePolicy); + btnSave->setFixedWidth(100); + btnSave->setIcon(QIcon( ":/icons/images/save.png" )); - btnClear = new QPushButton("Clear",this); + btnClear = new QPushButton("Clear ",this); btnClear->setFocusPolicy(Qt::NoFocus); - btnClear->setSizePolicy(sizePolicy); + btnClear->setFixedWidth(100); + btnClear->setIcon(QIcon( ":/icons/images/erase.png" )); gridLayout->addWidget(btnSave,0,0,1,1); gridLayout->addWidget(btnClear,0,4,1,1); diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 99475afa6..eadf9cc17 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -17,8 +17,8 @@ using namespace std; //------------------------------------------------------------------------------------------------------------------------------------------------- -qTabSettings::qTabSettings(QWidget *parent,multiSlsDetector*& detector,int detID): - QWidget(parent),myDet(detector),detID(detID){ +qTabSettings::qTabSettings(QWidget *parent,multiSlsDetector*& detector): + QWidget(parent),myDet(detector){ setupUi(this); SetupWidgetWindow(); @@ -40,7 +40,7 @@ void qTabSettings::SetupWidgetWindow(){ // Settings SetupDetectorSettings(); - comboSettings->setCurrentIndex(myDet->getSettings(detID)); + comboSettings->setCurrentIndex(myDet->getSettings()); //threshold spinThreshold->setValue(myDet->getThresholdEnergy()); @@ -68,7 +68,7 @@ void qTabSettings::SetupWidgetWindow(){ void qTabSettings::SetupDetectorSettings(){ // Get detector settings from detector - slsDetectorDefs::detectorSettings sett = myDet->getSettings(detID); + slsDetectorDefs::detectorSettings sett = myDet->getSettings(); // To be able to index items on a combo box model = qobject_cast(comboSettings->model()); @@ -163,7 +163,7 @@ void qTabSettings::setSettings(int index){ if(index!=(int)Uninitialized) item[(int)Uninitialized]->setEnabled(false); } - slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index,detID); + slsDetectorDefs::detectorSettings sett = myDet->setSettings((slsDetectorDefs::detectorSettings)index); #ifdef VERBOSE cout << "Settings have been set to " << myDet->slsDetectorBase::getDetectorSettings(sett) << endl; #endif @@ -256,7 +256,7 @@ void qTabSettings::SetEnergy(){ void qTabSettings::Refresh(){ // Settings SetupDetectorSettings(); - comboSettings->setCurrentIndex(myDet->getSettings(detID)); + comboSettings->setCurrentIndex(myDet->getSettings()); // Number of Modules spinNumModules->setValue(myDet->setNumberOfModules());