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 435b30ed1ca4e7a6f1844a418636dcd1a2a6d4df Author: Pieter Kempeneers <kempe...@gmail.com> Date: Tue Apr 15 14:50:24 2014 +0200 working on gui --- qt/pkcomposite_gui/mainwindow.cc | 12 ++++++ qt/pkcomposite_gui/mainwindow.h | 4 ++ qt/pkcomposite_gui/mainwindow.ui | 81 ++++++++++++++++++++++---------------- qt/pkextract_gui/pkextract_gui.pro | 2 +- 4 files changed, 64 insertions(+), 35 deletions(-) diff --git a/qt/pkcomposite_gui/mainwindow.cc b/qt/pkcomposite_gui/mainwindow.cc index 29a8ea1..df1eea9 100644 --- a/qt/pkcomposite_gui/mainwindow.cc +++ b/qt/pkcomposite_gui/mainwindow.cc @@ -63,6 +63,7 @@ void MainWindow::setDefaults() ui->uly->clear(); ui->lrx->clear(); ui->lry->clear(); + ui->extent->clear(); //composit ui->resample->setCurrentIndex(0); ui->crule->setCurrentIndex(0); @@ -221,3 +222,14 @@ void MainWindow::on_toolButton_Run_clicked() msgBox.exec(); } } + +void MainWindow::on_toolButton_extent_clicked() +{ + on_actionExtent_triggered(); +} + +void MainWindow::on_actionExtent_triggered() +{ + QString qsextent = QFileDialog::getOpenFileName(this, "extent"); + ui->extent->setText(qsextent); +} diff --git a/qt/pkcomposite_gui/mainwindow.h b/qt/pkcomposite_gui/mainwindow.h index ef66d8b..291dd8a 100644 --- a/qt/pkcomposite_gui/mainwindow.h +++ b/qt/pkcomposite_gui/mainwindow.h @@ -56,6 +56,10 @@ private slots: void on_toolButton_ct_clicked(); + void on_toolButton_extent_clicked(); + + void on_actionExtent_triggered(); + private: Ui::MainWindow *ui; void setDefaults(); diff --git a/qt/pkcomposite_gui/mainwindow.ui b/qt/pkcomposite_gui/mainwindow.ui index a25e571..6b9f5f9 100644 --- a/qt/pkcomposite_gui/mainwindow.ui +++ b/qt/pkcomposite_gui/mainwindow.ui @@ -18,7 +18,7 @@ <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>2</number> + <number>0</number> </property> <widget class="QWidget" name="tab"> <attribute name="title"> @@ -27,23 +27,6 @@ <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="1"> - <widget class="QToolButton" name="toolButton_input"> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Input images</string> - </property> - </widget> - </item> - <item row="0" column="2"> - <widget class="QListWidget" name="listWidget_input"/> - </item> <item row="1" column="3"> <spacer name="horizontalSpacer_3"> <property name="orientation"> @@ -57,9 +40,29 @@ </property> </spacer> </item> + <item row="0" column="2"> + <widget class="QListWidget" name="listWidget_input"/> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Input images</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QToolButton" name="toolButton_input"> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> <item row="3" column="2"> <widget class="QLineEdit" name="lry"/> </item> + <item row="1" column="2"> + <widget class="QLineEdit" name="uly"/> + </item> <item row="1" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> @@ -80,30 +83,31 @@ </property> </spacer> </item> - <item row="1" column="2"> - <widget class="QLineEdit" name="uly"/> - </item> <item row="2" column="3"> <widget class="QLineEdit" name="lrx"/> </item> <item row="2" column="1"> <widget class="QLineEdit" name="ulx"/> </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Geographical extent</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLineEdit" name="extent"/> + </item> + <item row="4" column="2"> + <widget class="QToolButton" name="toolButton_extent"> + <property name="text"> + <string>...</string> + </property> + </widget> + </item> </layout> </item> - <item> - <spacer name="verticalSpacer"> - <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> </widget> <widget class="QWidget" name="tab_2"> @@ -493,6 +497,7 @@ <string>File</string> </property> <addaction name="actionInput_image"/> + <addaction name="actionExtent"/> <addaction name="actionOutput_image"/> <addaction name="actionSelection_Info_file"/> <addaction name="actionQuit"/> @@ -540,6 +545,14 @@ <string>Alt+F</string> </property> </action> + <action name="actionExtent"> + <property name="text"> + <string>Extent</string> + </property> + <property name="shortcut"> + <string>Alt+E</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <tabstops> diff --git a/qt/pkextract_gui/pkextract_gui.pro b/qt/pkextract_gui/pkextract_gui.pro index 8c25274..2ba0a14 100644 --- a/qt/pkextract_gui/pkextract_gui.pro +++ b/qt/pkextract_gui/pkextract_gui.pro @@ -8,7 +8,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = pksvm +TARGET = pkexgtract_gui TEMPLATE = app -- 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