Hochschulprojekte
/
CG2_Tasks
0
0
Fork 0
Code Issues Pull Requests Activity

[TASK] Prepare Task #5.

This commit is contained in:
Jan Philipp Timme 2015-12-18 13:00:33 +01:00
parent 6ddb798177
commit afdb507c9b
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ Makefile
*.o *.o
moc_* moc_*
*.kdev4 *.kdev4
*.kate-swp

27
imageviewer-qt4.cpp
View File

@ -642,6 +642,15 @@ void ImageViewer::applyBasicFilterWithOverflowHandling() {
renewLogging(); renewLogging();
updateImageDisplay(); updateImageDisplay();
} }
/**
* Does the whole canny edge thing.
*
* @brief ImageViewer::runCannyEdge
*/
void ImageViewer::runCannyEdge(void) {
}
/**************************************************************************************** /****************************************************************************************
* *
* GUI elements related to the tasks are set up here. * GUI elements related to the tasks are set up here.
@ -890,6 +899,24 @@ void ImageViewer::generateControlPanels() {
tabWidget->addTab(task_tab4_widget, "Task #4"); tabWidget->addTab(task_tab4_widget, "Task #4");
// Tab for fifth task
task_tab5_widget = new QWidget();
task_tab5_vboxlayout = new QVBoxLayout();
task_tab5_widget->setLayout(task_tab5_vboxlayout);
task_tab5_scrollwidget = new QWidget();
task_tab5_scrollarea = new QScrollArea();
task_tab5_scrollarea->setWidgetResizable(true);
task_tab5_scrollarea->setWidget(task_tab5_scrollwidget);
task_tab5_vboxlayout->addWidget(task_tab5_scrollarea);
task_tab5_scrolllayout = new QVBoxLayout();
task_tab5_scrolllayout->setSizeConstraint(QLayout::SetMaximumSize);
task_tab5_scrollwidget->setLayout(task_tab5_scrolllayout);
run_canny_edge = new QPushButton("Run canny edge algorithm!");
QObject::connect(run_canny_edge, SIGNAL(clicked()), this, SLOT(runCannyEdge()));
tabWidget->addTab(task_tab5_widget, "Task #5");
//Show it //Show it
tabWidget->show(); tabWidget->show();

9
imageviewer-qt4.h
View File

@ -138,6 +138,15 @@ class ImageViewer : public QMainWindow {
QComboBox* filter_mode_combobox; QComboBox* filter_mode_combobox;
QPushButton* apply_border_mode_filter; QPushButton* apply_border_mode_filter;
// Fifth task tabWidget
QWidget* task_tab5_widget;
QVBoxLayout* task_tab5_vboxlayout;
QWidget* task_tab5_scrollwidget;
QScrollArea* task_tab5_scrollarea;
QVBoxLayout* task_tab5_scrolllayout;
QPushButton* run_canny_edge;
// "My" space for storing data/results // "My" space for storing data/results
LazyImage* original; LazyImage* original;
LazyImage* working_copy; LazyImage* working_copy;