diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm index 5e7b7f78..0eabd3b7 100755 --- a/src/external/MuSRFitGUI/MSR.pm +++ b/src/external/MuSRFitGUI/MSR.pm @@ -1147,6 +1147,7 @@ sub PrepParamTable { $Param=$Param."_".$iRun; # Check if this parameter has been initialized befor. If not take from defaults $value = $All{"$Param"}; + print "$Param=$value\n"; if ( $value ne "" ) { $error = $All{"$erradd$Param"}; $minvalue = $All{"$Param$minadd"}; @@ -1155,6 +1156,7 @@ sub PrepParamTable { # I need this although it is already in the MSR.pm module, just for this table # We can remove it from the MSR module later... # Or keep in the MSR as function ?? + print "I am here. Why?\n"; $value = $Defaults{$Param_ORG}; $error = $Defaults{ join( "", $erradd, $Param_ORG ) }; $minvalue = $Defaults{ join("", $Param_ORG, $minadd ) }; diff --git a/src/external/MuSRFitGUI/MuSRFit.pl b/src/external/MuSRFitGUI/MuSRFit.pl index de53157f..a2241bef 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: Sun Sep 6 15:38:11 2009 +# Created: Mon Sep 7 11:44:59 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -569,7 +569,7 @@ sub NEW setName("MuSRFitform" ); } setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) ); - setMinimumSize(Qt::Size(23, 222) ); + setMinimumSize(Qt::Size(21, 227) ); setIcon($image0 ); setCentralWidget(Qt::Widget(this, "qt_central_widget")); @@ -2447,7 +2447,7 @@ sub InitializeTab # Fill the table with labels and values of parametr for (my $PCount=0;$PCount<$NParam;$PCount++) { my ($Param,$value,$error,$minvalue,$maxvalue,$RUN) = split(/,/,$PTable{$PCount}); - InitParamTable->verticalHeader()->setLabel( $PCount,"$RUN: $Param"); + InitParamTable->verticalHeader()->setLabel( $PCount,"$Param"); # InitParamTable->verticalHeader()->setLabel( $PCount,"$Param"); InitParamTable->showRow($PCount); InitParamTable->setText($PCount,0,$value); diff --git a/src/external/MuSRFitGUI/MuSRFit.ui b/src/external/MuSRFitGUI/MuSRFit.ui index d9ca54d5..c5054eaa 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui +++ b/src/external/MuSRFitGUI/MuSRFit.ui @@ -22,8 +22,8 @@ - 23 - 222 + 21 + 227 @@ -2855,33 +2855,21 @@ Value - - - Error - - - Min - - - Max - - - InitParamTable diff --git a/src/external/MuSRFitGUI/MuSRFit.ui.h b/src/external/MuSRFitGUI/MuSRFit.ui.h index 6196a2ef..2e4ff0c6 100755 --- a/src/external/MuSRFitGUI/MuSRFit.ui.h +++ b/src/external/MuSRFitGUI/MuSRFit.ui.h @@ -546,8 +546,10 @@ void MuSRFitform::InitializeTab() # Fill the table with labels and values of parametr for (my $PCount=0;$PCount<$NParam;$PCount++) { my ($Param,$value,$error,$minvalue,$maxvalue,$RUN) = split(/,/,$PTable{$PCount}); - InitParamTable->verticalHeader()->setLabel( $PCount,"$RUN: $Param"); -# InitParamTable->verticalHeader()->setLabel( $PCount,"$Param"); +# If you use this then reading the parameters from the table is a problem +# You need to extract the correct parameter name from the row label +# InitParamTable->verticalHeader()->setLabel( $PCount,"$RUN: $Param"); + InitParamTable->verticalHeader()->setLabel( $PCount,"$Param"); InitParamTable->showRow($PCount); InitParamTable->setText($PCount,0,$value); InitParamTable->setText($PCount,1,$error);