From 6fbaa00048b6936f306cf392f26c65d7e96959bb Mon Sep 17 00:00:00 2001
From: Zaher Salman <zaher.salman@psi.ch>
Date: Mon, 23 Feb 2015 11:27:19 +0100
Subject: [PATCH] Connected plot functionality after reshuffeling of files.

---
 trimsp/src/TrimSPGUI4/TrimSPGUI4.pm    |  6 ++--
 trimsp/src/TrimSPGUI4/TrimSPGUI4.ui    | 42 ++++++++++++++++++++++++--
 trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm |  7 +++--
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/trimsp/src/TrimSPGUI4/TrimSPGUI4.pm b/trimsp/src/TrimSPGUI4/TrimSPGUI4.pm
index 07bb2e8..a0377ed 100644
--- a/trimsp/src/TrimSPGUI4/TrimSPGUI4.pm
+++ b/trimsp/src/TrimSPGUI4/TrimSPGUI4.pm
@@ -838,7 +838,7 @@ sub PlotProfiles()
     if ($filenames ne "" ) {
 	my $TrimPath = $ENV{'PERLLIB'};	
 # Now that we have the file list send it to root macro for plotting.
-	my $cmd='root -n -l "'.$TrimPath.'/plotRge.C(\"'.$filenames.'\")"&';
+	my $cmd='root -n -l "'.$TrimPath.'/../plotRge.C(\"'.$filenames.'\")"&';
 	my $pid=system($cmd);	
     }
 }
@@ -857,7 +857,7 @@ sub PlotFraction()
     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.'/plotFrc.C(\"'.$file.'\")"&';
+	my $cmd='root -n -l "'.$TrimPath.'/../plotFrc.C(\"'.$file.'\")"&';
 
 	my $pid=system($cmd);	
     }
@@ -878,7 +878,7 @@ sub PlotMean()
     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 $cmd='root -n -l "'.$TrimPath.'/../plotMean.C(\"'.$file.'\")"&';
 
 	my $pid=system($cmd);	
     }
diff --git a/trimsp/src/TrimSPGUI4/TrimSPGUI4.ui b/trimsp/src/TrimSPGUI4/TrimSPGUI4.ui
index 4a411a3..9e06119 100644
--- a/trimsp/src/TrimSPGUI4/TrimSPGUI4.ui
+++ b/trimsp/src/TrimSPGUI4/TrimSPGUI4.ui
@@ -1671,7 +1671,10 @@
   </action>
   <action name="plotMeanAction">
    <property name="text">
-    <string>Plot Mean/Stragg.</string>
+    <string>Plot Mean</string>
+   </property>
+   <property name="toolTip">
+    <string>Plot Mean/Straggling</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+P, Ctrl+M</string>
@@ -1743,8 +1746,8 @@
    <slot>DirectoryBrowse()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>689</x>
-     <y>427</y>
+     <x>686</x>
+     <y>425</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -2104,6 +2107,38 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>plotMeanAction</sender>
+   <signal>activated()</signal>
+   <receiver>TrimSPGUI4</receiver>
+   <slot>PlotMean()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>360</x>
+     <y>310</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>numLayer</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>TrimSPGUI4</receiver>
+   <slot>PrepLayers()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>182</x>
+     <y>94</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>720</x>
+     <y>358</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>DirectoryBrowse()</slot>
@@ -2125,6 +2160,7 @@
   <slot>TrimBin()</slot>
   <slot>GUIPath()</slot>
   <slot>findDensity()</slot>
+  <slot>PlotMean()</slot>
  </slots>
  <buttongroups>
   <buttongroup name="listGroup"/>
diff --git a/trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm b/trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm
index 54bbf61..c6a9a0e 100644
--- a/trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm
+++ b/trimsp/src/TrimSPGUI4/Ui_TrimSPGUI4.pm
@@ -5,7 +5,7 @@
 #################################################################################
 ## Form generated from reading UI file 'TrimSPGUI4.ui'
 ##
-## Created: Fri Feb 20 18:27:08 2015
+## Created: Mon Feb 23 11:19:21 2015
 ##      by: Qt User Interface Compiler version 4.8.6
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -1308,6 +1308,8 @@ sub setupUi {
     Qt::Object::connect($guiPathBrowse, SIGNAL 'clicked()' , $trimSPGUI4, SLOT 'GUIPath()' );
     Qt::Object::connect($numLayer, SIGNAL 'valueChanged(int)' , $trimSPGUI4, SLOT 'PrepLayers()' );
     Qt::Object::connect($layerTable, SIGNAL 'cellChanged(int,int)' , $trimSPGUI4, SLOT 'findDensity()' );
+    Qt::Object::connect($plotMeanAction, SIGNAL 'activated()' , $trimSPGUI4, SLOT 'PlotMean()' );
+    Qt::Object::connect($numLayer, SIGNAL 'valueChanged(int)' , $trimSPGUI4, SLOT 'PrepLayers()' );
 
     $tabs->setCurrentIndex( 0 );
 
@@ -1354,7 +1356,8 @@ sub retranslateUi {
     $self->{fileOpenAction}->setText( Qt::Application::translate( 'TrimSPGUI4', "&Open...", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{fileOpenAction}->setIconText( Qt::Application::translate( 'TrimSPGUI4', "Open", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{fileOpenAction}->setShortcut( Qt::KeySequence( Qt::Application::translate( 'TrimSPGUI4', "Ctrl+O", undef, Qt::Application::UnicodeUTF8() ) ) );
-    $self->{plotMeanAction}->setText( Qt::Application::translate( 'TrimSPGUI4', "Plot Mean/Stragg.", undef, Qt::Application::UnicodeUTF8() ) );
+    $self->{plotMeanAction}->setText( Qt::Application::translate( 'TrimSPGUI4', "Plot Mean", undef, Qt::Application::UnicodeUTF8() ) );
+    $self->{plotMeanAction}->setToolTip( Qt::Application::translate( 'TrimSPGUI4', "Plot Mean/Straggling", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{plotMeanAction}->setShortcut( Qt::KeySequence( Qt::Application::translate( 'TrimSPGUI4', "Ctrl+P, Ctrl+M", undef, Qt::Application::UnicodeUTF8() ) ) );
     $self->{groupLayer}->setTitle( Qt::Application::translate( 'TrimSPGUI4', "Layers", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{textLabel1_4}->setText( Qt::Application::translate( 'TrimSPGUI4', "Number of Layers", undef, Qt::Application::UnicodeUTF8() ) );