diff --git a/slsDetectorGui/forms/form_tab_measurement.ui b/slsDetectorGui/forms/form_tab_measurement.ui index 4832f0138..0b5f0d48a 100644 --- a/slsDetectorGui/forms/form_tab_measurement.ui +++ b/slsDetectorGui/forms/form_tab_measurement.ui @@ -564,6 +564,13 @@ true + + <nobr> +Exposure Time of a frame. +</nobr><br><nobr> + #exptime# +</nobr> + Exposure Time: @@ -581,8 +588,11 @@ - Exposure time of each frame. - #exptime# + <nobr> +Exposure Time of a frame. +</nobr><br><nobr> + #exptime# +</nobr> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -612,6 +622,13 @@ 0 + + <nobr> +Exposure Time of a frame. +</nobr><br><nobr> + #exptime# +</nobr> + Qt::LeftToRight @@ -656,15 +673,11 @@ false - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Frame period between exposures. </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #period#</p></td></tr></table></body></html> + <nobr> +Frame period between exposures. +</nobr><br><nobr> + #period# +</nobr> Acquisition Period: @@ -683,15 +696,11 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Frame period between exposures. </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #period#</p></td></tr></table></body></html> + <nobr> +Frame period between exposures. +</nobr><br><nobr> + #period# +</nobr> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -719,15 +728,11 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<table style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Frame period between exposures. </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> #period#</p></td></tr></table></body></html> + <nobr> +Frame period between exposures. +</nobr><br><nobr> + #period# +</nobr> Qt::LeftToRight diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index fdced7387..432e26292 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -6,7 +6,7 @@ UI_HEADERS_DIR = forms/include RESOURCES += icons.qrc -DEFINES += VERBOSE DACS_INT #VERYVERBOSE +DEFINES += VERBOSE DACS_INT VERYVERBOSE target.path += $(DESTDIR) diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 81301d4b5..2ac8319c7 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -509,7 +509,7 @@ void qTabPlot::EnableScanBox(){ bool checkedBefore = boxScan->isChecked();//||(!boxScan->isEnabled())); int ang; - //none of these scan plotting options make sense if positions>0 + //none of these scan plotting options make sense if positions exists bool positionsExist = myDet->getAngularConversion(ang);//myDet->getPositions(); //only now enable/disable @@ -551,7 +551,7 @@ void qTabPlot::EnableScanBox(){ if((positionsExist)&&(chkSuperimpose->isChecked())) chkSuperimpose->setChecked(false); chkSuperimpose->setEnabled(!positionsExist); //box frequency should be enabled cuz its a normal 1d plot - boxFrequency->setEnabled(positionsExist); + //boxFrequency->setEnabled(positionsExist); myPlot->EnableAnglePlot(positionsExist); @@ -688,8 +688,8 @@ void qTabPlot::Refresh(){ #endif if(!myPlot->isRunning()){ connect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox())); - SetFrequency(); EnableScanBox(); + SetFrequency(); }else{ disconnect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox())); boxScan->setEnabled(false);