diff --git a/app/Operations/CroissanceOp.cpp b/app/Operations/CroissanceOp.cpp index e9b6990f4f8316b6644b4e3f9e61957c99f09251..495c6de0f40c7a24b796c21c8b532c053d5b6ff1 100644 --- a/app/Operations/CroissanceOp.cpp +++ b/app/Operations/CroissanceOp.cpp @@ -42,7 +42,7 @@ bool CroissanceOp::needCurrentImg() const { return true; } -void CroissanceOp::operator()(const imagein::Image* image, const std::map<const imagein::Image*, std::string>&) { +void CroissanceOp::operator()(const imagein::Image* img, const std::map<const imagein::Image*, std::string>&) { QDialog* dialog = new QDialog(QApplication::activeWindow()); dialog->setWindowTitle(QString(qApp->translate("Operations", "Croissance"))); diff --git a/app/Operations/NoiseOp.cpp b/app/Operations/NoiseOp.cpp index 20944ddf5ab56b741fa09543d3b45d54236251f3..2e7100156bb133ad9cef10c23e05294ddca66b77 100644 --- a/app/Operations/NoiseOp.cpp +++ b/app/Operations/NoiseOp.cpp @@ -43,7 +43,7 @@ NoiseOp::NoiseOp() : GenericOperation(qApp->translate("Operations", "Add noise") { } -void NoiseOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>&) { +void NoiseOp::operator()(const ImageWindow* currentWnd, const vector<const ImageWindow*>&) { QDialog* dialog = new QDialog(); dialog->setWindowTitle(qApp->translate("Operations", "Parameters")); diff --git a/app/Operations/NoiseOp.h b/app/Operations/NoiseOp.h index 62aedf535b9e601c88379ed8f0543a3d7876d16f..1c32471dd50ccef5d8a54eaf61afed74a80e4529 100644 --- a/app/Operations/NoiseOp.h +++ b/app/Operations/NoiseOp.h @@ -28,7 +28,7 @@ class NoiseOp : public GenericOperation public: NoiseOp(); - virtual void operator()(const genericinterface::ImageWindow* currentWnd, std::vector<genericinterface::ImageWindow*>&); + virtual void operator()(const genericinterface::ImageWindow* currentWnd, const std::vector<const genericinterface::ImageWindow*>&); virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const; diff --git a/app/Operations/PointOp.cpp b/app/Operations/PointOp.cpp index 8cf8756a8169c8cb18811458f3e5298d50998f0d..e4f86cf89b49f73b86fb900c4a139704bd5cbb2c 100644 --- a/app/Operations/PointOp.cpp +++ b/app/Operations/PointOp.cpp @@ -90,7 +90,7 @@ PointOp::DoubleImageOp* PointOp::DoubleImageOp::fromString(QString op) { return new DoubleImgIdent(); } -void PointOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>& wndList) { +void PointOp::operator()(const ImageWindow* currentWnd, const vector<const ImageWindow*>& wndList) { QStringList pixOperators, imgOperators; @@ -99,7 +99,7 @@ void PointOp::operator()(const ImageWindow* currentWnd, vector<ImageWindow*>& wn QString currentImgName = currentWnd->windowTitle(); map<const Image*,string> stdImgList; map<const Image_t<double>*,string> dblImgList; - for(vector<ImageWindow*>::iterator it = wndList.begin(); it != wndList.end(); ++it) { + for(vector<const ImageWindow*>::const_iterator it = wndList.begin(); it != wndList.end(); ++it) { if((*it)->isStandard()) { const StandardImageWindow* stdImgWnd = dynamic_cast<const StandardImageWindow*>(*it); stdImgList.insert(pair<const Image*, string>(stdImgWnd->getImage(), stdImgWnd->windowTitle().toStdString())); diff --git a/app/Operations/PointOp.h b/app/Operations/PointOp.h index ffe4a8fb3b3a06c5299e63275ed93a3ded44f399..dec846e7b8ae8b4819be55301f929344bb23d34d 100644 --- a/app/Operations/PointOp.h +++ b/app/Operations/PointOp.h @@ -36,7 +36,7 @@ class PointOp : public GenericOperation { PointOp(); - virtual void operator()(const genericinterface::ImageWindow* currentWnd, std::vector<genericinterface::ImageWindow*>&); + virtual void operator()(const genericinterface::ImageWindow* currentWnd, const std::vector<const genericinterface::ImageWindow*>&); bool needCurrentImg() const; virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const; diff --git a/app/Operations/ScalingOp.cpp b/app/Operations/ScalingOp.cpp index c8bf6dbc7ea1543aa88e43e64c8b83dfbf0c9ded..832919a3167b6cd3fb6c9c59ad36d7a42977ff58 100644 --- a/app/Operations/ScalingOp.cpp +++ b/app/Operations/ScalingOp.cpp @@ -50,7 +50,7 @@ bool ScalingOp::isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const return imgWnd != NULL; } -void ScalingOp::operator()(const genericinterface::ImageWindow* currentWnd, vector<ImageWindow*>&) { +void ScalingOp::operator()(const genericinterface::ImageWindow* currentWnd, const vector<const ImageWindow*>&) { QDialog* dialog = new QDialog(QApplication::activeWindow()); dialog->setWindowTitle(QString(qApp->translate("Operations", "Scaling"))); diff --git a/app/Operations/ScalingOp.h b/app/Operations/ScalingOp.h index 551ba94fe0db8dd2d7e65747c4cbc84790ba7e4b..dc8199ee7708edfa997af58c36b9399cfedafff1 100644 --- a/app/Operations/ScalingOp.h +++ b/app/Operations/ScalingOp.h @@ -44,7 +44,7 @@ public: static void interpolate(typename imagein::Image_t<D>::ConstLine src, typename imagein::Image_t<double>::Line dst); }; - virtual void operator()(const genericinterface::ImageWindow* currentWnd, std::vector<genericinterface::ImageWindow*>&); + virtual void operator()(const genericinterface::ImageWindow* currentWnd, const std::vector<const genericinterface::ImageWindow*>&); bool needCurrentImg() const; virtual bool isValidImgWnd(const genericinterface::ImageWindow* imgWnd) const; diff --git a/app/Services/OperationService.cpp b/app/Services/OperationService.cpp index 57c36192140c24eda4a641863695df0407d27675..f66fac0366bf75536104d7294a4d30f2c06cc574 100644 --- a/app/Services/OperationService.cpp +++ b/app/Services/OperationService.cpp @@ -69,8 +69,8 @@ void OperationService::operation() { if(_operation->needCurrentImg() && !_operation->isValidImgWnd(curImgWnd)) return; map<const ImageWindow*, string> wndList; - vector<ImageWindow*> windows = ws->getImageWindows(); - for(vector<ImageWindow*>::iterator it = windows.begin(); it < windows.end(); ++it) { + vector<const ImageWindow*> windows = ws->getImageWindows(); + for(vector<const ImageWindow*>::const_iterator it = windows.begin(); it < windows.end(); ++it) { wndList.insert(pair<const ImageWindow*, string>(*it, (*it)->windowTitle().toStdString())); }