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

[TASK] Whoops. This was succeeding histogramm adaption.

Browse Source
This commit is contained in:
Jan Philipp Timme 2015-11-20 13:42:13 +01:00
parent d2efee34ed
commit 2f5f581890
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
imageviewer-qt4.cpp
View File

@ -364,12 +364,12 @@ void ImageViewer::linearHistogrammAdaption(void) {
} }
/** /**
* Do a piece based linear histogramm adaption using a reference image. * Do a succeeding histogramm adaption based on a reference image.
* *
* @brief Imageviewer::pieceLinearHistogrammAdaption * @brief Imageviewer::succeedingHistogrammAdaption
*/ */
void ImageViewer::pieceLinearHistogrammAdaption() { void ImageViewer::succeedingHistogrammAdaption() {
logFile << "Doing linear histogramm adaption ..." << std::endl; logFile << "Doing succeeding histogramm adaption ..." << std::endl;
renewLogging(); renewLogging();
if(histogramm_reference == NULL) { if(histogramm_reference == NULL) {
logFile << "No reference image loaded! Aborting." << std::endl; logFile << "No reference image loaded! Aborting." << std::endl;
@ -565,8 +565,8 @@ void ImageViewer::generateControlPanels() {
linear_histogramm_adaption = new QPushButton("Do linear histogramm adaption (basic)"); linear_histogramm_adaption = new QPushButton("Do linear histogramm adaption (basic)");
QObject::connect(linear_histogramm_adaption, SIGNAL(clicked()), this, SLOT(linearHistogrammAdaption())); QObject::connect(linear_histogramm_adaption, SIGNAL(clicked()), this, SLOT(linearHistogrammAdaption()));
piece_linear_histogramm_adaption = new QPushButton("Do linear histogramm adaption (pieces)"); succeeding_histogramm_adaption = new QPushButton("Do succeeding histogramm adaption");
QObject::connect(piece_linear_histogramm_adaption, SIGNAL(clicked()), this, SLOT(pieceLinearHistogrammAdaption())); QObject::connect(succeeding_histogramm_adaption, SIGNAL(clicked()), this, SLOT(succeedingHistogrammAdaption()));
task_tab3->addWidget(new QLabel("Reference image")); task_tab3->addWidget(new QLabel("Reference image"));
task_tab3->addWidget(reference_histogramm_cumulative_label); task_tab3->addWidget(reference_histogramm_cumulative_label);
@ -575,7 +575,7 @@ void ImageViewer::generateControlPanels() {
task_tab3->addWidget(new QLabel("Working copy")); task_tab3->addWidget(new QLabel("Working copy"));
task_tab3->addWidget(histogramm_cumulative_label); task_tab3->addWidget(histogramm_cumulative_label);
task_tab3->addWidget(linear_histogramm_adaption); task_tab3->addWidget(linear_histogramm_adaption);
task_tab3->addWidget(piece_linear_histogramm_adaption); task_tab3->addWidget(succeeding_histogramm_adaption);
tabWidget->addTab(task_tab_widget3, "Task #3"); tabWidget->addTab(task_tab_widget3, "Task #3");

4
imageviewer-qt4.h
View File

@ -110,7 +110,7 @@ class ImageViewer : public QMainWindow {
QLabel* histogramm_cumulative_label; QLabel* histogramm_cumulative_label;
QPushButton* linear_histogramm_adaption; QPushButton* linear_histogramm_adaption;
QPushButton* piece_linear_histogramm_adaption; QPushButton* succeeding_histogramm_adaption;
// "My" space for storing data/results // "My" space for storing data/results
LazyImage* original; LazyImage* original;
@ -130,7 +130,7 @@ class ImageViewer : public QMainWindow {
void saveToOriginal(); void saveToOriginal();
void robustAutomaticContrastAdaption(int c_param); void robustAutomaticContrastAdaption(int c_param);
void linearHistogrammAdaption(); void linearHistogrammAdaption();
void pieceLinearHistogrammAdaption(); void succeedingHistogrammAdaption();
void open(); void open();
void openReference(); void openReference();