Implemented dynamic number of multiple components and sharing

This commit is contained in:
salman 2018-02-12 13:54:11 +01:00
parent e4580072ff
commit 4a16cbe5d3
3 changed files with 266 additions and 945 deletions

View File

@ -403,12 +403,16 @@ sub CreateAllInput()
# old style, only 3 componenets
$numComps = 3;
}
$All{"numComps"}=$numComps;
# loop over fitTypes
for (my $i=1;$i<=$numComps;$i++) {
my $FTi=child("Qt::ComboBox","fitType$i");
$All{"FitType$i"} = $FTs{$FTi->currentIndex};
print "i=$i with value ".$All{"FitType$i"}."\n";
if ($FTi == 0) {
$All{"FitType$i"} = "None";
} else {
$All{"FitType$i"} = $FTs{$FTi->currentIndex};
}
if ( $All{"FitType$i"} ne "None" ) {
push( @FitTypes, $All{"FitType$i"} );
}
@ -427,6 +431,9 @@ sub CreateAllInput()
# Shared settings are detected here
$All{"EnableSharing"} = this->{ui}->buttonGroupSharing->isChecked();
# Make sure all sharing boxes exist
#addSharingComp();
my $Shared = 0;
my $PCount =0;
@ -474,7 +481,7 @@ sub CreateAllInput()
# check if it is checked
my $ChkName="shParam_".$Component."_".$NP;
my $ChkBx = child("Qt::Widget",$ChkName);
$Shared = $ChkBx->isChecked();
if ($ChkBx != 0) {$Shared = $ChkBx->isChecked();}
}
$All{"Sh_$Param"}=$Shared;
$NP++;
@ -735,18 +742,23 @@ sub ActivateShComp()
my @RUNS = split( /,/, MSR::ExpandRunNumbers($All{"RunNumbers"}) );
my @Hists = split( /,/, $All{"LRBF"} );
# Hide all sharing components
this->{ui}->sharingComp1->setHidden(1);
this->{ui}->sharingComp2->setHidden(1);
this->{ui}->sharingComp3->setHidden(1);
this->{ui}->sharingComp1->setEnabled(0);
this->{ui}->sharingComp2->setEnabled(0);
this->{ui}->sharingComp3->setEnabled(0);
# Make sure all sharing boxes exist
addSharingComp();
my $NShComps = this->{ui}->horizontalLayout->count();
my $sharingComp = "";
my $i = 1;
# Hide all sharing components
for ($i = 1; $i<=$NShComps;$i++) {
$sharingComp = child("Qt::GroupBox","sharingComp$i");
$sharingComp->setHidden(1);
$sharingComp->setEnabled(0);
}
my @FitTypes =();
foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) {
if ( $FitType ne "None" ) {
push( @FitTypes, $FitType );
for ($i=1;$i<=$All{"numComps"};$i++) {
if ( $All{"FitType$i"} ne "None" ) {
push( @FitTypes, $All{"FitType$i"} );
}
}
@ -796,7 +808,7 @@ sub ActivateShComp()
$CompShL->setText($All{"FitType$Component"});
# Change state/label of parameters
for (my $i=1; $i<=9;$i++) {
for ($i=1; $i<=9;$i++) {
my $ParamChkBx="shParam_".$Component."_".$i;
my $ChkBx = child("Qt::Widget",$ParamChkBx);
if (defined($Params[$i-1])) {
@ -1061,9 +1073,9 @@ sub InitializeFunctions()
my @Hists = split( /,/, $All{"LRBF"} );
my @FitTypes =();
foreach my $FitType ($All{"FitType1"}, $All{"FitType2"}, $All{"FitType3"}) {
if ( $FitType ne "None" ) {
push( @FitTypes, $FitType );
for (my $i=1;$i<=$All{"numComps"};$i++) {
if ( $All{"FitType$i"} ne "None" ) {
push( @FitTypes, $All{"FitType$i"} );
}
}
@ -1203,27 +1215,29 @@ sub addFitType {
$fitType->setMinimumSize( Qt::Size(0, 25) );
$fitType->setMaximumSize( Qt::Size(255, 25) );
$fitType->insertItems(0,
[Qt::Application::translate( 'MuSRFit4', "Exponential", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Gaussian", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Stretch Exp.",undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Exponential Cos",undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Gaussian Cos",undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Stretch Cos",undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Lorentzian Dynamic KT", undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Gaussian Dynamic KT", undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Background",undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Lorentzian Kubo-Toyabe LF x Exp", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Gaussian Kubo-Toyabe LF x Exp", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Lorentzian Kubo-Toyabe LF x Str Exp", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Gaussian Kubo-Toyabe LF x Str Exp", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "MolMag", undef,Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Meissner State Model", undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Lor-Gss combi KT", undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Lor-Gss combi KT x Exp", undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "Lor-Gss combi KT x SExp", undef, Qt::Application::UnicodeUTF8() ),
Qt::Application::translate( 'MuSRFit4', "None", undef,Qt::Application::UnicodeUTF8() )]);
["Exponential",
"Gaussian",
"Stretch Exp.",
"Exponential Cos",
"Gaussian Cos",
"Stretch Cos",
"Lorentzian Dynamic KT",
"Gaussian Dynamic KT",
"Background",
"Lorentzian Kubo-Toyabe LF x Exp",
"Gaussian Kubo-Toyabe LF x Exp",
"Lorentzian Kubo-Toyabe LF x Str Exp",
"Gaussian Kubo-Toyabe LF x Str Exp",
"MolMag",
"Meissner State Model",
"Lor-Gss combi KT",
"Lor-Gss combi KT x Exp",
"Lor-Gss combi KT x SExp",
"None",]);
if ($i==1) {
$fitType->setCurrentIndex( 0 );
$fitType->setCurrentIndex(0);
# remove the "None" option for the 1st component
$fitType->removeItem(18);
} else {
$fitType->setCurrentIndex( 18 );
}
@ -1245,111 +1259,51 @@ sub addSharingComp {
my $numComps = $self->numComps->value;
# count number of exisitng components
my $NShComps = $self->horizontalLayout->count();
my $sharingComp = Qt::GroupBox( $self->buttonGroupSharing );
my $sizePolicy = Qt::SizePolicy( Qt::SizePolicy::Expanding(), Qt::SizePolicy::MinimumExpanding() );
$self->{$sizePolicy} = $sizePolicy;
$sizePolicy->setHorizontalStretch( 0 );
$sizePolicy->setVerticalStretch( 0 );
$sizePolicy->setHeightForWidth( $sharingComp->sizePolicy()->hasHeightForWidth() );
for (my $i=2;$i<=$numComps;$i++) {
$sharingComp->setObjectName( "sharingComp$i" );
$sharingComp->setEnabled( 0 );
$sharingComp->setSizePolicy( $sizePolicy );
$sharingComp->setAlignment( Qt::AlignLeading() );
my $layout = Qt::Widget( $sharingComp );
$layout->setObjectName( "layoutSh$i" );
$layout->setGeometry( Qt::Rect(40, 60, 81, 266) );
my $_5 = Qt::VBoxLayout( $layout );
$self->{_5} = $_5;
$_5->setSpacing( 0 );
$_5->setMargin( 0 );
$_5->setObjectName( "_5" );
$_5->setContentsMargins(0, 0, 0, 0 );
my $shParam_1_1 = Qt::CheckBox( $layout );
$self->{shParam_1_1} = $shParam_1_1;
$shParam_1_1->setObjectName( "shParam_1_1" );
my @sharingComps = ();
for (my $i=$NShComps+1;$i<=$numComps;$i++) {
$sharingComps[$i] = Qt::GroupBox( $self->buttonGroupSharing );
my $sizePolicy = Qt::SizePolicy( Qt::SizePolicy::Expanding(), Qt::SizePolicy::MinimumExpanding() );
$self->{$sizePolicy} = $sizePolicy;
$sizePolicy->setHorizontalStretch( 0 );
$sizePolicy->setVerticalStretch( 0 );
$sizePolicy->setHeightForWidth( $sharingComps[$i]->sizePolicy()->hasHeightForWidth() );
# check is this component exists
if (child("Qt::GroupBox","sharingComp$i") == 0) {
$sharingComps[$i]->setObjectName( "sharingComp$i" );
$sharingComps[$i]->setEnabled( 0 );
$sharingComps[$i]->setSizePolicy( $sizePolicy );
$sharingComps[$i]->setAlignment( Qt::AlignLeading() );
$sharingComps[$i]->setTitle("Component $i");
my $layout = Qt::Widget( $sharingComps[$i] );
$layout->setObjectName( "layoutSh$i" );
$layout->setGeometry( Qt::Rect(40, 60, 81, 266) );
my $shBoxLayout = Qt::VBoxLayout( $layout );
$self->{shBoxLayout} = $shBoxLayout;
$shBoxLayout->setSpacing( 0 );
$shBoxLayout->setMargin( 0 );
$shBoxLayout->setObjectName( "shBoxLayout$i" );
$shBoxLayout->setContentsMargins(0, 0, 0, 0 );
my @shParam = ();
for (my $j=1;$j<=9;$j++) {
$shParam[$j] = Qt::CheckBox( $layout );
$self->{shParam} = $shParam[$j];
$shParam[$j]->setObjectName( "shParam_".$i."_$j" );
$shParam[$j]->setText("Param$j");
$shBoxLayout->addWidget( $shParam[$j] );
}
my $compShLabel = Qt::Label( $sharingComps[$i] );
$self->{compShLabel} = $compShLabel;
$compShLabel->setObjectName( "comp".$i."ShLabel" );
$compShLabel->setGeometry( Qt::Rect(2, 30, 141, 20) );
$compShLabel->setWordWrap( 0 );
$_5->addWidget( $shParam_1_1 );
my $shParam_1_2 = Qt::CheckBox( $layout );
$self->{shParam_1_2} = $shParam_1_2;
$shParam_1_2->setObjectName( "shParam_1_2" );
$_5->addWidget( $shParam_1_2 );
my $shParam_1_3 = Qt::CheckBox( $layout );
$self->{shParam_1_3} = $shParam_1_3;
$shParam_1_3->setObjectName( "shParam_1_3" );
$_5->addWidget( $shParam_1_3 );
my $shParam_1_4 = Qt::CheckBox( $layout );
$self->{shParam_1_4} = $shParam_1_4;
$shParam_1_4->setObjectName( "shParam_1_4" );
$_5->addWidget( $shParam_1_4 );
my $shParam_1_5 = Qt::CheckBox( $layout );
$self->{shParam_1_5} = $shParam_1_5;
$shParam_1_5->setObjectName( "shParam_1_5" );
$shParam_1_5->setEnabled( 0 );
$shParam_1_5->setTristate( 0 );
$_5->addWidget( $shParam_1_5 );
my $shParam_1_6 = Qt::CheckBox( $layout );
$self->{shParam_1_6} = $shParam_1_6;
$shParam_1_6->setObjectName( "shParam_1_6" );
$shParam_1_6->setEnabled( 0 );
$shParam_1_6->setTristate( 0 );
$_5->addWidget( $shParam_1_6 );
my $shParam_1_7 = Qt::CheckBox( $layout );
$self->{shParam_1_7} = $shParam_1_7;
$shParam_1_7->setObjectName( "shParam_1_7" );
$shParam_1_7->setEnabled( 0 );
$shParam_1_7->setTristate( 0 );
$_5->addWidget( $shParam_1_7 );
my $shParam_1_8 = Qt::CheckBox( $layout );
$self->{shParam_1_8} = $shParam_1_8;
$shParam_1_8->setObjectName( "shParam_1_8" );
$shParam_1_8->setEnabled( 0 );
$shParam_1_8->setTristate( 0 );
$_5->addWidget( $shParam_1_8 );
my $shParam_1_9 = Qt::CheckBox( $layout );
$self->{shParam_1_9} = $shParam_1_9;
$shParam_1_9->setObjectName( "shParam_1_9" );
$shParam_1_9->setEnabled( 0 );
$shParam_1_9->setTristate( 0 );
$_5->addWidget( $shParam_1_9 );
my $comp1ShLabel = Qt::Label( $sharingComp );
$self->{comp1ShLabel} = $comp1ShLabel;
$comp1ShLabel->setObjectName( "comp1ShLabel" );
$comp1ShLabel->setGeometry( Qt::Rect(2, 30, 141, 20) );
$comp1ShLabel->setWordWrap( 0 );
$self->horizontalLayout->addWidget( $sharingComp );
$self->{sharingComp1}->setTitle( Qt::Application::translate( 'MuSRFit4', "1st Component", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_1}->setText( Qt::Application::translate( 'MuSRFit4', "Param1", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_2}->setText( Qt::Application::translate( 'MuSRFit4', "Param2", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_3}->setText( Qt::Application::translate( 'MuSRFit4', "Param3", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_4}->setText( Qt::Application::translate( 'MuSRFit4', "Param4", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_5}->setText( Qt::Application::translate( 'MuSRFit4', "Param5", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_6}->setText( Qt::Application::translate( 'MuSRFit4', "Param6", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_7}->setText( Qt::Application::translate( 'MuSRFit4', "Param7", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_8}->setText( Qt::Application::translate( 'MuSRFit4', "Param8", undef, Qt::Application::UnicodeUTF8() ) );
$self->{shParam_1_9}->setText( Qt::Application::translate( 'MuSRFit4', "Param9", undef, Qt::Application::UnicodeUTF8() ) );
$self->{comp1ShLabel}->setText( Qt::Application::translate( 'MuSRFit4', "FitType1", undef, Qt::Application::UnicodeUTF8() ) );
$self->horizontalLayout->addWidget( $sharingComps[$i] );
$compShLabel->setText("FitType$i");
} else {
print "Exist, skip component $i\n";
}
}
}
1;

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>705</width>
<height>574</height>
<height>587</height>
</rect>
</property>
<property name="sizePolicy">
@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/MuSRFit.png</normaloff>../../../../../../.designer/backup/icos/MuSRFit.png</iconset>
<normaloff>icos/MuSRFit.png</normaloff>icos/MuSRFit.png</iconset>
</property>
<property name="windowIconText">
<string>MuSRFitGUI</string>
@ -70,24 +70,12 @@
<x>1</x>
<y>1</y>
<width>676</width>
<height>355</height>
<height>461</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="runsAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>1</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
<property name="title">
<string>RUN Numbers</string>
</property>
@ -428,12 +416,6 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="comp1Label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
@ -946,7 +928,7 @@
<x>0</x>
<y>0</y>
<width>276</width>
<height>70</height>
<height>180</height>
</rect>
</property>
<widget class="QVBoxLayout" name="columnView" native="true">
@ -967,7 +949,7 @@
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -987,7 +969,7 @@
<x>0</x>
<y>0</y>
<width>380</width>
<height>105</height>
<height>215</height>
</rect>
</property>
<widget class="QWidget" name="layoutWidget2">
@ -1331,7 +1313,7 @@
<item>
<layout class="QGridLayout" name="gridLayout_6">
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="fitAsyTypeLabel">
@ -1589,7 +1571,7 @@
</sizepolicy>
</property>
<property name="title">
<string>1st Component</string>
<string>Component 1</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading</set>
@ -1723,277 +1705,6 @@
</widget>
</widget>
</item>
<item>
<widget class="QGroupBox" name="sharingComp2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>2nd Component</string>
</property>
<widget class="QLabel" name="comp2ShLabel">
<property name="geometry">
<rect>
<x>2</x>
<y>30</y>
<width>141</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>FitType2</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
<widget class="QWidget" name="layout13">
<property name="geometry">
<rect>
<x>40</x>
<y>60</y>
<width>81</width>
<height>266</height>
</rect>
</property>
<layout class="QVBoxLayout" name="_1">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="shParam_2_1">
<property name="text">
<string>Param1</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_2">
<property name="text">
<string>Param2</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_3">
<property name="text">
<string>Param3</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_4">
<property name="text">
<string>Param4</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_5">
<property name="text">
<string>Param5</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param6</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param7</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param8</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_2_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param9</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QGroupBox" name="sharingComp3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>3rd Component</string>
</property>
<property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set>
</property>
<widget class="QLabel" name="comp3ShLabel">
<property name="geometry">
<rect>
<x>2</x>
<y>30</y>
<width>141</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>FitType3</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
<widget class="QWidget" name="layout15">
<property name="geometry">
<rect>
<x>41</x>
<y>58</y>
<width>81</width>
<height>266</height>
</rect>
</property>
<layout class="QVBoxLayout" name="_3">
<item>
<widget class="QCheckBox" name="shParam_3_1">
<property name="text">
<string>Param1</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_2">
<property name="text">
<string>Param2</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_3">
<property name="text">
<string>Param3</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_4">
<property name="text">
<string>Param4</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_5">
<property name="text">
<string>Param5</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param6</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param7</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param8</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shParam_3_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Param9</string>
</property>
<property name="tristate">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
@ -4461,7 +4172,7 @@
<action name="fileSaveAction">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/save.png</normaloff>../../../../../../.designer/backup/icos/save.png</iconset>
<normaloff>icos/save.png</normaloff>icos/save.png</iconset>
</property>
<property name="text">
<string>&amp;Save MSR...</string>
@ -4479,7 +4190,7 @@
<action name="fileExitAction">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/exit.png</normaloff>../../../../../../.designer/backup/icos/exit.png</iconset>
<normaloff>icos/exit.png</normaloff>icos/exit.png</iconset>
</property>
<property name="text">
<string>E&amp;xit</string>
@ -4536,7 +4247,7 @@
<action name="fileChangeDirAction">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/chdir.png</normaloff>../../../../../../.designer/backup/icos/chdir.png</iconset>
<normaloff>icos/chdir.png</normaloff>icos/chdir.png</iconset>
</property>
<property name="text">
<string>&amp;Change dir</string>
@ -4559,7 +4270,7 @@
<action name="parametersExport_AsAction">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/Export.png</normaloff>../../../../../../.designer/backup/icos/Export.png</iconset>
<normaloff>icos/Export.png</normaloff>icos/Export.png</iconset>
</property>
<property name="text">
<string>&amp;Export As...</string>
@ -4574,7 +4285,7 @@
<action name="parametersAppend_ToAction">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/Append.png</normaloff>../../../../../../.designer/backup/icos/Append.png</iconset>
<normaloff>icos/Append.png</normaloff>icos/Append.png</iconset>
</property>
<property name="text">
<string>&amp;Append To...</string>
@ -4589,7 +4300,7 @@
<action name="fit">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/Fit.png</normaloff>../../../../../../.designer/backup/icos/Fit.png</iconset>
<normaloff>icos/Fit.png</normaloff>icos/Fit.png</iconset>
</property>
<property name="iconText">
<string>Fit and Plot</string>
@ -4604,7 +4315,7 @@
</property>
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/Plot.png</normaloff>../../../../../../.designer/backup/icos/Plot.png</iconset>
<normaloff>icos/Plot.png</normaloff>icos/Plot.png</iconset>
</property>
<property name="iconText">
<string>Plot</string>
@ -4616,7 +4327,7 @@
<action name="t0">
<property name="icon">
<iconset>
<normaloff>../../../../../../.designer/backup/icos/T0.png</normaloff>../../../../../../.designer/backup/icos/T0.png</iconset>
<normaloff>icos/T0.png</normaloff>icos/T0.png</iconset>
</property>
<property name="iconText">
<string>Show t0 and Bg Bins</string>
@ -4678,24 +4389,6 @@
<tabstop>shParam_1_7</tabstop>
<tabstop>shParam_1_8</tabstop>
<tabstop>shParam_1_9</tabstop>
<tabstop>shParam_2_1</tabstop>
<tabstop>shParam_2_2</tabstop>
<tabstop>shParam_2_3</tabstop>
<tabstop>shParam_2_4</tabstop>
<tabstop>shParam_2_5</tabstop>
<tabstop>shParam_2_6</tabstop>
<tabstop>shParam_2_7</tabstop>
<tabstop>shParam_2_8</tabstop>
<tabstop>shParam_2_9</tabstop>
<tabstop>shParam_3_1</tabstop>
<tabstop>shParam_3_2</tabstop>
<tabstop>shParam_3_3</tabstop>
<tabstop>shParam_3_4</tabstop>
<tabstop>shParam_3_5</tabstop>
<tabstop>shParam_3_6</tabstop>
<tabstop>shParam_3_7</tabstop>
<tabstop>shParam_3_8</tabstop>
<tabstop>shParam_3_9</tabstop>
<tabstop>initParamTable</tabstop>
<tabstop>title</tabstop>
<tabstop>fileName</tabstop>
@ -4893,7 +4586,7 @@
<hints>
<hint type="sourcelabel">
<x>686</x>
<y>655</y>
<y>555</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
@ -4909,7 +4602,7 @@
<hints>
<hint type="sourcelabel">
<x>686</x>
<y>368</y>
<y>329</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
@ -4957,7 +4650,7 @@
<hints>
<hint type="sourcelabel">
<x>687</x>
<y>656</y>
<y>556</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
@ -5004,8 +4697,8 @@
<slot>t0Update()</slot>
<hints>
<hint type="sourcelabel">
<x>544</x>
<y>188</y>
<x>542</x>
<y>189</y>
</hint>
<hint type="destinationlabel">
<x>603</x>
@ -5020,8 +4713,8 @@
<slot>addFitType()</slot>
<hints>
<hint type="sourcelabel">
<x>235</x>
<y>345</y>
<x>292</x>
<y>340</y>
</hint>
<hint type="destinationlabel">
<x>703</x>

File diff suppressed because it is too large Load Diff