detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 14:38:14 +02:00
Code Issues Actions Packages Releases Activity

enhancement:nth frame changed to red, instead of error and changing it back

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@90 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-10-11 08:57:09 +00:00
parent f4dc6aab22
commit 19b6ca2eda
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -538,7 +538,7 @@ int qDrawPlot::GetData(detectorData *data){
//set progress //set progress
progress=(int)data->progressIndex; progress=(int)data->progressIndex;
currentFileIndex = fileIOStatic::getFileIndexFromFileName(string(data->fileName)); currentFileIndex = fileIOStatic::getFileIndexFromFileName(string(data->fileName));
#ifdef VERBOSE #ifdef VERYVERBOSE
cout << "progress:" << progress << endl; cout << "progress:" << progress << endl;
#endif #endif
@ -673,8 +673,6 @@ int qDrawPlot::GetData(detectorData *data){
//get scanvariable0 //get scanvariable0
int ci = 0, p = 0; double cs0 = 0 , cs1 = 0; int ci = 0, p = 0; double cs0 = 0 , cs1 = 0;
fileIOStatic::getVariablesFromFileName(string(data->fileName), ci, p, cs0, cs1); fileIOStatic::getVariablesFromFileName(string(data->fileName), ci, p, cs0, cs1);
cout<<"currentScanValue:"<<currentScanValue<<endl;
cout<<"cs0:"<<cs0<<endl;
//variables //variables
if(cs0!=currentScanValue) { if(cs0!=currentScanValue) {
if(backwardScanPlot) currentScanDivLevel--; if(backwardScanPlot) currentScanDivLevel--;
@ -946,8 +944,6 @@ void qDrawPlot::UpdatePlot(){
if(lastImageArray){ if(lastImageArray){
if(lastImageNumber&&last_plot_number!=(int)lastImageNumber && //there is a new plot if(lastImageNumber&&last_plot_number!=(int)lastImageNumber && //there is a new plot
nPixelsX>0&&nPixelsY>0){ nPixelsX>0&&nPixelsY>0){
cout<<"startpixel:"<<startPixel<<endl;
cout<<"endpixel:"<<endPixel<<endl;
//plot2D->GetPlot()->SetData(nPixelsX,-0.5,nPixelsX-0.5,nPixelsY,-0.5,nPixelsY-0.5,lastImageArray); //plot2D->GetPlot()->SetData(nPixelsX,-0.5,nPixelsX-0.5,nPixelsY,-0.5,nPixelsY-0.5,lastImageArray);
plot2D->GetPlot()->SetData(nPixelsX,-0.5,nPixelsX-0.5,nPixelsY,startPixel,endPixel,lastImageArray); plot2D->GetPlot()->SetData(nPixelsX,-0.5,nPixelsX-0.5,nPixelsY,startPixel,endPixel,lastImageArray);
plot2D->setTitle(GetImageTitle()); plot2D->setTitle(GetImageTitle());

5
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -30,7 +30,7 @@ qTabMeasurement::qTabMeasurement(QWidget *parent,multiSlsDetector*& detector, qD
setupUi(this); setupUi(this);
SetupWidgetWindow(); SetupWidgetWindow();
Initialization(); Initialization();
SetupTimingMode();
} }
@ -76,9 +76,6 @@ void qTabMeasurement::SetupWidgetWindow(){
//ly initially //ly initially
progressBar->setValue(0); progressBar->setValue(0);
//timing mode
SetupTimingMode();
//file write enabled/disabled //file write enabled/disabled
chkFile->setChecked(myDet->enableWriteToFile()); chkFile->setChecked(myDet->enableWriteToFile());
dispFileName->setEnabled(myDet->enableWriteToFile()); dispFileName->setEnabled(myDet->enableWriteToFile());

3
slsDetectorGui/src/qTabPlot.cpp
View File

@ -497,7 +497,8 @@ void qTabPlot::SetFrequency(){
boxFrequency->setToolTip(errTip); boxFrequency->setToolTip(errTip);
} }
//show red if acqPeriod<minInterval //show red if acqPeriod<minInterval
else if(acqPeriodMS<timeMS){ else if((acqPeriodMS+1)<timeMS){
cout<<"\nacqPeriodMS:"<<acqPeriodMS<<"\ttimeMS:"<<timeMS<<endl;
//qDefs::Message(qDefs::WARNING,"<nobr>Interval between Plots: You might be losing Images!</nobr>","Plot"); //qDefs::Message(qDefs::WARNING,"<nobr>Interval between Plots: You might be losing Images!</nobr>","Plot");
boxFrequency->setPalette(*red); boxFrequency->setPalette(*red);
boxFrequency->setTitle("Interval between Plots*"); boxFrequency->setTitle("Interval between Plots*");