Fixed merge on filtering service + deleted useless parts in QuantifOp

app/Operations/QuantificationDialog.cpp

@@ -98,8 +98,7 @@ void QuantificationDialog::methodChanged(int method) {
     this->adjustSize();
 }
 
-Quantification QuantificationDialog::getQuantif(const Image* image, unsigned int c, std::string &to_print, bool * checkOptiQuant) {
-    *checkOptiQuant = false;
+Quantification QuantificationDialog::getQuantif(const Image* image, unsigned int c, std::string &to_print) {
     int size = _sizeBox->value();
     if(_editorOnly) return Quantification::linearQuant(size);
     switch(_quantBox->currentIndex()) {
@@ -117,7 +116,6 @@ Quantification QuantificationDialog::getQuantif(const Image* image, unsigned int
                 break;
         case 4:
                 to_print = QString(tr("Quantification LloydMax :")).toStdString();
-                //*checkOptiQuant = true;
                 return Quantification::lloydMaxQuant(size, image, c);
                 break;
 

app/Operations/QuantificationDialog.h

@@ -33,7 +33,7 @@ class QuantificationDialog : public QDialog
 public:
     enum QuantMethod {LinearQuant, NonLinearQuant, NonLinearQuantOptimized};
     explicit QuantificationDialog(QWidget *parent = 0, QString imgName = QString());
-    Quantification getQuantif(const imagein::Image *image, unsigned int c, std::string &, bool * checkOptiQuant);
+    Quantification getQuantif(const imagein::Image *image, unsigned int c, std::string &);
     Quantification getQuantif();
     void setValues(int);
     void setQuantif(int);

app/Operations/QuantificationOp.cpp

@@ -174,7 +174,7 @@ void QuantificationOp::operator()(const imagein::Image* image, const std::map<co
         for(unsigned int c = 0; c < image->getNbChannels(); ++c) {
 
 
-            Quantification quantification = dialog->getQuantif(image, c, quantType, true);
+            Quantification quantification = dialog->getQuantif(image, c, quantType);
 
             //Generate the text to print in the information window
             output_msg += quantificationOpLog(c, &quantification);

app/Services/FilteringService.cpp

@@ -20,7 +20,7 @@
 #include "FilteringService.h"
 
 #include <QMdiArea>
-#include <Qstring>
+#include <QString>
 
 #include <GenericInterface.h>
 #include <Converter.h>
@@ -99,7 +99,7 @@ void FilteringService::applyAlgorithm(Filtering* algo)
            DoubleImageWindow* diw = dynamic_cast<DoubleImageWindow*>(_siw);
            image = diw->getImage();
         }
-        
+
         Image_t<double>* dblResImg = (*algo)(image);
         unsigned char i = 0;
         ImageWindow* riw;
@@ -117,7 +117,6 @@ void FilteringService::applyAlgorithm(Filtering* algo)
                 }
             }
             else {
-<<<<<<< Updated upstream
                 std::string outputMessage = "";
                 Image* resImg;
                 Image_t<int>* intResImg = Converter<Image_t<int> >::convert(*dblResImg);
@@ -133,50 +132,19 @@ void FilteringService::applyAlgorithm(Filtering* algo)
                 }
                 else{
                     resImg = Converter<Image>::convertAndRound(*dblResImg);
-                    outputMessage = "Pas de conversion [min : 0, max : 255]";
+                    outputMessage = qApp->translate("FilterinService","Pas de conversion [min : 0, max : 255]").toStdString();
 
                 }
                 riw = new StandardImageWindow(resImg, _siw->getPath());
                 _ws->addText(outputMessage);
-=======
-                riw = new DoubleImageWindow(dblResImg, _siw->getPath(), true);
-            }
-        }
-        else {
-            std::string outputMessage = "";
-            Image* resImg;
-            Image_t<int>* intResImg = Converter<Image_t<int> >::convert(*dblResImg);
-            if(_scaling && _offset ){
-                resImg  =  Converter<Image>::convertScaleAndOffset(*intResImg, &outputMessage);
->>>>>>> Stashed changes
-            }
-            else if(_scaling){
-                resImg  =  Converter<Image>::convertAndScale(*intResImg, &outputMessage);
             }
-            else if(_offset){
-                resImg = Converter<Image>::convertAndOffset(*intResImg, &outputMessage);
-            }
-            else{
-                resImg = Converter<Image>::convertAndRound(*dblResImg);
-                outputMessage = qApp->translate("Filtering","Pas de conversion [min : 0, max : 255]").toStdString();
 
-<<<<<<< Updated upstream
             if(i == 0) riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName() + " Result ");
             else riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName() + " " + i);
-            
+
             emit newImageWindowCreated(_ws->getNodeId(_siw), riw);
             i++;
             dblResImg = algo->getInterImg();
         }while(dblResImg != NULL);
-=======
-            }
-            delete dblResImg;
-            riw = new StandardImageWindow(resImg, _siw->getPath());
-            _ws->addText(outputMessage);
-            _ws->addText("-------------------------------------------");
-        }
-        riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName());
-        emit newImageWindowCreated(_ws->getNodeId(_siw), riw);
->>>>>>> Stashed changes
     }
 }

detiq-t @ 1243d76a

-Subproject commit 724ce285a1c9e9a15c61bea40d466f7e81e976e0
+Subproject commit 1243d76aab02a3ea0b840fe1333c5706961ec68a