From 1822d3ef644d9f73bc82df099bbb068ad0128043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sacha=20Percot-T=C3=A9tu?= <zakinster@zakinster.com>
Date: Mon, 24 Sep 2012 15:57:51 +0200
Subject: [PATCH] Removed useless include, corrected some bugs
---
app/Operations/CenterOp.cpp | 2 --
app/Operations/CombineColorOp.cpp | 9 +++++----
app/Operations/FFTOp.cpp | 1 -
app/Operations/FlipOp.cpp | 1 -
app/Operations/IFFTOp.cpp | 3 ++-
app/Operations/PointOp.cpp | 1 -
app/Operations/RotateOp.cpp | 2 --
app/Operations/SplitColorOp.cpp | 2 --
app/Operations/ThresholdOp.cpp | 2 --
app/Operations/TranslateOp.cpp | 2 --
app/Services/OperationService.cpp | 1 -
core/Operation.h | 1 -
core/PlugOperation.cpp | 4 ----
core/PlugOperation.h | 1 -
plugins/Segmentation/segmentation.cpp | 1 +
15 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/app/Operations/CenterOp.cpp b/app/Operations/CenterOp.cpp
index fc63791..9780e78 100644
--- a/app/Operations/CenterOp.cpp
+++ b/app/Operations/CenterOp.cpp
@@ -22,8 +22,6 @@
#include <Operation.h>
#include <Image.h>
-#include <ImgWidget.h>
-
#include "CenterOp.h"
diff --git a/app/Operations/CombineColorOp.cpp b/app/Operations/CombineColorOp.cpp
index 3ae0bcf..0bba537 100644
--- a/app/Operations/CombineColorOp.cpp
+++ b/app/Operations/CombineColorOp.cpp
@@ -27,7 +27,6 @@
#include <GrayscaleImage.h>
#include <Converter.h>
-#include <ImgWidget.h>
#include <Widgets/ImageListBox.h>
#include "CombineColorOp.h"
@@ -53,10 +52,10 @@ void CombineColorOp::operator()(const imagein::Image*, const std::map<const imag
dialog->setLayout(layout);
- int nChannel = 3;
+ unsigned int nChannel = 3;
ImageListBox** imageBoxes = new ImageListBox*[nChannel];
- for(int i=0; i < nChannel; ++i) {
+ for(unsigned int i=0; i < nChannel; ++i) {
imageBoxes[i] = new ImageListBox(dialog, NULL, imgList);
QLabel* label = new QLabel(Tools::colorName(i, nChannel), dialog);
layout->insertRow(i, label, imageBoxes[i]);
@@ -77,7 +76,9 @@ void CombineColorOp::operator()(const imagein::Image*, const std::map<const imag
unsigned int maxWidth = numeric_limits<unsigned int>::max();
unsigned int maxHeight = numeric_limits<unsigned int>::max();
for(unsigned int c = 0; c < nChannel; ++c) {
- channels[c] = Converter<GrayscaleImage>::convert(*imageBoxes[c]->currentImage());
+ const Image* img = imageBoxes[c]->currentImage();
+ if(img == NULL) return;
+ channels[c] = Converter<GrayscaleImage>::convert(*img);
maxWidth = min(maxWidth, channels[c]->getWidth());
maxHeight = min(maxHeight, channels[c]->getHeight());
}
diff --git a/app/Operations/FFTOp.cpp b/app/Operations/FFTOp.cpp
index 2e96c30..6f07ced 100644
--- a/app/Operations/FFTOp.cpp
+++ b/app/Operations/FFTOp.cpp
@@ -16,7 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with EIImage. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ImgWidget.h"
#include "FFTOp.h"
#include "../Tools.h"
#include "../Algorithms/FFT.h"
diff --git a/app/Operations/FlipOp.cpp b/app/Operations/FlipOp.cpp
index 934eb3d..4c78908 100644
--- a/app/Operations/FlipOp.cpp
+++ b/app/Operations/FlipOp.cpp
@@ -21,7 +21,6 @@
#include <Image.h>
-#include "ImgWidget.h"
#include "FlipOp.h"
using namespace std;
diff --git a/app/Operations/IFFTOp.cpp b/app/Operations/IFFTOp.cpp
index 86fada1..0cfa60b 100644
--- a/app/Operations/IFFTOp.cpp
+++ b/app/Operations/IFFTOp.cpp
@@ -26,7 +26,6 @@
#include <QRadioButton>
#include "IFFTOp.h"
-#include "ImgWidget.h"
#include "../Tools.h"
#include "../Algorithms/FFT.h"
#include <cmath>
@@ -100,6 +99,7 @@ void IFFTOp::operator()(const imagein::Image_t<double>*, const map<const imagein
const Image_t<double>* magnitudeImg = magtdImgBox->currentImage();
const Image_t<double>* phaseImg = phaseImgBox->currentImage();
+ if(magnitudeImg == NULL || phaseImg == NULL) return;
unsigned int width = min(nearestUpPower2(magnitudeImg->getWidth()), nearestUpPower2(phaseImg->getWidth()));
unsigned int height = min(nearestUpPower2(magnitudeImg->getHeight()), nearestUpPower2(phaseImg->getHeight()));
unsigned int channels = min(magnitudeImg->getNbChannels(), phaseImg->getNbChannels());
@@ -151,6 +151,7 @@ void IFFTOp::operator()(const imagein::Image_t<double>*, const map<const imagein
const Image_t<double>* realImg = realImgBox->currentImage();
const Image_t<double>* imagImg = imagImgBox->currentImage();
+ if(realImg == NULL || imagImg == NULL) return;
unsigned int width = min(nearestUpPower2(realImg->getWidth()), nearestUpPower2(imagImg->getWidth()));
unsigned int height = min(nearestUpPower2(realImg->getHeight()), nearestUpPower2(imagImg->getHeight()));
unsigned int channels = min(realImg->getNbChannels(), imagImg->getNbChannels());
diff --git a/app/Operations/PointOp.cpp b/app/Operations/PointOp.cpp
index e4f86cf..535c4b5 100644
--- a/app/Operations/PointOp.cpp
+++ b/app/Operations/PointOp.cpp
@@ -30,7 +30,6 @@
#include <QGroupBox>
#include "PointOp.h"
-#include "ImgWidget.h"
#include <Widgets/ImageListBox.h>
#include <Widgets/ImageWidgets/StandardImageWindow.h>
#include <Widgets/ImageWidgets/DoubleImageWindow.h>
diff --git a/app/Operations/RotateOp.cpp b/app/Operations/RotateOp.cpp
index 0338e6e..659ebcf 100644
--- a/app/Operations/RotateOp.cpp
+++ b/app/Operations/RotateOp.cpp
@@ -23,8 +23,6 @@
#include <QSpinBox>
#include <QCheckBox>
-#include "ImgWidget.h"
-
#include "RotateOp.h"
#include "../Tools.h"
diff --git a/app/Operations/SplitColorOp.cpp b/app/Operations/SplitColorOp.cpp
index aaad265..2ae27c8 100644
--- a/app/Operations/SplitColorOp.cpp
+++ b/app/Operations/SplitColorOp.cpp
@@ -18,8 +18,6 @@
*/
#include <GrayscaleImage.h>
-#include "ImgWidget.h"
-
#include "SplitColorOp.h"
#include "../Tools.h"
diff --git a/app/Operations/ThresholdOp.cpp b/app/Operations/ThresholdOp.cpp
index b2731a7..fd08985 100644
--- a/app/Operations/ThresholdOp.cpp
+++ b/app/Operations/ThresholdOp.cpp
@@ -1,5 +1,3 @@
-#include "ImgWidget.h"
-
#include "Algorithm/Binarization.h"
#include "Converter.h"
diff --git a/app/Operations/TranslateOp.cpp b/app/Operations/TranslateOp.cpp
index f33c72d..b05f5d6 100644
--- a/app/Operations/TranslateOp.cpp
+++ b/app/Operations/TranslateOp.cpp
@@ -4,8 +4,6 @@
#include <QSpinBox>
#include <QCheckBox>
-#include "ImgWidget.h"
-
#include "TranslateOp.h"
#include "../Tools.h"
using namespace std;
diff --git a/app/Services/OperationService.cpp b/app/Services/OperationService.cpp
index 1a22784..f641356 100644
--- a/app/Services/OperationService.cpp
+++ b/app/Services/OperationService.cpp
@@ -21,7 +21,6 @@
#include <GenericInterface.h>
#include <Widgets/ImageWidgets/DoubleImageWindow.h>
#include <Widgets/ImageWidgets/StandardImageWindow.h>
-#include <ImgWidget.h>
#include "EIImageService.h"
#include <QMessageBox>
diff --git a/core/Operation.h b/core/Operation.h
index de7893d..bc98465 100644
--- a/core/Operation.h
+++ b/core/Operation.h
@@ -23,7 +23,6 @@
#include <map>
#include <string>
-#include "Output.h"
#include "Image.h"
class QWidget;
diff --git a/core/PlugOperation.cpp b/core/PlugOperation.cpp
index 5117359..669585f 100644
--- a/core/PlugOperation.cpp
+++ b/core/PlugOperation.cpp
@@ -43,10 +43,6 @@ void PlugOperation::addInput(const Input& input) {
this->_inputs.push_back(input.clone());
}
-void PlugOperation::addOutput(const Output& output) {
- _outputs.push_back(output.clone());
-}
-
bool PlugOperation::isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const {
if(!this->needCurrentImg()) {
return true;
diff --git a/core/PlugOperation.h b/core/PlugOperation.h
index cf800b4..2baa8da 100644
--- a/core/PlugOperation.h
+++ b/core/PlugOperation.h
@@ -25,7 +25,6 @@
#include "Input.h"
#include "Parameter.h"
-#include "Output.h"
#include <Image.h>
#include "Operation.h"
diff --git a/plugins/Segmentation/segmentation.cpp b/plugins/Segmentation/segmentation.cpp
index 4cc3921..3cfe55b 100644
--- a/plugins/Segmentation/segmentation.cpp
+++ b/plugins/Segmentation/segmentation.cpp
@@ -73,6 +73,7 @@ class Dithering : public PlugOperation {
public:
Dithering() : PlugOperation("Dithering") {
this->addParam(CurrentImg(), &Dithering::img);
+// this->addParam(ImgParam("Image"), &Dithering::img);
}
void operation() {
--
GitLab