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 b5729434d20a5fd04ffd2d8e47c7473d75d8a7d8 Author: Pieter Kempeneers <pieter.kempene...@vito.be> Date: Fri Mar 28 11:20:28 2014 +0100 working on qt for SVM classifier --- qt/pkclassify_svm/mainwindow.cpp | 34 ++++++++++++++++++++++++---------- qt/pkclassify_svm/mainwindow.ui | 23 +++++++++++++++++++++++ qt/pkinfo/mainwindow.ui | 2 +- 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/qt/pkclassify_svm/mainwindow.cpp b/qt/pkclassify_svm/mainwindow.cpp index 9f58677..f600493 100644 --- a/qt/pkclassify_svm/mainwindow.cpp +++ b/qt/pkclassify_svm/mainwindow.cpp @@ -10,6 +10,19 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow) { ui->setupUi(this); + QStringList svmlist; + svmlist << "C_SVC" << "nu_SVC" << "one_class" << "epsilon_SVR" << "nu_SVR"; + ui->svmtype->addItems(svmlist); + QStringList kernellist; + kernellist << "radial" << "linear" << "polynomial" << "sigmoid"; + ui->kerneltype->addItems(kernellist); + ui->coef0->setText("0"); + ui->ccost->setText("1"); + ui->gamma->setText("0"); + ui->nu->setText("0.5"); + //test + m_training="d:\\osgeo\\course\\openstreetmap\\training2.sqlite"; + ui->training->setText(m_training); } MainWindow::~MainWindow() @@ -63,6 +76,7 @@ void MainWindow::on_toolButton_training_clicked() void MainWindow::on_training_returnPressed() { + m_training=ui->training->text(); QStringList labels; labels << "forest" << "non-forest"; setClassTable(labels); @@ -83,7 +97,7 @@ void MainWindow::setClassTable(const QStringList &labels) void MainWindow::on_pushButton_run_clicked() { try{ - QString program = "pkclassify_svm"; + QString program = "pksvm"; if(m_training.isEmpty()) MainWindow::on_actionTraining_triggered(); @@ -91,8 +105,6 @@ void MainWindow::on_pushButton_run_clicked() QString qsError="No training vector file selected"; throw(qsError); } - program+=" --training "; - program+=m_training; // QList<QCheckBox*> qcheckBoxList = this->findChildren<QCheckBox *>(); @@ -131,13 +143,15 @@ void MainWindow::on_pushButton_run_clicked() ui->commandLineEdit->insert(program); -//// QProcess *myProcess = new QProcess(parent); -// QProcess *myProcess = new QProcess(this); -// myProcess->start(program); -// myProcess->waitForFinished(-1); -// QString p_stdout = myProcess->readAll(); -//// ui->outputEdit->appendPlainText(p_stdout); -// delete myProcess; +// QProcess *myProcess = new QProcess(parent); + QProcess *myProcess = new QProcess(this); + + myProcess->start(program); + myProcess->waitForFinished(-1); + QString p_stdout = myProcess->readAll(); + ui->consoleEdit->clear(); + ui->consoleEdit->insertPlainText(p_stdout); + delete myProcess; } catch(QString qsError){ QMessageBox msgBox; diff --git a/qt/pkclassify_svm/mainwindow.ui b/qt/pkclassify_svm/mainwindow.ui index bb8c9d1..4c549e8 100644 --- a/qt/pkclassify_svm/mainwindow.ui +++ b/qt/pkclassify_svm/mainwindow.ui @@ -488,6 +488,29 @@ </rect> </property> </widget> + <widget class="QLabel" name="label_19"> + <property name="geometry"> + <rect> + <x>10</x> + <y>120</y> + <width>81</width> + <height>16</height> + </rect> + </property> + <property name="text"> + <string>Console output</string> + </property> + </widget> + <widget class="QPlainTextEdit" name="consoleEdit"> + <property name="geometry"> + <rect> + <x>10</x> + <y>140</y> + <width>361</width> + <height>171</height> + </rect> + </property> + </widget> </widget> </widget> <widget class="QPushButton" name="pushButton_run"> diff --git a/qt/pkinfo/mainwindow.ui b/qt/pkinfo/mainwindow.ui index 67a1c27..14d1593 100644 --- a/qt/pkinfo/mainwindow.ui +++ b/qt/pkinfo/mainwindow.ui @@ -99,7 +99,7 @@ </rect> </property> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="datasetinfo"> <attribute name="title"> -- 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