From b7565ad63584e516bfcef8f3606d80ab826adfd6 Mon Sep 17 00:00:00 2001
From: Zaher Salman <zaher.salman@psi.ch>
Date: Thu, 16 May 2013 10:00:16 +0000
Subject: [PATCH] Bug fix in layer thickness scans.

---
 trimsp/src/TrimSPGUI/TrimSPGUI.pl   | 13 ++++++++++---
 trimsp/src/TrimSPGUI/TrimSPGUI.ui   | 21 +++++++++++++++++++--
 trimsp/src/TrimSPGUI/TrimSPGUI.ui.h |  6 +++++-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/trimsp/src/TrimSPGUI/TrimSPGUI.pl b/trimsp/src/TrimSPGUI/TrimSPGUI.pl
index 93c4c86..007260f 100644
--- a/trimsp/src/TrimSPGUI/TrimSPGUI.pl
+++ b/trimsp/src/TrimSPGUI/TrimSPGUI.pl
@@ -1,6 +1,6 @@
 # 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)
 #
 # 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->setNumCols(layerTable->numCols() + 1);
     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->setAcceptDrops( 1 );
     layerTable->setResizePolicy( &Qt::Table::AutoOneFit() );
@@ -1900,6 +1902,7 @@ sub languageChange
     layerTable->horizontalHeader()->setLabel( 0, trUtf8("Composition") );
     layerTable->horizontalHeader()->setLabel( 1, trUtf8("Density [g/cm^3]") );
     layerTable->horizontalHeader()->setLabel( 2, trUtf8("Thickness [Å]") );
+    layerTable->verticalHeader()->setLabel( 0, trUtf8("1") );
     tabs->changeTab( LayersTab, trUtf8("Layers") );
     AddParam->setTitle( trUtf8("Additional parameters") );
     textLabelEF->setText( trUtf8("EF") );
@@ -2530,7 +2533,11 @@ sub StartSequenceOne
 	my $ScanAttrib = child($ScanName);
 	my $iScan=0;
 	foreach (@SValues) {
-	    $ScanAttrib->setText($_);
+	    if ($All{"dRadio"}) {
+		$ScanAttrib->setText($All{"ScandL"},2,$_);	
+	    } else {
+		$ScanAttrib->setText($_);
+	    }
 	    if ( $All{"SdzFlag"} == 1) {
 		if ($All{"ERadio"}==1) {
 		    dz->setText($SdzValues[$iScan]);
diff --git a/trimsp/src/TrimSPGUI/TrimSPGUI.ui b/trimsp/src/TrimSPGUI/TrimSPGUI.ui
index 973a26c..ec62163 100644
--- a/trimsp/src/TrimSPGUI/TrimSPGUI.ui
+++ b/trimsp/src/TrimSPGUI/TrimSPGUI.ui
@@ -676,24 +676,41 @@
                                 <property name="text">
                                     <string>Composition</string>
                                 </property>
+                                <property name="pixmap">
+                                    <pixmap></pixmap>
+                                </property>
                             </column>
                             <column>
                                 <property name="text">
                                     <string>Density [g/cm^3]</string>
                                 </property>
+                                <property name="pixmap">
+                                    <pixmap></pixmap>
+                                </property>
                             </column>
                             <column>
                                 <property name="text">
                                     <string>Thickness [Å]</string>
                                 </property>
+                                <property name="pixmap">
+                                    <pixmap></pixmap>
+                                </property>
                             </column>
+                            <row>
+                                <property name="text">
+                                    <string>1</string>
+                                </property>
+                                <property name="pixmap">
+                                    <pixmap></pixmap>
+                                </property>
+                            </row>
                             <property name="name">
                                 <cstring>layerTable</cstring>
                             </property>
                             <property name="sizePolicy">
                                 <sizepolicy>
-                                    <hsizetype>4</hsizetype>
-                                    <vsizetype>4</vsizetype>
+                                    <hsizetype>7</hsizetype>
+                                    <vsizetype>7</vsizetype>
                                     <horstretch>100</horstretch>
                                     <verstretch>100</verstretch>
                                 </sizepolicy>
diff --git a/trimsp/src/TrimSPGUI/TrimSPGUI.ui.h b/trimsp/src/TrimSPGUI/TrimSPGUI.ui.h
index 3da09a2..2a5d561 100644
--- a/trimsp/src/TrimSPGUI/TrimSPGUI.ui.h
+++ b/trimsp/src/TrimSPGUI/TrimSPGUI.ui.h
@@ -530,7 +530,11 @@ void TrimSPGUI::StartSequenceOne()
 	my $ScanAttrib = child($ScanName);
 	my $iScan=0;
 	foreach (@SValues) {
-	    $ScanAttrib->setText($_);
+	    if ($All{"dRadio"}) {
+		$ScanAttrib->setText($All{"ScandL"},2,$_);	
+	    } else {
+		$ScanAttrib->setText($_);
+	    }
 	    if ( $All{"SdzFlag"} == 1) {
 		if ($All{"ERadio"}==1) {
 		    dz->setText($SdzValues[$iScan]);