diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 66b720d0cc87f2e0e35d986888e6e1a11a0ab5b4..e8979bd2fecd64a8eed60e6e8581e24f8de000f1 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -79,12 +79,12 @@ set(eiimage_SOURCES Operations/InversePyramidOp.h Operations/MeanSquaredErrorOp.cpp Operations/MeanSquaredErrorOp.h - Operations/MICD.cpp - Operations/MICD.h - Operations/MICDDialog.cpp - Operations/MICDDialog.h - Operations/MICDEncodingOp.cpp - Operations/MICDEncodingOp.h + Operations/DPCM.cpp + Operations/DPCM.h + Operations/DPCMDialog.cpp + Operations/DPCMDialog.h + Operations/DPCMEncodingOp.cpp + Operations/DPCMEncodingOp.h Operations/NoiseOp.cpp Operations/NoiseOp.h Operations/PointOp.cpp @@ -169,7 +169,7 @@ set(UIS Operations/ClassAnalysisDialog.ui Operations/InversePyramidDialog.ui Operations/PyramidDialog.ui - Operations/MICDDialog.ui + Operations/DPCMDialog.ui Operations/DCTDialog.ui Operations/ColorDialog.ui ) diff --git a/app/Operations/MICD.cpp b/app/Operations/DPCM.cpp similarity index 99% rename from app/Operations/MICD.cpp rename to app/Operations/DPCM.cpp index 9a51b177f949091b9ef1b73cf64e33a915363a7f..63889e81a11c63f90e67124ca70815efabe791c9 100644 --- a/app/Operations/MICD.cpp +++ b/app/Operations/DPCM.cpp @@ -17,7 +17,7 @@ * along with EIImage. If not, see <http://www.gnu.org/licenses/>. */ -#include "MICD.h" +#include "DPCM.h" #include <cstring> #include <cstdio> #include <cmath> diff --git a/app/Operations/MICD.h b/app/Operations/DPCM.h similarity index 96% rename from app/Operations/MICD.h rename to app/Operations/DPCM.h index 16a1d8a15b0f28338a42b940ea8424f452adae58..752490b34fd9f3adcd2da120b2fb6135fecb8e66 100644 --- a/app/Operations/MICD.h +++ b/app/Operations/DPCM.h @@ -17,8 +17,8 @@ * along with EIImage. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MICD_H -#define MICD_H +#ifndef DPCM_H +#define DPCM_H #include <string> #include <GrayscaleImage.h> @@ -42,4 +42,4 @@ private: int itcod[2048][20],itrco[2048][20],ktab[2][20]; }; -#endif // MICD_H +#endif // DPCM_H diff --git a/app/Operations/MICDDialog.cpp b/app/Operations/DPCMDialog.cpp similarity index 97% rename from app/Operations/MICDDialog.cpp rename to app/Operations/DPCMDialog.cpp index b43c67c3142e2c4726196645f10ff71915124a25..d62266f9b0bfc2f10d61ea863d984954565f6039 100644 --- a/app/Operations/MICDDialog.cpp +++ b/app/Operations/DPCMDialog.cpp @@ -17,8 +17,8 @@ * along with EIImage. If not, see <http://www.gnu.org/licenses/>. */ -#include "MICDDialog.h" -#include "ui_MICDDialog.h" +#include "DPCMDialog.h" +#include "ui_DPCMDialog.h" #include <QFileDialog> #include "QuantificationDialog.h" diff --git a/app/Operations/MICDDialog.h b/app/Operations/DPCMDialog.h similarity index 93% rename from app/Operations/MICDDialog.h rename to app/Operations/DPCMDialog.h index c4d15eaab4ceb4ae350af5e67e6faeb049677329..86665e0432dcba0ad92abfd1feaa8fa94f8a0f15 100644 --- a/app/Operations/MICDDialog.h +++ b/app/Operations/DPCMDialog.h @@ -17,12 +17,12 @@ * along with EIImage. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MICDDIALOG_H -#define MICDDIALOG_H +#ifndef DPCMDIALOG_H +#define DPCMDIALOG_H #include <QDialog> #include "Quantification.h" -#include "MICD.h" +#include "DPCM.h" namespace Ui { class MICDDialog; @@ -48,4 +48,4 @@ private: Ui::MICDDialog *ui; }; -#endif // MICDDIALOG_H +#endif // DPCMDIALOG_H diff --git a/app/Operations/MICDDialog.ui b/app/Operations/DPCMDialog.ui similarity index 100% rename from app/Operations/MICDDialog.ui rename to app/Operations/DPCMDialog.ui diff --git a/app/Operations/MICDEncodingOp.cpp b/app/Operations/DPCMEncodingOp.cpp similarity index 96% rename from app/Operations/MICDEncodingOp.cpp rename to app/Operations/DPCMEncodingOp.cpp index a9e334cb9cee7cb243d16233564dee7937c499dd..173be2252a7c585b92f58c5b2ad8028a7bb0cf51 100644 --- a/app/Operations/MICDEncodingOp.cpp +++ b/app/Operations/DPCMEncodingOp.cpp @@ -17,11 +17,11 @@ * along with EIImage. If not, see <http://www.gnu.org/licenses/>. */ -#include "MICDEncodingOp.h" +#include "DPCMEncodingOp.h" #include "../Tools.h" #include <QApplication> -#include "MICDDialog.h" -#include "MICD.h" +#include "DPCMDialog.h" +#include "DPCM.h" #include <QMessageBox> #include <GrayscaleImage.h> #include <Converter.h> diff --git a/app/Operations/MICDEncodingOp.h b/app/Operations/DPCMEncodingOp.h similarity index 92% rename from app/Operations/MICDEncodingOp.h rename to app/Operations/DPCMEncodingOp.h index cb0522ad8c7f84e3ef1574deec594bfa6c6de0a1..2bd741dd78aa3bbb889e680d6cdb374bc11fa54b 100644 --- a/app/Operations/MICDEncodingOp.h +++ b/app/Operations/DPCMEncodingOp.h @@ -17,8 +17,8 @@ * along with EIImage. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MICDENCODINGOP_H -#define MICDENCODINGOP_H +#ifndef DPCMENCODINGOP_H +#define DPCMENCODINGOP_H #include <Operation.h> @@ -32,4 +32,4 @@ public: bool needCurrentImg() const; }; -#endif // MICDENCODINGOP_H +#endif // DPCMENCODINGOP_H diff --git a/app/main.cpp b/app/main.cpp index c13c9e7385764673418d130675cfbc9b53f65810..e9ec87495bfe0850b056438489e0f61fd1d7b969 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -57,7 +57,7 @@ #include "Operations/EntropyOp.h" #include "Operations/HuffmanOp.h" #include "Operations/RejectionRingOp.h" -#include "Operations/MICDEncodingOp.h" +#include "Operations/DPCMEncodingOp.h" #include "Operations/HadamardOp.h" #include "Operations/DCTOp.h" #include "Operations/HoughOp.h"