Cosmetic changes.

This commit is contained in:
salman 2009-08-27 15:58:53 +00:00
parent 6797878583
commit f967228cde
3 changed files with 325 additions and 176 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: Thu Aug 27 15:58:41 2009 # Created: Thu Aug 27 17:57:40 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!
@ -35,6 +35,7 @@ use Qt::slots
InitializeTab => [], InitializeTab => [],
TabChanged => [], TabChanged => [],
GoFit => [], GoFit => [],
GoPlot => [],
ShowMuSRT0 => []; ShowMuSRT0 => [];
use Qt::attributes qw( use Qt::attributes qw(
textLabel2_2 textLabel2_2
@ -108,15 +109,16 @@ use Qt::attributes qw(
FittingPage FittingPage
textMSROutput textMSROutput
TabPage TabPage
ErrorCalc FitTextOutput
HESSE
MINOS
Minimization Minimization
MINIMIZE MINIMIZE
MIGRAD MIGRAD
SIMPLEX SIMPLEX
FitTextOutput ErrorCalc
HESSE
MINOS
go go
PlotMSR
TabPage_2 TabPage_2
FPlot FPlot
FApodization FApodization
@ -560,7 +562,7 @@ sub NEW
musrfit_tabs->setGeometry( Qt::Rect(5, 0, 560, 400) ); musrfit_tabs->setGeometry( Qt::Rect(5, 0, 560, 400) );
musrfit_tabs->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, musrfit_tabs->sizePolicy()->hasHeightForWidth()) ); musrfit_tabs->setSizePolicy( Qt::SizePolicy(7, 7, 1, 1, musrfit_tabs->sizePolicy()->hasHeightForWidth()) );
musrfit_tabs->setMinimumSize( Qt::Size(560, 400) ); musrfit_tabs->setMinimumSize( Qt::Size(560, 400) );
musrfit_tabs->setMaximumSize( Qt::Size(32767, 32767) ); musrfit_tabs->setMaximumSize( Qt::Size(95, 32767) );
RUNSPage = Qt::Widget(musrfit_tabs, "RUNSPage"); RUNSPage = Qt::Widget(musrfit_tabs, "RUNSPage");
@ -893,7 +895,9 @@ sub NEW
InitParamTable->setFocusStyle( &Qt::Table::SpreadSheet() ); InitParamTable->setFocusStyle( &Qt::Table::SpreadSheet() );
TableUpdate = Qt::PushButton(InitializationPage, "TableUpdate"); TableUpdate = Qt::PushButton(InitializationPage, "TableUpdate");
TableUpdate->setGeometry( Qt::Rect(435, 335, 115, 28) ); TableUpdate->setGeometry( Qt::Rect(460, 335, 90, 30) );
TableUpdate->setMinimumSize( Qt::Size(90, 30) );
TableUpdate->setMaximumSize( Qt::Size(90, 30) );
musrfit_tabs->insertTab( InitializationPage, "" ); musrfit_tabs->insertTab( InitializationPage, "" );
FittingPage = Qt::Widget(musrfit_tabs, "FittingPage"); FittingPage = Qt::Widget(musrfit_tabs, "FittingPage");
@ -905,22 +909,12 @@ sub NEW
TabPage = Qt::Widget(musrfit_tabs, "TabPage"); TabPage = Qt::Widget(musrfit_tabs, "TabPage");
ErrorCalc = Qt::ButtonGroup(TabPage, "ErrorCalc"); FitTextOutput = Qt::TextEdit(TabPage, "FitTextOutput");
ErrorCalc->setGeometry( Qt::Rect(223, 11, 211, 125) ); FitTextOutput->setGeometry( Qt::Rect(5, 135, 545, 230) );
ErrorCalc->setAlignment( int(&Qt::ButtonGroup::AlignTop) ); FitTextOutput->setOverwriteMode( 1 );
ErrorCalc->setExclusive( 1 );
ErrorCalc->setRadioButtonExclusive( 1 );
ErrorCalc->setProperty( "selectedId", Qt::Variant(int(0) ) );
HESSE = Qt::RadioButton(ErrorCalc, "HESSE");
HESSE->setGeometry( Qt::Rect(19, 30, 69, 22) );
HESSE->setChecked( 1 );
MINOS = Qt::RadioButton(ErrorCalc, "MINOS");
MINOS->setGeometry( Qt::Rect(19, 59, 69, 22) );
Minimization = Qt::ButtonGroup(TabPage, "Minimization"); Minimization = Qt::ButtonGroup(TabPage, "Minimization");
Minimization->setGeometry( Qt::Rect(6, 11, 211, 125) ); Minimization->setGeometry( Qt::Rect(6, 1, 200, 125) );
Minimization->setExclusive( 1 ); Minimization->setExclusive( 1 );
Minimization->setRadioButtonExclusive( 1 ); Minimization->setRadioButtonExclusive( 1 );
Minimization->setProperty( "selectedId", Qt::Variant(int(0) ) ); Minimization->setProperty( "selectedId", Qt::Variant(int(0) ) );
@ -935,177 +929,204 @@ sub NEW
SIMPLEX = Qt::RadioButton(Minimization, "SIMPLEX"); SIMPLEX = Qt::RadioButton(Minimization, "SIMPLEX");
SIMPLEX->setGeometry( Qt::Rect(16, 88, 83, 22) ); SIMPLEX->setGeometry( Qt::Rect(16, 88, 83, 22) );
FitTextOutput = Qt::TextEdit(TabPage, "FitTextOutput"); ErrorCalc = Qt::ButtonGroup(TabPage, "ErrorCalc");
FitTextOutput->setGeometry( Qt::Rect(5, 140, 545, 225) ); ErrorCalc->setGeometry( Qt::Rect(208, 1, 200, 125) );
FitTextOutput->setOverwriteMode( 1 ); ErrorCalc->setAlignment( int(&Qt::ButtonGroup::AlignTop) );
ErrorCalc->setExclusive( 1 );
ErrorCalc->setRadioButtonExclusive( 1 );
ErrorCalc->setProperty( "selectedId", Qt::Variant(int(0) ) );
go = Qt::PushButton(TabPage, "go"); HESSE = Qt::RadioButton(ErrorCalc, "HESSE");
go->setGeometry( Qt::Rect(440, 15, 111, 31) ); HESSE->setGeometry( Qt::Rect(19, 30, 69, 22) );
HESSE->setChecked( 1 );
MINOS = Qt::RadioButton(ErrorCalc, "MINOS");
MINOS->setGeometry( Qt::Rect(19, 59, 69, 22) );
my $LayoutWidget_5 = Qt::Widget(TabPage, '$LayoutWidget_5');
$LayoutWidget_5->setGeometry( Qt::Rect(418, 5, 125, 120) );
my $layout28 = Qt::VBoxLayout($LayoutWidget_5, 11, 6, '$layout28');
go = Qt::PushButton($LayoutWidget_5, "go");
go->setSizePolicy( Qt::SizePolicy(7, 0, 1, 0, go->sizePolicy()->hasHeightForWidth()) );
go->setMinimumSize( Qt::Size(95, 30) );
go->setMaximumSize( Qt::Size(95, 30) );
go->setAutoDefault( 0 ); go->setAutoDefault( 0 );
go->setDefault( 1 ); go->setDefault( 1 );
$layout28->addWidget(go);
PlotMSR = Qt::PushButton($LayoutWidget_5, "PlotMSR");
PlotMSR->setSizePolicy( Qt::SizePolicy(7, 0, 1, 0, PlotMSR->sizePolicy()->hasHeightForWidth()) );
PlotMSR->setMinimumSize( Qt::Size(95, 30) );
PlotMSR->setMaximumSize( Qt::Size(95, 30) );
PlotMSR->setAutoDefault( 0 );
PlotMSR->setDefault( 1 );
$layout28->addWidget(PlotMSR);
musrfit_tabs->insertTab( TabPage, "" ); musrfit_tabs->insertTab( TabPage, "" );
TabPage_2 = Qt::Widget(musrfit_tabs, "TabPage_2"); TabPage_2 = Qt::Widget(musrfit_tabs, "TabPage_2");
my $LayoutWidget_5 = Qt::Widget(TabPage_2, '$LayoutWidget_5'); my $LayoutWidget_6 = Qt::Widget(TabPage_2, '$LayoutWidget_6');
$LayoutWidget_5->setGeometry( Qt::Rect(8, 18, 225, 92) ); $LayoutWidget_6->setGeometry( Qt::Rect(8, 18, 225, 105) );
my $layout11 = Qt::GridLayout($LayoutWidget_5, 1, 1, 11, 6, '$layout11'); my $layout11 = Qt::GridLayout($LayoutWidget_6, 1, 1, 11, 6, '$layout11');
FPlot = Qt::ComboBox(0, $LayoutWidget_5, "FPlot"); FPlot = Qt::ComboBox(0, $LayoutWidget_6, "FPlot");
FPlot->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FPlot->sizePolicy()->hasHeightForWidth()) ); FPlot->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FPlot->sizePolicy()->hasHeightForWidth()) );
$layout11->addWidget(FPlot, 2, 1); $layout11->addWidget(FPlot, 2, 1);
FApodization = Qt::ComboBox(0, $LayoutWidget_5, "FApodization"); FApodization = Qt::ComboBox(0, $LayoutWidget_6, "FApodization");
FApodization->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FApodization->sizePolicy()->hasHeightForWidth()) ); FApodization->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FApodization->sizePolicy()->hasHeightForWidth()) );
$layout11->addWidget(FApodization, 1, 1); $layout11->addWidget(FApodization, 1, 1);
FApodizationLabel = Qt::Label($LayoutWidget_5, "FApodizationLabel"); FApodizationLabel = Qt::Label($LayoutWidget_6, "FApodizationLabel");
$layout11->addWidget(FApodizationLabel, 1, 0); $layout11->addWidget(FApodizationLabel, 1, 0);
FUnits = Qt::ComboBox(0, $LayoutWidget_5, "FUnits"); FUnits = Qt::ComboBox(0, $LayoutWidget_6, "FUnits");
FUnits->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FUnits->sizePolicy()->hasHeightForWidth()) ); FUnits->setSizePolicy( Qt::SizePolicy(5, 5, 0, 0, FUnits->sizePolicy()->hasHeightForWidth()) );
$layout11->addWidget(FUnits, 0, 1); $layout11->addWidget(FUnits, 0, 1);
FPlotLabel = Qt::Label($LayoutWidget_5, "FPlotLabel"); FPlotLabel = Qt::Label($LayoutWidget_6, "FPlotLabel");
$layout11->addWidget(FPlotLabel, 2, 0); $layout11->addWidget(FPlotLabel, 2, 0);
FUnitsLabel = Qt::Label($LayoutWidget_5, "FUnitsLabel"); FUnitsLabel = Qt::Label($LayoutWidget_6, "FUnitsLabel");
$layout11->addWidget(FUnitsLabel, 0, 0); $layout11->addWidget(FUnitsLabel, 0, 0);
musrfit_tabs->insertTab( TabPage_2, "" ); musrfit_tabs->insertTab( TabPage_2, "" );
TabPage_3 = Qt::Widget(musrfit_tabs, "TabPage_3"); TabPage_3 = Qt::Widget(musrfit_tabs, "TabPage_3");
my $LayoutWidget_6 = Qt::Widget(TabPage_3, '$LayoutWidget_6'); my $LayoutWidget_7 = Qt::Widget(TabPage_3, '$LayoutWidget_7');
$LayoutWidget_6->setGeometry( Qt::Rect(7, 5, 540, 180) ); $LayoutWidget_7->setGeometry( Qt::Rect(7, 5, 540, 180) );
my $layout27 = Qt::HBoxLayout($LayoutWidget_6, 0, 6, '$layout27'); my $layout27 = Qt::HBoxLayout($LayoutWidget_7, 0, 6, '$layout27');
groupHist0 = Qt::GroupBox($LayoutWidget_6, "groupHist0"); groupHist0 = Qt::GroupBox($LayoutWidget_7, "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_7 = Qt::Widget(groupHist0, '$LayoutWidget_7'); my $LayoutWidget_8 = Qt::Widget(groupHist0, '$LayoutWidget_8');
$LayoutWidget_7->setGeometry( Qt::Rect(5, 28, 100, 135) ); $LayoutWidget_8->setGeometry( Qt::Rect(5, 28, 100, 135) );
my $layout16_2 = Qt::VBoxLayout($LayoutWidget_7, 11, 0, '$layout16_2'); my $layout16_2 = Qt::VBoxLayout($LayoutWidget_8, 11, 0, '$layout16_2');
textLabel2 = Qt::Label($LayoutWidget_7, "textLabel2"); textLabel2 = Qt::Label($LayoutWidget_8, "textLabel2");
$layout16_2->addWidget(textLabel2); $layout16_2->addWidget(textLabel2);
textLabel2_2_2_3 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_3"); textLabel2_2_2_3 = Qt::Label($LayoutWidget_8, "textLabel2_2_2_3");
$layout16_2->addWidget(textLabel2_2_2_3); $layout16_2->addWidget(textLabel2_2_2_3);
textLabel2_2_2 = Qt::Label($LayoutWidget_7, "textLabel2_2_2"); textLabel2_2_2 = Qt::Label($LayoutWidget_8, "textLabel2_2_2");
$layout16_2->addWidget(textLabel2_2_2); $layout16_2->addWidget(textLabel2_2_2);
textLabel2_2_2_2 = Qt::Label($LayoutWidget_7, "textLabel2_2_2_2"); textLabel2_2_2_2 = Qt::Label($LayoutWidget_8, "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_7, "textLabel2_2_2_2_2"); textLabel2_2_2_2_2 = Qt::Label($LayoutWidget_8, "textLabel2_2_2_2_2");
$layout16_2->addWidget(textLabel2_2_2_2_2); $layout16_2->addWidget(textLabel2_2_2_2_2);
$layout27->addWidget(groupHist0); $layout27->addWidget(groupHist0);
groupHist1 = Qt::GroupBox($LayoutWidget_6, "groupHist1"); groupHist1 = Qt::GroupBox($LayoutWidget_7, "groupHist1");
groupHist1->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist1->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_8 = Qt::Widget(groupHist1, '$LayoutWidget_8'); my $LayoutWidget_9 = Qt::Widget(groupHist1, '$LayoutWidget_9');
$LayoutWidget_8->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_9->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_2 = Qt::VBoxLayout($LayoutWidget_8, 0, 0, '$layout18_2'); my $layout18_2 = Qt::VBoxLayout($LayoutWidget_9, 0, 0, '$layout18_2');
t01 = Qt::LineEdit($LayoutWidget_8, "t01"); t01 = Qt::LineEdit($LayoutWidget_9, "t01");
$layout18_2->addWidget(t01); $layout18_2->addWidget(t01);
Bg11 = Qt::LineEdit($LayoutWidget_8, "Bg11"); Bg11 = Qt::LineEdit($LayoutWidget_9, "Bg11");
$layout18_2->addWidget(Bg11); $layout18_2->addWidget(Bg11);
Bg21 = Qt::LineEdit($LayoutWidget_8, "Bg21"); Bg21 = Qt::LineEdit($LayoutWidget_9, "Bg21");
$layout18_2->addWidget(Bg21); $layout18_2->addWidget(Bg21);
Data11 = Qt::LineEdit($LayoutWidget_8, "Data11"); Data11 = Qt::LineEdit($LayoutWidget_9, "Data11");
$layout18_2->addWidget(Data11); $layout18_2->addWidget(Data11);
Data21 = Qt::LineEdit($LayoutWidget_8, "Data21"); Data21 = Qt::LineEdit($LayoutWidget_9, "Data21");
$layout18_2->addWidget(Data21); $layout18_2->addWidget(Data21);
$layout27->addWidget(groupHist1); $layout27->addWidget(groupHist1);
groupHist2 = Qt::GroupBox($LayoutWidget_6, "groupHist2"); groupHist2 = Qt::GroupBox($LayoutWidget_7, "groupHist2");
groupHist2->setEnabled( 1 ); groupHist2->setEnabled( 1 );
groupHist2->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist2->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_9 = Qt::Widget(groupHist2, '$LayoutWidget_9'); my $LayoutWidget_10 = Qt::Widget(groupHist2, '$LayoutWidget_10');
$LayoutWidget_9->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_10->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_2_2 = Qt::VBoxLayout($LayoutWidget_9, 0, 0, '$layout18_2_2'); my $layout18_2_2 = Qt::VBoxLayout($LayoutWidget_10, 0, 0, '$layout18_2_2');
t02 = Qt::LineEdit($LayoutWidget_9, "t02"); t02 = Qt::LineEdit($LayoutWidget_10, "t02");
$layout18_2_2->addWidget(t02); $layout18_2_2->addWidget(t02);
Bg12 = Qt::LineEdit($LayoutWidget_9, "Bg12"); Bg12 = Qt::LineEdit($LayoutWidget_10, "Bg12");
$layout18_2_2->addWidget(Bg12); $layout18_2_2->addWidget(Bg12);
Bg22 = Qt::LineEdit($LayoutWidget_9, "Bg22"); Bg22 = Qt::LineEdit($LayoutWidget_10, "Bg22");
$layout18_2_2->addWidget(Bg22); $layout18_2_2->addWidget(Bg22);
Data12 = Qt::LineEdit($LayoutWidget_9, "Data12"); Data12 = Qt::LineEdit($LayoutWidget_10, "Data12");
$layout18_2_2->addWidget(Data12); $layout18_2_2->addWidget(Data12);
Data22 = Qt::LineEdit($LayoutWidget_9, "Data22"); Data22 = Qt::LineEdit($LayoutWidget_10, "Data22");
$layout18_2_2->addWidget(Data22); $layout18_2_2->addWidget(Data22);
$layout27->addWidget(groupHist2); $layout27->addWidget(groupHist2);
groupHist3 = Qt::GroupBox($LayoutWidget_6, "groupHist3"); groupHist3 = Qt::GroupBox($LayoutWidget_7, "groupHist3");
groupHist3->setEnabled( 1 ); groupHist3->setEnabled( 1 );
groupHist3->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist3->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_10 = Qt::Widget(groupHist3, '$LayoutWidget_10'); my $LayoutWidget_11 = Qt::Widget(groupHist3, '$LayoutWidget_11');
$LayoutWidget_10->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_11->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_3 = Qt::VBoxLayout($LayoutWidget_10, 0, 0, '$layout18_3'); my $layout18_3 = Qt::VBoxLayout($LayoutWidget_11, 0, 0, '$layout18_3');
t03 = Qt::LineEdit($LayoutWidget_10, "t03"); t03 = Qt::LineEdit($LayoutWidget_11, "t03");
$layout18_3->addWidget(t03); $layout18_3->addWidget(t03);
Bg13 = Qt::LineEdit($LayoutWidget_10, "Bg13"); Bg13 = Qt::LineEdit($LayoutWidget_11, "Bg13");
$layout18_3->addWidget(Bg13); $layout18_3->addWidget(Bg13);
Bg23 = Qt::LineEdit($LayoutWidget_10, "Bg23"); Bg23 = Qt::LineEdit($LayoutWidget_11, "Bg23");
$layout18_3->addWidget(Bg23); $layout18_3->addWidget(Bg23);
Data13 = Qt::LineEdit($LayoutWidget_10, "Data13"); Data13 = Qt::LineEdit($LayoutWidget_11, "Data13");
$layout18_3->addWidget(Data13); $layout18_3->addWidget(Data13);
Data23 = Qt::LineEdit($LayoutWidget_10, "Data23"); Data23 = Qt::LineEdit($LayoutWidget_11, "Data23");
$layout18_3->addWidget(Data23); $layout18_3->addWidget(Data23);
$layout27->addWidget(groupHist3); $layout27->addWidget(groupHist3);
groupHist4 = Qt::GroupBox($LayoutWidget_6, "groupHist4"); groupHist4 = Qt::GroupBox($LayoutWidget_7, "groupHist4");
groupHist4->setEnabled( 1 ); groupHist4->setEnabled( 1 );
groupHist4->setFrameShadow( &Qt::GroupBox::Plain() ); groupHist4->setFrameShadow( &Qt::GroupBox::Plain() );
my $LayoutWidget_11 = Qt::Widget(groupHist4, '$LayoutWidget_11'); my $LayoutWidget_12 = Qt::Widget(groupHist4, '$LayoutWidget_12');
$LayoutWidget_11->setGeometry( Qt::Rect(8, 17, 75, 150) ); $LayoutWidget_12->setGeometry( Qt::Rect(8, 17, 75, 150) );
my $layout18_4 = Qt::VBoxLayout($LayoutWidget_11, 0, 0, '$layout18_4'); my $layout18_4 = Qt::VBoxLayout($LayoutWidget_12, 0, 0, '$layout18_4');
t04 = Qt::LineEdit($LayoutWidget_11, "t04"); t04 = Qt::LineEdit($LayoutWidget_12, "t04");
$layout18_4->addWidget(t04); $layout18_4->addWidget(t04);
Bg14 = Qt::LineEdit($LayoutWidget_11, "Bg14"); Bg14 = Qt::LineEdit($LayoutWidget_12, "Bg14");
$layout18_4->addWidget(Bg14); $layout18_4->addWidget(Bg14);
Bg24 = Qt::LineEdit($LayoutWidget_11, "Bg24"); Bg24 = Qt::LineEdit($LayoutWidget_12, "Bg24");
$layout18_4->addWidget(Bg24); $layout18_4->addWidget(Bg24);
Data14 = Qt::LineEdit($LayoutWidget_11, "Data14"); Data14 = Qt::LineEdit($LayoutWidget_12, "Data14");
$layout18_4->addWidget(Data14); $layout18_4->addWidget(Data14);
Data24 = Qt::LineEdit($LayoutWidget_11, "Data24"); Data24 = Qt::LineEdit($LayoutWidget_12, "Data24");
$layout18_4->addWidget(Data24); $layout18_4->addWidget(Data24);
$layout27->addWidget(groupHist4); $layout27->addWidget(groupHist4);
ShowT0 = Qt::PushButton(TabPage_3, "ShowT0"); ShowT0 = Qt::PushButton(TabPage_3, "ShowT0");
ShowT0->setGeometry( Qt::Rect(435, 190, 111, 31) ); ShowT0->setGeometry( Qt::Rect(451, 190, 95, 30) );
ShowT0->setMinimumSize( Qt::Size(95, 30) );
ShowT0->setMaximumSize( Qt::Size(95, 30) );
ShowT0->setAutoDefault( 0 ); ShowT0->setAutoDefault( 0 );
ShowT0->setDefault( 1 ); ShowT0->setDefault( 1 );
musrfit_tabs->insertTab( TabPage_3, "" ); musrfit_tabs->insertTab( TabPage_3, "" );
@ -1224,6 +1245,7 @@ sub NEW
Qt::Object::connect(go, SIGNAL "clicked()", this, SLOT "GoFit()"); Qt::Object::connect(go, SIGNAL "clicked()", this, SLOT "GoFit()");
Qt::Object::connect(TableUpdate, SIGNAL "clicked()", this, SLOT "CallMSRCreate()"); Qt::Object::connect(TableUpdate, SIGNAL "clicked()", this, SLOT "CallMSRCreate()");
Qt::Object::connect(ShowT0, SIGNAL "clicked()", this, SLOT "ShowMuSRT0()"); Qt::Object::connect(ShowT0, SIGNAL "clicked()", this, SLOT "ShowMuSRT0()");
Qt::Object::connect(PlotMSR, SIGNAL "clicked()", this, SLOT "GoPlot()");
setTabOrder(musrfit_tabs, TITLE); setTabOrder(musrfit_tabs, TITLE);
setTabOrder(TITLE, FILENAME); setTabOrder(TITLE, FILENAME);
@ -1402,14 +1424,15 @@ sub languageChange
TableUpdate->setText( trUtf8("Update") ); TableUpdate->setText( trUtf8("Update") );
musrfit_tabs->changeTab( InitializationPage, trUtf8("Initialization") ); musrfit_tabs->changeTab( InitializationPage, trUtf8("Initialization") );
musrfit_tabs->changeTab( FittingPage, trUtf8("MSR File") ); musrfit_tabs->changeTab( FittingPage, trUtf8("MSR File") );
ErrorCalc->setTitle( trUtf8("Error Calculation") );
HESSE->setText( trUtf8("Hesse") );
MINOS->setText( trUtf8("Minos") );
Minimization->setTitle( trUtf8("Minimization") ); Minimization->setTitle( trUtf8("Minimization") );
MINIMIZE->setText( trUtf8("Minimize") ); MINIMIZE->setText( trUtf8("Minimize") );
MIGRAD->setText( trUtf8("Migrad") ); MIGRAD->setText( trUtf8("Migrad") );
SIMPLEX->setText( trUtf8("Simplex") ); SIMPLEX->setText( trUtf8("Simplex") );
ErrorCalc->setTitle( trUtf8("Error Calculation") );
HESSE->setText( trUtf8("Hesse") );
MINOS->setText( trUtf8("Minos") );
go->setText( trUtf8("Fit") ); go->setText( trUtf8("Fit") );
PlotMSR->setText( trUtf8("Plot") );
musrfit_tabs->changeTab( TabPage, trUtf8("Fitting") ); musrfit_tabs->changeTab( TabPage, trUtf8("Fitting") );
FPlot->clear(); FPlot->clear();
FPlot->insertItem( trUtf8("power") ); FPlot->insertItem( trUtf8("power") );
@ -1418,10 +1441,10 @@ sub languageChange
FPlot->insertItem( trUtf8("real_and_imag") ); FPlot->insertItem( trUtf8("real_and_imag") );
FPlot->insertItem( trUtf8("phase") ); FPlot->insertItem( trUtf8("phase") );
FApodization->clear(); FApodization->clear();
FApodization->insertItem( trUtf8("NONE") );
FApodization->insertItem( trUtf8("WEAK") );
FApodization->insertItem( trUtf8("MEDIUM") );
FApodization->insertItem( trUtf8("STRONG") ); FApodization->insertItem( trUtf8("STRONG") );
FApodization->insertItem( trUtf8("MEDIUM") );
FApodization->insertItem( trUtf8("WEAK") );
FApodization->insertItem( trUtf8("NONE") );
FApodizationLabel->setText( trUtf8("Apodization") ); FApodizationLabel->setText( trUtf8("Apodization") );
FUnits->clear(); FUnits->clear();
FUnits->insertItem( trUtf8("MHz") ); FUnits->insertItem( trUtf8("MHz") );
@ -2162,6 +2185,22 @@ sub GoFit
} }
sub GoPlot
{
my %All=CreateAllInput();
CallMSRCreate();
my $FILENAME=$All{"FILENAME"}.".msr";
if (-e $FILENAME) {
my $cmd="musrview $FILENAME &";
my $pid = system($cmd);
} else {
FitTextOutput->append("Cannot find MSR file!");
}
return;
}
sub ShowMuSRT0 sub ShowMuSRT0
{ {

View File

@ -82,7 +82,7 @@
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>95</width>
<height>32767</height> <height>32767</height>
</size> </size>
</property> </property>
@ -1527,12 +1527,24 @@
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>435</x> <x>460</x>
<y>335</y> <y>335</y>
<width>115</width> <width>90</width>
<height>28</height> <height>30</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>90</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>90</width>
<height>30</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Update</string> <string>Update</string>
</property> </property>
@ -1569,68 +1581,21 @@
<attribute name="title"> <attribute name="title">
<string>Fitting</string> <string>Fitting</string>
</attribute> </attribute>
<widget class="QButtonGroup"> <widget class="QTextEdit">
<property name="name"> <property name="name">
<cstring>ErrorCalc</cstring> <cstring>FitTextOutput</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>223</x> <x>5</x>
<y>11</y> <y>135</y>
<width>211</width> <width>545</width>
<height>125</height> <height>230</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="overwriteMode">
<string>Error Calculation</string>
</property>
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="exclusive">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="radioButtonExclusive">
<bool>true</bool>
</property>
<property name="selectedId" stdset="0">
<number>0</number>
</property>
<widget class="QRadioButton">
<property name="name">
<cstring>HESSE</cstring>
</property>
<property name="geometry">
<rect>
<x>19</x>
<y>30</y>
<width>69</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Hesse</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton">
<property name="name">
<cstring>MINOS</cstring>
</property>
<property name="geometry">
<rect>
<x>19</x>
<y>59</y>
<width>69</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Minos</string>
</property>
</widget>
</widget> </widget>
<widget class="QButtonGroup"> <widget class="QButtonGroup">
<property name="name"> <property name="name">
@ -1639,8 +1604,8 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>6</x> <x>6</x>
<y>11</y> <y>1</y>
<width>211</width> <width>200</width>
<height>125</height> <height>125</height>
</rect> </rect>
</property> </property>
@ -1708,43 +1673,154 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<widget class="QTextEdit"> <widget class="QButtonGroup">
<property name="name"> <property name="name">
<cstring>FitTextOutput</cstring> <cstring>ErrorCalc</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>5</x> <x>208</x>
<y>140</y> <y>1</y>
<width>545</width> <width>200</width>
<height>225</height> <height>125</height>
</rect> </rect>
</property> </property>
<property name="overwriteMode"> <property name="title">
<string>Error Calculation</string>
</property>
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="exclusive">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="radioButtonExclusive">
<bool>true</bool>
</property>
<property name="selectedId" stdset="0">
<number>0</number>
</property>
<widget class="QRadioButton">
<property name="name">
<cstring>HESSE</cstring>
</property>
<property name="geometry">
<rect>
<x>19</x>
<y>30</y>
<width>69</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Hesse</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton">
<property name="name">
<cstring>MINOS</cstring>
</property>
<property name="geometry">
<rect>
<x>19</x>
<y>59</y>
<width>69</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>Minos</string>
</property>
</widget>
</widget> </widget>
<widget class="QPushButton"> <widget class="QLayoutWidget">
<property name="name"> <property name="name">
<cstring>go</cstring> <cstring>layout28</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>440</x> <x>418</x>
<y>15</y> <y>5</y>
<width>111</width> <width>125</width>
<height>31</height> <height>120</height>
</rect> </rect>
</property> </property>
<property name="text"> <vbox>
<string>Fit</string> <property name="name">
</property> <cstring>unnamed</cstring>
<property name="autoDefault"> </property>
<bool>false</bool> <widget class="QPushButton">
</property> <property name="name">
<property name="default"> <cstring>go</cstring>
<bool>true</bool> </property>
</property> <property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>95</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>95</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>Fit</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>PlotMSR</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>95</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>95</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>Plot</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</vbox>
</widget> </widget>
</widget> </widget>
<widget class="QWidget"> <widget class="QWidget">
@ -1763,7 +1839,7 @@
<x>8</x> <x>8</x>
<y>18</y> <y>18</y>
<width>225</width> <width>225</width>
<height>92</height> <height>105</height>
</rect> </rect>
</property> </property>
<grid> <grid>
@ -2262,12 +2338,24 @@
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>435</x> <x>451</x>
<y>190</y> <y>190</y>
<width>111</width> <width>95</width>
<height>31</height> <height>30</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>95</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>95</width>
<height>30</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Show</string> <string>Show</string>
</property> </property>
@ -2820,6 +2908,12 @@
<receiver>MuSRFitform</receiver> <receiver>MuSRFitform</receiver>
<slot>ShowMuSRT0()</slot> <slot>ShowMuSRT0()</slot>
</connection> </connection>
<connection>
<sender>PlotMSR</sender>
<signal>clicked()</signal>
<receiver>MuSRFitform</receiver>
<slot>GoPlot()</slot>
</connection>
</connections> </connections>
<tabstops> <tabstops>
<tabstop>musrfit_tabs</tabstop> <tabstop>musrfit_tabs</tabstop>
@ -2879,6 +2973,7 @@
<slot>InitializeTab()</slot> <slot>InitializeTab()</slot>
<slot>TabChanged()</slot> <slot>TabChanged()</slot>
<slot>GoFit()</slot> <slot>GoFit()</slot>
<slot>GoPlot()</slot>
<slot>ShowMuSRT0()</slot> <slot>ShowMuSRT0()</slot>
</slots> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>

View File

@ -666,6 +666,21 @@ void MuSRFitform::GoFit()
return; return;
} }
void MuSRFitform::GoPlot()
{
my %All=CreateAllInput();
CallMSRCreate();
my $FILENAME=$All{"FILENAME"}.".msr";
if (-e $FILENAME) {
my $cmd="musrview $FILENAME &";
my $pid = system($cmd);
} else {
FitTextOutput->append("Cannot find MSR file!");
}
return;
}
void MuSRFitform::ShowMuSRT0() void MuSRFitform::ShowMuSRT0()
{ {
# Create MSR file and then run musrt0 # Create MSR file and then run musrt0