From 55378846835ed73f2a681b882ccf375e328ef616 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Tue, 11 Aug 2009 13:31:33 +0000 Subject: [PATCH] Added GPL License. Added H projectile. --- trimsp/TrimSPGUI/Chem.pm | 16 ++++++++++++++++ trimsp/TrimSPGUI/TrimSP | 1 + trimsp/TrimSPGUI/TrimSPGUI.pl | 19 ++++++++----------- trimsp/TrimSPGUI/TrimSPGUItabs.ui.h | 23 ++++++++++++++++++----- 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/trimsp/TrimSPGUI/Chem.pm b/trimsp/TrimSPGUI/Chem.pm index 63e255e..505195a 100644 --- a/trimsp/TrimSPGUI/Chem.pm +++ b/trimsp/TrimSPGUI/Chem.pm @@ -1,3 +1,19 @@ +# This file is part of TrimSPGUI. +# +# TrimSPGUI is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# TrimSPGUI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Foobar. If not, see . +# +# Copyright 2009 by Zaher Salman and the LEM Group. package Chem; diff --git a/trimsp/TrimSPGUI/TrimSP b/trimsp/TrimSPGUI/TrimSP index 1f977c0..feed1db 100755 --- a/trimsp/TrimSPGUI/TrimSP +++ b/trimsp/TrimSPGUI/TrimSP @@ -1,4 +1,5 @@ #!/bin/bash +# Copyright 2009 by Zaher Salman and the LEM Group. export TRIMBIN=/usr/local/bin/trimsp7l export PERLLIB=$HOME/Projects/TrimSPGUI diff --git a/trimsp/TrimSPGUI/TrimSPGUI.pl b/trimsp/TrimSPGUI/TrimSPGUI.pl index 11bfed3..1343966 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 Aug 11 12:14:49 2009 +# Created: Tue Aug 11 15:28:40 2009 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -24,6 +24,7 @@ use Qt::slots DirectoryBrowse => [], ConfirmQuit => []; use Qt::attributes qw( + Progress tabs LayersTab groupBox1 @@ -136,7 +137,6 @@ use Qt::attributes qw( NProjRadio dRadio ScandL - Progress TrimSPGUIHelp ); @@ -797,6 +797,10 @@ sub NEW setModal(1 ); + Progress = Qt::ProgressBar(this, "Progress"); + Progress->setGeometry( Qt::Rect(0, 525, 715, 20) ); + Progress->setFrameShape( &Qt::ProgressBar::WinPanel() ); + tabs = Qt::TabWidget(this, "tabs"); tabs->setGeometry( Qt::Rect(0, 0, 715, 525) ); @@ -1249,10 +1253,6 @@ sub NEW ScandL->setMaxValue( int(7) ); ScandL->setMinValue( int(1) ); tabs->insertTab( ScansTab, "" ); - - Progress = Qt::ProgressBar(this, "Progress"); - Progress->setGeometry( Qt::Rect(0, 525, 715, 20) ); - Progress->setFrameShape( &Qt::ProgressBar::WinPanel() ); languageChange(); my $resize = Qt::Size(717, 547); $resize = $resize->expandedTo(minimumSizeHint()); @@ -1307,6 +1307,7 @@ sub languageChange ProjType->insertItem( trUtf8("Muon") ); ProjType->insertItem( trUtf8("Li8") ); ProjType->insertItem( trUtf8("B12") ); + ProjType->insertItem( trUtf8("H") ); Qt::WhatsThis::add(ProjType, trUtf8("Choose the projectile type.")); NLabel->setText( trUtf8("Number of projectiles") ); z0Label->setText( trUtf8("Starting depth [Å]") ); @@ -1484,7 +1485,7 @@ sub ProjSmartDefaults # For Li8 set Sigma E=0 eV and Sigam angle=0 degrees by default SigE->setText("0"); SigAngle->setText("0"); - } + } } @@ -1603,10 +1604,6 @@ sub CollectValues # Filenames etc. $All{"FNPre"}=FNPre->text(); $All{"Path"}=Path->text(); - if ($All{"Path"} eq "./") { - Path -> setText($ENV{'PWD'}); - $All{"Path"}=Path->text(); - } # Scan parameters only if selected $All{"ScanSeq"}=ScanSeq->isChecked(); diff --git a/trimsp/TrimSPGUI/TrimSPGUItabs.ui.h b/trimsp/TrimSPGUI/TrimSPGUItabs.ui.h index f0ce90f..0a961bb 100755 --- a/trimsp/TrimSPGUI/TrimSPGUItabs.ui.h +++ b/trimsp/TrimSPGUI/TrimSPGUItabs.ui.h @@ -10,6 +10,23 @@ ** destructor. *****************************************************************************/ +# This file is part of TrimSPGUI. +# +# TrimSPGUI is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# TrimSPGUI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Foobar. If not, see . +# +# Copyright 2009 by Zaher Salman and the LEM Group. +# void TrimSPGUI::ToggleScanSingle() { @@ -95,7 +112,7 @@ void TrimSPGUI::ProjSmartDefaults() # For Li8 set Sigma E=0 eV and Sigam angle=0 degrees by default SigE->setText("0"); SigAngle->setText("0"); - } + } } @@ -211,10 +228,6 @@ void TrimSPGUI::CollectValues() # Filenames etc. $All{"FNPre"}=FNPre->text(); $All{"Path"}=Path->text(); - if ($All{"Path"} eq "./") { - Path -> setText($ENV{'PWD'}); - $All{"Path"}=Path->text(); - } # Scan parameters only if selected $All{"ScanSeq"}=ScanSeq->isChecked();