[pktools] 314/375: documentation and pkcrop_gui error message

[Bas Couwenberg]

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 2142c8c61f7e99eda3827ebf2037459ab8c66146
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Tue Sep 9 18:49:15 2014 +0200

    documentation and pkcrop_gui error message
---
 doc/mainpage.dox            |  6 ++++--
 qt/pkcrop_gui/mainwindow.cc | 13 +++++++------
 qt/pkcrop_gui/mainwindow.ui |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index 8b6125d..6baad3b 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -91,7 +91,7 @@ packages to install before pktools
 
 \subsection pktools_installation_optional Optional packages
 
-<b>To enable program \ref pkopt_svm</b>
+<b>To enable program \ref pkoptsvm</b>
 
    Install additional package 
 
@@ -115,7 +115,7 @@ packages to install before pktools
    \endcode
 
 
-<b>To enable programs \ref pkclassify_nn and \ref pkfs_nn</b>
+<b>To enable programs \ref pkann and \ref pkfsann</b>
 
    Install package 
 
@@ -165,6 +165,8 @@ packages to install before pktools
    
    Or install manually as explained in http://www.liblas.org/compilation.html#using-unix-makefiles-on-linux
 
+   ! Note that if you want support for compressed las format (LAZ), you need to install laszip first (http://www.laszip.org) and install liblas manually
+
    - Install pktools with with extra configuration option --enable-las:
 
    \code
diff --git a/qt/pkcrop_gui/mainwindow.cc b/qt/pkcrop_gui/mainwindow.cc
index 5b1889a..9ca5237 100644
--- a/qt/pkcrop_gui/mainwindow.cc
+++ b/qt/pkcrop_gui/mainwindow.cc
@@ -23,6 +23,7 @@ along with pktools.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFileDialog>
 #include <QProcess>
 #include <QMessageBox>
+#include <QProcess>
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -262,12 +263,12 @@ void MainWindow::on_toolButton_Run_clicked()
         myProcess->start(program);
         myProcess->setProcessChannelMode(QProcess::MergedChannels);
         myProcess->waitForFinished(-1);
-        QString p_stderr = myProcess->readyReadStandardError();
-        if(!p_stderr.isEmpty()){
-            QMessageBox msgBox;
-            msgBox.setText(p_stderr);
-            msgBox.exec();
-        }
+//        QString p_stderr = myProcess->readyReadStandardError();
+//        if(!p_stderr.isEmpty()){
+//            QMessageBox msgBox;
+//            msgBox.setText(p_stderr);
+//            msgBox.exec();
+//        }
         QString p_stdout = myProcess->readAll();
         ui->consoleEdit->insertPlainText(p_stdout);
         delete myProcess;
diff --git a/qt/pkcrop_gui/mainwindow.ui b/qt/pkcrop_gui/mainwindow.ui
index a069a32..ad2a0f5 100644
--- a/qt/pkcrop_gui/mainwindow.ui
+++ b/qt/pkcrop_gui/mainwindow.ui
@@ -18,7 +18,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>3</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -613,7 +613,7 @@
      <x>0</x>
      <y>0</y>
      <width>821</width>
-     <height>27</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git