diff --git a/trimsp/TrimSPGUI/TrimSPGUI.pl b/trimsp/TrimSPGUI/TrimSPGUI.pl index 3a10b9c..4d547ed 100644 --- a/trimsp/TrimSPGUI/TrimSPGUI.pl +++ b/trimsp/TrimSPGUI/TrimSPGUI.pl @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'TrimSPGUI.ui' # -# Created: Fri Sep 3 18:08:30 2010 +# Created: Tue Sep 28 13:00:09 2010 # by: The PerlQt User Interface Compiler (puic) # # WARNING! All changes made in this file will be lost! @@ -2187,8 +2187,9 @@ sub CollectValues $All{"IPOTR"}=sprintf("%3d",$All{"IPOTR"}); $All{"IRL"}=sprintf("%2d",$All{"IRL"}); -# Filenames etc. +# Filenames etc. The filename should not have white spaces $All{"FNPre"}=FNPre->text(); + $All{"FNPre"}=~ s/\s+//g; $All{"Path"}=Path->text(); # Scan parameters only if selected @@ -2199,13 +2200,20 @@ sub CollectValues $All{"NProjRadio"}=NProjRadio->isChecked(); $All{"dRadio"}=dRadio->isChecked(); $All{"ScandL"}=ScandL->text(); +# Remove any white spaces + $All{"ScandL"} =~ s/\s+//g; $All{"ListRadio"}=ListRadio->isChecked(); $All{"LoopRadio"}=LoopRadio->isChecked(); $All{"ScanList"}=ScanList->text(); +# Remove any white spaces + $All{"ScanList"} =~ s/\s+//g; $All{"ScanListdz"}=ScanListdz->text(); - $All{"SFrom"}=SFrom->text(); - $All{"STo"}=STo->text(); - $All{"SStep"}=SStep->text(); +# Remove any white spaces + $All{"ScanListdz"} =~ s/\s+//g; +# These should be numeric + $All{"SFrom"}=1*SFrom->text(); + $All{"STo"}=1*STo->text(); + $All{"SStep"}=1*SStep->text(); # } # Return values to caller @@ -2429,14 +2437,21 @@ sub StartSequenceOne $All{"NProjRadio"}=NProjRadio->isChecked(); $All{"dRadio"}=dRadio->isChecked(); $All{"ScandL"}=ScandL->text(); +# Remove any white spaces + $All{"ScandL"} =~ s/\s+//g; $All{"ListRadio"}=ListRadio->isChecked(); $All{"LoopRadio"}=LoopRadio->isChecked(); $All{"ScanList"}=ScanList->text(); +# Remove any white spaces + $All{"ScanList"} =~ s/\s+//g; $All{"ScanListdz"}=ScanListdz->text(); - $All{"SFrom"}=SFrom->text(); - $All{"STo"}=STo->text(); - $All{"SStep"}=SStep->text(); - +# Remove any white spaces + $All{"ScanListdz"} =~ s/\s+//g; +# These should be numeric + $All{"SFrom"}=1*SFrom->text(); + $All{"STo"}=1*STo->text(); + $All{"SStep"}=1*SStep->text(); + if ($All{"ListRadio"}) { @SValues=split(/,/,$All{"ScanList"}); @SdzValues=split(/,/,$All{"ScanListdz"}); diff --git a/trimsp/TrimSPGUI/TrimSPGUI.ui.h b/trimsp/TrimSPGUI/TrimSPGUI.ui.h index 0d679cd..17c9fd4 100644 --- a/trimsp/TrimSPGUI/TrimSPGUI.ui.h +++ b/trimsp/TrimSPGUI/TrimSPGUI.ui.h @@ -245,8 +245,9 @@ void TrimSPGUI::CollectValues() $All{"IPOTR"}=sprintf("%3d",$All{"IPOTR"}); $All{"IRL"}=sprintf("%2d",$All{"IRL"}); -# Filenames etc. +# Filenames etc. The filename should not have white spaces $All{"FNPre"}=FNPre->text(); + $All{"FNPre"}=~ s/\s+//g; $All{"Path"}=Path->text(); # Scan parameters only if selected @@ -257,13 +258,20 @@ void TrimSPGUI::CollectValues() $All{"NProjRadio"}=NProjRadio->isChecked(); $All{"dRadio"}=dRadio->isChecked(); $All{"ScandL"}=ScandL->text(); +# Remove any white spaces + $All{"ScandL"} =~ s/\s+//g; $All{"ListRadio"}=ListRadio->isChecked(); $All{"LoopRadio"}=LoopRadio->isChecked(); $All{"ScanList"}=ScanList->text(); +# Remove any white spaces + $All{"ScanList"} =~ s/\s+//g; $All{"ScanListdz"}=ScanListdz->text(); - $All{"SFrom"}=SFrom->text(); - $All{"STo"}=STo->text(); - $All{"SStep"}=SStep->text(); +# Remove any white spaces + $All{"ScanListdz"} =~ s/\s+//g; +# These should be numeric + $All{"SFrom"}=1*SFrom->text(); + $All{"STo"}=1*STo->text(); + $All{"SStep"}=1*SStep->text(); # } # Return values to caller @@ -485,14 +493,21 @@ void TrimSPGUI::StartSequenceOne() $All{"NProjRadio"}=NProjRadio->isChecked(); $All{"dRadio"}=dRadio->isChecked(); $All{"ScandL"}=ScandL->text(); +# Remove any white spaces + $All{"ScandL"} =~ s/\s+//g; $All{"ListRadio"}=ListRadio->isChecked(); $All{"LoopRadio"}=LoopRadio->isChecked(); $All{"ScanList"}=ScanList->text(); +# Remove any white spaces + $All{"ScanList"} =~ s/\s+//g; $All{"ScanListdz"}=ScanListdz->text(); - $All{"SFrom"}=SFrom->text(); - $All{"STo"}=STo->text(); - $All{"SStep"}=SStep->text(); - +# Remove any white spaces + $All{"ScanListdz"} =~ s/\s+//g; +# These should be numeric + $All{"SFrom"}=1*SFrom->text(); + $All{"STo"}=1*STo->text(); + $All{"SStep"}=1*SStep->text(); + if ($All{"ListRadio"}) { @SValues=split(/,/,$All{"ScanList"}); @SdzValues=split(/,/,$All{"ScanListdz"});