From c2265cc8cd6b2b3866f61fb8df22a1c5abc2fe60 Mon Sep 17 00:00:00 2001 From: Antoine Lorence <antoine.lorence@insa-rennes.fr> Date: Tue, 9 Dec 2014 15:04:53 +0100 Subject: [PATCH] Rename MICD related files to DPCM equivalents --- app/CMakeLists.txt | 14 +++++++------- app/Operations/{MICD.cpp => DPCM.cpp} | 2 +- app/Operations/{MICD.h => DPCM.h} | 6 +++--- app/Operations/{MICDDialog.cpp => DPCMDialog.cpp} | 4 ++-- app/Operations/{MICDDialog.h => DPCMDialog.h} | 8 ++++---- app/Operations/{MICDDialog.ui => DPCMDialog.ui} | 0 .../{MICDEncodingOp.cpp => DPCMEncodingOp.cpp} | 6 +++--- .../{MICDEncodingOp.h => DPCMEncodingOp.h} | 6 +++--- app/main.cpp | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) rename app/Operations/{MICD.cpp => DPCM.cpp} (99%) rename app/Operations/{MICD.h => DPCM.h} (96%) rename app/Operations/{MICDDialog.cpp => DPCMDialog.cpp} (97%) rename app/Operations/{MICDDialog.h => DPCMDialog.h} (93%) rename app/Operations/{MICDDialog.ui => DPCMDialog.ui} (100%) rename app/Operations/{MICDEncodingOp.cpp => DPCMEncodingOp.cpp} (96%) rename app/Operations/{MICDEncodingOp.h => DPCMEncodingOp.h} (92%) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 66b720d..e8979bd 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 9a51b17..63889e8 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 16a1d8a..752490b 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 b43c67c..d62266f 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 c4d15ea..86665e0 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 a9e334c..173be22 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 cb0522a..2bd741d 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 c13c9e7..e9ec874 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" -- GitLab