diff --git a/slsDetectorGui/forms/form_tab_dataoutput.ui b/slsDetectorGui/forms/form_tab_dataoutput.ui
index 514bb5a9c..8fabbf474 100644
--- a/slsDetectorGui/forms/form_tab_dataoutput.ui
+++ b/slsDetectorGui/forms/form_tab_dataoutput.ui
@@ -492,13 +492,13 @@ Directory where one saves the data.
-
+
20
- 8
- 737
- 155
+ 40
+ 735
+ 100
@@ -507,33 +507,44 @@ Directory where one saves the data.
- 13
- 19
- 713
- 125
+ 12
+ 20
+ 714
+ 68
4
- -
-
-
- Qt::Horizontal
+
-
+
+
+
+ 0
+ 0
+
-
- QSizePolicy::Fixed
+
+ <nobr>
+Directory where one saves the data.
+</nobr><br>
+ #outdir#
+<br>
+Disabled if a receiver is utilized in acquisition.
+<br>
+
-
-
- 45
- 20
-
+
+ Browse
-
+
+
+ :/icons/images/browse.png:/icons/images/browse.png
+
+
- -
+
-
@@ -567,69 +578,21 @@ Directory where one saves the data.
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Qt::Horizontal
-
+
+ QSizePolicy::Fixed
+
+
- 70
- 16777215
+ 10
+ 20
-
-
-
-
-
-
- 2
- 2
- 2
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 119
- 119
- 119
-
-
-
-
-
-
-
- <nobr>
-Directory where one saves the data.
-</nobr><br>
- #outdir#
-<br>
-
-
-
- Readout:
-
-
+
-
@@ -647,146 +610,7 @@ Directory where one saves the data.
- -
-
-
- Qt::NoFocus
-
-
- <nobr>
-Directory where one saves the data.
-</nobr><br>
- #outdir#
-<br>
-
-
-
- false
-
-
- QLineEdit::Normal
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 70
- 16777215
-
-
-
-
-
-
-
-
- 2
- 2
- 2
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 119
- 119
- 119
-
-
-
-
-
-
-
- <html><head/><body><p>File Format<br/>#fileformat# <br/></p></body></html>
-
-
- Format:
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 470
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <nobr>
-Directory where one saves the data.
-</nobr><br>
- #outdir#
-<br>
-
-
-
- Browse
-
-
-
- :/icons/images/browse.png:/icons/images/browse.png
-
-
-
- -
-
-
- Qt::StrongFocus
-
-
- <nobr>
-Directory where one saves the data.
-</nobr><br>
- #outdir#
-<br>
-
-
-
-
- -
+
-
@@ -850,26 +674,105 @@ Directory where one saves the data.
- -
-
-
- Qt::NoFocus
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 70
+ 16777215
+
+
+
+
+
+
+
+
+ 2
+ 2
+ 2
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 119
+ 119
+ 119
+
+
+
+
+
- <html><head/><body><p>Name of file. Can be modified in Measurement tab.<br/>#fname# <br/></p></body></html>
+ <html><head/><body><p>File Format<br/>#fileformat# <br/></p></body></html>
-
- false
-
-
- QLineEdit::Normal
-
-
- true
+
+ Format:
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ Overwrite Enable
+ #overwrite#
+
+
+ Overwrite
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+ -
@@ -877,6 +780,12 @@ Directory where one saves the data.
0
+
+
+ 75
+ 16777215
+
+
@@ -922,6 +831,52 @@ Directory where one saves the data.
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p>Name of file. Can be modified in Measurement tab.<br/>#fname# <br/></p></body></html>
+
+
+ false
+
+
+ QLineEdit::Normal
+
+
+ true
+
+
+
+ -
+
+
+ Qt::StrongFocus
+
+
+ <nobr>
+Directory where one saves the data.
+</nobr><br>
+ #outdir#
+<br>
+
+
+
+
diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp
index ca5cc7661..38fb7e6ea 100644
--- a/slsDetectorGui/src/qTabDataOutput.cpp
+++ b/slsDetectorGui/src/qTabDataOutput.cpp
@@ -549,24 +549,23 @@ void qTabDataOutput::GetOutputDir(){
dispOutputDir->setText(QString(myDet->getFilePath().c_str()));
//multi file path blank means sls file paths are different
if (dispOutputDir->text().isEmpty()) {
- qDefs::Message(qDefs::INFO,"The file path for individual units are different.\n"
+ qDefs::Message(qDefs::INFORMATION,"The file path for individual units are different.\n"
"Hence, leaving the common field blank.","qTabDataOutput::GetOutputDir");
#ifdef VERBOSE
cout << "The file path for individual units are different.\n"
"Hence, leaving the common field blank." << endl;
#endif
QString errTip = QString("
"
- "Output Directory"
- "Information only: The file path for individual units are different.
"
+ "Output Directory Information only: The file path for individual units are different.
"
"Hence, leaving the common field blank.");
lblOutputDir->setText("Path*:");
- //dispOutputDir->setPalette(*red1);
+ lblOutputDir->setPalette(red);
lblOutputDir->setToolTip(errTip);
btnOutputBrowse->setToolTip(errTip);
dispOutputDir->setToolTip(errTip);
} else {
lblOutputDir->setText("Path:");
- //dispOutputDir->setPalette(*black1);
+ lblOutputDir->setPalette(*black1);
lblOutputDir->setToolTip(outDirTip);
btnOutputBrowse->setToolTip(outDirTip);
dispOutputDir->setToolTip(outDirTip);
@@ -633,7 +632,7 @@ int qTabDataOutput::VerifyOutputDirectory(){
QString(mess.c_str()) +
QString( ".");
lblOutputDir->setText("Path*:");
- dispOutputDir->setPalette(*red1);
+ lblOutputDir->setPalette(red);
lblOutputDir->setToolTip(errTip);
btnOutputBrowse->setToolTip(errTip);
dispOutputDir->setToolTip(errTip);
@@ -647,7 +646,7 @@ int qTabDataOutput::VerifyOutputDirectory(){
cout << "The output pathid valid" << endl;
#endif
lblOutputDir->setText("Path:");
- dispOutputDir->setPalette(*black1);
+ lblOutputDir->setPalette(*black1);
lblOutputDir->setToolTip(outDirTip);
btnOutputBrowse->setToolTip(outDirTip);
dispOutputDir->setToolTip(outDirTip);
@@ -712,7 +711,7 @@ void qTabDataOutput::SetOutputDir(){
"Invalid File Path");
lblOutputDir->setText("Path*:");
- dispOutputDir->setPalette(*red1);
+ lblOutputDir->setPalette(red);
lblOutputDir->setToolTip(errTip);
btnOutputBrowse->setToolTip(errTip);
dispOutputDir->setToolTip(errTip);
@@ -722,7 +721,7 @@ void qTabDataOutput::SetOutputDir(){
cout << "The output path has been modified" << endl;
#endif
lblOutputDir->setText("Path:");
- dispOutputDir->setPalette(*black1);
+ lblOutputDir->setPalette(*black1);
lblOutputDir->setToolTip(outDirTip);
btnOutputBrowse->setToolTip(outDirTip);
dispOutputDir->setToolTip(outDirTip);
@@ -997,7 +996,7 @@ void qTabDataOutput::UpdateFileOverwriteFromServer(){
#endif
disconnect(chkOverwriteEnable, SIGNAL(toggled(bool)), this, SLOT(SetOverwriteEnable(bool)));
- chkFile->setChecked(myDet->overwriteFile());
+ chkOverwriteEnable->setChecked(myDet->overwriteFile());
connect(chkOverwriteEnable, SIGNAL(toggled(bool)), this, SLOT(SetOverwriteEnable(bool)));
}
@@ -1030,11 +1029,16 @@ void qTabDataOutput::Refresh(){
cout << endl << "**Updating DataOutput Tab" << endl;
#endif
+ if (!myDet->enableWriteToFile())
+ boxFileWriteEnabled->setEnabled(false);
+ else
+ boxFileWriteEnabled->setEnabled(true);
// output dir
#ifdef VERBOSE
cout << "Getting output directory" << endl;
#endif
+
disconnect(comboDetector, SIGNAL(currentIndexChanged(int)), this, SLOT(GetOutputDir()));
PopulateDetectors();
connect(comboDetector, SIGNAL(currentIndexChanged(int)), this, SLOT(GetOutputDir()));
@@ -1048,11 +1052,6 @@ void qTabDataOutput::Refresh(){
//file name
dispFileName->setText(QString(myDet->getFileName().c_str()));
- //file write enable
- if(myDet->enableWriteToFile() == 1)
- dispFileName->setText("Enabled");
- else dispFileName->setText("Disabled");
-
//flat field correction from server
#ifdef VERBOSE
cout << "Getting flat field" << endl;