diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index f470bdae1..158e09cb8 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -31,7 +31,7 @@ using namespace std; //------------------------------------------------------------------------------------------------------------------------------------------------- int main (int argc, char **argv) { - MyApplication *theApp = new MyApplication(argc, argv); + QApplication *theApp = new QApplication(argc, argv); // QApplication *theApp = new QApplication(argc, argv); theApp->setStyle(new QPlastiqueStyle);//not default when desktop is windows theApp->setWindowIcon(QIcon( ":/icons/images/mountain.png" )); diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 8d9d48f55..018ccf313 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -630,13 +630,9 @@ void qDrawPlot::SetupMeasurement(){ #ifdef VERBOSE cout << "SetupMeasurement function:" << running << endl; #endif - cout<<"begnPixelsX:"<GetData(data,fIndex); - cout << "data ready callback worked ok" << endl; return 0; } @@ -750,7 +742,7 @@ int qDrawPlot::GetDataCallBack(detectorData *data, int fIndex, void *this_pointe int qDrawPlot::GetData(detectorData *data,int fIndex){ - //#ifdef VERYVERBOSE +#ifdef VERYVERBOSE cout << "******Entering GetDatafunction********" << endl; cout << "fIndex " << fIndex << endl; cout << "fname " << data->fileName << endl; @@ -760,9 +752,9 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){ cout << "values " << data->values << endl; cout << "errors " << data->errors << endl; cout << "angle " << data->angles << endl; - //#endif +#endif if(!stop_signal){ -cout<<"before progress"<progressIndex; currentFrameIndex = fileIOStatic::getIndicesFromFileName(string(data->fileName),currentFileIndex); @@ -771,9 +763,9 @@ cout<<"before progress"<progress= currentProgress; - cout << "progress callback " << endl; return 0; } @@ -1189,9 +1179,7 @@ void qDrawPlot::ShowAcquisitionErrorMessage(QString status){ int qDrawPlot::GetMeasurementFinishedCallBack(int currentMeasurementIndex, int fileIndex, void *this_pointer){ - cout << "measurement finished callback?" << endl; ((qDrawPlot*)this_pointer)->MeasurementFinished(currentMeasurementIndex, fileIndex); - cout << "measurement finished callback worked ok" << endl; return 0; } diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index a5b7565e9..8d85327a8 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -127,13 +127,13 @@ void qTabAdvanced::SetupWidgetWindow(){ det = myDet->getSlsDetector(comboDetector->currentIndex()); qDefs::checkErrorMessage(myDet,"qTabAdvanced::SetupWidgetWindow"); - cout << "ports" << endl; + cout << "Getting ports" << endl; spinControlPort->setValue(det->getControlPort()); spinStopPort->setValue(det->getStopPort()); spinTCPPort->setValue(det->getReceiverPort()); spinUDPPort->setValue(atoi(det->getReceiverUDPPort())); - cout << "net" << endl; + cout << "Getting network information" << endl; dispIP->setText(det->getDetectorIP()); dispMAC->setText(det->getDetectorMAC()); dispRxrHostname->setText(det->getReceiver()); @@ -142,8 +142,9 @@ void qTabAdvanced::SetupWidgetWindow(){ //check if its online and set it to red if offline - +#ifdef VERYVERBOSE cout << "online" << endl; +#endif if(det->setOnline()==slsDetectorDefs::ONLINE_FLAG) det->checkOnline(); if(det->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG) @@ -164,17 +165,12 @@ void qTabAdvanced::SetupWidgetWindow(){ } - cout << "ROI" << endl; - //updates roi + cout << "Getting ROI" << endl; updateROIList(); - cout << "Init" << endl; - Initialization(); - cout << "done" << endl; - qDefs::checkErrorMessage(det,"qTabAdvanced::SetupWidgetWindow"); } diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index eb3e997a7..776774b02 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -110,8 +110,7 @@ void qTabDataOutput::SetupWidgetWindow(){ //discard bad channels from server #ifdef VERBOSE - cout << "Getting bad channel correction" << endl; - cout << "func " << myDet->getBadChannelCorrection() << endl; + cout << "Getting bad channel correction:" << myDet->getBadChannelCorrection() << endl; #endif @@ -123,9 +122,6 @@ void qTabDataOutput::SetupWidgetWindow(){ chkDiscardBad->setChecked(false); connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); -#ifdef VERBOSE - cout << "done" << endl; -#endif qDefs::checkErrorMessage(myDet,"qTabDataOutput::SetupWidgetWindow"); }