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

incl. prev commit: Included file overwrite, format and changed the functonality of filewrite enable and file path

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-03-10 12:21:19 +01:00
parent 2ef44ec70b
commit 8ebbfbb84b
2 changed files with 203 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

423
slsDetectorGui/forms/form_tab_dataoutput.ui
View File

@ -492,13 +492,13 @@ Directory where one saves the data.
</widget> </widget>
</widget> </widget>
</widget> </widget>
<widget class="QGroupBox" name="boxCorrection_3"> <widget class="QGroupBox" name="boxFileWriteEnabled">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>8</y> <y>40</y>
<width>737</width> <width>735</width>
<height>155</height> <height>100</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
@ -507,33 +507,44 @@ Directory where one saves the data.
<widget class="QWidget" name="horizontalLayoutWidget"> <widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>13</x> <x>12</x>
<y>19</y> <y>20</y>
<width>713</width> <width>714</width>
<height>125</height> <height>68</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>4</number> <number>4</number>
</property> </property>
<item row="3" column="2"> <item row="0" column="16">
<spacer name="horizontalSpacer_6"> <widget class="QPushButton" name="btnOutputBrowse">
<property name="orientation"> <property name="sizePolicy">
<enum>Qt::Horizontal</enum> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="sizeType"> <property name="toolTip">
<enum>QSizePolicy::Fixed</enum> <string>&lt;nobr&gt;
Directory where one saves the data.
&lt;/nobr&gt;&lt;br&gt;
#outdir#
&lt;br&gt;
Disabled if a receiver is utilized in acquisition.
&lt;br&gt;
</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="text">
<size> <string>Browse</string>
<width>45</width>
<height>20</height>
</size>
</property> </property>
</spacer> <property name="icon">
<iconset resource="../include/icons.qrc">
<normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
</property>
</widget>
</item> </item>
<item row="3" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="comboFileFormat"> <widget class="QComboBox" name="comboFileFormat">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -567,69 +578,21 @@ Directory where one saves the data.
</item> </item>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="1" column="2">
<widget class="QLabel" name="lblDetector"> <spacer name="horizontalSpacer_10">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <enum>Qt::Horizontal</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>70</width> <width>10</width>
<height>16777215</height> <height>20</height>
</size> </size>
</property> </property>
<property name="palette"> </spacer>
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>2</red>
<green>2</green>
<blue>2</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>119</red>
<green>119</green>
<blue>119</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Directory where one saves the data.
&lt;/nobr&gt;&lt;br&gt;
#outdir#
&lt;br&gt;
</string>
</property>
<property name="text">
<string>Readout:</string>
</property>
</widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="comboDetector"> <widget class="QComboBox" name="comboDetector">
@ -647,146 +610,7 @@ Directory where one saves the data.
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="6"> <item row="0" column="0">
<widget class="QLineEdit" name="dispReadOutputDir">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Directory where one saves the data.
&lt;/nobr&gt;&lt;br&gt;
#outdir#
&lt;br&gt;
</string>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lblFileFormat">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>2</red>
<green>2</green>
<blue>2</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>119</red>
<green>119</green>
<blue>119</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;File Format&lt;br/&gt;#fileformat# &lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Format:</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="5">
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>470</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="6">
<widget class="QPushButton" name="btnOutputBrowse">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Directory where one saves the data.
&lt;/nobr&gt;&lt;br&gt;
#outdir#
&lt;br&gt;
</string>
</property>
<property name="text">
<string>Browse</string>
</property>
<property name="icon">
<iconset resource="../include/icons.qrc">
<normaloff>:/icons/images/browse.png</normaloff>:/icons/images/browse.png</iconset>
</property>
</widget>
</item>
<item row="2" column="1" colspan="5">
<widget class="QLineEdit" name="dispOutputDir">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Directory where one saves the data.
&lt;/nobr&gt;&lt;br&gt;
#outdir#
&lt;br&gt;
</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lblOutputDir"> <widget class="QLabel" name="lblOutputDir">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -850,26 +674,105 @@ Directory where one saves the data.
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="4" colspan="3"> <item row="1" column="0">
<widget class="QLineEdit" name="dispFileName"> <widget class="QLabel" name="lblFileFormat">
<property name="focusPolicy"> <property name="sizePolicy">
<enum>Qt::NoFocus</enum> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>2</red>
<green>2</green>
<blue>2</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>119</red>
<green>119</green>
<blue>119</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Name of file. Can be modified in Measurement tab.&lt;br/&gt;#fname# &lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;File Format&lt;br/&gt;#fileformat# &lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="frame"> <property name="text">
<bool>false</bool> <string>Format:</string>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3"> <item row="1" column="16">
<widget class="QCheckBox" name="chkOverwriteEnable">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Overwrite Enable
#overwrite#</string>
</property>
<property name="text">
<string>Overwrite</string>
</property>
</widget>
</item>
<item row="1" column="15">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="3">
<widget class="QLabel" name="lblFileName"> <widget class="QLabel" name="lblFileName">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -877,6 +780,12 @@ Directory where one saves the data.
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>75</width>
<height>16777215</height>
</size>
</property>
<property name="palette"> <property name="palette">
<palette> <palette>
<active> <active>
@ -922,6 +831,52 @@ Directory where one saves the data.
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="4" colspan="11">
<widget class="QLineEdit" name="dispFileName">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Name of file. Can be modified in Measurement tab.&lt;br/&gt;#fname# &lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="3" colspan="12">
<widget class="QLineEdit" name="dispOutputDir">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Directory where one saves the data.
&lt;/nobr&gt;&lt;br&gt;
#outdir#
&lt;br&gt;
</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

29
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -549,24 +549,23 @@ void qTabDataOutput::GetOutputDir(){
dispOutputDir->setText(QString(myDet->getFilePath().c_str())); dispOutputDir->setText(QString(myDet->getFilePath().c_str()));
//multi file path blank means sls file paths are different //multi file path blank means sls file paths are different
if (dispOutputDir->text().isEmpty()) { 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"); "Hence, leaving the common field blank.","qTabDataOutput::GetOutputDir");
#ifdef VERBOSE #ifdef VERBOSE
cout << "The file path for individual units are different.\n" cout << "The file path for individual units are different.\n"
"Hence, leaving the common field blank." << endl; "Hence, leaving the common field blank." << endl;
#endif #endif
QString errTip = QString("<br><nobr><font color=\"red\">" QString errTip = QString("<br><nobr><font color=\"red\">"
"<b>Output Directory</b>" "<b>Output Directory</b> Information only: The file path for individual units are different.<br>"
"Information only: The file path for individual units are different.<br>"
"Hence, leaving the common field blank.</font></nobr>"); "Hence, leaving the common field blank.</font></nobr>");
lblOutputDir->setText("Path*:"); lblOutputDir->setText("Path*:");
//dispOutputDir->setPalette(*red1); lblOutputDir->setPalette(red);
lblOutputDir->setToolTip(errTip); lblOutputDir->setToolTip(errTip);
btnOutputBrowse->setToolTip(errTip); btnOutputBrowse->setToolTip(errTip);
dispOutputDir->setToolTip(errTip); dispOutputDir->setToolTip(errTip);
} else { } else {
lblOutputDir->setText("Path:"); lblOutputDir->setText("Path:");
//dispOutputDir->setPalette(*black1); lblOutputDir->setPalette(*black1);
lblOutputDir->setToolTip(outDirTip); lblOutputDir->setToolTip(outDirTip);
btnOutputBrowse->setToolTip(outDirTip); btnOutputBrowse->setToolTip(outDirTip);
dispOutputDir->setToolTip(outDirTip); dispOutputDir->setToolTip(outDirTip);
@ -633,7 +632,7 @@ int qTabDataOutput::VerifyOutputDirectory(){
QString(mess.c_str()) + QString(mess.c_str()) +
QString( ".</font></nobr>"); QString( ".</font></nobr>");
lblOutputDir->setText("Path*:"); lblOutputDir->setText("Path*:");
dispOutputDir->setPalette(*red1); lblOutputDir->setPalette(red);
lblOutputDir->setToolTip(errTip); lblOutputDir->setToolTip(errTip);
btnOutputBrowse->setToolTip(errTip); btnOutputBrowse->setToolTip(errTip);
dispOutputDir->setToolTip(errTip); dispOutputDir->setToolTip(errTip);
@ -647,7 +646,7 @@ int qTabDataOutput::VerifyOutputDirectory(){
cout << "The output pathid valid" << endl; cout << "The output pathid valid" << endl;
#endif #endif
lblOutputDir->setText("Path:"); lblOutputDir->setText("Path:");
dispOutputDir->setPalette(*black1); lblOutputDir->setPalette(*black1);
lblOutputDir->setToolTip(outDirTip); lblOutputDir->setToolTip(outDirTip);
btnOutputBrowse->setToolTip(outDirTip); btnOutputBrowse->setToolTip(outDirTip);
dispOutputDir->setToolTip(outDirTip); dispOutputDir->setToolTip(outDirTip);
@ -712,7 +711,7 @@ void qTabDataOutput::SetOutputDir(){
"Invalid <b>File Path</b></font></nobr>"); "Invalid <b>File Path</b></font></nobr>");
lblOutputDir->setText("Path*:"); lblOutputDir->setText("Path*:");
dispOutputDir->setPalette(*red1); lblOutputDir->setPalette(red);
lblOutputDir->setToolTip(errTip); lblOutputDir->setToolTip(errTip);
btnOutputBrowse->setToolTip(errTip); btnOutputBrowse->setToolTip(errTip);
dispOutputDir->setToolTip(errTip); dispOutputDir->setToolTip(errTip);
@ -722,7 +721,7 @@ void qTabDataOutput::SetOutputDir(){
cout << "The output path has been modified" << endl; cout << "The output path has been modified" << endl;
#endif #endif
lblOutputDir->setText("Path:"); lblOutputDir->setText("Path:");
dispOutputDir->setPalette(*black1); lblOutputDir->setPalette(*black1);
lblOutputDir->setToolTip(outDirTip); lblOutputDir->setToolTip(outDirTip);
btnOutputBrowse->setToolTip(outDirTip); btnOutputBrowse->setToolTip(outDirTip);
dispOutputDir->setToolTip(outDirTip); dispOutputDir->setToolTip(outDirTip);
@ -997,7 +996,7 @@ void qTabDataOutput::UpdateFileOverwriteFromServer(){
#endif #endif
disconnect(chkOverwriteEnable, SIGNAL(toggled(bool)), this, SLOT(SetOverwriteEnable(bool))); 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))); connect(chkOverwriteEnable, SIGNAL(toggled(bool)), this, SLOT(SetOverwriteEnable(bool)));
} }
@ -1030,11 +1029,16 @@ void qTabDataOutput::Refresh(){
cout << endl << "**Updating DataOutput Tab" << endl; cout << endl << "**Updating DataOutput Tab" << endl;
#endif #endif
if (!myDet->enableWriteToFile())
boxFileWriteEnabled->setEnabled(false);
else
boxFileWriteEnabled->setEnabled(true);
// output dir // output dir
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting output directory" << endl; cout << "Getting output directory" << endl;
#endif #endif
disconnect(comboDetector, SIGNAL(currentIndexChanged(int)), this, SLOT(GetOutputDir())); disconnect(comboDetector, SIGNAL(currentIndexChanged(int)), this, SLOT(GetOutputDir()));
PopulateDetectors(); PopulateDetectors();
connect(comboDetector, SIGNAL(currentIndexChanged(int)), this, SLOT(GetOutputDir())); connect(comboDetector, SIGNAL(currentIndexChanged(int)), this, SLOT(GetOutputDir()));
@ -1048,11 +1052,6 @@ void qTabDataOutput::Refresh(){
//file name //file name
dispFileName->setText(QString(myDet->getFileName().c_str())); 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 //flat field correction from server
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting flat field" << endl; cout << "Getting flat field" << endl;