From 7f62f5cbe5348b9d33c1c2b75dc68dd60cda41bf Mon Sep 17 00:00:00 2001
From: BertrandP <bertrand.provot@insa-rennes.fr>
Date: Mon, 2 Jul 2018 14:26:01 +0200
Subject: [PATCH] Updated convert to uchar
---
app/Operations/UCharConvertDialog.cpp | 5 +++++
app/Operations/UCharConvertDialog.h | 2 ++
app/Operations/UCharConvertOp.cpp | 12 ++++++++++--
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/app/Operations/UCharConvertDialog.cpp b/app/Operations/UCharConvertDialog.cpp
index dd68b75..8dfc57d 100644
--- a/app/Operations/UCharConvertDialog.cpp
+++ b/app/Operations/UCharConvertDialog.cpp
@@ -9,6 +9,7 @@
#include <QSpinBox>
#include <QComboBox>
#include <QStringList>
+#include <QString>
UCharConvertDialog::UCharConvertDialog(QWidget *parent) :
@@ -74,3 +75,7 @@ int UCharConvertDialog::getCombo(){
int UCharConvertDialog::getOffset(){
return _spinBox->value();
}
+
+QString UCharConvertDialog::getText(){
+ return _comboBox->currentText();
+}
diff --git a/app/Operations/UCharConvertDialog.h b/app/Operations/UCharConvertDialog.h
index fbcae62..694eb08 100644
--- a/app/Operations/UCharConvertDialog.h
+++ b/app/Operations/UCharConvertDialog.h
@@ -5,6 +5,7 @@
#include <QSpinBox>
#include <QLabel>
#include <QComboBox>
+#include <QString>
namespace Ui {
class UCharConvertDialog;
@@ -18,6 +19,7 @@ public:
explicit UCharConvertDialog(QWidget *parent = 0);
int getCombo();
int getOffset();
+ QString getText();
public slots:
diff --git a/app/Operations/UCharConvertOp.cpp b/app/Operations/UCharConvertOp.cpp
index 8c39c07..bc60e34 100644
--- a/app/Operations/UCharConvertOp.cpp
+++ b/app/Operations/UCharConvertOp.cpp
@@ -56,11 +56,13 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
std::string LogMessage = "";
Image_t<int> * tempIntImg;
int offset;
+ std::string windowName;
switch(dialog->getCombo())
{
case 0 :
resImg = Converter<Image>::convertAndRound(*from);
+ windowName = qApp->translate("Operations","Cropped").toStdString();
break;
case 1 :
@@ -68,6 +70,7 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
tempIntImg->normalize();
resImg = Converter<Image>::convert(*tempIntImg);
delete tempIntImg;
+ windowName = qApp->translate("Operations","Normalized").toStdString();
break;
case 2 :
@@ -76,27 +79,32 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
offset = dialog->getOffset();
resImg = Converter<Image>::convertAndOffset(*tempIntImg, &LogMessage, offset);
delete tempIntImg;
+ windowName = qApp->translate("Operations","Offset").toStdString();
break;
case 4 :
tempIntImg = Converter<Image_t<double>>::convertToInt(*from);
resImg = Converter<Image>::convertScaleAndOffset(*tempIntImg, &LogMessage);
delete tempIntImg;
+ windowName = qApp->translate("Operations","Offset and scaled").toStdString();
break;
case 3 :
tempIntImg = Converter<Image_t<double>>::convertToInt(*from);
resImg = Converter<Image>::convertAndScale(*tempIntImg, &LogMessage);
delete tempIntImg;
+ windowName = qApp->translate("Operations","Scaled").toStdString();
break;
default:
std::cout << "Default conversion" << std::endl;
resImg = Converter<Image>::convertAndRound(*from);
+ windowName = qApp->translate("Operations","Cropped").toStdString();
break;
}
-
- outImage(resImg, "Title");
+
+ //si erreur lors du chargement alors non de fenêtre vide
+ outImage(resImg, windowName);
}
--
GitLab