diff --git a/app/Operations/DPCM.cpp b/app/Operations/DPCM.cpp index 63889e81a11c63f90e67124ca70815efabe791c9..ee0f2a6ecc3019d2e25f4ce13432c70ead51bdb6 100644 --- a/app/Operations/DPCM.cpp +++ b/app/Operations/DPCM.cpp @@ -25,7 +25,7 @@ using namespace std; using namespace imagein; -MICD::MICD() +DPCM::DPCM() { long counter; for( counter=0; counter< 128; counter++ ) { @@ -41,12 +41,12 @@ MICD::MICD() quantdef = NULL; } -MICD::~MICD() +DPCM::~DPCM() { } -string MICD::execute( const GrayscaleImage *im, Prediction prediction_alg, imagein::ImageDouble **err_image, Image **recons_image, double Q ) { +string DPCM::execute( const GrayscaleImage *im, Prediction prediction_alg, imagein::ImageDouble **err_image, Image **recons_image, double Q ) { char buffer[255]; if( quantdef == NULL ) { throw "Error in MICD::execute:\nquantdef = NULL"; @@ -166,7 +166,7 @@ string MICD::execute( const GrayscaleImage *im, Prediction prediction_alg, image return returnval; } -void MICD::codlq(int m) { +void DPCM::codlq(int m) { int n,nar,nk,i,j; n=iloiqu[0]; @@ -185,7 +185,7 @@ void MICD::codlq(int m) { ktab[1][m]=iloiqu[2*i+1]; } -void MICD::codec(int nlq,int ier,int *icode,int *ireco) { +void DPCM::codec(int nlq,int ier,int *icode,int *ireco) { int m,ip,iep,ierp,n,l; m=nlq; ip=ktab[0][m]; @@ -209,7 +209,7 @@ void MICD::codec(int nlq,int ier,int *icode,int *ireco) { } } -void MICD::set_levels() { +void DPCM::set_levels() { // Fills in iloiqu with the specified values if( quantdef->nbThresholds() > N_MAX_THRESHOLD || quantdef->nbThresholds() < 1 ) { char buffer[255]; @@ -226,7 +226,7 @@ void MICD::set_levels() { iloiqu[quantdef->nbThresholds() * 2 + 2 ] = quantdef->value(quantdef->nbThresholds()); } -string MICD::print_iloiqu() { +string DPCM::print_iloiqu() { string returnval; returnval = "seuils de decision --------------- niveaux de reconstruction\n"; int counter; @@ -245,7 +245,7 @@ string MICD::print_iloiqu() { return returnval; } -void MICD::setQuantification( Quantification *tquantdef ) { +void DPCM::setQuantification( Quantification *tquantdef ) { if( tquantdef == NULL ) { throw "Error in MICD::setQuantDef:\ntquantdef = NULL"; } diff --git a/app/Operations/DPCM.h b/app/Operations/DPCM.h index 752490b34fd9f3adcd2da120b2fb6135fecb8e66..24abccdcc50f6deee827ca247fe8d6fe10ef5fb0 100644 --- a/app/Operations/DPCM.h +++ b/app/Operations/DPCM.h @@ -24,12 +24,12 @@ #include <GrayscaleImage.h> #include "Quantification.h" -class MICD +class DPCM { public: - MICD(); + DPCM(); enum Prediction {PX_EQ_A, PX_EQ_B, PX_EQ_APC, PX_EQ_Q}; - virtual ~MICD(); + virtual ~DPCM(); std::string execute(const imagein::GrayscaleImage *im, Prediction prediction_alg, imagein::ImageDouble **err_image, imagein::Image **recons_image, double Q = 0 ); void setQuantification( Quantification* tquantdef ); private: diff --git a/app/Operations/DPCMDialog.cpp b/app/Operations/DPCMDialog.cpp index d62266f9b0bfc2f10d61ea863d984954565f6039..df8acf08c3df4dc313c49bc4114da094ef9cf586 100644 --- a/app/Operations/DPCMDialog.cpp +++ b/app/Operations/DPCMDialog.cpp @@ -22,32 +22,32 @@ #include <QFileDialog> #include "QuantificationDialog.h" -MICDDialog::MICDDialog(QWidget *parent) : +DPCMDialog::DPCMDialog(QWidget *parent) : QDialog(parent), - ui(new Ui::MICDDialog) + ui(new Ui::DPCMDialog) { ui->setupUi(this); } -MICDDialog::~MICDDialog() +DPCMDialog::~DPCMDialog() { delete ui; } -void MICDDialog::on_quantBrowseButton_clicked() +void DPCMDialog::on_quantBrowseButton_clicked() { QString filename = QFileDialog::getOpenFileName(this, tr("Open file"), "", tr("Loi de quantification (*.loi)")); ui->quantFileEdit->setText(filename); } -void MICDDialog::on_quantEditorButton_clicked() +void DPCMDialog::on_quantEditorButton_clicked() { QuantificationDialog* dialog = new QuantificationDialog(QApplication::activeWindow()); dialog->exec(); } -Quantification* MICDDialog::getQuantification() const { +Quantification* DPCMDialog::getQuantification() const { try { Quantification* quantif = new Quantification(ui->quantFileEdit->text().toStdString()); return quantif; @@ -57,14 +57,14 @@ Quantification* MICDDialog::getQuantification() const { } } -MICD::Prediction MICDDialog::getPrediction() const { - if(ui->predictRadioA->isChecked()) return MICD::PX_EQ_A; - else if(ui->predictRadioAC->isChecked()) return MICD::PX_EQ_B; - else if(ui->predictRadioC->isChecked()) return MICD::PX_EQ_APC; - else if(ui->predictRadioGraham->isChecked()) return MICD::PX_EQ_Q; - else return MICD::PX_EQ_A; +DPCM::Prediction DPCMDialog::getPrediction() const { + if(ui->predictRadioA->isChecked()) return DPCM::PX_EQ_A; + else if(ui->predictRadioAC->isChecked()) return DPCM::PX_EQ_B; + else if(ui->predictRadioC->isChecked()) return DPCM::PX_EQ_APC; + else if(ui->predictRadioGraham->isChecked()) return DPCM::PX_EQ_Q; + else return DPCM::PX_EQ_A; } -double MICDDialog::getQ() const { +double DPCMDialog::getQ() const { return ui->qSpinBox->value(); } diff --git a/app/Operations/DPCMDialog.h b/app/Operations/DPCMDialog.h index 86665e0432dcba0ad92abfd1feaa8fa94f8a0f15..02e5eb13da4d14dc2d524e88fe9bc0e6aace6aa0 100644 --- a/app/Operations/DPCMDialog.h +++ b/app/Operations/DPCMDialog.h @@ -25,18 +25,18 @@ #include "DPCM.h" namespace Ui { -class MICDDialog; +class DPCMDialog; } -class MICDDialog : public QDialog +class DPCMDialog : public QDialog { Q_OBJECT public: - explicit MICDDialog(QWidget *parent = 0); - ~MICDDialog(); + explicit DPCMDialog(QWidget *parent = 0); + ~DPCMDialog(); Quantification* getQuantification() const; - MICD::Prediction getPrediction() const; + DPCM::Prediction getPrediction() const; double getQ() const; private slots: @@ -45,7 +45,7 @@ private slots: void on_quantEditorButton_clicked(); private: - Ui::MICDDialog *ui; + Ui::DPCMDialog *ui; }; #endif // DPCMDIALOG_H diff --git a/app/Operations/DPCMDialog.ui b/app/Operations/DPCMDialog.ui index 285ec2775cdb223db3949e7eaddb84f3ed76d759..f2a37ce518bbf78df85bc87775f284d49cf3cbb0 100644 --- a/app/Operations/DPCMDialog.ui +++ b/app/Operations/DPCMDialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>MICDDialog</class> - <widget class="QDialog" name="MICDDialog"> + <class>DPCMDialog</class> + <widget class="QDialog" name="DPCMDialog"> <property name="geometry"> <rect> <x>0</x> @@ -210,7 +210,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>MICDDialog</receiver> + <receiver>DPCMDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -226,7 +226,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>MICDDialog</receiver> + <receiver>DPCMDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> diff --git a/app/Operations/DPCMEncodingOp.cpp b/app/Operations/DPCMEncodingOp.cpp index 173be2252a7c585b92f58c5b2ad8028a7bb0cf51..ef6a9065f49622602e913959ed435c208aa1cea4 100644 --- a/app/Operations/DPCMEncodingOp.cpp +++ b/app/Operations/DPCMEncodingOp.cpp @@ -29,23 +29,23 @@ using namespace std; using namespace imagein; -MICDEncodingOp::MICDEncodingOp() : Operation(qApp->translate("Operations", "MICD Encoding").toStdString()) +DPCMEncodingOp::DPCMEncodingOp() : Operation(qApp->translate("Operations", "MICD Encoding").toStdString()) { } -bool MICDEncodingOp::needCurrentImg() const { +bool DPCMEncodingOp::needCurrentImg() const { return true; } -void MICDEncodingOp::operator()(const imagein::Image* img, const std::map<const imagein::Image*, std::string>&) { +void DPCMEncodingOp::operator()(const imagein::Image* img, const std::map<const imagein::Image*, std::string>&) { - MICDDialog* dialog = new MICDDialog(QApplication::activeWindow()); + DPCMDialog* dialog = new DPCMDialog(QApplication::activeWindow()); QDialog::DialogCode code = static_cast<QDialog::DialogCode>(dialog->exec()); if(code != QDialog::Accepted) return; - MICD micd; + DPCM micd; try { micd.setQuantification(dialog->getQuantification()); } diff --git a/app/Operations/DPCMEncodingOp.h b/app/Operations/DPCMEncodingOp.h index 2bd741dd78aa3bbb889e680d6cdb374bc11fa54b..5f425c98f17c44c10704cd10f86ceae53d5c1501 100644 --- a/app/Operations/DPCMEncodingOp.h +++ b/app/Operations/DPCMEncodingOp.h @@ -22,10 +22,10 @@ #include <Operation.h> -class MICDEncodingOp : public Operation +class DPCMEncodingOp : public Operation { public: - MICDEncodingOp(); + DPCMEncodingOp(); void operator()(const imagein::Image*, const std::map<const imagein::Image*, std::string>&); diff --git a/app/main.cpp b/app/main.cpp index e9ec87495bfe0850b056438489e0f61fd1d7b969..2b4e9af74b1a4696395d952942950aba14bff800 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -149,7 +149,7 @@ int main(int argc, char** argv) BuiltinOpSet* encode = new BuiltinOpSet(qApp->translate("", "&Encoding").toStdString()); encode->addOperation(new HuffmanOp()); - encode->addOperation(new MICDEncodingOp()); + encode->addOperation(new DPCMEncodingOp()); BuiltinOpSet* morpho = new BuiltinOpSet("&Morpho. math."); morpho->addOperation(new DMMOp());