Skip to content
Snippets Groups Projects
Commit 7f62f5cb authored by Provot Bertrand's avatar Provot Bertrand
Browse files

Updated convert to uchar
parent 48509804
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <QComboBox> #include <QComboBox>
#include <QStringList> #include <QStringList>
#include <QString>
UCharConvertDialog::UCharConvertDialog(QWidget *parent) : UCharConvertDialog::UCharConvertDialog(QWidget *parent) :
...@@ -74,3 +75,7 @@ int UCharConvertDialog::getCombo(){ ...@@ -74,3 +75,7 @@ int UCharConvertDialog::getCombo(){
int UCharConvertDialog::getOffset(){ int UCharConvertDialog::getOffset(){
return _spinBox->value(); return _spinBox->value();
} }
QString UCharConvertDialog::getText(){
return _comboBox->currentText();
}
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <QLabel> #include <QLabel>
#include <QComboBox> #include <QComboBox>
#include <QString>
namespace Ui { namespace Ui {
class UCharConvertDialog; class UCharConvertDialog;
...@@ -18,6 +19,7 @@ public: ...@@ -18,6 +19,7 @@ public:
explicit UCharConvertDialog(QWidget *parent = 0); explicit UCharConvertDialog(QWidget *parent = 0);
int getCombo(); int getCombo();
int getOffset(); int getOffset();
QString getText();
public slots: public slots:
......
...@@ -56,11 +56,13 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std: ...@@ -56,11 +56,13 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
std::string LogMessage = ""; std::string LogMessage = "";
Image_t<int> * tempIntImg; Image_t<int> * tempIntImg;
int offset; int offset;
std::string windowName;
switch(dialog->getCombo()) switch(dialog->getCombo())
{ {
case 0 : case 0 :
resImg = Converter<Image>::convertAndRound(*from); resImg = Converter<Image>::convertAndRound(*from);
windowName = qApp->translate("Operations","Cropped").toStdString();
break; break;
case 1 : case 1 :
...@@ -68,6 +70,7 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std: ...@@ -68,6 +70,7 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
tempIntImg->normalize(); tempIntImg->normalize();
resImg = Converter<Image>::convert(*tempIntImg); resImg = Converter<Image>::convert(*tempIntImg);
delete tempIntImg; delete tempIntImg;
windowName = qApp->translate("Operations","Normalized").toStdString();
break; break;
case 2 : case 2 :
...@@ -76,27 +79,32 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std: ...@@ -76,27 +79,32 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
offset = dialog->getOffset(); offset = dialog->getOffset();
resImg = Converter<Image>::convertAndOffset(*tempIntImg, &LogMessage, offset); resImg = Converter<Image>::convertAndOffset(*tempIntImg, &LogMessage, offset);
delete tempIntImg; delete tempIntImg;
windowName = qApp->translate("Operations","Offset").toStdString();
break; break;
case 4 : case 4 :
tempIntImg = Converter<Image_t<double>>::convertToInt(*from); tempIntImg = Converter<Image_t<double>>::convertToInt(*from);
resImg = Converter<Image>::convertScaleAndOffset(*tempIntImg, &LogMessage); resImg = Converter<Image>::convertScaleAndOffset(*tempIntImg, &LogMessage);
delete tempIntImg; delete tempIntImg;
windowName = qApp->translate("Operations","Offset and scaled").toStdString();
break; break;
case 3 : case 3 :
tempIntImg = Converter<Image_t<double>>::convertToInt(*from); tempIntImg = Converter<Image_t<double>>::convertToInt(*from);
resImg = Converter<Image>::convertAndScale(*tempIntImg, &LogMessage); resImg = Converter<Image>::convertAndScale(*tempIntImg, &LogMessage);
delete tempIntImg; delete tempIntImg;
windowName = qApp->translate("Operations","Scaled").toStdString();
break; break;
default: default:
std::cout << "Default conversion" << std::endl; std::cout << "Default conversion" << std::endl;
resImg = Converter<Image>::convertAndRound(*from); resImg = Converter<Image>::convertAndRound(*from);
windowName = qApp->translate("Operations","Cropped").toStdString();
break; break;
} }
outImage(resImg, "Title"); //si erreur lors du chargement alors non de fenêtre vide
outImage(resImg, windowName);
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment