Moving forward with qt4..

trimsp/src/Chem.pm

@@ -11,7 +11,7 @@
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+#   along with TrimSPGUI. If not, see <http://www.gnu.org/licenses/>.
 #
 # Copyright 2009 by Zaher Salman and the LEM Group.
 

trimsp/src/TrimSPGUI/Chem.pm

@@ -0,0 +1 @@
+../Chem.pm

trimsp/src/TrimSPGUI4/Chem.pm

@@ -0,0 +1 @@
+../Chem.pm

trimsp/src/TrimSPGUI4/PQtNotes.txt

@@ -0,0 +1,5 @@
+- Change TrimSPGUI4.ui file using qt4-designer
+- Compile TrimSPGUI4.ui file to generate Ui_TrimSPGUI4.pm
+  puic4 TrimSPGUI4.ui -o Ui_TrimSPGUI4.pm
+- Edit Ui_TrimSPGUI4.pm to connect signal to slot is setupUi subroutine, e.g.
+  Qt::Object::connect($plotMeanAction, SIGNAL 'activated()' , $trimSPGUI4, SLOT 'PlotMean()' );

trimsp/src/TrimSPGUI4/TrimSP

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Copyright 2009-2013 by Zaher Salman and the LEM Group.
 
-export TRIMBIN=$HOME/bin/trimsp7l
+export TRIMBIN=$HOME/bin/trimspNL
-export PERLLIB=$HOME/LEM/simulation/trimsp/TrimSPGUI4
+export PERLLIB=$HOME/LEM/git/simulation/trimsp/src/TrimSPGUI4
-perl $PERLLIB/TrimSPGUI.pl
+perl $PERLLIB/TrimSP.pl

trimsp/src/TrimSPGUI4/TrimSPGUI4.pm

@@ -27,6 +27,7 @@ use QtCore4::slots
     ConfirmQuit => [],
     PlotProfiles => [],
     PlotFraction => [],
+    PlotMean => [],
     OpenFile => [],
     SaveFile => [],
     SaveFileAs => [];
@@ -199,15 +200,12 @@ sub CollectValues()
     $All{"numLayer"}=this->{ui}->numLayer->value();
 # Collect layers parameters
     for (my $i=1;$i<=$All{"numLayer"};$i++) {
-	my $LComp = "layer".$i."Comp";
+	my $LComp = "L".$i."Comp";
-	my $Lrho="layer".$i."rho";
+	my $Lrho="L".$i."rho";
-	my $Ld="layer".$i."d";
+	my $Ld="L".$i."d";
-	my $LCompAttrib = child("Qt::LineEdit",$LComp);
+	$All{"$LComp"}=this->{ui}->layerTable->item($i-1,0)->text();
-	my $LrhoAttrib = child("Qt::LineEdit",$Lrho);
+	$All{"$Lrho"}=this->{ui}->layerTable->item($i-1,1)->text();
-	my $LdAttrib = child("Qt::LineEdit",$Ld);
+	$All{"$Ld"}=this->{ui}->layerTable->item($i-1,2)->text();
-	$All{"$LComp"}=$LCompAttrib->text();
-	$All{"$Lrho"}=$LrhoAttrib->text();
-	$All{"$Ld"}=$LdAttrib->text();
     }
 
 # Collect projectile parameters
@@ -297,28 +295,33 @@ sub CollectValues()
 # binary
 sub CreateInpFile()
 {
-#    use lib '$ENV{HOME}/Projects/TrimSPGUI/Chem';  
-#    push @INC, "$ENV{HOME}/Projects/TrimSPGUI";
     use Chem;
 # The proper way I think is not to have scan sequences implimented
-# here but rather call this multiple times to generate the scan. To
+# here but rather call this multiple times to generate the scan To
-# achieve this, the function CreateInpFile will expect a unique
+# resolve this, the function CreateInpFile will expect a unique
 # thickness for each layer, one energy value, one energy sigma and one
-# projectile number. These will be stored in keys layer1/2/3/4/5/6/7d,
+# projectile number.  These will be stored in keys L1/2/3/4/5/6/7d, E,
-# valEnergy, sigEnergy and numberProj, respectively.
+# SigE and NProj, respectively.
     
 # Chemical formulas will be parsed on the fly for each layer. However,
-# I will check if all the layers have inputs for composition,
+# we will check if all the layers have inputs for composition,
-# thickness and density. If not complain and stop :)
+# thickness and density. If not fail and crash :)
     
 # Values of Z,A as well as other needed parameters are obtained from
 # Chem.pm.
     
-# This is the form of the input file:
+# This is the form of the begining of the input file:
     my $TemplateFile=
 	    " ProjZ ProjAM valEnergy sigEnergy valAngle sigAngle parEF parESB parSHEATH parERC
- numberProj ranSeed ranSeed ranSeed z0 parRD dz parCA parKK0 parKK0R parKDEE1 parKDEE2 parIPOT parIPOTR parIRL
+ numberProj ranSeed ranSeed ranSeed z0 parRD dz parCA parKK0 parKK0R parKDEE1 parKDEE2 parIPOT parIPOTR parIRL";
- layer1d layer2d layer3d layer4d layer5d layer6d layer7d layer1rho layer2rho layer3rho layer4rho layer5rho layer6rho layer7rho L1CK L2CK L3CK L4CK L5CK L6CK L7CK
+ 
+# Then comes the number of layers (new format) for example 4 layers:
+#  N_Layers=4
+    $TemplateFile=$TemplateFile."\n"."N_Layers=numLayer"."\n";
+    			 
+# Then loop over the layers and for each give the following structure
+   my $TemplateLayer=
+ "L1d L1rho L1CK
  L1ELZ1 L1ELZ2 L1ELZ3 L1ELZ4 L1ELZ5
  L1ELW1 L1ELW2 L1ELW3 L1ELW4 L1ELW5
  L1ELC1 L1ELC2 L1ELC3 L1ELC4 L1ELC5
@@ -330,72 +333,6 @@ sub CreateInpFile()
  L1ELST13 L1ELST23 L1ELST33 L1ELST43 L1ELST53
  L1ELST14 L1ELST24 L1ELST34 L1ELST44 L1ELST54
  L1ELST15 L1ELST25 L1ELST35 L1ELST45 L1ELST55
- L2ELZ1 L2ELZ2 L2ELZ3 L2ELZ4 L2ELZ5
- L2ELW1 L2ELW2 L2ELW3 L2ELW4 L2ELW5
- L2ELC1 L2ELC2 L2ELC3 L2ELC4 L2ELC5
- L2ELE1 L2ELE2 L2ELE3 L2ELE4 L2ELE5
- L20301 L20302 L20303 L20304 L20305
-   0.0000   0.0000   0.0000   0.0000   0.0000
- L2ELST11 L2ELST21 L2ELST31 L2ELST41 L2ELST51
- L2ELST12 L2ELST22 L2ELST32 L2ELST42 L2ELST52
- L2ELST13 L2ELST23 L2ELST33 L2ELST43 L2ELST53
- L2ELST14 L2ELST24 L2ELST34 L2ELST44 L2ELST54
- L2ELST15 L2ELST25 L2ELST35 L2ELST45 L2ELST55
- L3ELZ1 L3ELZ2 L3ELZ3 L3ELZ4 L3ELZ5
- L3ELW1 L3ELW2 L3ELW3 L3ELW4 L3ELW5
- L3ELC1 L3ELC2 L3ELC3 L3ELC4 L3ELC5
- L3ELE1 L3ELE2 L3ELE3 L3ELE4 L3ELE5
- L30301 L30302 L30303 L30304 L30305
-   0.0000   0.0000   0.0000   0.0000   0.0000
- L3ELST11 L3ELST21 L3ELST31 L3ELST41 L3ELST51
- L3ELST12 L3ELST22 L3ELST32 L3ELST42 L3ELST52
- L3ELST13 L3ELST23 L3ELST33 L3ELST43 L3ELST53
- L3ELST14 L3ELST24 L3ELST34 L3ELST44 L3ELST54
- L3ELST15 L3ELST25 L3ELST35 L3ELST45 L3ELST55
- L4ELZ1 L4ELZ2 L4ELZ3 L4ELZ4 L4ELZ5
- L4ELW1 L4ELW2 L4ELW3 L4ELW4 L4ELW5
- L4ELC1 L4ELC2 L4ELC3 L4ELC4 L4ELC5
- L4ELE1 L4ELE2 L4ELE3 L4ELE4 L4ELE5
- L40301 L40302 L40303 L40304 L40305
-   0.0000   0.0000   0.0000   0.0000   0.0000
- L4ELST11 L4ELST21 L4ELST31 L4ELST41 L4ELST51
- L4ELST12 L4ELST22 L4ELST32 L4ELST42 L4ELST52
- L4ELST13 L4ELST23 L4ELST33 L4ELST43 L4ELST53
- L4ELST14 L4ELST24 L4ELST34 L4ELST44 L4ELST54
- L4ELST15 L4ELST25 L4ELST35 L4ELST45 L4ELST55
- L5ELZ1 L5ELZ2 L5ELZ3 L5ELZ4 L5ELZ5
- L5ELW1 L5ELW2 L5ELW3 L5ELW4 L5ELW5
- L5ELC1 L5ELC2 L5ELC3 L5ELC4 L5ELC5
- L5ELE1 L5ELE2 L5ELE3 L5ELE4 L5ELE5
- L50301 L50302 L50303 L50304 L50305
-   0.0000   0.0000   0.0000   0.0000   0.0000
- L5ELST11 L5ELST21 L5ELST31 L5ELST41 L5ELST51
- L5ELST12 L5ELST22 L5ELST32 L5ELST42 L5ELST52
- L5ELST13 L5ELST23 L5ELST33 L5ELST43 L5ELST53
- L5ELST14 L5ELST24 L5ELST34 L5ELST44 L5ELST54
- L5ELST15 L5ELST25 L5ELST35 L5ELST45 L5ELST55
- L6ELZ1 L6ELZ2 L6ELZ3 L6ELZ4 L6ELZ5
- L6ELW1 L6ELW2 L6ELW3 L6ELW4 L6ELW5
- L6ELC1 L6ELC2 L6ELC3 L6ELC4 L6ELC5
- L6ELE1 L6ELE2 L6ELE3 L6ELE4 L6ELE5
- L60301 L60302 L60303 L60304 L60305
-   0.0000   0.0000   0.0000   0.0000   0.0000
- L6ELST11 L6ELST21 L6ELST31 L6ELST41 L6ELST51
- L6ELST12 L6ELST22 L6ELST32 L6ELST42 L6ELST52
- L6ELST13 L6ELST23 L6ELST33 L6ELST43 L6ELST53
- L6ELST14 L6ELST24 L6ELST34 L6ELST44 L6ELST54
- L6ELST15 L6ELST25 L6ELST35 L6ELST45 L6ELST55
- L7ELZ1 L7ELZ2 L7ELZ3 L7ELZ4 L7ELZ5
- L7ELW1 L7ELW2 L7ELW3 L7ELW4 L7ELW5
- L7ELC1 L7ELC2 L7ELC3 L7ELC4 L7ELC5
- L7ELE1 L7ELE2 L7ELE3 L7ELE4 L7ELE5
- L70301 L70302 L70303 L70304 L70305
-   0.0000   0.0000   0.0000   0.0000   0.0000
- L7ELST11 L7ELST21 L7ELST31 L7ELST41 L7ELST51
- L7ELST12 L7ELST22 L7ELST32 L7ELST42 L7ELST52
- L7ELST13 L7ELST23 L7ELST33 L7ELST43 L7ELST53
- L7ELST14 L7ELST24 L7ELST34 L7ELST44 L7ELST54
- L7ELST15 L7ELST25 L7ELST35 L7ELST45 L7ELST55
  ";
 
 # Get values from form
@@ -406,32 +343,36 @@ sub CreateInpFile()
 
 # This is the flag for checking layers    
     my $Check=0;
+    my $Layer="";
+    my $Li="";
 # Loop over layers an create appropriate values
-    for (my $i=1;$i<=7;$i++){
+    for (my $i=1;$i<=$All{"numLayer"};$i++){
+	$Li = "L".$i;
+	$Layer = $TemplateLayer;
+	$Layer =~ s/L1/$Li/g;
+	$TemplateFile=$TemplateFile.$Layer;
 	$Check=0;
 # Composition of layers	
-	my $LComp="layer".$i."Comp";
+	my $LComp="L".$i."Comp";
-	my $LCompAttrib = child("Qt::LineEdit",$LComp);
+	my $Comp = this->{ui}->layerTable->item($i-1,0)->text();
-	my $Comp =  $LCompAttrib->text();
+	$All{$LComp} = $Comp;
 	my %LElComp=Chem::parse_formula($Comp);
 	if ($Comp eq "") {$Check++;}
 	
 # Densities of layers
-	my $Lrho="layer".$i."rho";
+	my $Lrho="L".$i."rho";
-	my $LrhoAttrib = child("Qt::LineEdit",$Lrho);
+	my $rho = this->{ui}->layerTable->item($i-1,1)->text();
-	my $rho = 1*$LrhoAttrib->text();
 	$All{$Lrho}=sprintf("%6.2f",$rho);
 	if ($rho eq "") {$Check++;}
 	
 # Thickness of layers
-	my $Ld ="layer".$i."d";
+	my $Ld ="L".$i."d";
-	my $LdAttrib = child("Qt::LineEdit",$Ld);
+	my $d = this->{ui}->layerTable->item($i-1,2)->text();
-	my $d = $LdAttrib->text();
 	$All{$Ld}=sprintf("%8.2f",$d);
 	if ($d eq "") {$Check++;}
 	
 # Sanity check, is the layer supposed to have value? are they all there?
-	if ($Check!=0 & $i<=$All{"numLayer"}) {
+	if ($Check!=0) {
 	    my $ErrMsg="Error: Layer $i is empty. Expecting it to be defined!\n";
 	    print STDERR $ErrMsg;
 	    my $HelpWindow = Qt::MessageBox::information( this, "Error!",$ErrMsg);
@@ -447,9 +388,6 @@ sub CreateInpFile()
 	}
 	if ($Sum==0) {$Sum=1;}
 		
-#	print STDOUT "Layer: ".$i."\n";
-#	print STDOUT "Composition: ".$Comp."\n";
-	
 	my @Els = keys %LElComp;
 	
 	for (my $NEl=1;$NEl<=5;$NEl++) {
@@ -461,7 +399,7 @@ sub CreateInpFile()
 	    my $ElE = Chem::Elastof($El);
 	    my $El030 = 30;
 	    if ($El eq "") { $El030 = 0.0;}
-#	    print STDOUT "$El, ElC=$ElC ElZ=$ElZ ElW=$ElW ElE=$ElE\n";
+	    
 	    $All{$LEkey."Z".$NEl}=sprintf("%8.4f",$ElZ);
 	    $All{$LEkey."W".$NEl}=sprintf("%8.4f",$ElW);
 	    $All{$LEkey."C".$NEl}=sprintf("%8.4f",$ElC);
@@ -592,7 +530,7 @@ sub StartSequenceOne()
 	my $iScan=0;
 	foreach (@SValues) {
 	    if ($All{"comboScan"}==5) {
-		layerTable->setText($All{"ScandL"}-1,2,$_);	
+		this->{ui}->layerTable->setText($All{"ScandL"}-1,2,$_);	
 	    } else {
 		$ScanAttrib->setText($_);
 	    }
@@ -609,8 +547,6 @@ sub StartSequenceOne()
 	    open (INPF,q{>}, "$FILENAME.inp" );
 	    print INPF $eingabe1;
 	    close(INPF);
-# Use windoz version	    
-#	    system("cp $FILENAME.inp eingabe1.inp; wine TrimSP7L.exe");
 # Use Linux version	    
 	    $Progress=$Progress+90/$#SValues;
 	    this->{ui}->progress->setValue($Progress);
@@ -637,8 +573,6 @@ sub StartSequenceOne()
 	$Progress=20;
 	this->{ui}->progress->setValue($Progress);
 	
-# Use windoz version	    
-#              system("cp $FILENAME.inp eingabe1.inp; wine TrimSP7L.exe");
 # Use Linux version
 	$cmd = "cp $FILENAME.inp eingabe1.inp; ".$ENV{'TRIMBIN'};
 	system($cmd);
@@ -938,6 +872,27 @@ sub PlotFraction()
 
 }
 
+# Subroutine: Plot mean depth and straggeling 
+# a root macro
+sub PlotMean()
+{
+    my $Path=this->{ui}->workPath->text();
+    my $file=Qt::FileDialog::getOpenFileName(
+	this,
+	"Choose a sequence data file",
+	$Path,
+	"Implantation sequence file (*.dat)");
+        
+    if ($file ne "" ) {
+	my $TrimPath = $ENV{'PERLLIB'};	
+# Now that we have the file name send it to root macro for plotting.
+	my $cmd='root -n -l "'.$TrimPath.'/plotMean.C(\"'.$file.'\")"&';
+
+	my $pid=system($cmd);	
+    }
+
+}
+
 # Subroutine: Help window contents
 sub helpContentsAction()
 {

trimsp/src/TrimSPGUI4/TrimSPGUI4.ui

@@ -365,10 +365,6 @@
               </sizepolicy>
              </property>
             </widget>
-            <zorder>layer4Comp</zorder>
-            <zorder>layer4rho</zorder>
-            <zorder>layer4d</zorder>
-            <zorder>layer1Comp</zorder>
            </widget>
           </item>
           <item>
@@ -1859,7 +1855,7 @@
      <x>0</x>
      <y>0</y>
      <width>722</width>
-     <height>19</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="File">
@@ -1881,6 +1877,7 @@
     </property>
     <addaction name="plotProfilesAction"/>
     <addaction name="plotFractionsAction"/>
+    <addaction name="plotMeanAction"/>
    </widget>
    <widget class="QMenu" name="helpMenu">
     <property name="title">
@@ -2031,6 +2028,14 @@
     <string>Ctrl+O</string>
    </property>
   </action>
+  <action name="plotMeanAction">
+   <property name="text">
+    <string>Plot Mean/Stragg.</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+P, Ctrl+M</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>