LMU/musrsim
LMU/musrsim
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix in layer thickness scans.

Browse Source
This commit is contained in:
salman 2013-05-16 10:00:16 +00:00
parent 370dcd57af
commit b7565ad635
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trimsp/src/TrimSPGUI/TrimSPGUI.pl
View File

@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'TrimSPGUI.ui' # Form implementation generated from reading ui file 'TrimSPGUI.ui'
# #
# Created: Mon Apr 8 11:03:16 2013 # Created: Thu May 16 11:49:01 2013
# by: The PerlQt User Interface Compiler (puic) # by: The PerlQt User Interface Compiler (puic)
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -1446,7 +1446,9 @@ sub NEW
layerTable->horizontalHeader()->setLabel(layerTable->numCols() - 1, trUtf8("Density [g/cm^3]")); layerTable->horizontalHeader()->setLabel(layerTable->numCols() - 1, trUtf8("Density [g/cm^3]"));
layerTable->setNumCols(layerTable->numCols() + 1); layerTable->setNumCols(layerTable->numCols() + 1);
layerTable->horizontalHeader()->setLabel(layerTable->numCols() - 1, trUtf8("Thickness [Å]")); layerTable->horizontalHeader()->setLabel(layerTable->numCols() - 1, trUtf8("Thickness [Å]"));
layerTable->setSizePolicy( Qt::SizePolicy(4, 4, 100, 100, layerTable->sizePolicy()->hasHeightForWidth()) ); layerTable->setNumRows(layerTable->numRows() + 1 );
layerTable->verticalHeader()->setLabel(layerTable->numRows() - 1, trUtf8("1"));
layerTable->setSizePolicy( Qt::SizePolicy(7, 7, 100, 100, layerTable->sizePolicy()->hasHeightForWidth()) );
layerTable->setMinimumSize( Qt::Size(410, 405) ); layerTable->setMinimumSize( Qt::Size(410, 405) );
layerTable->setAcceptDrops( 1 ); layerTable->setAcceptDrops( 1 );
layerTable->setResizePolicy( &Qt::Table::AutoOneFit() ); layerTable->setResizePolicy( &Qt::Table::AutoOneFit() );
@ -1900,6 +1902,7 @@ sub languageChange
layerTable->horizontalHeader()->setLabel( 0, trUtf8("Composition") ); layerTable->horizontalHeader()->setLabel( 0, trUtf8("Composition") );
layerTable->horizontalHeader()->setLabel( 1, trUtf8("Density [g/cm^3]") ); layerTable->horizontalHeader()->setLabel( 1, trUtf8("Density [g/cm^3]") );
layerTable->horizontalHeader()->setLabel( 2, trUtf8("Thickness [Å]") ); layerTable->horizontalHeader()->setLabel( 2, trUtf8("Thickness [Å]") );
layerTable->verticalHeader()->setLabel( 0, trUtf8("1") );
tabs->changeTab( LayersTab, trUtf8("Layers") ); tabs->changeTab( LayersTab, trUtf8("Layers") );
AddParam->setTitle( trUtf8("Additional parameters") ); AddParam->setTitle( trUtf8("Additional parameters") );
textLabelEF->setText( trUtf8("EF") ); textLabelEF->setText( trUtf8("EF") );
@ -2530,7 +2533,11 @@ sub StartSequenceOne
my $ScanAttrib = child($ScanName); my $ScanAttrib = child($ScanName);
my $iScan=0; my $iScan=0;
foreach (@SValues) { foreach (@SValues) {
if ($All{"dRadio"}) {
$ScanAttrib->setText($All{"ScandL"},2,$_);
} else {
$ScanAttrib->setText($_); $ScanAttrib->setText($_);
}
if ( $All{"SdzFlag"} == 1) { if ( $All{"SdzFlag"} == 1) {
if ($All{"ERadio"}==1) { if ($All{"ERadio"}==1) {
dz->setText($SdzValues[$iScan]); dz->setText($SdzValues[$iScan]);

21
trimsp/src/TrimSPGUI/TrimSPGUI.ui
View File

@ -676,24 +676,41 @@
<property name="text"> <property name="text">
<string>Composition</string> <string>Composition</string>
</property> </property>
<property name="pixmap">
<pixmap></pixmap>
</property>
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>Density [g/cm^3]</string> <string>Density [g/cm^3]</string>
</property> </property>
<property name="pixmap">
<pixmap></pixmap>
</property>
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>Thickness [Å]</string> <string>Thickness [Å]</string>
</property> </property>
<property name="pixmap">
<pixmap></pixmap>
</property>
</column> </column>
<row>
<property name="text">
<string>1</string>
</property>
<property name="pixmap">
<pixmap></pixmap>
</property>
</row>
<property name="name"> <property name="name">
<cstring>layerTable</cstring> <cstring>layerTable</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
<hsizetype>4</hsizetype> <hsizetype>7</hsizetype>
<vsizetype>4</vsizetype> <vsizetype>7</vsizetype>
<horstretch>100</horstretch> <horstretch>100</horstretch>
<verstretch>100</verstretch> <verstretch>100</verstretch>
</sizepolicy> </sizepolicy>

4
trimsp/src/TrimSPGUI/TrimSPGUI.ui.h
View File

@ -530,7 +530,11 @@ void TrimSPGUI::StartSequenceOne()
my $ScanAttrib = child($ScanName); my $ScanAttrib = child($ScanName);
my $iScan=0; my $iScan=0;
foreach (@SValues) { foreach (@SValues) {
if ($All{"dRadio"}) {
$ScanAttrib->setText($All{"ScandL"},2,$_);
} else {
$ScanAttrib->setText($_); $ScanAttrib->setText($_);
}
if ( $All{"SdzFlag"} == 1) { if ( $All{"SdzFlag"} == 1) {
if ($All{"ERadio"}==1) { if ($All{"ERadio"}==1) {
dz->setText($SdzValues[$iScan]); dz->setText($SdzValues[$iScan]);