From a6854a9625369ff2bf52cd66811520c36f1af2e8 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Fri, 13 Nov 2015 14:39:51 +0100 Subject: [PATCH] [TASK] Remove acid trip. --- imageviewer-qt4.cpp | 22 ---------------------- imageviewer-qt4.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/imageviewer-qt4.cpp b/imageviewer-qt4.cpp index a3af53d..5046957 100644 --- a/imageviewer-qt4.cpp +++ b/imageviewer-qt4.cpp @@ -162,23 +162,6 @@ void ImageViewer::drawRainbowCross(int initialHue=0) { } } -/** - * Repeatedly draw the rainbow cross forever. - * You will need to kill the process manually after triggering this. - * @brief ImageViewer::acidTrippin - */ -void ImageViewer::acidTrippin() { - logFile << "There is no stop button yet. Kill the process or keep it." << std::endl; - renewLogging(); - int h = 0; - while(true) { - drawRainbowCross(h); - h += 20; - if(h > 359) h = 0; - qApp->processEvents(); - } -} - /** * Analyze the image, get average luminance * Also fill grayscale_absolute_histogramm @@ -329,10 +312,6 @@ void ImageViewer::generateControlPanels() { draw_rainbow_cross->setText("Draw a rainbow cross"); QObject::connect(draw_rainbow_cross, SIGNAL(clicked()), this, SLOT (drawRainbowCross())); - acid_trip = new QPushButton(); - acid_trip->setText("Start the neverending acid trip!"); - QObject::connect(acid_trip, SIGNAL(clicked()), this, SLOT (acidTrippin())); - diagonal_cross = new QPushButton(); diagonal_cross->setText("Draw a diagonal cross"); QObject::connect(diagonal_cross, SIGNAL(clicked()), this, SLOT (drawDiagonalCross())); @@ -347,7 +326,6 @@ void ImageViewer::generateControlPanels() { task_tab1->addWidget(new QLabel("Let's draw something!")); task_tab1->addWidget(draw_black_line); task_tab1->addWidget(draw_rainbow_cross); - task_tab1->addWidget(acid_trip); task_tab1->addWidget(diagonal_cross); task_tab1->addWidget(new QLabel("This will not stop unless process is killed.")); task_tab1->addWidget(line_slider); diff --git a/imageviewer-qt4.h b/imageviewer-qt4.h index f323c15..1f79d63 100644 --- a/imageviewer-qt4.h +++ b/imageviewer-qt4.h @@ -77,7 +77,6 @@ class ImageViewer : public QMainWindow { QPushButton* draw_black_line; QPushButton* draw_rainbow_cross; - QPushButton* acid_trip; QPushButton* diagonal_cross; QPushButton* monochrome; @@ -111,7 +110,6 @@ class ImageViewer : public QMainWindow { void drawBlackLine(); void drawRainbowCross(); void drawDiagonalCross(); - void acidTrippin(); void analyzeImage(); void adjustBrightness(int b); void adjustContrast(int c);