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 5ee1786d41643220d3e91dd689963241e816e03d Author: Pieter Kempeneers <kempe...@gmail.com> Date: Fri May 9 16:28:39 2014 +0200 pkextract_gui added single threshold --- qt/pkextract_gui/mainwindow.cpp | 9 ++++--- qt/pkextract_gui/mainwindow.ui | 52 ++++++++++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/qt/pkextract_gui/mainwindow.cpp b/qt/pkextract_gui/mainwindow.cpp index aab8aad..b1616af 100644 --- a/qt/pkextract_gui/mainwindow.cpp +++ b/qt/pkextract_gui/mainwindow.cpp @@ -14,7 +14,7 @@ MainWindow::MainWindow(QWidget *parent) : rulelist << "point" << "pointOnSurface" << "centroid" << "mean" << "median" << "proportion" << "minimum" << "maximum" << "maximum voting" << "sum"; ui->rule->addItems(rulelist); QStringList formatlist; - formatlist << "ESRI Shapefile" << "SQLite"; + formatlist << "SQLite" << "ESRI Shapefile"; ui->f->addItems(formatlist); setDefaults(); @@ -36,9 +36,12 @@ void MainWindow::setDefaults() ui->f->setCurrentIndex(0); ui->output->clear(); //tab extract - ui->bname->setText("B"); + ui->bname->setText("b"); ui->rule->setCurrentIndex(0); - + ui->nclass->clear(); + QStringList labels; + setClassTable(labels); + ui->threshold->clear(); } void MainWindow::on_actionInput_triggered() diff --git a/qt/pkextract_gui/mainwindow.ui b/qt/pkextract_gui/mainwindow.ui index b5ff9a0..b6a1372 100644 --- a/qt/pkextract_gui/mainwindow.ui +++ b/qt/pkextract_gui/mainwindow.ui @@ -165,19 +165,6 @@ <item row="1" column="1"> <widget class="QLineEdit" name="bname"/> </item> - <item row="5" column="1"> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> <item row="2" column="1"> <spacer name="verticalSpacer"> <property name="orientation"> @@ -194,7 +181,7 @@ <item row="4" column="0"> <widget class="QLabel" name="label_20"> <property name="toolTip"> - <string><html><head/><body><p>Prepare a table if you want to extract a subset of the points in the provided sample vector file. Use a percentual threshold value for each of the labels in the sample. To prepare the table, first enter the number of classes and then press the button '-&gt;'.</p></body></html></string> + <string><html><head/><body><p>Prepare a table with class names. To prepare the table, first enter the number of classes and then press the button '-&gt;'. </p><p>Prepare a class table only in two cases:</p><p>1) The sample is a raster file and you want to select a subset of classes, with each a defined threshold (in percentage). A threshold of 50 means you want half of the pixels to be selected.</p><p>2) The s [...] </property> <property name="text"> <string>prepare table </string> @@ -224,10 +211,17 @@ </property> </widget> </item> + <item row="3" column="1"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string># classes</string> + </property> + </widget> + </item> <item row="4" column="2"> <widget class="QToolButton" name="toolButton_createTable"> <property name="toolTip"> - <string><html><head/><body><p>Prepare a table if you want to extract a subset of the points in the provided sample vector file. Use a percentual threshold value for each of the labels in the sample. To prepare the table, first enter the number of classes and then press the button '-&gt;'.</p></body></html></string> + <string><html><head/><body><p>Prepare a table with class names. To prepare the table, first enter the number of classes and then press the button '-&gt;'. </p><p>Prepare a class table only in two cases:</p><p>1) The sample is a raster file and you want to select a subset of classes, with each a defined threshold (in percentage). A threshold of 50 means you want half of the pixels to be selected.</p><p>2) The s [...] </property> <property name="text"> <string>-></string> @@ -244,13 +238,32 @@ </property> </widget> </item> - <item row="3" column="1"> - <widget class="QLabel" name="label_21"> + <item row="5" column="0"> + <widget class="QLabel" name="label"> + <property name="toolTip"> + <string><html><head/><body><p>Threshold value for selection process. Select this percentage of the raster pixels (if sample is a raster dataset) or this percentage of the features in the vector file (if sample is a vector file). In case the sample is a land cover raster dataset, you can also define a threshold for each land cover class individually by preparing the table on the right.</p></body></html></string> + </property> <property name="text"> - <string># classes</string> + <string>Single threshold</string> </property> </widget> </item> + <item row="5" column="1"> + <widget class="QLineEdit" name="threshold"/> + </item> + <item row="6" column="0"> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item> @@ -413,12 +426,13 @@ <tabstop>bname</tabstop> <tabstop>nclass</tabstop> <tabstop>toolButton_createTable</tabstop> - <tabstop>commandLineEdit</tabstop> + <tabstop>threshold</tabstop> <tabstop>consoleEdit</tabstop> <tabstop>pushButton_run</tabstop> <tabstop>pushButton_restore</tabstop> <tabstop>tabWidget</tabstop> <tabstop>tableView_labels</tabstop> + <tabstop>commandLineEdit</tabstop> </tabstops> <resources/> <connections/> -- 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