This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch upstream-master in repository pktools.
commit 872927f518770f323a94280c83d9e12f6adffd8b Author: Pieter Kempeneers <kempe...@gmail.com> Date: Wed Apr 2 18:56:38 2014 +0200 empty combobox means default in pkcomposite_gui --- ChangeLog | 1 + qt/pkcomposite_gui/mainwindow.cc | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d4767b..49ee4c7 100755 --- a/ChangeLog +++ b/ChangeLog @@ -280,6 +280,7 @@ version 2.5.2 removed underscore for QProcess in Windows - pkmosaic -> pkcomposite name was confusing as also compositing is supported (unlike gdal_merge.py and gdalwarp) + resample option similar to pkcrop - version control for libraries thanks to suggestion of Francesco Paolo Lovergine - subdirectory pktools for include headers diff --git a/qt/pkcomposite_gui/mainwindow.cc b/qt/pkcomposite_gui/mainwindow.cc index 3e44a6f..21d9036 100644 --- a/qt/pkcomposite_gui/mainwindow.cc +++ b/qt/pkcomposite_gui/mainwindow.cc @@ -42,10 +42,10 @@ MainWindow::MainWindow(QWidget *parent) : compressedlist << "NONE" << "LZW" << "PACKBITS" <<"DEFLATE"; ui->compressed->addItems(compressedlist); QStringList otypelist; - otypelist << "Byte" << "Int16" << "UInt16" << "UInt32" << "Int32" << "Float32" << "Float64" << "CInt16" << "CInt32" << "CFloat32" << "CFloat64"; + otypelist << "" << "Byte" << "Int16" << "UInt16" << "UInt32" << "Int32" << "Float32" << "Float64" << "CInt16" << "CInt32" << "CFloat32" << "CFloat64"; ui->otype->addItems(otypelist); QStringList oformatlist; - oformatlist << "GTiff" << "HFA" << "ENVI"; + oformatlist << "" << "GTiff" << "HFA" << "ENVI"; ui->oformat->addItems(oformatlist); setDefaults(); } @@ -155,10 +155,12 @@ void MainWindow::on_toolButton_Run_clicked() program+=" --resample "+ui->resample->currentText(); program+=" --crule "+ui->crule->currentText(); - program+=" --otype "+ui->otype->currentText(); - program+=" --oformat "+ui->oformat->currentText(); + if(!ui->otype->currentText().isEmpty()) + program+=" --otype "+ui->otype->currentText(); + if(!ui->oformat->currentText().isEmpty()) + program+=" --oformat "+ui->oformat->currentText(); program+=" -co COMPRESS="+ui->compressed->currentText(); - program+=" -co INTERLEAVED="+ui->interleaved->currentText(); + program+=" -co INTERLEAVE="+ui->interleaved->currentText(); if(ui->tiled->isChecked()) program+=" -co TILED=YES"; @@ -191,7 +193,7 @@ void MainWindow::on_toolButton_Run_clicked() // QProcess *myProcess = new QProcess(parent); QProcess *myProcess = new QProcess(this); -// myProcess->start(program); + myProcess->start(program); myProcess->waitForFinished(-1); QString p_stdout = myProcess->readAll(); ui->consoleEdit->insertPlainText(p_stdout); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel