Cleanup and tweeks

This commit is contained in:
salman 2009-09-23 16:28:56 +00:00
parent 497cc536d6
commit 41267b9fef
3 changed files with 973 additions and 884 deletions

View File

@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'MuSRFit.ui' # Form implementation generated from reading ui file 'MuSRFit.ui'
# #
# Created: Tue Sep 22 16:07:47 2009 # Created: Wed Sep 23 18:24:32 2009
# by: The PerlQt User Interface Compiler (puic) # by: The PerlQt User Interface Compiler (puic)
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -45,15 +45,6 @@ use Qt::slots
use Qt::attributes qw( use Qt::attributes qw(
musrfit_tabs musrfit_tabs
RUNSPage RUNSPage
RUNSAuto
YEARLabel
BeamLine
BeamLineLabel
YEAR
RunNumbers
RUNSMan
RunFiles
Browse
groupBox7 groupBox7
FitType2 FitType2
TfsLabel TfsLabel
@ -71,7 +62,16 @@ use Qt::attributes qw(
FitAsyType FitAsyType
LRBFLabel LRBFLabel
LRBF LRBF
TabPage RUNSAuto
YEARLabel
BeamLine
BeamLineLabel
YEAR
RunNumbers
RUNSMan
RunFiles
Browse
FittingPage
Minimization Minimization
textLabel1_4 textLabel1_4
Yf Yf
@ -84,7 +84,7 @@ use Qt::attributes qw(
Xf Xf
ltc ltc
FitTextOutput FitTextOutput
SharingPahe SharingPage
buttonGroupSharing buttonGroupSharing
SharingComp1 SharingComp1
ShParam_1_1 ShParam_1_1
@ -121,14 +121,14 @@ use Qt::attributes qw(
ShParam_3_9 ShParam_3_9
InitializationPage InitializationPage
InitParamTable InitParamTable
FittingPage MSRPage
groupTitle groupTitle
TITLELabel TITLELabel
TITLE TITLE
FILENAMELabel FILENAMELabel
FILENAME FILENAME
textMSROutput textMSROutput
TabPage_2 FourierPage
FUnitsLabel FUnitsLabel
FApodizationLabel FApodizationLabel
FPlotLabel FPlotLabel
@ -138,16 +138,16 @@ use Qt::attributes qw(
textLabel1 textLabel1
textLabel1_3 textLabel1_3
textLabel1_3_5 textLabel1_3_5
lineEdit28 FrqMin
textLabel1_3_2 textLabel1_3_2
textLabel1_3_6 textLabel1_3_6
textLabel1_2 textLabel1_2
textLabel1_3_3 textLabel1_3_3
textLabel1_3_7 textLabel1_3_7
lineEdit28_2 FrqMax
textLabel1_3_4 textLabel1_3_4
textLabel1_3_8 textLabel1_3_8
TabPage_3 T0Page
groupHist0 groupHist0
textLabel2 textLabel2
textLabel2_2_2_3 textLabel2_2_2_3
@ -180,9 +180,9 @@ use Qt::attributes qw(
Data24 Data24
MenuBar MenuBar
fileMenu fileMenu
Edit
Actions Actions
Parameters Parameters
Edit
Options Options
helpMenu helpMenu
FileToolBar FileToolBar
@ -212,6 +212,8 @@ use Qt::attributes qw(
Fit Fit
Plot Plot
T0 T0
optionsFourier
optionsT0
); );
@ -1581,59 +1583,10 @@ sub NEW
RUNSPage = Qt::Widget(musrfit_tabs, "RUNSPage"); RUNSPage = Qt::Widget(musrfit_tabs, "RUNSPage");
my $LayoutWidget = Qt::Widget(RUNSPage, '$LayoutWidget'); my $LayoutWidget = Qt::Widget(RUNSPage, '$LayoutWidget');
$LayoutWidget->setGeometry( Qt::Rect(3, 3, 545, 95) ); $LayoutWidget->setGeometry( Qt::Rect(3, 100, 545, 203) );
my $layout43 = Qt::VBoxLayout($LayoutWidget, 5, 6, '$layout43'); my $layout26 = Qt::VBoxLayout($LayoutWidget, 5, 6, '$layout26');
RUNSAuto = Qt::GroupBox($LayoutWidget, "RUNSAuto"); groupBox7 = Qt::GroupBox($LayoutWidget, "groupBox7");
RUNSAuto->setSizePolicy( Qt::SizePolicy(5, 7, 0, 0, RUNSAuto->sizePolicy()->hasHeightForWidth()) );
RUNSAuto->setMargin( int(5) );
YEARLabel = Qt::Label(RUNSAuto, "YEARLabel");
YEARLabel->setGeometry( Qt::Rect(361, 55, 55, 26) );
YEARLabel->setMinimumSize( Qt::Size(0, 20) );
BeamLine = Qt::ComboBox(0, RUNSAuto, "BeamLine");
BeamLine->setGeometry( Qt::Rect(232, 55, 100, 26) );
BeamLine->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, BeamLine->sizePolicy()->hasHeightForWidth()) );
BeamLine->setMinimumSize( Qt::Size(0, 20) );
BeamLineLabel = Qt::Label(RUNSAuto, "BeamLineLabel");
BeamLineLabel->setGeometry( Qt::Rect(127, 55, 99, 26) );
BeamLineLabel->setMinimumSize( Qt::Size(0, 20) );
YEAR = Qt::ComboBox(0, RUNSAuto, "YEAR");
YEAR->setGeometry( Qt::Rect(420, 55, 100, 26) );
YEAR->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, YEAR->sizePolicy()->hasHeightForWidth()) );
YEAR->setMinimumSize( Qt::Size(0, 20) );
RunNumbers = Qt::LineEdit(RUNSAuto, "RunNumbers");
RunNumbers->setGeometry( Qt::Rect(15, 25, 505, 26) );
RunNumbers->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, RunNumbers->sizePolicy()->hasHeightForWidth()) );
RunNumbers->setMinimumSize( Qt::Size(0, 23) );
$layout43->addWidget(RUNSAuto);
RUNSMan = Qt::GroupBox($LayoutWidget, "RUNSMan");
RUNSMan->setEnabled( 1 );
RUNSMan->setMargin( int(5) );
RunFiles = Qt::LineEdit(RUNSMan, "RunFiles");
RunFiles->setEnabled( 1 );
RunFiles->setGeometry( Qt::Rect(15, 25, 505, 26) );
RunFiles->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, RunFiles->sizePolicy()->hasHeightForWidth()) );
RunFiles->setMinimumSize( Qt::Size(0, 23) );
Browse = Qt::PushButton(RUNSMan, "Browse");
Browse->setEnabled( 1 );
Browse->setGeometry( Qt::Rect(420, 55, 100, 26) );
Browse->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, Browse->sizePolicy()->hasHeightForWidth()) );
Browse->setMinimumSize( Qt::Size(0, 20) );
$layout43->addWidget(RUNSMan);
my $LayoutWidget_2 = Qt::Widget(RUNSPage, '$LayoutWidget_2');
$LayoutWidget_2->setGeometry( Qt::Rect(3, 100, 545, 203) );
my $layout26 = Qt::VBoxLayout($LayoutWidget_2, 5, 6, '$layout26');
groupBox7 = Qt::GroupBox($LayoutWidget_2, "groupBox7");
my $pal = Qt::Palette(); my $pal = Qt::Palette();
my $cg = Qt::ColorGroup(); my $cg = Qt::ColorGroup();
$cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Foreground, &black);
@ -1695,21 +1648,21 @@ sub NEW
groupBox7->setMargin( int(0) ); groupBox7->setMargin( int(0) );
groupBox7->setAlignment( int(&Qt::GroupBox::AlignTop) ); groupBox7->setAlignment( int(&Qt::GroupBox::AlignTop) );
my $LayoutWidget_3 = Qt::Widget(groupBox7, '$LayoutWidget_3'); my $LayoutWidget_2 = Qt::Widget(groupBox7, '$LayoutWidget_2');
$LayoutWidget_3->setGeometry( Qt::Rect(8, 21, 520, 125) ); $LayoutWidget_2->setGeometry( Qt::Rect(8, 21, 520, 125) );
my $layout42 = Qt::GridLayout($LayoutWidget_3, 1, 1, 5, 6, '$layout42'); my $layout42 = Qt::GridLayout($LayoutWidget_2, 1, 1, 5, 6, '$layout42');
FitType2 = Qt::ComboBox(0, $LayoutWidget_3, "FitType2"); FitType2 = Qt::ComboBox(0, $LayoutWidget_2, "FitType2");
FitType2->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType2->sizePolicy()->hasHeightForWidth()) ); FitType2->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType2->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(FitType2, 1, 1); $layout42->addWidget(FitType2, 1, 1);
TfsLabel = Qt::Label($LayoutWidget_3, "TfsLabel"); TfsLabel = Qt::Label($LayoutWidget_2, "TfsLabel");
TfsLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, TfsLabel->sizePolicy()->hasHeightForWidth()) ); TfsLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, TfsLabel->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(TfsLabel, 2, 1); $layout42->addWidget(TfsLabel, 2, 1);
FitType1 = Qt::ComboBox(0, $LayoutWidget_3, "FitType1"); FitType1 = Qt::ComboBox(0, $LayoutWidget_2, "FitType1");
FitType1->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType1->sizePolicy()->hasHeightForWidth()) ); FitType1->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType1->sizePolicy()->hasHeightForWidth()) );
FitType1->setSizeLimit( int(20) ); FitType1->setSizeLimit( int(20) );
FitType1->setAutoCompletion( 0 ); FitType1->setAutoCompletion( 0 );
@ -1717,12 +1670,12 @@ sub NEW
$layout42->addWidget(FitType1, 1, 0); $layout42->addWidget(FitType1, 1, 0);
BINS = Qt::LineEdit($LayoutWidget_3, "BINS"); BINS = Qt::LineEdit($LayoutWidget_2, "BINS");
BINS->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, BINS->sizePolicy()->hasHeightForWidth()) ); BINS->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, BINS->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(BINS, 3, 2); $layout42->addWidget(BINS, 3, 2);
Comp3Label = Qt::Label($LayoutWidget_3, "Comp3Label"); Comp3Label = Qt::Label($LayoutWidget_2, "Comp3Label");
$cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Foreground, &black);
$cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249));
$cg->setColor(&Qt::ColorGroup::Light, &white); $cg->setColor(&Qt::ColorGroup::Light, &white);
@ -1778,17 +1731,17 @@ sub NEW
$layout42->addWidget(Comp3Label, 0, 2); $layout42->addWidget(Comp3Label, 0, 2);
Tis = Qt::LineEdit($LayoutWidget_3, "Tis"); Tis = Qt::LineEdit($LayoutWidget_2, "Tis");
Tis->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, Tis->sizePolicy()->hasHeightForWidth()) ); Tis->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, Tis->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(Tis, 3, 0); $layout42->addWidget(Tis, 3, 0);
Tfs = Qt::LineEdit($LayoutWidget_3, "Tfs"); Tfs = Qt::LineEdit($LayoutWidget_2, "Tfs");
Tfs->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, Tfs->sizePolicy()->hasHeightForWidth()) ); Tfs->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, Tfs->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(Tfs, 3, 1); $layout42->addWidget(Tfs, 3, 1);
Comp1Label = Qt::Label($LayoutWidget_3, "Comp1Label"); Comp1Label = Qt::Label($LayoutWidget_2, "Comp1Label");
$cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Foreground, &black);
$cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249));
$cg->setColor(&Qt::ColorGroup::Light, &white); $cg->setColor(&Qt::ColorGroup::Light, &white);
@ -1844,22 +1797,22 @@ sub NEW
$layout42->addWidget(Comp1Label, 0, 0); $layout42->addWidget(Comp1Label, 0, 0);
BINSLabel = Qt::Label($LayoutWidget_3, "BINSLabel"); BINSLabel = Qt::Label($LayoutWidget_2, "BINSLabel");
BINSLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, BINSLabel->sizePolicy()->hasHeightForWidth()) ); BINSLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, BINSLabel->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(BINSLabel, 2, 2); $layout42->addWidget(BINSLabel, 2, 2);
TisLabel = Qt::Label($LayoutWidget_3, "TisLabel"); TisLabel = Qt::Label($LayoutWidget_2, "TisLabel");
TisLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, TisLabel->sizePolicy()->hasHeightForWidth()) ); TisLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, TisLabel->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(TisLabel, 2, 0); $layout42->addWidget(TisLabel, 2, 0);
FitType3 = Qt::ComboBox(0, $LayoutWidget_3, "FitType3"); FitType3 = Qt::ComboBox(0, $LayoutWidget_2, "FitType3");
FitType3->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType3->sizePolicy()->hasHeightForWidth()) ); FitType3->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitType3->sizePolicy()->hasHeightForWidth()) );
$layout42->addWidget(FitType3, 1, 2); $layout42->addWidget(FitType3, 1, 2);
Comp2Label = Qt::Label($LayoutWidget_3, "Comp2Label"); Comp2Label = Qt::Label($LayoutWidget_2, "Comp2Label");
$cg->setColor(&Qt::ColorGroup::Foreground, &black); $cg->setColor(&Qt::ColorGroup::Foreground, &black);
$cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249)); $cg->setColor(&Qt::ColorGroup::Button, Qt::Color(230,240,249));
$cg->setColor(&Qt::ColorGroup::Light, &white); $cg->setColor(&Qt::ColorGroup::Light, &white);
@ -1918,27 +1871,76 @@ sub NEW
my $layout23 = Qt::HBoxLayout(undef, 0, 3, '$layout23'); my $layout23 = Qt::HBoxLayout(undef, 0, 3, '$layout23');
FitAsyTypeLabel = Qt::Label($LayoutWidget_2, "FitAsyTypeLabel"); FitAsyTypeLabel = Qt::Label($LayoutWidget, "FitAsyTypeLabel");
FitAsyTypeLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitAsyTypeLabel->sizePolicy()->hasHeightForWidth()) ); FitAsyTypeLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitAsyTypeLabel->sizePolicy()->hasHeightForWidth()) );
$layout23->addWidget(FitAsyTypeLabel); $layout23->addWidget(FitAsyTypeLabel);
FitAsyType = Qt::ComboBox(0, $LayoutWidget_2, "FitAsyType"); FitAsyType = Qt::ComboBox(0, $LayoutWidget, "FitAsyType");
FitAsyType->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitAsyType->sizePolicy()->hasHeightForWidth()) ); FitAsyType->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, FitAsyType->sizePolicy()->hasHeightForWidth()) );
$layout23->addWidget(FitAsyType); $layout23->addWidget(FitAsyType);
LRBFLabel = Qt::Label($LayoutWidget_2, "LRBFLabel"); LRBFLabel = Qt::Label($LayoutWidget, "LRBFLabel");
LRBFLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, LRBFLabel->sizePolicy()->hasHeightForWidth()) ); LRBFLabel->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, LRBFLabel->sizePolicy()->hasHeightForWidth()) );
$layout23->addWidget(LRBFLabel); $layout23->addWidget(LRBFLabel);
LRBF = Qt::LineEdit($LayoutWidget_2, "LRBF"); LRBF = Qt::LineEdit($LayoutWidget, "LRBF");
LRBF->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, LRBF->sizePolicy()->hasHeightForWidth()) ); LRBF->setSizePolicy( Qt::SizePolicy(5, 0, 0, 0, LRBF->sizePolicy()->hasHeightForWidth()) );
$layout23->addWidget(LRBF); $layout23->addWidget(LRBF);
$layout26->addLayout($layout23); $layout26->addLayout($layout23);
my $LayoutWidget_3 = Qt::Widget(RUNSPage, '$LayoutWidget_3');
$LayoutWidget_3->setGeometry( Qt::Rect(3, 3, 545, 95) );
my $layout43 = Qt::VBoxLayout($LayoutWidget_3, 5, 6, '$layout43');
RUNSAuto = Qt::GroupBox($LayoutWidget_3, "RUNSAuto");
RUNSAuto->setSizePolicy( Qt::SizePolicy(5, 7, 0, 0, RUNSAuto->sizePolicy()->hasHeightForWidth()) );
RUNSAuto->setMargin( int(5) );
YEARLabel = Qt::Label(RUNSAuto, "YEARLabel");
YEARLabel->setGeometry( Qt::Rect(361, 55, 55, 26) );
YEARLabel->setMinimumSize( Qt::Size(0, 20) );
BeamLine = Qt::ComboBox(0, RUNSAuto, "BeamLine");
BeamLine->setGeometry( Qt::Rect(232, 55, 100, 26) );
BeamLine->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, BeamLine->sizePolicy()->hasHeightForWidth()) );
BeamLine->setMinimumSize( Qt::Size(0, 20) );
BeamLineLabel = Qt::Label(RUNSAuto, "BeamLineLabel");
BeamLineLabel->setGeometry( Qt::Rect(127, 55, 99, 26) );
BeamLineLabel->setMinimumSize( Qt::Size(0, 20) );
YEAR = Qt::ComboBox(0, RUNSAuto, "YEAR");
YEAR->setGeometry( Qt::Rect(420, 55, 100, 26) );
YEAR->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, YEAR->sizePolicy()->hasHeightForWidth()) );
YEAR->setMinimumSize( Qt::Size(0, 20) );
RunNumbers = Qt::LineEdit(RUNSAuto, "RunNumbers");
RunNumbers->setGeometry( Qt::Rect(15, 25, 505, 26) );
RunNumbers->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, RunNumbers->sizePolicy()->hasHeightForWidth()) );
RunNumbers->setMinimumSize( Qt::Size(0, 23) );
$layout43->addWidget(RUNSAuto);
RUNSMan = Qt::GroupBox($LayoutWidget_3, "RUNSMan");
RUNSMan->setEnabled( 1 );
RUNSMan->setMargin( int(5) );
RunFiles = Qt::LineEdit(RUNSMan, "RunFiles");
RunFiles->setEnabled( 1 );
RunFiles->setGeometry( Qt::Rect(15, 25, 505, 26) );
RunFiles->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, RunFiles->sizePolicy()->hasHeightForWidth()) );
RunFiles->setMinimumSize( Qt::Size(0, 23) );
Browse = Qt::PushButton(RUNSMan, "Browse");
Browse->setEnabled( 1 );
Browse->setGeometry( Qt::Rect(420, 55, 100, 26) );
Browse->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, Browse->sizePolicy()->hasHeightForWidth()) );
Browse->setMinimumSize( Qt::Size(0, 20) );
$layout43->addWidget(RUNSMan);
musrfit_tabs->insertTab( RUNSPage, "" ); musrfit_tabs->insertTab( RUNSPage, "" );
TabPage = Qt::Widget(musrfit_tabs, "TabPage"); FittingPage = Qt::Widget(musrfit_tabs, "FittingPage");
my $LayoutWidget_4 = Qt::Widget(TabPage, '$LayoutWidget_4'); my $LayoutWidget_4 = Qt::Widget(FittingPage, '$LayoutWidget_4');
$LayoutWidget_4->setGeometry( Qt::Rect(5, 10, 545, 350) ); $LayoutWidget_4->setGeometry( Qt::Rect(5, 10, 545, 350) );
my $layout34 = Qt::VBoxLayout($LayoutWidget_4, 11, 6, '$layout34'); my $layout34 = Qt::VBoxLayout($LayoutWidget_4, 11, 6, '$layout34');
@ -1993,11 +1995,11 @@ sub NEW
FitTextOutput = Qt::TextEdit($LayoutWidget_4, "FitTextOutput"); FitTextOutput = Qt::TextEdit($LayoutWidget_4, "FitTextOutput");
FitTextOutput->setOverwriteMode( 1 ); FitTextOutput->setOverwriteMode( 1 );
$layout34->addWidget(FitTextOutput); $layout34->addWidget(FitTextOutput);
musrfit_tabs->insertTab( TabPage, "" ); musrfit_tabs->insertTab( FittingPage, "" );
SharingPahe = Qt::Widget(musrfit_tabs, "SharingPahe"); SharingPage = Qt::Widget(musrfit_tabs, "SharingPage");
buttonGroupSharing = Qt::ButtonGroup(SharingPahe, "buttonGroupSharing"); buttonGroupSharing = Qt::ButtonGroup(SharingPage, "buttonGroupSharing");
buttonGroupSharing->setGeometry( Qt::Rect(5, 5, 545, 355) ); buttonGroupSharing->setGeometry( Qt::Rect(5, 5, 545, 355) );
buttonGroupSharing->setSizePolicy( Qt::SizePolicy(7, 7, 0, 0, buttonGroupSharing->sizePolicy()->hasHeightForWidth()) ); buttonGroupSharing->setSizePolicy( Qt::SizePolicy(7, 7, 0, 0, buttonGroupSharing->sizePolicy()->hasHeightForWidth()) );
buttonGroupSharing->setAlignment( int(&Qt::ButtonGroup::AlignLeft) ); buttonGroupSharing->setAlignment( int(&Qt::ButtonGroup::AlignLeft) );
@ -2163,7 +2165,7 @@ sub NEW
ShParam_3_9->setPaletteBackgroundColor( Qt::Color(234, 233, 232) ); ShParam_3_9->setPaletteBackgroundColor( Qt::Color(234, 233, 232) );
ShParam_3_9->setTristate( 0 ); ShParam_3_9->setTristate( 0 );
$layout15->addWidget(ShParam_3_9); $layout15->addWidget(ShParam_3_9);
musrfit_tabs->insertTab( SharingPahe, "" ); musrfit_tabs->insertTab( SharingPage, "" );
InitializationPage = Qt::Widget(musrfit_tabs, "InitializationPage"); InitializationPage = Qt::Widget(musrfit_tabs, "InitializationPage");
@ -2194,9 +2196,9 @@ sub NEW
InitParamTable->setFocusStyle( &Qt::Table::SpreadSheet() ); InitParamTable->setFocusStyle( &Qt::Table::SpreadSheet() );
musrfit_tabs->insertTab( InitializationPage, "" ); musrfit_tabs->insertTab( InitializationPage, "" );
FittingPage = Qt::Widget(musrfit_tabs, "FittingPage"); MSRPage = Qt::Widget(musrfit_tabs, "MSRPage");
my $LayoutWidget_8 = Qt::Widget(FittingPage, '$LayoutWidget_8'); my $LayoutWidget_8 = Qt::Widget(MSRPage, '$LayoutWidget_8');
$LayoutWidget_8->setGeometry( Qt::Rect(5, 5, 545, 355) ); $LayoutWidget_8->setGeometry( Qt::Rect(5, 5, 545, 355) );
my $layout25 = Qt::VBoxLayout($LayoutWidget_8, 0, 6, '$layout25'); my $layout25 = Qt::VBoxLayout($LayoutWidget_8, 0, 6, '$layout25');
@ -2229,11 +2231,11 @@ sub NEW
textMSROutput = Qt::TextEdit($LayoutWidget_8, "textMSROutput"); textMSROutput = Qt::TextEdit($LayoutWidget_8, "textMSROutput");
textMSROutput->setOverwriteMode( 1 ); textMSROutput->setOverwriteMode( 1 );
$layout25->addWidget(textMSROutput); $layout25->addWidget(textMSROutput);
musrfit_tabs->insertTab( FittingPage, "" ); musrfit_tabs->insertTab( MSRPage, "" );
TabPage_2 = Qt::Widget(musrfit_tabs, "TabPage_2"); FourierPage = Qt::Widget(musrfit_tabs, "FourierPage");
my $LayoutWidget_10 = Qt::Widget(TabPage_2, '$LayoutWidget_10'); my $LayoutWidget_10 = Qt::Widget(FourierPage, '$LayoutWidget_10');
$LayoutWidget_10->setGeometry( Qt::Rect(5, 5, 545, 94) ); $LayoutWidget_10->setGeometry( Qt::Rect(5, 5, 545, 94) );
my $layout33_2 = Qt::HBoxLayout($LayoutWidget_10, 11, 6, '$layout33_2'); my $layout33_2 = Qt::HBoxLayout($LayoutWidget_10, 11, 6, '$layout33_2');
@ -2278,9 +2280,9 @@ sub NEW
my $layout29 = Qt::VBoxLayout(undef, 0, 6, '$layout29'); my $layout29 = Qt::VBoxLayout(undef, 0, 6, '$layout29');
lineEdit28 = Qt::LineEdit($LayoutWidget_10, "lineEdit28"); FrqMin = Qt::LineEdit($LayoutWidget_10, "FrqMin");
lineEdit28->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, lineEdit28->sizePolicy()->hasHeightForWidth()) ); FrqMin->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FrqMin->sizePolicy()->hasHeightForWidth()) );
$layout29->addWidget(lineEdit28); $layout29->addWidget(FrqMin);
textLabel1_3_2 = Qt::Label($LayoutWidget_10, "textLabel1_3_2"); textLabel1_3_2 = Qt::Label($LayoutWidget_10, "textLabel1_3_2");
$layout29->addWidget(textLabel1_3_2); $layout29->addWidget(textLabel1_3_2);
@ -2303,9 +2305,9 @@ sub NEW
my $layout32 = Qt::VBoxLayout(undef, 0, 6, '$layout32'); my $layout32 = Qt::VBoxLayout(undef, 0, 6, '$layout32');
lineEdit28_2 = Qt::LineEdit($LayoutWidget_10, "lineEdit28_2"); FrqMax = Qt::LineEdit($LayoutWidget_10, "FrqMax");
lineEdit28_2->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, lineEdit28_2->sizePolicy()->hasHeightForWidth()) ); FrqMax->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FrqMax->sizePolicy()->hasHeightForWidth()) );
$layout32->addWidget(lineEdit28_2); $layout32->addWidget(FrqMax);
textLabel1_3_4 = Qt::Label($LayoutWidget_10, "textLabel1_3_4"); textLabel1_3_4 = Qt::Label($LayoutWidget_10, "textLabel1_3_4");
$layout32->addWidget(textLabel1_3_4); $layout32->addWidget(textLabel1_3_4);
@ -2313,133 +2315,134 @@ sub NEW
textLabel1_3_8 = Qt::Label($LayoutWidget_10, "textLabel1_3_8"); textLabel1_3_8 = Qt::Label($LayoutWidget_10, "textLabel1_3_8");
$layout32->addWidget(textLabel1_3_8); $layout32->addWidget(textLabel1_3_8);
$layout33_2->addLayout($layout32); $layout33_2->addLayout($layout32);
musrfit_tabs->insertTab( TabPage_2, "" ); musrfit_tabs->insertTab( FourierPage, "" );
TabPage_3 = Qt::Widget(musrfit_tabs, "TabPage_3"); T0Page = Qt::Widget(musrfit_tabs, "T0Page");
my $T0PageLayout = Qt::GridLayout(T0Page, 1, 1, 11, 6, '$T0PageLayout');
my $LayoutWidget_11 = Qt::Widget(TabPage_3, '$LayoutWidget_11'); my $layout27_2 = Qt::HBoxLayout(undef, 0, 6, '$layout27_2');
$LayoutWidget_11->setGeometry( Qt::Rect(7, 5, 540, 180) );
my $layout27_2 = Qt::HBoxLayout($LayoutWidget_11, 0, 6, '$layout27_2');
groupHist0 = Qt::GroupBox($LayoutWidget_11, "groupHist0"); groupHist0 = Qt::GroupBox(T0Page, "groupHist0");
groupHist0->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, groupHist0->sizePolicy()->hasHeightForWidth()) ); groupHist0->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, groupHist0->sizePolicy()->hasHeightForWidth()) );
groupHist0->setMinimumSize( Qt::Size(0, 0) ); groupHist0->setMinimumSize( Qt::Size(0, 0) );
my $LayoutWidget_12 = Qt::Widget(groupHist0, '$LayoutWidget_12'); my $LayoutWidget_11 = Qt::Widget(groupHist0, '$LayoutWidget_11');
$LayoutWidget_12->setGeometry( Qt::Rect(5, 18, 100, 150) ); $LayoutWidget_11->setGeometry( Qt::Rect(5, 18, 100, 150) );
my $layout16_2 = Qt::VBoxLayout($LayoutWidget_12, 11, 6, '$layout16_2'); my $layout16_2 = Qt::VBoxLayout($LayoutWidget_11, 11, 6, '$layout16_2');
textLabel2 = Qt::Label($LayoutWidget_12, "textLabel2"); textLabel2 = Qt::Label($LayoutWidget_11, "textLabel2");
$layout16_2->addWidget(textLabel2); $layout16_2->addWidget(textLabel2);
textLabel2_2_2_3 = Qt::Label($LayoutWidget_12, "textLabel2_2_2_3"); textLabel2_2_2_3 = Qt::Label($LayoutWidget_11, "textLabel2_2_2_3");
$layout16_2->addWidget(textLabel2_2_2_3); $layout16_2->addWidget(textLabel2_2_2_3);
textLabel2_2_2 = Qt::Label($LayoutWidget_12, "textLabel2_2_2"); textLabel2_2_2 = Qt::Label($LayoutWidget_11, "textLabel2_2_2");
$layout16_2->addWidget(textLabel2_2_2); $layout16_2->addWidget(textLabel2_2_2);
textLabel2_2_2_2 = Qt::Label($LayoutWidget_12, "textLabel2_2_2_2"); textLabel2_2_2_2 = Qt::Label($LayoutWidget_11, "textLabel2_2_2_2");
$layout16_2->addWidget(textLabel2_2_2_2); $layout16_2->addWidget(textLabel2_2_2_2);
textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_12, "textLabel2_2_2_2_2"); textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_11, "textLabel2_2_2_2_2");
$layout16_2->addWidget(textLabel2_2_2_2_2); $layout16_2->addWidget(textLabel2_2_2_2_2);
$layout27_2->addWidget(groupHist0); $layout27_2->addWidget(groupHist0);
groupHist1 = Qt::GroupBox($LayoutWidget_11, "groupHist1"); groupHist1 = Qt::GroupBox(T0Page, "groupHist1");
groupHist1->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist1->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_13 = Qt::Widget(groupHist1, '$LayoutWidget_13'); my $LayoutWidget_12 = Qt::Widget(groupHist1, '$LayoutWidget_12');
$LayoutWidget_13->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_12->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18 = Qt::VBoxLayout($LayoutWidget_13, 0, 0, '$layout18'); my $layout18 = Qt::VBoxLayout($LayoutWidget_12, 0, 0, '$layout18');
t01 = Qt::LineEdit($LayoutWidget_13, "t01"); t01 = Qt::LineEdit($LayoutWidget_12, "t01");
$layout18->addWidget(t01); $layout18->addWidget(t01);
Bg11 = Qt::LineEdit($LayoutWidget_13, "Bg11"); Bg11 = Qt::LineEdit($LayoutWidget_12, "Bg11");
$layout18->addWidget(Bg11); $layout18->addWidget(Bg11);
Bg21 = Qt::LineEdit($LayoutWidget_13, "Bg21"); Bg21 = Qt::LineEdit($LayoutWidget_12, "Bg21");
$layout18->addWidget(Bg21); $layout18->addWidget(Bg21);
Data11 = Qt::LineEdit($LayoutWidget_13, "Data11"); Data11 = Qt::LineEdit($LayoutWidget_12, "Data11");
$layout18->addWidget(Data11); $layout18->addWidget(Data11);
Data21 = Qt::LineEdit($LayoutWidget_13, "Data21"); Data21 = Qt::LineEdit($LayoutWidget_12, "Data21");
$layout18->addWidget(Data21); $layout18->addWidget(Data21);
$layout27_2->addWidget(groupHist1); $layout27_2->addWidget(groupHist1);
groupHist2 = Qt::GroupBox($LayoutWidget_11, "groupHist2"); groupHist2 = Qt::GroupBox(T0Page, "groupHist2");
groupHist2->setEnabled( 1 ); groupHist2->setEnabled( 1 );
groupHist2->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist2->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_14 = Qt::Widget(groupHist2, '$LayoutWidget_14'); my $LayoutWidget_13 = Qt::Widget(groupHist2, '$LayoutWidget_13');
$LayoutWidget_14->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_13->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_2 = Qt::VBoxLayout($LayoutWidget_14, 0, 0, '$layout18_2'); my $layout18_2 = Qt::VBoxLayout($LayoutWidget_13, 0, 0, '$layout18_2');
t02 = Qt::LineEdit($LayoutWidget_14, "t02"); t02 = Qt::LineEdit($LayoutWidget_13, "t02");
$layout18_2->addWidget(t02); $layout18_2->addWidget(t02);
Bg12 = Qt::LineEdit($LayoutWidget_14, "Bg12"); Bg12 = Qt::LineEdit($LayoutWidget_13, "Bg12");
$layout18_2->addWidget(Bg12); $layout18_2->addWidget(Bg12);
Bg22 = Qt::LineEdit($LayoutWidget_14, "Bg22"); Bg22 = Qt::LineEdit($LayoutWidget_13, "Bg22");
$layout18_2->addWidget(Bg22); $layout18_2->addWidget(Bg22);
Data12 = Qt::LineEdit($LayoutWidget_14, "Data12"); Data12 = Qt::LineEdit($LayoutWidget_13, "Data12");
$layout18_2->addWidget(Data12); $layout18_2->addWidget(Data12);
Data22 = Qt::LineEdit($LayoutWidget_14, "Data22"); Data22 = Qt::LineEdit($LayoutWidget_13, "Data22");
$layout18_2->addWidget(Data22); $layout18_2->addWidget(Data22);
$layout27_2->addWidget(groupHist2); $layout27_2->addWidget(groupHist2);
groupHist3 = Qt::GroupBox($LayoutWidget_11, "groupHist3"); groupHist3 = Qt::GroupBox(T0Page, "groupHist3");
groupHist3->setEnabled( 1 ); groupHist3->setEnabled( 1 );
groupHist3->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist3->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_15 = Qt::Widget(groupHist3, '$LayoutWidget_15'); my $LayoutWidget_14 = Qt::Widget(groupHist3, '$LayoutWidget_14');
$LayoutWidget_15->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_14->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_3 = Qt::VBoxLayout($LayoutWidget_15, 0, 0, '$layout18_3'); my $layout18_3 = Qt::VBoxLayout($LayoutWidget_14, 0, 0, '$layout18_3');
t03 = Qt::LineEdit($LayoutWidget_15, "t03"); t03 = Qt::LineEdit($LayoutWidget_14, "t03");
$layout18_3->addWidget(t03); $layout18_3->addWidget(t03);
Bg13 = Qt::LineEdit($LayoutWidget_15, "Bg13"); Bg13 = Qt::LineEdit($LayoutWidget_14, "Bg13");
$layout18_3->addWidget(Bg13); $layout18_3->addWidget(Bg13);
Bg23 = Qt::LineEdit($LayoutWidget_15, "Bg23"); Bg23 = Qt::LineEdit($LayoutWidget_14, "Bg23");
$layout18_3->addWidget(Bg23); $layout18_3->addWidget(Bg23);
Data13 = Qt::LineEdit($LayoutWidget_15, "Data13"); Data13 = Qt::LineEdit($LayoutWidget_14, "Data13");
$layout18_3->addWidget(Data13); $layout18_3->addWidget(Data13);
Data23 = Qt::LineEdit($LayoutWidget_15, "Data23"); Data23 = Qt::LineEdit($LayoutWidget_14, "Data23");
$layout18_3->addWidget(Data23); $layout18_3->addWidget(Data23);
$layout27_2->addWidget(groupHist3); $layout27_2->addWidget(groupHist3);
groupHist4 = Qt::GroupBox($LayoutWidget_11, "groupHist4"); groupHist4 = Qt::GroupBox(T0Page, "groupHist4");
groupHist4->setEnabled( 1 ); groupHist4->setEnabled( 1 );
groupHist4->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist4->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_16 = Qt::Widget(groupHist4, '$LayoutWidget_16'); my $LayoutWidget_15 = Qt::Widget(groupHist4, '$LayoutWidget_15');
$LayoutWidget_16->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_15->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_4 = Qt::VBoxLayout($LayoutWidget_16, 0, 0, '$layout18_4'); my $layout18_4 = Qt::VBoxLayout($LayoutWidget_15, 0, 0, '$layout18_4');
t04 = Qt::LineEdit($LayoutWidget_16, "t04"); t04 = Qt::LineEdit($LayoutWidget_15, "t04");
$layout18_4->addWidget(t04); $layout18_4->addWidget(t04);
Bg14 = Qt::LineEdit($LayoutWidget_16, "Bg14"); Bg14 = Qt::LineEdit($LayoutWidget_15, "Bg14");
$layout18_4->addWidget(Bg14); $layout18_4->addWidget(Bg14);
Bg24 = Qt::LineEdit($LayoutWidget_16, "Bg24"); Bg24 = Qt::LineEdit($LayoutWidget_15, "Bg24");
$layout18_4->addWidget(Bg24); $layout18_4->addWidget(Bg24);
Data14 = Qt::LineEdit($LayoutWidget_16, "Data14"); Data14 = Qt::LineEdit($LayoutWidget_15, "Data14");
$layout18_4->addWidget(Data14); $layout18_4->addWidget(Data14);
Data24 = Qt::LineEdit($LayoutWidget_16, "Data24"); Data24 = Qt::LineEdit($LayoutWidget_15, "Data24");
$layout18_4->addWidget(Data24); $layout18_4->addWidget(Data24);
$layout27_2->addWidget(groupHist4); $layout27_2->addWidget(groupHist4);
musrfit_tabs->insertTab( TabPage_3, "" );
$T0PageLayout->addLayout($layout27_2, 0, 0);
musrfit_tabs->insertTab( T0Page, "" );
fileNewAction= Qt::Action(this, "fileNewAction"); fileNewAction= Qt::Action(this, "fileNewAction");
fileNewAction->setIconSet( Qt::IconSet($image1) ); fileNewAction->setIconSet( Qt::IconSet($image1) );
@ -2500,6 +2503,10 @@ sub NEW
Plot->setIconSet( Qt::IconSet($image18) ); Plot->setIconSet( Qt::IconSet($image18) );
T0= Qt::Action(this, "T0"); T0= Qt::Action(this, "T0");
T0->setIconSet( Qt::IconSet($image19) ); T0->setIconSet( Qt::IconSet($image19) );
optionsFourier= Qt::Action(this, "optionsFourier");
optionsFourier->setToggleAction( 1 );
optionsT0= Qt::Action(this, "optionsT0");
optionsT0->setToggleAction( 1 );
FileToolBar = Qt::ToolBar("", this, &DockTop); FileToolBar = Qt::ToolBar("", this, &DockTop);
@ -2532,17 +2539,6 @@ sub NEW
fileExitAction->addTo( fileMenu ); fileExitAction->addTo( fileMenu );
MenuBar->insertItem( "", fileMenu, 2 ); MenuBar->insertItem( "", fileMenu, 2 );
Actions = Qt::PopupMenu( this );
Fit->addTo( Actions );
Plot->addTo( Actions );
T0->addTo( Actions );
MenuBar->insertItem( "", Actions, 3 );
Parameters = Qt::PopupMenu( this );
parametersExport_AsAction->addTo( Parameters );
parametersAppend_ToAction->addTo( Parameters );
MenuBar->insertItem( "", Parameters, 4 );
Edit = Qt::PopupMenu( this ); Edit = Qt::PopupMenu( this );
editUndoAction->addTo( Edit ); editUndoAction->addTo( Edit );
editRedoAction->addTo( Edit ); editRedoAction->addTo( Edit );
@ -2550,11 +2546,24 @@ sub NEW
editCutAction->addTo( Edit ); editCutAction->addTo( Edit );
editCopyAction->addTo( Edit ); editCopyAction->addTo( Edit );
editPasteAction->addTo( Edit ); editPasteAction->addTo( Edit );
MenuBar->insertItem( "", Edit, 5 ); MenuBar->insertItem( "", Edit, 3 );
Actions = Qt::PopupMenu( this );
Fit->addTo( Actions );
Plot->addTo( Actions );
T0->addTo( Actions );
MenuBar->insertItem( "", Actions, 4 );
Parameters = Qt::PopupMenu( this );
parametersExport_AsAction->addTo( Parameters );
parametersAppend_ToAction->addTo( Parameters );
MenuBar->insertItem( "", Parameters, 5 );
Options = Qt::PopupMenu( this ); Options = Qt::PopupMenu( this );
FileExistCheck->addTo( Options ); FileExistCheck->addTo( Options );
ManualFile->addTo( Options ); ManualFile->addTo( Options );
optionsFourier->addTo( Options );
optionsT0->addTo( Options );
MenuBar->insertItem( "", Options, 6 ); MenuBar->insertItem( "", Options, 6 );
helpMenu = Qt::PopupMenu( this ); helpMenu = Qt::PopupMenu( this );
@ -2577,7 +2586,6 @@ sub NEW
Qt::Object::connect(parametersExport_AsAction, SIGNAL "activated()", this, SLOT "parametersExport()"); Qt::Object::connect(parametersExport_AsAction, SIGNAL "activated()", this, SLOT "parametersExport()");
Qt::Object::connect(BeamLine, SIGNAL "activated(int)", this, SLOT "T0Update()"); Qt::Object::connect(BeamLine, SIGNAL "activated(int)", this, SLOT "T0Update()");
Qt::Object::connect(Browse, SIGNAL "clicked()", this, SLOT "fileBrowse()"); Qt::Object::connect(Browse, SIGNAL "clicked()", this, SLOT "fileBrowse()");
Qt::Object::connect(ManualFile, SIGNAL "toggled(bool)", this, SLOT "RunSelectionToggle()");
Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "CallMSRCreate()"); Qt::Object::connect(InitParamTable, SIGNAL "valueChanged(int,int)", this, SLOT "CallMSRCreate()");
Qt::Object::connect(musrfit_tabs, SIGNAL "selected(const QString&)", this, SLOT "TabChanged()"); Qt::Object::connect(musrfit_tabs, SIGNAL "selected(const QString&)", this, SLOT "TabChanged()");
Qt::Object::connect(fileChangeDirAction, SIGNAL "activated()", this, SLOT "fileChangeDir()"); Qt::Object::connect(fileChangeDirAction, SIGNAL "activated()", this, SLOT "fileChangeDir()");
@ -2644,9 +2652,9 @@ sub NEW
setTabOrder(textMSROutput, FUnits); setTabOrder(textMSROutput, FUnits);
setTabOrder(FUnits, FApodization); setTabOrder(FUnits, FApodization);
setTabOrder(FApodization, FPlot); setTabOrder(FApodization, FPlot);
setTabOrder(FPlot, lineEdit28); setTabOrder(FPlot, FrqMin);
setTabOrder(lineEdit28, lineEdit28_2); setTabOrder(FrqMin, FrqMax);
setTabOrder(lineEdit28_2, t01); setTabOrder(FrqMax, t01);
setTabOrder(t01, Bg11); setTabOrder(t01, Bg11);
setTabOrder(Bg11, Bg21); setTabOrder(Bg11, Bg21);
setTabOrder(Bg21, Data11); setTabOrder(Bg21, Data11);
@ -2683,29 +2691,6 @@ sub languageChange
{ {
setCaption(trUtf8("MuSRFit GUI") ); setCaption(trUtf8("MuSRFit GUI") );
setIconText(trUtf8("MuSRFitGUI") ); setIconText(trUtf8("MuSRFitGUI") );
RUNSAuto->setTitle( trUtf8("RUN Numbers") );
YEARLabel->setText( trUtf8("Year") );
BeamLine->clear();
BeamLine->insertItem( trUtf8("LEM") );
BeamLine->insertItem( trUtf8("GPS") );
BeamLine->insertItem( trUtf8("Dolly") );
BeamLine->insertItem( trUtf8("LTF") );
BeamLineLabel->setText( trUtf8("On beam line") );
YEAR->clear();
YEAR->insertItem( trUtf8("2009") );
YEAR->insertItem( trUtf8("2008") );
YEAR->insertItem( trUtf8("2007") );
YEAR->insertItem( trUtf8("2006") );
YEAR->insertItem( trUtf8("2005") );
YEAR->insertItem( trUtf8("2004") );
Qt::ToolTip::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated."));
Qt::WhatsThis::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated."));
RUNSMan->setTitle( trUtf8("RUN Files") );
Qt::ToolTip::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated."));
Qt::WhatsThis::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated."));
Browse->setText( trUtf8("Browse") );
Qt::ToolTip::add(Browse, trUtf8("Browse to select data files for fitting."));
Qt::WhatsThis::add(Browse, trUtf8("Browse to select data files for fitting."));
groupBox7->setTitle( trUtf8("Theory Function") ); groupBox7->setTitle( trUtf8("Theory Function") );
FitType2->clear(); FitType2->clear();
FitType2->insertItem( trUtf8("Exponential") ); FitType2->insertItem( trUtf8("Exponential") );
@ -2772,6 +2757,29 @@ sub languageChange
FitAsyType->insertItem( trUtf8("SingleHist") ); FitAsyType->insertItem( trUtf8("SingleHist") );
LRBFLabel->setText( trUtf8("Histograms list") ); LRBFLabel->setText( trUtf8("Histograms list") );
LRBF->setText( trUtf8("1,3") ); LRBF->setText( trUtf8("1,3") );
RUNSAuto->setTitle( trUtf8("RUN Numbers") );
YEARLabel->setText( trUtf8("Year") );
BeamLine->clear();
BeamLine->insertItem( trUtf8("LEM") );
BeamLine->insertItem( trUtf8("GPS") );
BeamLine->insertItem( trUtf8("Dolly") );
BeamLine->insertItem( trUtf8("LTF") );
BeamLineLabel->setText( trUtf8("On beam line") );
YEAR->clear();
YEAR->insertItem( trUtf8("2009") );
YEAR->insertItem( trUtf8("2008") );
YEAR->insertItem( trUtf8("2007") );
YEAR->insertItem( trUtf8("2006") );
YEAR->insertItem( trUtf8("2005") );
YEAR->insertItem( trUtf8("2004") );
Qt::ToolTip::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated."));
Qt::WhatsThis::add(RunNumbers, trUtf8("Numbers of RUNs to fit. Multiple runs are comma separated."));
RUNSMan->setTitle( trUtf8("RUN Files") );
Qt::ToolTip::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated."));
Qt::WhatsThis::add(RunFiles, trUtf8("Names of data files to be fit. Multiple data files are comma separated."));
Browse->setText( trUtf8("Browse") );
Qt::ToolTip::add(Browse, trUtf8("Browse to select data files for fitting."));
Qt::WhatsThis::add(Browse, trUtf8("Browse to select data files for fitting."));
musrfit_tabs->changeTab( RUNSPage, trUtf8("RUNS") ); musrfit_tabs->changeTab( RUNSPage, trUtf8("RUNS") );
Minimization->clear(); Minimization->clear();
Minimization->insertItem( trUtf8("MINIMIZE") ); Minimization->insertItem( trUtf8("MINIMIZE") );
@ -2785,7 +2793,7 @@ sub languageChange
ErrorCalc->insertItem( trUtf8("MINOS") ); ErrorCalc->insertItem( trUtf8("MINOS") );
textLabel1_5->setText( trUtf8("Minimization type") ); textLabel1_5->setText( trUtf8("Minimization type") );
ltc->setText( trUtf8("Life time correction") ); ltc->setText( trUtf8("Life time correction") );
musrfit_tabs->changeTab( TabPage, trUtf8("Fitting") ); musrfit_tabs->changeTab( FittingPage, trUtf8("Fitting") );
buttonGroupSharing->setTitle( trUtf8("Shared Parameters") ); buttonGroupSharing->setTitle( trUtf8("Shared Parameters") );
SharingComp1->setTitle( trUtf8("1st Component") ); SharingComp1->setTitle( trUtf8("1st Component") );
ShParam_1_1->setText( trUtf8("Param1") ); ShParam_1_1->setText( trUtf8("Param1") );
@ -2820,7 +2828,7 @@ sub languageChange
ShParam_3_7->setText( trUtf8("Param7") ); ShParam_3_7->setText( trUtf8("Param7") );
ShParam_3_8->setText( trUtf8("Param8") ); ShParam_3_8->setText( trUtf8("Param8") );
ShParam_3_9->setText( trUtf8("Param9") ); ShParam_3_9->setText( trUtf8("Param9") );
musrfit_tabs->changeTab( SharingPahe, trUtf8("Sharing") ); musrfit_tabs->changeTab( SharingPage, trUtf8("Sharing") );
InitParamTable->horizontalHeader()->setLabel( 0, trUtf8("Value") ); InitParamTable->horizontalHeader()->setLabel( 0, trUtf8("Value") );
InitParamTable->horizontalHeader()->setLabel( 1, trUtf8("Error") ); InitParamTable->horizontalHeader()->setLabel( 1, trUtf8("Error") );
InitParamTable->horizontalHeader()->setLabel( 2, trUtf8("Min") ); InitParamTable->horizontalHeader()->setLabel( 2, trUtf8("Min") );
@ -2834,7 +2842,7 @@ sub languageChange
FILENAMELabel->setText( trUtf8("Enter [name] for output [name].msr file (optional)") ); FILENAMELabel->setText( trUtf8("Enter [name] for output [name].msr file (optional)") );
Qt::ToolTip::add(FILENAME, trUtf8("Name of the produced MSR file (optional)")); Qt::ToolTip::add(FILENAME, trUtf8("Name of the produced MSR file (optional)"));
Qt::WhatsThis::add(FILENAME, trUtf8("Name of the produced MSR file (optional)")); Qt::WhatsThis::add(FILENAME, trUtf8("Name of the produced MSR file (optional)"));
musrfit_tabs->changeTab( FittingPage, trUtf8("MSR File") ); musrfit_tabs->changeTab( MSRPage, trUtf8("MSR File") );
FUnitsLabel->setText( trUtf8("Units") ); FUnitsLabel->setText( trUtf8("Units") );
FApodizationLabel->setText( trUtf8("Apodization") ); FApodizationLabel->setText( trUtf8("Apodization") );
FPlotLabel->setText( trUtf8("Plot") ); FPlotLabel->setText( trUtf8("Plot") );
@ -2863,7 +2871,7 @@ sub languageChange
textLabel1_3_7->setText( undef ); textLabel1_3_7->setText( undef );
textLabel1_3_4->setText( undef ); textLabel1_3_4->setText( undef );
textLabel1_3_8->setText( undef ); textLabel1_3_8->setText( undef );
musrfit_tabs->changeTab( TabPage_2, trUtf8("Fourier") ); musrfit_tabs->changeTab( FourierPage, trUtf8("Fourier") );
groupHist0->setTitle( undef ); groupHist0->setTitle( undef );
textLabel2->setText( trUtf8("t0") ); textLabel2->setText( trUtf8("t0") );
textLabel2_2_2_3->setText( trUtf8("Bg1") ); textLabel2_2_2_3->setText( trUtf8("Bg1") );
@ -2874,7 +2882,7 @@ sub languageChange
groupHist2->setTitle( trUtf8("Hist2") ); groupHist2->setTitle( trUtf8("Hist2") );
groupHist3->setTitle( trUtf8("Hist3") ); groupHist3->setTitle( trUtf8("Hist3") );
groupHist4->setTitle( trUtf8("Hist4") ); groupHist4->setTitle( trUtf8("Hist4") );
musrfit_tabs->changeTab( TabPage_3, trUtf8("t0/Bg Bins") ); musrfit_tabs->changeTab( T0Page, trUtf8("t0/Bg Bins") );
fileNewAction->setText( trUtf8("&New") ); fileNewAction->setText( trUtf8("&New") );
fileNewAction->setMenuText( trUtf8("&New") ); fileNewAction->setMenuText( trUtf8("&New") );
fileNewAction->setAccel( Qt::KeySequence( trUtf8("Ctrl+N") ) ); fileNewAction->setAccel( Qt::KeySequence( trUtf8("Ctrl+N") ) );
@ -2923,8 +2931,9 @@ sub languageChange
helpAboutAction->setAccel( Qt::KeySequence( undef ) ); helpAboutAction->setAccel( Qt::KeySequence( undef ) );
separatorAction->setText( undef ); separatorAction->setText( undef );
separatorAction->setMenuText( undef ); separatorAction->setMenuText( undef );
FileExistCheck->setText( trUtf8("Change name") ); FileExistCheck->setText( trUtf8("Overwrite MSR File") );
FileExistCheck->setMenuText( trUtf8("Change name") ); FileExistCheck->setMenuText( trUtf8("Overwrite MSR File") );
FileExistCheck->setToolTip( trUtf8("Enable overwriting MSR files") );
FileExistCheck->setWhatsThis( trUtf8("Enable/Disable checking for MSR files.") ); FileExistCheck->setWhatsThis( trUtf8("Enable/Disable checking for MSR files.") );
ManualFile->setText( trUtf8("Maual file selection") ); ManualFile->setText( trUtf8("Maual file selection") );
ManualFile->setMenuText( trUtf8("Maual file selection") ); ManualFile->setMenuText( trUtf8("Maual file selection") );
@ -2945,12 +2954,16 @@ sub languageChange
Plot->setAccel( Qt::KeySequence( trUtf8("Ctrl+P") ) ); Plot->setAccel( Qt::KeySequence( trUtf8("Ctrl+P") ) );
T0->setText( trUtf8("Show t0 and Bg Bins") ); T0->setText( trUtf8("Show t0 and Bg Bins") );
T0->setAccel( Qt::KeySequence( trUtf8("Ctrl+T") ) ); T0->setAccel( Qt::KeySequence( trUtf8("Ctrl+T") ) );
optionsFourier->setText( trUtf8("Fourier") );
optionsFourier->setMenuText( trUtf8("Fourier") );
optionsT0->setText( trUtf8("T0 and Bg bins") );
optionsT0->setMenuText( trUtf8("T0 and Bg bins") );
FileToolBar->setLabel( trUtf8("File Menu") ); FileToolBar->setLabel( trUtf8("File Menu") );
ActionsToolBar->setLabel( trUtf8("Actions Menu") ); ActionsToolBar->setLabel( trUtf8("Actions Menu") );
MenuBar->findItem( 2 )->setText( trUtf8("&File") ); MenuBar->findItem( 2 )->setText( trUtf8("&File") );
MenuBar->findItem( 3 )->setText( trUtf8("Actions") ); MenuBar->findItem( 3 )->setText( trUtf8("Edit") );
MenuBar->findItem( 4 )->setText( trUtf8("Parameters") ); MenuBar->findItem( 4 )->setText( trUtf8("Actions") );
MenuBar->findItem( 5 )->setText( trUtf8("Edit") ); MenuBar->findItem( 5 )->setText( trUtf8("Parameters") );
MenuBar->findItem( 6 )->setText( trUtf8("Options") ); MenuBar->findItem( 6 )->setText( trUtf8("Options") );
MenuBar->findItem( 7 )->setText( trUtf8("&Help") ); MenuBar->findItem( 7 )->setText( trUtf8("&Help") );
} }
@ -3147,24 +3160,23 @@ sub CreateAllInput
# TODO: Need to automatically generage years list depending on beamline # TODO: Need to automatically generage years list depending on beamline
my %All=(); my %All=();
# From RUNS Tab # From RUNS Tab
$All{"TITLE"}= TITLE->text; # Run data file
$All{"FILENAME"}= FILENAME->text;
$All{"RunNumbers"} = RunNumbers->text; $All{"RunNumbers"} = RunNumbers->text;
$All{"RunFiles"} = RunFiles->text; $All{"RunFiles"} = RunFiles->text;
$All{"BeamLine"} = BeamLine->currentText; $All{"BeamLine"} = BeamLine->currentText;
$All{"RUNSType"} = ManualFile->isOn(); $All{"RUNSType"} = ManualFile->isOn();
$All{"optionsFourier"} = optionsFourier->isOn();
$All{"optionsT0"} = optionsT0->isOn();
$All{"YEAR"} =YEAR->currentText; $All{"YEAR"} =YEAR->currentText;
# Time range and BINS
$All{"Tis"} = Tis->text; $All{"Tis"} = Tis->text;
$All{"Tfs"} = Tfs->text; $All{"Tfs"} = Tfs->text;
$All{"BINS"} = BINS->text; $All{"BINS"} = BINS->text;
$All{"FitAsyType"} = FitAsyType->currentText; $All{"FitAsyType"} = FitAsyType->currentText;
$All{"LRBF"} = LRBF->text; $All{"LRBF"} = LRBF->text;
$All{"Xi"}=Xi->text; my @Hists = split(/,/, $All{"LRBF"} );
$All{"Xf"}=Xf->text;
$All{"Yi"}=Yi->text;
$All{"Yf"}=Yf->text;
# Lifetime corrections in enabled/visible only for SingleHis fits # Lifetime corrections in enabled/visible only for SingleHis fits
if ( $All{"FitAsyType"} eq "Asymmetry" ) { if ( $All{"FitAsyType"} eq "Asymmetry" ) {
ltc->setHidden(1); ltc->setHidden(1);
@ -3173,11 +3185,29 @@ sub CreateAllInput
ltc->setHidden(0); ltc->setHidden(0);
} }
# From Fitting Tab
# Plot range
$All{"Xi"}=Xi->text;
$All{"Xf"}=Xf->text;
$All{"Yi"}=Yi->text;
$All{"Yf"}=Yf->text;
# Life time correction
if (ltc->isChecked()) { if (ltc->isChecked()) {
$All{"ltc"}="y"; $All{"ltc"}="y";
} else { } else {
$All{"ltc"}="n"; $All{"ltc"}="n";
} }
# Minuit commands
if ( $All{"go"} eq "" ) {
$All{"go"}="PLOT";
}
# Get minimization process
$All{"Minimization"} = Minimization->currentText();
$All{"go"}=$All{"Minimization"};
# Get Error calculation process
$All{"ErrorCalc"} = ErrorCalc->currentText();
$All{"go"}=$All{"ErrorCalc"};
RunSelectionToggle(); RunSelectionToggle();
my @RUNS = (); my @RUNS = ();
@ -3188,12 +3218,17 @@ sub CreateAllInput
@RUNS = split( /,/, $All{"RunNumbers"} ); @RUNS = split( /,/, $All{"RunNumbers"} );
} }
my @Hists = split(/,/, $All{"LRBF"} ); # From MSR File Tab
$All{"TITLE"}= TITLE->text;
$All{"FILENAME"}= FILENAME->text;
# From Fourier Tab # From Fourier Tab
$All{"FUNITS"}= FUnits->currentText; $All{"FUNITS"}= FUnits->currentText;
$All{"FAPODIZATION"}= FApodization->currentText; $All{"FAPODIZATION"}= FApodization->currentText;
$All{"FPLOT"}= FPlot->currentText; $All{"FPLOT"}= FPlot->currentText;
# Fourier range
$All{"FrqMin"}=FrqMin->text;
$All{"FrqMax"}=FrqMax->text;
# Get values of t0 and Bg/Data bins if given # Get values of t0 and Bg/Data bins if given
my $NHist = 1; my $NHist = 1;
@ -3325,17 +3360,7 @@ sub CreateAllInput
$All{"FILENAME"}="TMP"; $All{"FILENAME"}="TMP";
} }
if ( $All{"go"} eq "" ) {
$All{"go"}="PLOT";
}
# Get minimization process
$All{"Minimization"} = Minimization->currentText();
$All{"go"}=$All{"Minimization"};
# Get Error calculation process
$All{"ErrorCalc"} = ErrorCalc->currentText();
$All{"go"}=$All{"ErrorCalc"};
# Return Hash with all important values # Return Hash with all important values
return %All; return %All;
@ -3699,6 +3724,20 @@ sub RunSelectionToggle
RUNSAuto->setHidden(0); RUNSAuto->setHidden(0);
} }
# Also use this for other options
# Fourier toggle
my $Fourier=optionsFourier->isOn();
if ($Fourier) {
# Fourier tab visible
# musrfit_tabs->addTab(FourierPage,"Fourier");
# musrfit_tabs->showPage(FourierPage);
# FourierPage->hide();
} else {
# Fourier tab invisible
# musrfit_tabs->removePage(FourierPage);
# FourierPage->show();
}
} }
sub fileBrowse sub fileBrowse

View File

@ -77,316 +77,6 @@
<attribute name="title"> <attribute name="title">
<string>RUNS</string> <string>RUNS</string>
</attribute> </attribute>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout43</cstring>
</property>
<property name="geometry">
<rect>
<x>3</x>
<y>3</y>
<width>545</width>
<height>95</height>
</rect>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="margin">
<number>5</number>
</property>
<widget class="QGroupBox">
<property name="name">
<cstring>RUNSAuto</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="title">
<string>RUN Numbers</string>
</property>
<widget class="QLabel">
<property name="name">
<cstring>YEARLabel</cstring>
</property>
<property name="geometry">
<rect>
<x>361</x>
<y>55</y>
<width>55</width>
<height>26</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Year</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>LEM</string>
</property>
</item>
<item>
<property name="text">
<string>GPS</string>
</property>
</item>
<item>
<property name="text">
<string>Dolly</string>
</property>
</item>
<item>
<property name="text">
<string>LTF</string>
</property>
</item>
<property name="name">
<cstring>BeamLine</cstring>
</property>
<property name="geometry">
<rect>
<x>232</x>
<y>55</y>
<width>100</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>BeamLineLabel</cstring>
</property>
<property name="geometry">
<rect>
<x>127</x>
<y>55</y>
<width>99</width>
<height>26</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>On beam line</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>2009</string>
</property>
</item>
<item>
<property name="text">
<string>2008</string>
</property>
</item>
<item>
<property name="text">
<string>2007</string>
</property>
</item>
<item>
<property name="text">
<string>2006</string>
</property>
</item>
<item>
<property name="text">
<string>2005</string>
</property>
</item>
<item>
<property name="text">
<string>2004</string>
</property>
</item>
<property name="name">
<cstring>YEAR</cstring>
</property>
<property name="geometry">
<rect>
<x>420</x>
<y>55</y>
<width>100</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>RunNumbers</cstring>
</property>
<property name="geometry">
<rect>
<x>15</x>
<y>25</y>
<width>505</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="toolTip" stdset="0">
<string>Numbers of RUNs to fit. Multiple runs are comma separated.</string>
</property>
<property name="whatsThis" stdset="0">
<string>Numbers of RUNs to fit. Multiple runs are comma separated.</string>
</property>
</widget>
</widget>
<widget class="QGroupBox">
<property name="name">
<cstring>RUNSMan</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="title">
<string>RUN Files</string>
</property>
<widget class="QLineEdit">
<property name="name">
<cstring>RunFiles</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>15</x>
<y>25</y>
<width>505</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="toolTip" stdset="0">
<string>Names of data files to be fit. Multiple data files are comma separated.</string>
</property>
<property name="whatsThis" stdset="0">
<string>Names of data files to be fit. Multiple data files are comma separated.</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>Browse</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>420</x>
<y>55</y>
<width>100</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Browse</string>
</property>
<property name="toolTip" stdset="0">
<string>Browse to select data files for fitting.</string>
</property>
<property name="whatsThis" stdset="0">
<string>Browse to select data files for fitting.</string>
</property>
</widget>
</widget>
</vbox>
</widget>
<widget class="QLayoutWidget"> <widget class="QLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout26</cstring> <cstring>layout26</cstring>
@ -1959,10 +1649,320 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout43</cstring>
</property>
<property name="geometry">
<rect>
<x>3</x>
<y>3</y>
<width>545</width>
<height>95</height>
</rect>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="margin">
<number>5</number>
</property>
<widget class="QGroupBox">
<property name="name">
<cstring>RUNSAuto</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="title">
<string>RUN Numbers</string>
</property>
<widget class="QLabel">
<property name="name">
<cstring>YEARLabel</cstring>
</property>
<property name="geometry">
<rect>
<x>361</x>
<y>55</y>
<width>55</width>
<height>26</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Year</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>LEM</string>
</property>
</item>
<item>
<property name="text">
<string>GPS</string>
</property>
</item>
<item>
<property name="text">
<string>Dolly</string>
</property>
</item>
<item>
<property name="text">
<string>LTF</string>
</property>
</item>
<property name="name">
<cstring>BeamLine</cstring>
</property>
<property name="geometry">
<rect>
<x>232</x>
<y>55</y>
<width>100</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>BeamLineLabel</cstring>
</property>
<property name="geometry">
<rect>
<x>127</x>
<y>55</y>
<width>99</width>
<height>26</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>On beam line</string>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
<string>2009</string>
</property>
</item>
<item>
<property name="text">
<string>2008</string>
</property>
</item>
<item>
<property name="text">
<string>2007</string>
</property>
</item>
<item>
<property name="text">
<string>2006</string>
</property>
</item>
<item>
<property name="text">
<string>2005</string>
</property>
</item>
<item>
<property name="text">
<string>2004</string>
</property>
</item>
<property name="name">
<cstring>YEAR</cstring>
</property>
<property name="geometry">
<rect>
<x>420</x>
<y>55</y>
<width>100</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>RunNumbers</cstring>
</property>
<property name="geometry">
<rect>
<x>15</x>
<y>25</y>
<width>505</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="toolTip" stdset="0">
<string>Numbers of RUNs to fit. Multiple runs are comma separated.</string>
</property>
<property name="whatsThis" stdset="0">
<string>Numbers of RUNs to fit. Multiple runs are comma separated.</string>
</property>
</widget>
</widget>
<widget class="QGroupBox">
<property name="name">
<cstring>RUNSMan</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="title">
<string>RUN Files</string>
</property>
<widget class="QLineEdit">
<property name="name">
<cstring>RunFiles</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>15</x>
<y>25</y>
<width>505</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>23</height>
</size>
</property>
<property name="toolTip" stdset="0">
<string>Names of data files to be fit. Multiple data files are comma separated.</string>
</property>
<property name="whatsThis" stdset="0">
<string>Names of data files to be fit. Multiple data files are comma separated.</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>Browse</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>420</x>
<y>55</y>
<width>100</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Browse</string>
</property>
<property name="toolTip" stdset="0">
<string>Browse to select data files for fitting.</string>
</property>
<property name="whatsThis" stdset="0">
<string>Browse to select data files for fitting.</string>
</property>
</widget>
</widget>
</vbox>
</widget>
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
<property name="name"> <property name="name">
<cstring>TabPage</cstring> <cstring>FittingPage</cstring>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>Fitting</string> <string>Fitting</string>
@ -2104,7 +2104,7 @@
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
<property name="name"> <property name="name">
<cstring>SharingPahe</cstring> <cstring>SharingPage</cstring>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>Sharing</string> <string>Sharing</string>
@ -2843,7 +2843,7 @@
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
<property name="name"> <property name="name">
<cstring>FittingPage</cstring> <cstring>MSRPage</cstring>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>MSR File</string> <string>MSR File</string>
@ -2991,7 +2991,7 @@
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
<property name="name"> <property name="name">
<cstring>TabPage</cstring> <cstring>FourierPage</cstring>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>Fourier</string> <string>Fourier</string>
@ -3199,7 +3199,7 @@
</property> </property>
<widget class="QLineEdit"> <widget class="QLineEdit">
<property name="name"> <property name="name">
<cstring>lineEdit28</cstring> <cstring>FrqMin</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -3272,7 +3272,7 @@
</property> </property>
<widget class="QLineEdit"> <widget class="QLineEdit">
<property name="name"> <property name="name">
<cstring>lineEdit28_2</cstring> <cstring>FrqMax</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -3306,23 +3306,19 @@
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
<property name="name"> <property name="name">
<cstring>TabPage</cstring> <cstring>T0Page</cstring>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>t0/Bg Bins</string> <string>t0/Bg Bins</string>
</attribute> </attribute>
<widget class="QLayoutWidget"> <grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout27</cstring> <cstring>layout27</cstring>
</property> </property>
<property name="geometry">
<rect>
<x>7</x>
<y>5</y>
<width>540</width>
<height>180</height>
</rect>
</property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -3661,6 +3657,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
</grid>
</widget> </widget>
</widget> </widget>
</widget> </widget>
@ -3680,6 +3677,14 @@
<separator/> <separator/>
<action name="fileExitAction"/> <action name="fileExitAction"/>
</item> </item>
<item text="Edit" name="Edit">
<action name="editUndoAction"/>
<action name="editRedoAction"/>
<separator/>
<action name="editCutAction"/>
<action name="editCopyAction"/>
<action name="editPasteAction"/>
</item>
<item text="Actions" name="Actions"> <item text="Actions" name="Actions">
<action name="Fit"/> <action name="Fit"/>
<action name="Plot"/> <action name="Plot"/>
@ -3689,17 +3694,11 @@
<action name="parametersExport_AsAction"/> <action name="parametersExport_AsAction"/>
<action name="parametersAppend_ToAction"/> <action name="parametersAppend_ToAction"/>
</item> </item>
<item text="Edit" name="Edit">
<action name="editUndoAction"/>
<action name="editRedoAction"/>
<separator/>
<action name="editCutAction"/>
<action name="editCopyAction"/>
<action name="editPasteAction"/>
</item>
<item text="Options" name="Options"> <item text="Options" name="Options">
<action name="FileExistCheck"/> <action name="FileExistCheck"/>
<action name="ManualFile"/> <action name="ManualFile"/>
<action name="optionsFourier"/>
<action name="optionsT0"/>
</item> </item>
<item text="&amp;Help" name="helpMenu"> <item text="&amp;Help" name="helpMenu">
<action name="helpContentsAction"/> <action name="helpContentsAction"/>
@ -4045,10 +4044,13 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Change name</string> <string>Overwrite MSR File</string>
</property> </property>
<property name="menuText"> <property name="menuText">
<string>Change name</string> <string>Overwrite MSR File</string>
</property>
<property name="toolTip">
<string>Enable overwriting MSR files</string>
</property> </property>
<property name="whatsThis"> <property name="whatsThis">
<string>Enable/Disable checking for MSR files.</string> <string>Enable/Disable checking for MSR files.</string>
@ -4175,6 +4177,34 @@
<string>Ctrl+T</string> <string>Ctrl+T</string>
</property> </property>
</action> </action>
<action>
<property name="name">
<cstring>optionsFourier</cstring>
</property>
<property name="toggleAction">
<bool>true</bool>
</property>
<property name="text">
<string>Fourier</string>
</property>
<property name="menuText">
<string>Fourier</string>
</property>
</action>
<action>
<property name="name">
<cstring>optionsT0</cstring>
</property>
<property name="toggleAction">
<bool>true</bool>
</property>
<property name="text">
<string>T0 and Bg bins</string>
</property>
<property name="menuText">
<string>T0 and Bg bins</string>
</property>
</action>
</actions> </actions>
<images> <images>
<image name="image0"> <image name="image0">
@ -4269,12 +4299,6 @@
<receiver>MuSRFitform</receiver> <receiver>MuSRFitform</receiver>
<slot>fileBrowse()</slot> <slot>fileBrowse()</slot>
</connection> </connection>
<connection>
<sender>ManualFile</sender>
<signal>toggled(bool)</signal>
<receiver>MuSRFitform</receiver>
<slot>RunSelectionToggle()</slot>
</connection>
<connection> <connection>
<sender>InitParamTable</sender> <sender>InitParamTable</sender>
<signal>valueChanged(int,int)</signal> <signal>valueChanged(int,int)</signal>
@ -4428,8 +4452,8 @@
<tabstop>FUnits</tabstop> <tabstop>FUnits</tabstop>
<tabstop>FApodization</tabstop> <tabstop>FApodization</tabstop>
<tabstop>FPlot</tabstop> <tabstop>FPlot</tabstop>
<tabstop>lineEdit28</tabstop> <tabstop>FrqMin</tabstop>
<tabstop>lineEdit28_2</tabstop> <tabstop>FrqMax</tabstop>
<tabstop>t01</tabstop> <tabstop>t01</tabstop>
<tabstop>Bg11</tabstop> <tabstop>Bg11</tabstop>
<tabstop>Bg21</tabstop> <tabstop>Bg21</tabstop>

View File

@ -214,24 +214,23 @@ void MuSRFitform::CreateAllInput()
{ {
# TODO: Need to automatically generage years list depending on beamline # TODO: Need to automatically generage years list depending on beamline
my %All=(); my %All=();
# From RUNS Tab # From RUNS Tab
$All{"TITLE"}= TITLE->text; # Run data file
$All{"FILENAME"}= FILENAME->text;
$All{"RunNumbers"} = RunNumbers->text; $All{"RunNumbers"} = RunNumbers->text;
$All{"RunFiles"} = RunFiles->text; $All{"RunFiles"} = RunFiles->text;
$All{"BeamLine"} = BeamLine->currentText; $All{"BeamLine"} = BeamLine->currentText;
$All{"RUNSType"} = ManualFile->isOn(); $All{"RUNSType"} = ManualFile->isOn();
$All{"optionsFourier"} = optionsFourier->isOn();
$All{"optionsT0"} = optionsT0->isOn();
$All{"YEAR"} =YEAR->currentText; $All{"YEAR"} =YEAR->currentText;
# Time range and BINS
$All{"Tis"} = Tis->text; $All{"Tis"} = Tis->text;
$All{"Tfs"} = Tfs->text; $All{"Tfs"} = Tfs->text;
$All{"BINS"} = BINS->text; $All{"BINS"} = BINS->text;
$All{"FitAsyType"} = FitAsyType->currentText; $All{"FitAsyType"} = FitAsyType->currentText;
$All{"LRBF"} = LRBF->text; $All{"LRBF"} = LRBF->text;
$All{"Xi"}=Xi->text; my @Hists = split(/,/, $All{"LRBF"} );
$All{"Xf"}=Xf->text;
$All{"Yi"}=Yi->text;
$All{"Yf"}=Yf->text;
# Lifetime corrections in enabled/visible only for SingleHis fits # Lifetime corrections in enabled/visible only for SingleHis fits
if ( $All{"FitAsyType"} eq "Asymmetry" ) { if ( $All{"FitAsyType"} eq "Asymmetry" ) {
ltc->setHidden(1); ltc->setHidden(1);
@ -240,11 +239,29 @@ void MuSRFitform::CreateAllInput()
ltc->setHidden(0); ltc->setHidden(0);
} }
# From Fitting Tab
# Plot range
$All{"Xi"}=Xi->text;
$All{"Xf"}=Xf->text;
$All{"Yi"}=Yi->text;
$All{"Yf"}=Yf->text;
# Life time correction
if (ltc->isChecked()) { if (ltc->isChecked()) {
$All{"ltc"}="y"; $All{"ltc"}="y";
} else { } else {
$All{"ltc"}="n"; $All{"ltc"}="n";
} }
# Minuit commands
if ( $All{"go"} eq "" ) {
$All{"go"}="PLOT";
}
# Get minimization process
$All{"Minimization"} = Minimization->currentText();
$All{"go"}=$All{"Minimization"};
# Get Error calculation process
$All{"ErrorCalc"} = ErrorCalc->currentText();
$All{"go"}=$All{"ErrorCalc"};
RunSelectionToggle(); RunSelectionToggle();
my @RUNS = (); my @RUNS = ();
@ -255,12 +272,17 @@ void MuSRFitform::CreateAllInput()
@RUNS = split( /,/, $All{"RunNumbers"} ); @RUNS = split( /,/, $All{"RunNumbers"} );
} }
my @Hists = split(/,/, $All{"LRBF"} ); # From MSR File Tab
$All{"TITLE"}= TITLE->text;
$All{"FILENAME"}= FILENAME->text;
# From Fourier Tab # From Fourier Tab
$All{"FUNITS"}= FUnits->currentText; $All{"FUNITS"}= FUnits->currentText;
$All{"FAPODIZATION"}= FApodization->currentText; $All{"FAPODIZATION"}= FApodization->currentText;
$All{"FPLOT"}= FPlot->currentText; $All{"FPLOT"}= FPlot->currentText;
# Fourier range
$All{"FrqMin"}=FrqMin->text;
$All{"FrqMax"}=FrqMax->text;
# Get values of t0 and Bg/Data bins if given # Get values of t0 and Bg/Data bins if given
my $NHist = 1; my $NHist = 1;
@ -392,17 +414,7 @@ void MuSRFitform::CreateAllInput()
$All{"FILENAME"}="TMP"; $All{"FILENAME"}="TMP";
} }
if ( $All{"go"} eq "" ) {
$All{"go"}="PLOT";
}
# Get minimization process
$All{"Minimization"} = Minimization->currentText();
$All{"go"}=$All{"Minimization"};
# Get Error calculation process
$All{"ErrorCalc"} = ErrorCalc->currentText();
$All{"go"}=$All{"ErrorCalc"};
# Return Hash with all important values # Return Hash with all important values
return %All; return %All;
@ -747,6 +759,20 @@ void MuSRFitform::RunSelectionToggle()
RUNSAuto->setEnabled(1); RUNSAuto->setEnabled(1);
RUNSAuto->setHidden(0); RUNSAuto->setHidden(0);
} }
# Also use this for other options
# Fourier toggle
my $Fourier=optionsFourier->isOn();
if ($Fourier) {
# Fourier tab visible
# musrfit_tabs->addTab(FourierPage,"Fourier");
# musrfit_tabs->showPage(FourierPage);
# FourierPage->hide();
} else {
# Fourier tab invisible
# musrfit_tabs->removePage(FourierPage);
# FourierPage->show();
}
} }
void MuSRFitform::fileBrowse() void MuSRFitform::fileBrowse()