diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl
index f5b8456d..7aa901f9 100755
--- a/src/external/MuSRFitGUI/MuSRFit.pl
+++ b/src/external/MuSRFitGUI/MuSRFit.pl
@@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'MuSRFit.ui'
#
-# Created: Thu Sep 17 14:43:44 2009
+# Created: Thu Sep 17 23:18:50 2009
# by: The PerlQt User Interface Compiler (puic)
#
# WARNING! All changes made in this file will be lost!
@@ -584,7 +584,7 @@ sub NEW
setName("MuSRFitform" );
}
setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) );
- setMinimumSize(Qt::Size(21, 251) );
+ setMinimumSize(Qt::Size(23, 246) );
setIcon($image0 );
setCentralWidget(Qt::Widget(this, "qt_central_widget"));
@@ -998,7 +998,7 @@ sub NEW
PlotOptions->setAlignment( int(&Qt::ButtonGroup::AlignTop) );
PlotOptions->setExclusive( 1 );
PlotOptions->setRadioButtonExclusive( 1 );
- PlotOptions->setProperty( "selectedId", Qt::Variant(int(2) ) );
+ PlotOptions->setProperty( "selectedId", Qt::Variant(int(-1) ) );
my $LayoutWidget_5 = Qt::Widget(PlotOptions, '$LayoutWidget_5');
$LayoutWidget_5->setGeometry( Qt::Rect(3, 18, 190, 94) );
@@ -1057,7 +1057,7 @@ sub NEW
ErrorCalc->setAlignment( int(&Qt::ButtonGroup::AlignTop | &Qt::ButtonGroup::AlignLeft) );
ErrorCalc->setExclusive( 1 );
ErrorCalc->setRadioButtonExclusive( 1 );
- ErrorCalc->setProperty( "selectedId", Qt::Variant(int(0) ) );
+ ErrorCalc->setProperty( "selectedId", Qt::Variant(int(1) ) );
MINOS = Qt::RadioButton(ErrorCalc, "MINOS");
MINOS->setGeometry( Qt::Rect(19, 59, 69, 22) );
@@ -1845,7 +1845,7 @@ sub languageChange
PlotOptions->setTitle( trUtf8("Options") );
textLabel1_4->setText( trUtf8("X Range") );
textLabel1_4_2->setText( trUtf8("Y Range") );
- ltc->setText( trUtf8("Life time cor.") );
+ ltc->setText( trUtf8("Life time correction") );
go->setText( trUtf8("Fit") );
PlotMSR->setText( trUtf8("Plot") );
ErrorCalc->setTitle( trUtf8("Error") );
@@ -2755,6 +2755,8 @@ sub RunSelectionToggle
sub fileBrowse
{
+ my $RunFiles=RunFiles->text();
+ print "Runs:$RunFiles\n";
my $files_ref=Qt::FileDialog::getOpenFileNames(
"Data files (*.root *.bin)",
"./",
@@ -2762,7 +2764,13 @@ sub fileBrowse
"open files dialog",
"Select one or more files to fit");
my @files = @$files_ref;
- my $RunFiles=join(",",@files);
+ if ($RunFiles eq "") {
+# We started with an empty list
+ $RunFiles=join(",",@files);
+ } else {
+# Add files to existing list
+ $RunFiles=join(",",$RunFiles,@files);
+ }
RunFiles->setText($RunFiles);
}
diff --git a/src/external/MuSRFitGUI/MuSRFit.ui b/src/external/MuSRFitGUI/MuSRFit.ui
index 8aaed86c..cabd228d 100755
--- a/src/external/MuSRFitGUI/MuSRFit.ui
+++ b/src/external/MuSRFitGUI/MuSRFit.ui
@@ -22,8 +22,8 @@
- 21
- 251
+ 23
+ 246
@@ -2168,7 +2168,7 @@
true
- 2
+ -1
@@ -2247,7 +2247,7 @@
ltc
- Life time cor.
+ Life time correction
true
@@ -2367,7 +2367,7 @@
true
- 0
+ 1
diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h
index f7c8f5a5..3979fcc8 100755
--- a/src/external/MuSRFitGUI/MuSRFit.ui.h
+++ b/src/external/MuSRFitGUI/MuSRFit.ui.h
@@ -741,6 +741,8 @@ void MuSRFitform::RunSelectionToggle()
void MuSRFitform::fileBrowse()
{
+ my $RunFiles=RunFiles->text();
+ print "Runs:$RunFiles\n";
my $files_ref=Qt::FileDialog::getOpenFileNames(
"Data files (*.root *.bin)",
"./",
@@ -748,7 +750,13 @@ void MuSRFitform::fileBrowse()
"open files dialog",
"Select one or more files to fit");
my @files = @$files_ref;
- my $RunFiles=join(",",@files);
+ if ($RunFiles eq "") {
+# We started with an empty list
+ $RunFiles=join(",",@files);
+ } else {
+# Add files to existing list
+ $RunFiles=join(",",$RunFiles,@files);
+ }
RunFiles->setText($RunFiles);
}
diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.pl b/src/external/MuSRFitGUI/devel/MuSRFit.pl
index d808142c..e771ca85 100755
--- a/src/external/MuSRFitGUI/devel/MuSRFit.pl
+++ b/src/external/MuSRFitGUI/devel/MuSRFit.pl
@@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'MuSRFit.ui'
#
-# Created: Thu Sep 17 17:13:26 2009
+# Created: Thu Sep 17 23:21:40 2009
# by: The PerlQt User Interface Compiler (puic)
#
# WARNING! All changes made in this file will be lost!
@@ -593,7 +593,7 @@ sub NEW
setName("MuSRFitform" );
}
setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) );
- setMinimumSize(Qt::Size(21, 251) );
+ setMinimumSize(Qt::Size(23, 246) );
setIcon($image0 );
setCentralWidget(Qt::Widget(this, "qt_central_widget"));
@@ -1996,7 +1996,7 @@ sub languageChange
PlotOptions->setTitle( trUtf8("Options") );
textLabel1_4->setText( trUtf8("X Range") );
textLabel1_4_2->setText( trUtf8("Y Range") );
- ltc->setText( trUtf8("Life time cor.") );
+ ltc->setText( trUtf8("Life time correction") );
go->setText( trUtf8("Fit") );
PlotMSR->setText( trUtf8("Plot") );
ErrorCalc->setTitle( trUtf8("Error") );
@@ -2916,6 +2916,8 @@ sub RunSelectionToggle
sub fileBrowse
{
+ my $RunFiles=RunFiles->text();
+ print "Runs:$RunFiles\n";
my $files_ref=Qt::FileDialog::getOpenFileNames(
"Data files (*.root *.bin)",
"./",
@@ -2923,7 +2925,13 @@ sub fileBrowse
"open files dialog",
"Select one or more files to fit");
my @files = @$files_ref;
- my $RunFiles=join(",",@files);
+ if ($RunFiles eq "") {
+# We started with an empty list
+ $RunFiles=join(",",@files);
+ } else {
+# Add files to existing list
+ $RunFiles=join(",",$RunFiles,@files);
+ }
RunFiles->setText($RunFiles);
}
diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui b/src/external/MuSRFitGUI/devel/MuSRFit.ui
index 25b297cf..fa6da379 100755
--- a/src/external/MuSRFitGUI/devel/MuSRFit.ui
+++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui
@@ -22,8 +22,8 @@
- 21
- 251
+ 23
+ 246
@@ -2247,7 +2247,7 @@
ltc
- Life time cor.
+ Life time correction
true
diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h
index 40693faf..49977c0a 100755
--- a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h
+++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h
@@ -746,6 +746,8 @@ void MuSRFitform::RunSelectionToggle()
void MuSRFitform::fileBrowse()
{
+ my $RunFiles=RunFiles->text();
+ print "Runs:$RunFiles\n";
my $files_ref=Qt::FileDialog::getOpenFileNames(
"Data files (*.root *.bin)",
"./",
@@ -753,7 +755,13 @@ void MuSRFitform::fileBrowse()
"open files dialog",
"Select one or more files to fit");
my @files = @$files_ref;
- my $RunFiles=join(",",@files);
+ if ($RunFiles eq "") {
+# We started with an empty list
+ $RunFiles=join(",",@files);
+ } else {
+# Add files to existing list
+ $RunFiles=join(",",$RunFiles,@files);
+ }
RunFiles->setText($RunFiles);
}