Skip to content
Snippets Groups Projects
Commit 7dc447df authored by Tanguy Raufflet's avatar Tanguy Raufflet
Browse files

Suppression de l'utilisation d'une quantification unitaire pour faire le mode... 

Suppression de l'utilisation d'une quantification unitaire pour faire le mode sans quantification sur le DPCM
parent 2f6c7477
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/Operations/DPCM.cpp
+ 42
− 18
View file @ 7dc447df
......@@ -23,6 +23,9 @@
#include <cmath>
#include <Converter.h>
/*In DPCM NULL is used to represent no-quantization choice */
#define NO_QUANTDEF NULL
using namespace std;
using namespace imagein;
......@@ -49,9 +52,7 @@ DPCM::~DPCM()
string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, imagein::ImageDouble **quant_err_image, imagein::ImageDouble **err_image, Image **recons_image, Image **pred_image,ImageDouble **coding_err_image, double Q ) {
char buffer[512], buffer2[512];
if( quantdef == nullptr ) {
throw "Error in DPCM::execute:\nquantdef = NULL";
}
string returnval;
int imgHeight = (int)im->getHeight();
int imgWidth = (int)im->getWidth();
......@@ -97,7 +98,10 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
}
else {
pred[i][j] = reconstructed_image->getPixelAt(j - 1, i);
quant_pred_err = quantdef->valueOf(pixImg-pred[i][j]);
if(quantdef == NO_QUANTDEF)
quant_pred_err = pixImg-pred[i][j];
else
quant_pred_err = quantdef->valueOf(pixImg-pred[i][j]);
}
quantized_prediction_error_image->setPixelAt(j, i,quant_pred_err);
break;
......@@ -109,7 +113,10 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
}
else {
pred[i][j] = reconstructed_image->getPixelAt(j, i - 1);
quant_pred_err = quantdef->valueOf(pixImg-pred[i][j]);
if(quantdef == NO_QUANTDEF)
quant_pred_err = pixImg-pred[i][j];
else
quant_pred_err = quantdef->valueOf(pixImg-pred[i][j]);
}
quantized_prediction_error_image->setPixelAt(j, i,quant_pred_err);
break;
......@@ -121,7 +128,10 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
}
else {
pred[i][j] = (reconstructed_image->getPixelAt(j, i - 1) + reconstructed_image->getPixelAt(j-1, i))/2;
quant_pred_err = quantdef->valueOf(pixImg-pred[i][j]);
if(quantdef == NO_QUANTDEF)
quant_pred_err = pixImg-pred[i][j];
else
quant_pred_err = quantdef->valueOf(pixImg-pred[i][j]);
}
quantized_prediction_error_image->setPixelAt(j, i,quant_pred_err);
break;
......@@ -166,7 +176,10 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
}
else {
pred[i][j] = (uint8_t)((A + C) / 2);
quant_pred_err = quantdef->valueOf(pixImg - pred[i][j]);
if(quantdef == NO_QUANTDEF)
quant_pred_err = pixImg-pred[i][j];
else
quant_pred_err = quantdef->valueOf(pixImg - pred[i][j]);
}
}
else {
......@@ -177,7 +190,10 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
}
else {
pred[i][j] = (uint8_t)A;
quant_pred_err = quantdef->valueOf(pixImg - pred[i][j]);
if(quantdef == NO_QUANTDEF)
quant_pred_err = pixImg-pred[i][j];
else
quant_pred_err = quantdef->valueOf(pixImg - pred[i][j]);
}
} else {
......@@ -187,7 +203,10 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
}
else {
pred[i][j] = (uint8_t) C;
quant_pred_err = quantdef->valueOf(pixImg - pred[i][j]);
if(quantdef == NO_QUANTDEF)
quant_pred_err = pixImg-pred[i][j];
else
quant_pred_err = quantdef->valueOf(pixImg - pred[i][j]);
}
}
}
......@@ -223,12 +242,13 @@ string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, image
double quant_pred_err_entrop = quantized_prediction_error_image->getEntropy();
sprintf(buffer2, qApp->translate("DPCM", "\nL'entropie de l'image d'erreur de prediction quantifiee vaut : %f\n").toUtf8(), quant_pred_err_entrop);
returnval = returnval + buffer;
returnval = returnval + "\n";
returnval = returnval + buffer2;
returnval = returnval + "\n";
returnval = returnval + print_iloiqu();
if (quantdef != NO_QUANTDEF) {
returnval = returnval + buffer;
returnval = returnval + "\n";
returnval = returnval + buffer2;
returnval = returnval + "\n";
returnval = returnval + print_iloiqu();
}
/* libration de la mmoire alloue */
*quant_err_image = quantized_prediction_error_image;
......@@ -283,8 +303,11 @@ void DPCM::codec(int nlq,int ier,int *icode,int *ireco) {
}
void DPCM::set_levels() {
//No_Quantification checked
if(quantdef == NO_QUANTDEF)
return;
// Fills in iloiqu with the specified values
if( quantdef->nbThresholds() > N_MAX_THRESHOLD_FULL || quantdef->nbThresholds() < 1 ) {
else if( quantdef->nbThresholds() > N_MAX_THRESHOLD_FULL || quantdef->nbThresholds() < 1 ) {
char buffer[512];
sprintf( buffer, qApp->translate("DPCM","Error in DPCM::set_levels:\nquantdef->GetNumThresholds() = %d").toUtf8(), quantdef->nbThresholds() );
throw buffer;
......@@ -322,8 +345,9 @@ string DPCM::print_iloiqu() {
}
void DPCM::setQuantification( Quantification *tquantdef ) {
if( tquantdef == NULL ) {
throw "Error in DPCM::setQuantDef:\ntquantdef = NULL";
if(tquantdef == NO_QUANTDEF) {
quantdef = NO_QUANTDEF;
return;
}
if( tquantdef->nbThresholds() > N_MAX_THRESHOLD_FULL || tquantdef->nbThresholds() < 1 ) {
char buffer[512];
......
app/Operations/DPCM.h
+ 0
− 1
View file @ 7dc447df
......@@ -19,7 +19,6 @@
#ifndef DPCM_H
#define DPCM_H
#include <string>
#include <GrayscaleImage.h>
#include "Quantification.h"
......
app/Operations/DPCMDialog.cpp
+ 18
− 9
View file @ 7dc447df
......@@ -22,6 +22,9 @@
#include <QFileDialog>
#include "QuantificationDialog.h"
/*In DPCM NULL is used to represent no-quantization choice */
#define NO_QUANTDEF NULL
DPCMDialog::DPCMDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::DPCMDialog)
......@@ -61,16 +64,22 @@ void DPCMDialog::on_noQuantization_clicked()
}
Quantification* DPCMDialog::getQuantification() const {
if(ui->noQuantization->isChecked()) {
Quantification* quantif = new Quantification();
return quantif;
}else{
try {
Quantification* quantif = new Quantification(ui->quantFileEdit->text().toStdString());
return quantif;
if (ui->noQuantization->isChecked()) {
//return new Quantification();
return NO_QUANTDEF;
} else {
std::string quantFilePath = ui->quantFileEdit->text().toStdString();
if (quantFilePath.empty()) {
throw std::runtime_error("Quantification file path is empty.");
}
catch(std::exception&) {
return NULL;
try {
return new Quantification(quantFilePath);
} catch (const std::exception& e) {
// Si une exception est lancée dans le constructeur de Quantification, la propager plus loin
// Va se produire si le filename est incorrect
throw;
}
}
}
......
app/Operations/DPCMEncodingOp.cpp
+ 12
− 1
View file @ 7dc447df
......@@ -51,11 +51,22 @@ void DPCMEncodingOp::operator()(const imagein::Image* img, const std::map<const
try {
micd.setQuantification(dialog->getQuantification());
}
catch(const char* str) {
catch (const std::runtime_error& e) {
// Traiter spécifiquement l'erreur liée au chemin de fichier vide
QMessageBox::critical(nullptr, qApp->translate("DPCM", "Error while loading quantification file"),
qApp->translate("DPCM", "The path to the quantification file is empty"));
return;
}
catch (const std::exception& e) {
// ON traite toutes les autres exceptions
QMessageBox::critical(nullptr, qApp->translate("DPCM", "Error while loading quantification file"),
qApp->translate("DPCM", "The specified quantification file could not be opened !"));
return;
}
catch(const char* str) {
}
GrayscaleImage* image = Converter<GrayscaleImage>::convert(*img);
Image *reconstructedImage;
Image *predictionImage;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment