*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc4a57d6fb196852c9f377804d97f9a4b9517bdc..51e48a686018cb3d5c0a3a99d0a99863bd878420 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,16 @@ ELSE (BUILD_V2)
 ENDIF (BUILD_V2)
 
 
+OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" OFF)
+
+IF (BUILD_CREA_BRUKER)
+       FIND_PACKAGE(creaBruker REQUIRED)
+       IF (creaBruker_FOUND)
+               INCLUDE(${creaBruker_USE_FILE})
+               CREA_DEFINE(BUILD_BRUKER)
+       ENDIF(creaBruker_FOUND)
+ENDIF (BUILD_CREA_BRUKER)
+
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)

diff --git a/appli/TestGimmickReaderDialog/CMakeLists.txt b/appli/TestGimmickReaderDialog/CMakeLists.txt
index ec9dbb02288db947352dfb498e89235ff9bf01cc..b52ed4048603bbe45c0195562f2792d5045ae2c3 100644 (file)
--- a/appli/TestGimmickReaderDialog/CMakeLists.txt
+++ b/appli/TestGimmickReaderDialog/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestGimmickReaderDialog main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES( TestGimmickReaderDialog creaImageIO2)
+TARGET_LINK_LIBRARIES( TestGimmickReaderDialog creaImageIO2  )
 
 INSTALL_TARGETS(/bin/ TestGimmickReaderDialog )

diff --git a/appli/TestWxGimmickDialog/CMakeLists.txt b/appli/TestWxGimmickDialog/CMakeLists.txt
index a42fd05210cf44615745921736aa5ba4d18a4ecc..927da7c1b09f9f1425f20b8fdf3c50e375f7fa0f 100644 (file)
--- a/appli/TestWxGimmickDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickDialog/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestWxGimmickDialog MACOSX_BUNDLE  main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES( TestWxGimmickDialog creaImageIO)
+TARGET_LINK_LIBRARIES(         TestWxGimmickDialog creaImageIO2  )
 
 INSTALL_TARGETS(/bin/ TestWxGimmickDialog )

diff --git a/appli/TestWxGimmickReaderDialog/CMakeLists.txt b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
index 8b9e7a5fae02ccdb30c5c695729594581d998c77..21ecb93b38304ccd877288b9953bccb595ea3fd1 100644 (file)
--- a/appli/TestWxGimmickReaderDialog/CMakeLists.txt
+++ b/appli/TestWxGimmickReaderDialog/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(TestWxGimmickReaderDialog MACOSX_BUNDLE main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES( TestWxGimmickReaderDialog creaImageIO2)
+TARGET_LINK_LIBRARIES(         TestWxGimmickReaderDialog creaImageIO2  )
 
 INSTALL_TARGETS(/bin/ TestWxGimmickReaderDialog )

diff --git a/appli/gimmick/CMakeLists.txt b/appli/gimmick/CMakeLists.txt
index 21e988d97eeb34e2fd7ec8660368783f051f4f01..14878961182666e1f4ee7cd1997a8a6e817b7ac4 100644 (file)
--- a/appli/gimmick/CMakeLists.txt
+++ b/appli/gimmick/CMakeLists.txt
@@ -8,6 +8,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(gimmick ${SOURCES})
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES( gimmick creaImageIO2)
+TARGET_LINK_LIBRARIES(         gimmick creaImageIO2  )
 
 INSTALL_TARGETS(/bin/ gimmick )

diff --git a/appli/wxGimmick/CMakeLists.txt b/appli/wxGimmick/CMakeLists.txt
index 81221ff38665462858ca020d9f8bd428e1a29e63..417e6d2bbc913de25abc13393ccc892200024da2 100644 (file)
--- a/appli/wxGimmick/CMakeLists.txt
+++ b/appli/wxGimmick/CMakeLists.txt
@@ -6,6 +6,6 @@ ELSE(WIN32)
   ADD_EXECUTABLE(${NAME} MACOSX_BUNDLE main)
 ENDIF(WIN32)
 
-TARGET_LINK_LIBRARIES( ${NAME} creaImageIO2)
+TARGET_LINK_LIBRARIES(         ${NAME} creaImageIO2  )
 
 INSTALL_TARGETS(/bin/ ${NAME} )

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index e5b263ee355c69e2771ab4851b9783ed7e1d2179..68ff6fe8dc94019298e762503ef500a09c16783f 100644 (file)
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -81,6 +81,7 @@ ADD_LIBRARY(${LIBRARY_NAME} ${CREAIMAGEIO_BUILD_SHARED} ${SRCS})
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
+  ${creaBruker_LIBRARIES}
   ${WXWIDGETS_LIBRARIES}
   ${VTK_LIBRARIES}
   ${GDCM_LIBRARIES}

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index a97e99abc8c1e51d065fc876025aa650174edd05..53b0342e919eea1b0b934a4d2ec0d5398f3d6253 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -1,4 +1,4 @@
-#include <creaImageIOWxGimmickView.h>
+#include <creaImageIOWxGimmickView.h>
 #include <creaImageIOWxTreeView.h>
 #include <creaImageIOSystem.h>
 #include <creaImageIOWxCustomizeConfigPanel.h>
@@ -21,6 +21,9 @@ using namespace crea;
 #include <wx/imaglist.h>
 #include <wx/popupwin.h>
 #include<boost/filesystem/operations.hpp>
+#if defined(BUILD_BRUKER)
+       #include "bruker2dicom.h"
+#endif
 
 namespace creaImageIO
 {
@@ -703,7 +706,7 @@ namespace creaImageIO
   {
                mViewer->StopPlayer();
                
-               wxDialog* dial = new wxDialog (this,-1,"Tools",wxDefaultPosition, wxSize(300,250));
+               wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(300,250));
 
                wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
                wxNotebook* nb= new wxNotebook(dial, -1, wxDefaultPosition, wxDefaultSize, 0);
@@ -712,9 +715,11 @@ namespace creaImageIO
                dialSizer->Add(nb,1,wxGROW,0);
                dialSizer->Add(buttonsSizer,0,wxGROW);
 
-               //First page: Bruker Image Reader
-               WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory);
-               nb->AddPage( gimmickTools, crea::std2wx("Bruker Image Reader") );
+#if defined(BUILD_BRUKER)
+                       //First page: Bruker Image Reader
+                       WxGimmickTools * gimmickTools = new WxGimmickTools(nb, mCurrentDirectory);
+                       nb->AddPage( gimmickTools, _T("Bruker Image Reader") );
+#endif
 
                dial->SetSizer(dialSizer, true);
                dial->Layout();
@@ -722,40 +727,44 @@ namespace creaImageIO
 
                if (dial->GetReturnCode() == wxID_OK)
                        {
-                               if (nb->GetSelection()==0)//Selection: Bruker Image Reader
-                               {
-                                       std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
-                                       std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
-                                       bool addToDB = gimmickTools->getCheckBoxValue();
-
-                                       if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
+#if defined(BUILD_BRUKER)
+                                       if (nb->GetSelection()==0)//Selection: Bruker Image Reader
                                        {
-                                               /*
-                                               Bruker2Dicom b2d;    
-                                               b2d.SetInputDirectory(crea::wx2std(inputDir));
-                                               b2d.SetOutputDirectory(crea::wx2std(outputDir));
-                                               b2d.SetConvertModeToDicom();
-                                               b2d.Execute();
-                                               */
-
-                                               if (addToDB)
+                                               std::string inputDir = crea::wx2std(gimmickTools->getInputDir());
+                                               std::string outputDir = crea::wx2std(gimmickTools->getOutputDir());
+                                               bool addToDB = gimmickTools->getCheckBoxValue();
+
+                                               if (inputDir.compare("")!=0 && outputDir.compare("")!=0)
                                                {
-                                                       mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
-                                                       mCurrentDirectory = outputDir;  
-                                                       mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),crea::wx2std(outputDir),true);
-                                                       mProgressDialog->Pulse(_T("Updating view..."));
-                                                       
-                                                       UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
-                                                       delete mProgressDialog;
-                                                       DisplayAddSummary();
-                                               }       
-                                       }
-
-                                       else
-                                       {
-                                               wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this);
-                                       }
+                                                       if ( wxMessageBox(_T("Depending on the amount of Data the process can take between 1 and 5 minutes. Do you want to continue?"),
+                                                                       _T("Please confirm"), wxICON_QUESTION | wxYES_NO) == wxYES )
+                                                       {
+                                                               Bruker2Dicom b2d;    
+                                                               b2d.SetInputDirectory(inputDir);
+                                                               b2d.SetOutputDirectory(outputDir);
+                                                               b2d.SetConvertModeToDicom();
+                                                               b2d.Execute();
+
+                                                               if (addToDB)
+                                                               {
+                                                                       mProgressDialog = new wxProgressDialog(_T("Adding directory"),_T(""),1000,this,wxPD_ELAPSED_TIME |wxPD_CAN_ABORT );
+                                                                       mCurrentDirectory = gimmickTools->getOutputDir();  // Try // JPRx
+                                                                       mGimmick->AddDir(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),outputDir,true);
+                                                                       mProgressDialog->Pulse(_T("Updating view..."));
+                                                                       
+                                                                       UpdateTreeViewLevel(crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection())),1);
+                                                                       delete mProgressDialog;
+                                                                       DisplayAddSummary();
+                                                               }       
+                                                       }
+                                               }
+
+                                               else
+                                               {
+                                                       wxMessageBox(_T("One or both of the directory fields are empty"),_T("Empty Fields"),wxOK,this);
+                                               }
                                }
+#endif
                        }
 
                mViewer->StartPlayer();
@@ -904,7 +913,7 @@ namespace creaImageIO
     mess << "Files\tadded  \t: " << p.GetNumberAddedFiles()   << "\n\n";
 
     /*    char times[500];
-    sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms",
+    sprintf(times,"Time to parse dir \t\t: %ld ms \t%d°/o\nTime to read files info \t: %ld ms \t%d°/o\nTime to update structs \t: %ld ms \t%d°/o\nTime to update database \t: %ld ms \t%d°/o\nTotal time \t\t\t: %ld ms",
            summary.parse_time,
            (int)( summary.parse_time*100./summary.total_time),
            summary.file_scan_time,

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index cf3dd3f0a72ffb1091431a68e4fb9666c0873fcb..d6df0f61a79aadff926d594ad016cb558e4e7d59 100644 (file)
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -9,8 +9,6 @@
 #include <creaImageIOListener.h>
 #include <creaWx.h>
 #include "wx/wx.h"
-//#include "bruker2dicom.h"
-
 #include <wx/splitter.h>
 #include <wx/toolbar.h> 
 #include <wx/tbarbase.h>