diff --git a/src/perl/make_pardialog_source.pl b/src/perl/make_pardialog_source.pl --- a/src/perl/make_pardialog_source.pl +++ b/src/perl/make_pardialog_source.pl @@ -98,140 +98,139 @@ print cppfile <addWidget( new QLabel( \"$value[$i]\", this), $row, $col, 1, 2 );\n"; +$numrows = 30; +$c = 0; +for ($i=0;$i<$lines;$i++) { + $col = 2*int($c/($numrows-3)); + $row = $c % ($numrows-3) + $ntitles * 3; + if ($convtype[$i] eq "label") { + print cppfile " grid->addWidget( new QLabel( \"$value[$i]\", this), $row, $col, 1, 2 );\n"; + $c++; + } else { + if ($convtype[$i] eq "title") { + if ($ntitles) { + print stderr "Sorry, only one title allowed. Aborting source construction...\n"; + exit(1); + } + print cppfile " setWindowTitle( QString( \"$value[$i]\") );\n"; + print cppfile " grid->addWidget( new QLabel( \"

$value[$i]

\",this), $row, $col, 1, -1, Qt::AlignCenter);\n"; + print cppfile " grid->addWidget( new QLabel( \"\", this), $row+1, $col, 1, -1);\n"; + $ntitles++; + } else { + print cppfile " grid->addWidget( new QLabel( \"$param[$i]\", this ),$row, $col );\n"; + print cppfile " grid->addWidget( $param[$i]_edit, $row, $col+1 );\n"; $c++; - } else { - if ($convtype[$i] eq "title") { - if ($ntitles) { - print stderr "Sorry, only one title allowed. Aborting source construction...\n"; - exit(1); - } - print cppfile " setWindowTitle( QString( \"$value[$i]\") );\n"; - print cppfile " grid->addWidget( new QLabel( \"

$value[$i]

\",this), $row, $col, 1, -1, Qt::AlignCenter);\n"; - print cppfile " grid->addWidget( new QLabel( \"\", this), $row+1, $col, 1, -1);\n"; - $ntitles++; - } else { - print cppfile " grid->addWidget( new QLabel( \"$param[$i]\", this ),$row, $col );\n"; - print cppfile " grid->addWidget( $param[$i]_edit, $row, $col+1 );\n"; - $c++; - } } } +} - $row = $numrows+1; - $col = 2*int($i/$numrows); +$row = $numrows+1; +$col = 2*int($i/$numrows); - print cppfile <addWidget(pb, $row, $col ); - connect( pb, SIGNAL( clicked() ), this, SLOT( write() ) ); - QPushButton *pb2 = new QPushButton( \"&Close\", this ); - grid->addWidget(pb2,$row, $col+1 ); - connect( pb2, SIGNAL( clicked() ), this, SLOT( close() ) ); - QPushButton *pb3 = new QPushButton( \"&Reset\", this ); - grid->addWidget(pb3, $row, $col+2 ); - connect( pb3, SIGNAL( clicked() ), this, SLOT( Reset() ) ); - show(); +print cppfile <addWidget(pb, $row, $col ); +connect( pb, SIGNAL( clicked() ), this, SLOT( write() ) ); +QPushButton *pb2 = new QPushButton( \"&Close\", this ); +grid->addWidget(pb2,$row, $col+1 ); +connect( pb2, SIGNAL( clicked() ), this, SLOT( close() ) ); +QPushButton *pb3 = new QPushButton( \"&Reset\", this ); +grid->addWidget(pb3, $row, $col+2 ); +connect( pb3, SIGNAL( clicked() ), this, SLOT( Reset() ) ); +show(); }; ParameterDialog::~ParameterDialog(void) { - ANOTHER_LABEL +ANOTHER_LABEL - for ($i=0;$i<$lines;$i++) { - if ($convtype[$i] ne "label" && $convtype[$i] ne "title") { - print cppfile "delete $param[$i]_edit;\n"; - } +for ($i=0;$i<$lines;$i++) { + if ($convtype[$i] ne "label" && $convtype[$i] ne "title") { + print cppfile "delete $param[$i]_edit;\n"; } - - print cppfile <text().section(',', $j, $j);\n"; + print cppfile " par.$param[$i]\[$j\] = tmpval.toDouble();\n"; } - if ($convtype[$i] eq "double *") { - @paramlist = split(/,/,$value[$i]); - for ($j=0;$j<=$#paramlist;$j++) { - print cppfile " tmpval = $param[$i]_edit->text().section(',', $j, $j);\n"; - print cppfile " par.$param[$i]\[$j\] = tmpval.toDouble();\n"; - } + } else { + if ($convtype[$i] eq "bool") { + print cppfile " tmpval = $param[$i]_edit->text().stripWhiteSpace();\n"; + print cppfile " if (tmpval == \"true\" || tmpval == \"yes\" ) par.$param[$i] = true;\n"; + print cppfile " else if (tmpval == \"false\" || tmpval == \"no\") par.$param[$i] = false;\n"; + print cppfile " else {\n"; + print cppfile " if (QMessageBox::question(this, \"Syntax error\", tr(\"Value %1 of parameter %2 is not recognized as Boolean.\\nDo you mean TRUE or FALSE?\").arg(tmpval).arg(\"$param[$i]\"),\"True\",\"False\", QString::null, 0, 1)==0) par.$param[$i]=true;\n"; + print cppfile " else par.$param[$i]=false;\n"; + print cppfile " }\n"; } else { - if ($convtype[$i] eq "bool") { - print cppfile " tmpval = $param[$i]_edit->text().stripWhiteSpace();\n"; - print cppfile " if (tmpval == \"true\" || tmpval == \"yes\" ) par.$param[$i] = true;\n"; - print cppfile " else if (tmpval == \"false\" || tmpval == \"no\") par.$param[$i] = false;\n"; - print cppfile " else {\n"; - print cppfile " if (QMessageBox::question(this, \"Syntax error\", tr(\"Value %1 of parameter %2 is not recognized as Boolean.\\nDo you mean TRUE or FALSE?\").arg(tmpval).arg(\"$param[$i]\"),\"True\",\"False\", QString::null, 0, 1)==0) par.$param[$i]=true;\n"; - print cppfile " else par.$param[$i]=false;\n"; - print cppfile " }\n"; + if ($convtype[$i] eq "char *") { + print cppfile " par.$param[$i] = strdup((const char *)$param[$i]_edit->text());\n"; } else { - if ($convtype[$i] eq "char *") { - print cppfile " par.$param[$i] = strdup((const char *)$param[$i]_edit->text());\n"; - } else { - print cppfile " par.$param[$i] = $param[$i]_edit->text().$funname{$convtype[$i]}();\n"; - } + print cppfile " par.$param[$i] = $param[$i]_edit->text().$funname{$convtype[$i]}();\n"; } } - } + } +} - print cppfile <