diff --git a/trimsp/TrimSPGUI/TrimSPGUI.pl b/trimsp/TrimSPGUI/TrimSPGUI.pl index 682d71b..11e9af4 100644 --- a/trimsp/TrimSPGUI/TrimSPGUI.pl +++ b/trimsp/TrimSPGUI/TrimSPGUI.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'TrimSPGUItabs.ui' # -# Created: Tue Sep 8 11:42:14 2009 +# Created: Wed Sep 9 15:14:26 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -38,29 +38,29 @@ use Qt::attributes qw( L1rho L1d BoxL2 - L2d L2Comp L2rho + L2d BoxL3 - L3d L3Comp L3rho + L3d BoxL4 - L4d L4Comp L4rho + L4d BoxL5 - L5d L5Comp L5rho + L5d BoxL6 - L6d L6Comp L6rho + L6d BoxL7 - L7d L7Comp L7rho + L7d ProjParam textLabel1 ProjType @@ -92,7 +92,6 @@ use Qt::attributes qw( AddParTab AddParam textLabelEF - textLabelESB textLabelSHEATH textLabelERC textLabelRD @@ -119,6 +118,7 @@ use Qt::attributes qw( IPOT IPOTR IRL + textLabelESB ScansTab ScanSeq ScanMode @@ -807,13 +807,13 @@ sub NEW LayersTab = Qt::Widget(tabs, "LayersTab"); groupBox1 = Qt::GroupBox(LayersTab, "groupBox1"); - groupBox1->setGeometry( Qt::Rect(0, 0, 460, 500) ); + groupBox1->setGeometry( Qt::Rect(5, 0, 445, 485) ); groupBox1->setFrameShape( &Qt::GroupBox::GroupBoxPanel() ); groupBox1->setFrameShadow( &Qt::GroupBox::Sunken() ); my $LayoutWidget = Qt::Widget(groupBox1, '$LayoutWidget'); - $LayoutWidget->setGeometry( Qt::Rect(5, 20, 450, 465) ); - my $layout27 = Qt::VBoxLayout($LayoutWidget, 11, 6, '$layout27'); + $LayoutWidget->setGeometry( Qt::Rect(5, 20, 435, 460) ); + my $layout27 = Qt::VBoxLayout($LayoutWidget, 11, 3, '$layout27'); my $layout19 = Qt::HBoxLayout(undef, 0, 6, '$layout19'); @@ -845,6 +845,7 @@ sub NEW $layout27->addLayout($layout26); BoxL1 = Qt::GroupBox($LayoutWidget, "BoxL1"); + BoxL1->setMargin( int(0) ); L1Comp = Qt::LineEdit(BoxL1, "L1Comp"); L1Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); @@ -853,96 +854,96 @@ sub NEW L1rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); L1d = Qt::LineEdit(BoxL1, "L1d"); - L1d->setGeometry( Qt::Rect(320, 20, 105, 25) ); + L1d->setGeometry( Qt::Rect(320, 20, 85, 25) ); L1d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L1d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL1); BoxL2 = Qt::GroupBox($LayoutWidget, "BoxL2"); BoxL2->setEnabled( 0 ); - L2d = Qt::LineEdit(BoxL2, "L2d"); - L2d->setGeometry( Qt::Rect(320, 20, 105, 25) ); - L2d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L2d->sizePolicy()->hasHeightForWidth()) ); - L2Comp = Qt::LineEdit(BoxL2, "L2Comp"); L2Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); L2rho = Qt::LineEdit(BoxL2, "L2rho"); L2rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); + + L2d = Qt::LineEdit(BoxL2, "L2d"); + L2d->setGeometry( Qt::Rect(320, 20, 85, 25) ); + L2d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L2d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL2); BoxL3 = Qt::GroupBox($LayoutWidget, "BoxL3"); BoxL3->setEnabled( 0 ); - L3d = Qt::LineEdit(BoxL3, "L3d"); - L3d->setGeometry( Qt::Rect(320, 20, 105, 25) ); - L3d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L3d->sizePolicy()->hasHeightForWidth()) ); - L3Comp = Qt::LineEdit(BoxL3, "L3Comp"); L3Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); L3rho = Qt::LineEdit(BoxL3, "L3rho"); L3rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); + + L3d = Qt::LineEdit(BoxL3, "L3d"); + L3d->setGeometry( Qt::Rect(320, 20, 85, 25) ); + L3d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L3d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL3); BoxL4 = Qt::GroupBox($LayoutWidget, "BoxL4"); BoxL4->setEnabled( 0 ); - L4d = Qt::LineEdit(BoxL4, "L4d"); - L4d->setGeometry( Qt::Rect(320, 20, 105, 25) ); - L4d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L4d->sizePolicy()->hasHeightForWidth()) ); - L4Comp = Qt::LineEdit(BoxL4, "L4Comp"); L4Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); L4rho = Qt::LineEdit(BoxL4, "L4rho"); L4rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); + + L4d = Qt::LineEdit(BoxL4, "L4d"); + L4d->setGeometry( Qt::Rect(320, 20, 85, 25) ); + L4d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L4d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL4); BoxL5 = Qt::GroupBox($LayoutWidget, "BoxL5"); BoxL5->setEnabled( 0 ); - L5d = Qt::LineEdit(BoxL5, "L5d"); - L5d->setGeometry( Qt::Rect(320, 20, 105, 25) ); - L5d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L5d->sizePolicy()->hasHeightForWidth()) ); - L5Comp = Qt::LineEdit(BoxL5, "L5Comp"); L5Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); L5rho = Qt::LineEdit(BoxL5, "L5rho"); L5rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); + + L5d = Qt::LineEdit(BoxL5, "L5d"); + L5d->setGeometry( Qt::Rect(320, 20, 85, 25) ); + L5d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L5d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL5); BoxL6 = Qt::GroupBox($LayoutWidget, "BoxL6"); BoxL6->setEnabled( 0 ); - L6d = Qt::LineEdit(BoxL6, "L6d"); - L6d->setGeometry( Qt::Rect(320, 20, 105, 25) ); - L6d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L6d->sizePolicy()->hasHeightForWidth()) ); - L6Comp = Qt::LineEdit(BoxL6, "L6Comp"); L6Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); L6rho = Qt::LineEdit(BoxL6, "L6rho"); L6rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); + + L6d = Qt::LineEdit(BoxL6, "L6d"); + L6d->setGeometry( Qt::Rect(320, 20, 85, 25) ); + L6d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L6d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL6); BoxL7 = Qt::GroupBox($LayoutWidget, "BoxL7"); BoxL7->setEnabled( 0 ); - L7d = Qt::LineEdit(BoxL7, "L7d"); - L7d->setGeometry( Qt::Rect(320, 20, 105, 25) ); - L7d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L7d->sizePolicy()->hasHeightForWidth()) ); - L7Comp = Qt::LineEdit(BoxL7, "L7Comp"); L7Comp->setGeometry( Qt::Rect(10, 20, 180, 25) ); L7rho = Qt::LineEdit(BoxL7, "L7rho"); L7rho->setGeometry( Qt::Rect(200, 20, 111, 25) ); + + L7d = Qt::LineEdit(BoxL7, "L7d"); + L7d->setGeometry( Qt::Rect(320, 20, 85, 25) ); + L7d->setSizePolicy( Qt::SizePolicy(0, 0, 0, 0, L7d->sizePolicy()->hasHeightForWidth()) ); $layout27->addWidget(BoxL7); my $LayoutWidget_2 = Qt::Widget(LayersTab, '$LayoutWidget_2'); - $LayoutWidget_2->setGeometry( Qt::Rect(460, 0, 254, 490) ); + $LayoutWidget_2->setGeometry( Qt::Rect(455, 0, 250, 480) ); my $layout13 = Qt::VBoxLayout($LayoutWidget_2, 0, 0, '$layout13'); ProjParam = Qt::GroupBox($LayoutWidget_2, "ProjParam"); @@ -1049,7 +1050,7 @@ sub NEW $layout14->addLayout($layout13_2); $layout13->addWidget(groupBox15); - my $layout12 = Qt::HBoxLayout(undef, 0, 6, '$layout12'); + my $layout12 = Qt::HBoxLayout(undef, 4, 6, '$layout12'); Help = Qt::PushButton($LayoutWidget_2, "Help"); Help->setSizePolicy( Qt::SizePolicy(7, 7, 0, 0, Help->sizePolicy()->hasHeightForWidth()) ); @@ -1068,14 +1069,11 @@ sub NEW AddParTab = Qt::Widget(tabs, "AddParTab"); AddParam = Qt::GroupBox(AddParTab, "AddParam"); - AddParam->setGeometry( Qt::Rect(0, 0, 250, 210) ); + AddParam->setGeometry( Qt::Rect(5, 0, 245, 210) ); textLabelEF = Qt::Label(AddParam, "textLabelEF"); textLabelEF->setGeometry( Qt::Rect(12, 26, 63, 25) ); - textLabelESB = Qt::Label(AddParam, "textLabelESB"); - textLabelESB->setGeometry( Qt::Rect(12, 51, 63, 25) ); - textLabelSHEATH = Qt::Label(AddParam, "textLabelSHEATH"); textLabelSHEATH->setGeometry( Qt::Rect(12, 76, 63, 25) ); @@ -1180,12 +1178,15 @@ sub NEW IRL = Qt::SpinBox(AddParam, "IRL"); IRL->setGeometry( Qt::Rect(186, 176, 52, 26) ); IRL->setMaxValue( int(1) ); + + textLabelESB = Qt::Label(AddParam, "textLabelESB"); + textLabelESB->setGeometry( Qt::Rect(12, 51, 63, 25) ); tabs->insertTab( AddParTab, "" ); ScansTab = Qt::Widget(tabs, "ScansTab"); ScanSeq = Qt::GroupBox(ScansTab, "ScanSeq"); - ScanSeq->setGeometry( Qt::Rect(0, 0, 500, 165) ); + ScanSeq->setGeometry( Qt::Rect(5, 0, 495, 165) ); ScanSeq->setCheckable( 1 ); ScanSeq->setChecked( 0 ); @@ -1254,7 +1255,7 @@ sub NEW ScandL->setMinValue( int(1) ); tabs->insertTab( ScansTab, "" ); languageChange(); - my $resize = Qt::Size(717, 547); + my $resize = Qt::Size(713, 547); $resize = $resize->expandedTo(minimumSizeHint()); resize( $resize ); clearWState( &Qt::WState_Polished ); @@ -1348,7 +1349,6 @@ sub languageChange tabs->changeTab( LayersTab, trUtf8("Layers") ); AddParam->setTitle( trUtf8("Additional parameters") ); textLabelEF->setText( trUtf8("EF") ); - textLabelESB->setText( trUtf8("ESB") ); textLabelSHEATH->setText( trUtf8("SHEATH") ); textLabelERC->setText( trUtf8("ERC") ); textLabelRD->setText( trUtf8("RD") ); @@ -1368,6 +1368,7 @@ sub languageChange RD->setText( trUtf8("50.0") ); CA->setText( trUtf8("1.0") ); ESB->setText( trUtf8("0.0") ); + textLabelESB->setText( trUtf8("ESB") ); tabs->changeTab( AddParTab, trUtf8("Additional Parameters") ); ScanSeq->setTitle( trUtf8("Scan sequence") ); Qt::WhatsThis::add(ScanSeq, trUtf8("Select to scan a certain parameter in the simulation and produce multiple output files for each value of this parameter.")); diff --git a/trimsp/TrimSPGUI/TrimSPGUItabs.ui b/trimsp/TrimSPGUI/TrimSPGUItabs.ui index 3e3285f..618febc 100755 --- a/trimsp/TrimSPGUI/TrimSPGUItabs.ui +++ b/trimsp/TrimSPGUI/TrimSPGUItabs.ui @@ -8,7 +8,7 @@ 0 0 - 717 + 713 547 @@ -85,10 +85,10 @@ - 0 + 5 0 - 460 - 500 + 445 + 485 @@ -108,14 +108,17 @@ 5 20 - 450 - 465 + 435 + 460 unnamed + + 3 + layout19 @@ -239,6 +242,9 @@ BoxL1 + + 0 + Layer 1 @@ -291,7 +297,7 @@ 320 20 - 105 + 85 25 @@ -321,27 +327,6 @@ Layer 2 - - - L2d - - - - 320 - 20 - 105 - 25 - - - - - 0 - 0 - 0 - 0 - - - L2Comp @@ -368,26 +353,15 @@ - - - - BoxL3 - - - false - - - Layer 3 - - L3d + L2d 320 20 - 105 + 85 25 @@ -400,6 +374,17 @@ + + + + BoxL3 + + + false + + + Layer 3 + L3Comp @@ -426,26 +411,15 @@ - - - - BoxL4 - - - false - - - Layer 4 - - L4d + L3d 320 20 - 105 + 85 25 @@ -458,6 +432,17 @@ + + + + BoxL4 + + + false + + + Layer 4 + L4Comp @@ -484,26 +469,15 @@ - - - - BoxL5 - - - false - - - Layer 5 - - L5d + L4d 320 20 - 105 + 85 25 @@ -516,6 +490,17 @@ + + + + BoxL5 + + + false + + + Layer 5 + L5Comp @@ -542,26 +527,15 @@ - - - - BoxL6 - - - false - - - Layer 6 - - L6d + L5d 320 20 - 105 + 85 25 @@ -574,6 +548,17 @@ + + + + BoxL6 + + + false + + + Layer 6 + L6Comp @@ -600,26 +585,15 @@ - - - - BoxL7 - - - false - - - Layer 7 - - L7d + L6d 320 20 - 105 + 85 25 @@ -632,6 +606,17 @@ + + + + BoxL7 + + + false + + + Layer 7 + L7Comp @@ -658,6 +643,27 @@ + + + L7d + + + + 320 + 20 + 85 + 25 + + + + + 0 + 0 + 0 + 0 + + + @@ -668,10 +674,10 @@ - 460 + 455 0 - 254 - 490 + 250 + 480 @@ -1120,6 +1126,9 @@ unnamed + + 4 + Help @@ -1189,9 +1198,9 @@ - 0 + 5 0 - 250 + 245 210 @@ -1214,22 +1223,6 @@ EF - - - textLabelESB - - - - 12 - 51 - 63 - 25 - - - - ESB - - textLabelSHEATH @@ -1741,6 +1734,22 @@ 1 + + + textLabelESB + + + + 12 + 51 + 63 + 25 + + + + ESB + + @@ -1756,9 +1765,9 @@ - 0 + 5 0 - 500 + 495 165