From e485eb91a9e9b36d67e121af1fee6bc6995e15e1 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Fri, 9 Oct 2009 21:57:15 +0000 Subject: [PATCH] More work on functions block --- src/external/MuSRFitGUI/devel/MuSRFit.pl | 8 ++++---- src/external/MuSRFitGUI/devel/MuSRFit.ui | 4 ++-- src/external/MuSRFitGUI/devel/MuSRFit.ui.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.pl b/src/external/MuSRFitGUI/devel/MuSRFit.pl index 2641c5e5..856d3ede 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: Fri Oct 9 17:49:00 2009 +# Created: Fri Oct 9 23:56:08 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -1578,7 +1578,7 @@ sub NEW setName("MuSRFitform" ); } setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) ); - setMinimumSize(Qt::Size(21, 275) ); + setMinimumSize(Qt::Size(23, 270) ); setIcon($image0 ); setCentralWidget(Qt::Widget(this, "qt_central_widget")); @@ -3932,7 +3932,7 @@ sub fileBrowse sub AppendToFunctions { - my $ParName=CParamsCombo->currentItem; + my $ParName=CParamsCombo->currentText(); my $Full_T_Block=TheoryBlock->text; my $Constraint=ConstraintLine->text; # Then clear the text @@ -3943,7 +3943,7 @@ sub AppendToFunctions my $ConstLine="fun$i = $Constraint\n"; FunctionsBlock->append($ConstLine); -# Replace parameter in theory block with fun$1 +# Replace parameter in theory block with fun$i $Full_T_Block=~ s/$ParName/fun$i/; TheoryBlock->setText($Full_T_Block); diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui b/src/external/MuSRFitGUI/devel/MuSRFit.ui index 7e185d88..8268a021 100755 --- a/src/external/MuSRFitGUI/devel/MuSRFit.ui +++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui @@ -22,8 +22,8 @@ - 21 - 275 + 23 + 270 diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h index 5bf406ba..da905e05 100755 --- a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h @@ -806,7 +806,7 @@ void MuSRFitform::fileBrowse() void MuSRFitform::AppendToFunctions() { - my $ParName=CParamsCombo->currentItem; + my $ParName=CParamsCombo->currentText(); my $Full_T_Block=TheoryBlock->text; my $Constraint=ConstraintLine->text; # Then clear the text