Merge pull request #220 from PauloCarvalhoRJ/Wavelet2

Wavelet2

GammaRay.pro

@@ -234,7 +234,9 @@ SOURCES += main.cpp\
     imagejockey/gabor/gaborfilterdialog.cpp \
     imagejockey/gabor/gaborscandialog.cpp \
     imagejockey/gabor/gaborutils.cpp \
-    imagejockey/gabor/gaborfrequencyazimuthselections.cpp
+    imagejockey/gabor/gaborfrequencyazimuthselections.cpp \
+    imagejockey/wavelet/wavelettransformdialog.cpp \
+    imagejockey/wavelet/waveletutils.cpp
 
 HEADERS  += mainwindow.h \
     domain/project.h \
@@ -447,7 +449,9 @@ HEADERS  += mainwindow.h \
     imagejockey/gabor/gaborfilterdialog.h \
     imagejockey/gabor/gaborscandialog.h \
     imagejockey/gabor/gaborutils.h \
-    imagejockey/gabor/gaborfrequencyazimuthselections.h
+    imagejockey/gabor/gaborfrequencyazimuthselections.h \
+    imagejockey/wavelet/wavelettransformdialog.h \
+    imagejockey/wavelet/waveletutils.h
 
 
 FORMS    += mainwindow.ui \
@@ -528,7 +532,8 @@ FORMS    += mainwindow.ui \
     dialogs/variograminputdialog.ui \
     imagejockey/emd/emdanalysisdialog.ui \
     imagejockey/gabor/gaborfilterdialog.ui \
-    imagejockey/gabor/gaborscandialog.ui
+    imagejockey/gabor/gaborscandialog.ui \
+    imagejockey/wavelet/wavelettransformdialog.ui
 
 #==================== The Boost include path.==================
 _BOOST_INCLUDE = $$(BOOST_INCLUDE)
@@ -646,6 +651,20 @@ LIBS        += -lfftw3
 LIBS        += -lfftw3f
 #==============================================================
 
+#========= The GSL (GNU Scientific Library) include and lib path and libraries.=========
+_GSL_INCLUDE = $$(GSL_INCLUDE)
+isEmpty(_GSL_INCLUDE){
+        error(GSL_INCLUDE environment variable not defined.)
+}
+_GSL_LIB = $$(GSL_LIB)
+isEmpty(_GSL_LIB){
+        error(GSL_LIB environment variable not defined.)
+}
+INCLUDEPATH += $$_GSL_INCLUDE
+LIBPATH     += $$_GSL_LIB
+LIBS        += -lgsl
+#==============================================================
+
 #=====================Embedded thirdparty libraries===========================
 INCLUDEPATH += thirdparty
 #=============================================================================
@@ -658,7 +677,7 @@ win32 {
 # The application version
 # Don't forget to update the Util::importSettingsFromPreviousVersion() method to
 # enable the import of registry/user settings of previous versions.
-VERSION = 5.3
+VERSION = 5.5
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"

README.md

@@ -7,6 +7,7 @@ Abstract:
 GammaRay is a graphical user interface (GUI) that automates geostatistical workflows by driving and coordinating the several modules of the renowned Geostatistical Software Library (GSLib).  The main purpose of GammaRay is to add a user-friendly interface layer on top of the scientifically and numerically robust GSLib, greatly automating parameter file editing and module chaining so the practitioner can focus on geostatistics.  GammaRay was conceived as a free and portable alternative to WinGSLib®, which is a commercial software available only for Microsoft Windows® users.  GammaRay is also open source and thus is subject to code review and can receive contributions from other software developers as well as user feedback, suggestions and bug reports.  GammaRay is built with the C++ programming language upon the famous Qt library to leverage the construction of a modern and platform independent graphical user interface.
 
 VERSION HISTORY:<br>
+&nbsp;&nbsp;&nbsp;Version 5.5   - wavelet transform<br>
 &nbsp;&nbsp;&nbsp;Version 5.3   - Gabor analysis<br>
 &nbsp;&nbsp;&nbsp;Version 5.1   - empirical mode decomposition<br>
 <strong>Version 5.0   - stratigraphic grid<br></strong>

domain/file.cpp

@@ -1,4 +1,5 @@
 #include "file.h"
+#include "domain/application.h"
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
@@ -38,6 +39,10 @@ void File::rename(QString new_name)
     QFile file( this->_path );
     //builds a file info object to describe the current file
     QFileInfo original( this->_path );
+    if( original.fileName() == new_name ){
+        Application::instance()->logWarn("File::rename(): file already has the target name. Operation ignored.");
+        return;
+    }
     //constructs the path with the new file name
     QString newPath = original.canonicalPath() + QDir::separator() + new_name;
     //make a file object with the future name

imagejockey/gabor/gaborutils.h

@@ -140,7 +140,7 @@ class GaborUtils
     * Returns a ITK image object object with data from an spectral::array.
     * Supported grid dimension depends on what is set in the gridDim constant (see top of this header file).
     */
-   static ImageTypePtr convertSpectralArrayToITKImage( const spectral::array& input );
+    static ImageTypePtr convertSpectralArrayToITKImage( const spectral::array& input );
 };
 
 #endif // GABORUTILS_H

imagejockey/ijresources.qrc

@@ -17,5 +17,6 @@
         <file alias="ijadd32">icons/ijadd32.png</file>
         <file alias="ijpreview32">icons/ijpreview32.png</file>
         <file alias="ijsave32">icons/ijsave32.png</file>
+        <file alias="ijreadgrid32">icons/ijreadgrid32.png</file>
     </qresource>
 </RCC>