From f9df1e607bc8935272f943d304853707a5da0e23 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Fri, 27 Jul 2018 16:28:51 +0200
Subject: [PATCH] #3208 creaImageIO Feature New Normal branch mingw64

---
 appli/TestWxGimmickReaderDialog/CMakeLists.txt | 8 +++++++-
 src/CMakeLists.txt                             | 4 ++++
 src/creaImageIOSystem.h                        | 4 ++--
 src/creaImageIOUltrasonixImageReader.cpp       | 7 ++++---
 src/creaImageIOWxGimmickView.h                 | 2 +-
 src/creaImageIOWxTreeView.cpp                  | 7 +------
 src/creaImageIOWxViewer.h                      | 2 +-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/appli/TestWxGimmickReaderDialog/CMakeLists.txt b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
index 255ab8f..66a1fb1 100644
--- a/appli/TestWxGimmickReaderDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
@@ -25,7 +25,13 @@
 
 IF(WIN32)
   ADD_EXECUTABLE(creaImageIOApp WIN32 main)  
-  SET_TARGET_PROPERTIES(creaImageIOApp PROPERTIES LINK_FLAGS /subsystem:console )
+
+  IF(MINGW)
+	SET_TARGET_PROPERTIES(creaImageIOApp PROPERTIES LINK_FLAGS  -mconsole )
+  ELSE(MINGW)
+	SET_TARGET_PROPERTIES(creaImageIOApp PROPERTIES LINK_FLAGS /subsystem:console )
+  ENDIF(MINGW)
+  
 ELSE(WIN32)
   ADD_EXECUTABLE(creaImageIOApp MACOSX_BUNDLE main)
 ENDIF(WIN32)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c8726b7..2f188a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -285,6 +285,10 @@ ENDIF(USE_WXWIDGETS)
 
 
 IF (NOT USE_XERCES)
+
+message("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+message(${VTK_LIBRARIES})
+
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
   ${creaBruker_LIBRARIES}
diff --git a/src/creaImageIOSystem.h b/src/creaImageIOSystem.h
index 3518a14..bae87fe 100644
--- a/src/creaImageIOSystem.h
+++ b/src/creaImageIOSystem.h
@@ -77,10 +77,10 @@ namespace creaImageIO
 	{
 		delete crea::MessageManager::GetInstance();
 	}
-  
 
 #define GimmickMessage(LEV,MESS)			\
-  creaMessage("Gimmick!",LEV,"[Gimmick!] "<<MESS);
+  creaMessage( "Gimmick!" , LEV , "[Gimmick!] " << MESS );
+
 #define GimmickDebugMessage(LEV,MESS)					\
   creaDebugMessage("Gimmick! DEBUG",LEV,"[Gimmick!] DEBUG: "<<MESS);
 #define GimmickError(MESS)			\
diff --git a/src/creaImageIOUltrasonixImageReader.cpp b/src/creaImageIOUltrasonixImageReader.cpp
index 8c609d3..99285c1 100644
--- a/src/creaImageIOUltrasonixImageReader.cpp
+++ b/src/creaImageIOUltrasonixImageReader.cpp
@@ -28,6 +28,7 @@
 
 #include "creaImageIOSystem.h"
 #include "creaImageIOUltrasonixImageReader.h"
+
 #include <creaVtk.h>
 #include <boost/filesystem/path.hpp>
 
@@ -164,7 +165,7 @@ namespace creaImageIO
 		}
 		fclose(Ultrasonix_file);  
 
-		im = crea::NewVtkImageDataFromRaw( dataRF, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw<short>( dataRF, h.width, h.height, h.frame);
 	break;
 
 	case TYPE_B8:
@@ -182,7 +183,7 @@ namespace creaImageIO
 
 		fclose(Ultrasonix_file);  
 
-	im = crea::NewVtkImageDataFromRaw( dataB8, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw<char>( dataB8, h.width, h.height, h.frame);
 	break;
 
 	case TYPE_B32:
@@ -200,7 +201,7 @@ namespace creaImageIO
 
 		fclose(Ultrasonix_file);  
 
-		im = crea::NewVtkImageDataFromRaw( dataB32, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw<int>( dataB32, h.width, h.height, h.frame);
 	break;
     }
 
diff --git a/src/creaImageIOWxGimmickView.h b/src/creaImageIOWxGimmickView.h
index e472420..62e1136 100644
--- a/src/creaImageIOWxGimmickView.h
+++ b/src/creaImageIOWxGimmickView.h
@@ -56,7 +56,7 @@ namespace creaImageIO
   //=====================================================================
   /// Concrete derivative of GimmickView which implements a wxWidgets-based view
 
-  class WxGimmickView : public wxPanel, virtual public GimmickView
+  class CREAIMAGEIO_EXPORT WxGimmickView : public wxPanel, virtual public GimmickView
   {
   public:
     
diff --git a/src/creaImageIOWxTreeView.cpp b/src/creaImageIOWxTreeView.cpp
index 3c1f308..c28e00a 100644
--- a/src/creaImageIOWxTreeView.cpp
+++ b/src/creaImageIOWxTreeView.cpp
@@ -27,7 +27,6 @@
 
 #include <creaImageIOWxTreeView.h>
 #include <creaImageIOGimmickView.h>
-
 #include <wx/splitter.h>
 #include <wx/gdicmn.h>
 #include <boost/date_time/gregorian/gregorian.hpp>
@@ -419,11 +418,7 @@ namespace creaImageIO
 		    std::vector<tree::Node*>::const_iterator i;
 		    for (i=sel.begin(); i!=sel.end(); ++i)
 		      {
-			GimmickMessage(1,
-				       "deleting '"
-				       <<(*i)->GetLabel()
-				       <<"'"<<mLastLevel
-				       <<std::endl);
+			GimmickMessage(1,"deleting '" << (*i)->GetLabel() << "'" << mLastLevel << std::endl );			
 			if((*i)->GetParent()->GetNumberOfChildren()<2)
 			  {
 			    needRefresh=true;
diff --git a/src/creaImageIOWxViewer.h b/src/creaImageIOWxViewer.h
index c7b427f..566e316 100644
--- a/src/creaImageIOWxViewer.h
+++ b/src/creaImageIOWxViewer.h
@@ -49,7 +49,7 @@ namespace creaImageIO
 
   class WxViewerPlayer;
 
-  class WxViewer : public wxPanel
+  class CREAIMAGEIO_EXPORT WxViewer : public wxPanel
   {
  
   public:
-- 
2.47.1