#3208 creaImageIO Feature New Normal branch mingw64

diff --git a/appli/TestWxGimmickReaderDialog/CMakeLists.txt b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
index 255ab8f39eec323a0467825df1ef4574dc639bd0..66a1fb1b3ed90de4a4b113084c00f05c5ca4950f 100644 (file)
--- 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 c8726b77f03f30233a38bde2a5db6178e02c7f8a..2f188a3b797417350fb1274ced814cd66d0e485c 100644 (file)
--- 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 3518a14b90897a188c9ffed43ca52ab519cea951..bae87fe3adfd8abf7d9b4e7f897edaa721258525 100644 (file)
--- 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 8c609d356f6cdef917ff833a0a6360a8a0d59ea7..99285c1725fea662175f7fdea988037dd8b250ce 100644 (file)
--- 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 e472420bcd3a1e3758894714112d3cbcc363d0e8..62e113695fe3a7ab8d80b6e51e0af9fb072b9a24 100644 (file)
--- 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 3c1f3081a9fc0c287a6cf284f32c9fb863c423de..c28e00ae518ab5fe5442e63f68ca85305ab14d84 100644 (file)
--- 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 c7b427f619be894861fd938b3b4f984d4b8d6131..566e316a989481e60a1c778d853e8e4edbc55760 100644 (file)
--- 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: