add SOURCE_GROUP command to reorganize files in folder for visual studio project

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c5ded1b9bacfca45d696b4b9a5b408cdf003393..931f7e59093da3f29b77d15efd041672004794e9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,13 @@ IF (BUILD_CREA_BRUKER)
        ENDIF(creaBruker_FOUND)
 ENDIF (BUILD_CREA_BRUKER)
 
+
+# To Use PACS connection library
+OPTION(BUILD_CREA_PACS "Build creaImageIO with PACS connection library ?" OFF)
+IF (BUILD_CREA_PACS)
+       CREA_DEFINE(BUILD_PACS)
+ENDIF(BUID_CREA_PACS)
+
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)

diff --git a/src2/CMakeLists.txt b/src2/CMakeLists.txt
index 7c01e92a84e25a9befe39edecdb7072c87509139..6c0c6f1d9decdcdb84dd01ea7d776913c8c635e3 100644 (file)
--- a/src2/CMakeLists.txt
+++ b/src2/CMakeLists.txt
@@ -1,72 +1,113 @@
 SET(LIBRARY_NAME creaImageIO2)
 
-SET( SRCS
+
+FILE(GLOB SOURCES_CREAIMAGEIO  
   # SQLite 
-  CppSQLite3
+  CppSQLite3.cpp
   
-  # wxTreeListCtrl
-#  treelistctrl.cpp
-
-
-  # Attributed tree data structure
-  creaImageIOTree
-  creaImageIOTreeNode
-  creaImageIOTreeDescriptor
-  creaImageIOTreeLevelDescriptor
-  creaImageIOTreeAttributeDescriptor
-
-
-  # Image readers
-  creaImageIOAbstractImageReader
-  creaImageIOVtkImageReader
-  creaImageIODicomImageReader
-  creaImageIOUltrasonixImageReader
-  creaImageIOImageReader
-  creaImageIOMultiThreadImageReader
 
-  # Tree Handlers
-  creaImageIOTreeHandler
-  creaImageIOSQLiteTreeHandler
-
-  # 
-  creaImageIOTreeHandlerImageAdder
   
   # 
-  creaImageIOGimmick
-  creaImageIOSynchron
-  creaImageIOListener
-  creaImageIOPACSConnection
+  creaImageIOGimmick.cpp
+  creaImageIOSynchron.cpp
+  creaImageIOListener.cpp
+  creaImageIOPACSConnection.cpp
 
   # Abstract views
-  creaImageIOGimmickView
-  creaImageIOTreeView
-
-  # The wxWidgets-based components
-  creaImageIOWxGimmickView
-  creaImageIOWxTreeView
-  creaImageIOWxGimmickReaderDialog
-  creaImageIOWxGimmickFrame
-  creaImageIOWxGimmickPanel
-  creaImageIOWxGimmickTools
-  creaImageIOWxCustomizeConfigPanel
-  creaImageIOWxListenerPanel
-  creaImageIOWxEditFieldsPanel
-  creaImageIOWxAttributeSelectionPanel
-  creaImageIOWxPACSConnectionPanel
-  creaImageIOWxDescriptorPanel
+  creaImageIOGimmickView.cpp
+  creaImageIOTreeView.cpp
+
+  
   # 
-  BlockScopeWxApp
-  creaImageIOGimmickReaderDialog
+  BlockScopeWxApp.cpp
+  creaImageIOGimmickReaderDialog.cpp
 
   #  Viewer
-  creaImageIOWxViewer
-  creaImageIOImagePointerHolder.h
+  creaImageIOWxViewer.cpp
+  
   
   # settings
-  creaImageIOSettings
-
+  creaImageIOSettings.cpp
+  )
+ 
+ # Attributed tree data structure
+FILE(GLOB SOURCES_CREAIMAGEIO_TREE
+         creaImageIOTree.cpp
+         creaImageIOTreeAttributeDescriptor.cpp
+         creaImageIOTreeDescriptor.cpp
+         creaImageIOTreeNode.cpp
+         creaImageIOTreeLevelDescriptor.cpp
+           # Tree Handlers
+         creaImageIOTreeHandler.cpp
+         creaImageIOTreeHandlerImageAdder.cpp
+         creaImageIOSQLiteTreeHandler.cpp
+         )
+ 
+ # Image Readers
+FILE(GLOB SOURCES_CREAIMAGEIO_IMG_READER
+         creaImageIOAbstractImageReader.cpp
+         creaImageIODicomImageReader.cpp
+         creaImageIOImageReader.cpp
+         creaImageIOMultiThreadImageReader.cpp
+         creaImageIOUltrasonixImageReader.cpp
+         creaImageIOVtkImageReader.cpp
+         )
+
+
+# The wxWidgets-based components
+FILE(GLOB SOURCES_CREAIMAGEIO_WX
+         creaImageIOWxGimmickView.cpp
+         creaImageIOWxTreeView.cpp
+      creaImageIOWxGimmickReaderDialog.cpp
+      creaImageIOWxGimmickFrame.cpp
+      creaImageIOWxGimmickPanel.cpp
+      creaImageIOWxGimmickTools.cpp
+      creaImageIOWxCustomizeConfigPanel.cpp
+      creaImageIOWxListenerPanel.cpp
+      creaImageIOWxEditFieldsPanel.cpp
+         creaImageIOWxAttributeSelectionPanel.cpp
+         creaImageIOWxPACSConnectionPanel.cpp
+         creaImageIOWxDescriptorPanel.cpp
+         )
+# Header Files   
+FILE(GLOB HEADER_CREAIMAGEIO creaImageIOImagePointerHolder.h)
+FILE(GLOB SOURCES_CREAIMAGEIO_PACS PACS/*.cpp)
+FILE(GLOB HEADER_CREAIMAGEIO_PACS PACS/*.h)
+
+
+SOURCE_GROUP("Source Files" FILES ${SOURCES_CREAIMAGEIO})
+SOURCE_GROUP("Header Files" FILES ${HEADER_CREAIMAGEIO})
+SOURCE_GROUP("Source Files\\GUI" FILES ${SOURCES_CREAIMAGEIO_WX})
+if(BUILD_CREA_PACS)
+       SOURCE_GROUP("Source Files\\PACS" FILES ${SOURCES_CREAIMAGEIO_PACS})
+       SOURCE_GROUP("Header Files\\PACS" FILES ${HEADER_CREAIMAGEIO_PACS})
+endif(BUILD_CREA_PACS)
+SOURCE_GROUP("Source Files\\Readers" FILES ${SOURCES_CREAIMAGEIO_IMG_READER})
+SOURCE_GROUP("Source Files\\Tree" FILES ${SOURCES_CREAIMAGEIO_TREE})
+
+
+SET( PRIMITIVE_SRCS
+ ${SOURCES_CREAIMAGEIO}
+ ${HEADER_CREAIMAGEIO}
+ ${SOURCES_CREAIMAGEIO_IMG_READER}
+ ${SOURCES_CREAIMAGEIO_WX}
+ ${SOURCES_CREAIMAGEIO_TREE}
 )
 
+if( BUILD_CREA_PACS)
+       SET (SRCS
+               ${PRIMITIVE_SRCS}
+               ${SOURCES_CREAIMAGEIO_PACS}
+               ${HEADER_CREAIMAGEIO_PACS}
+               )
+else (BUILD_CREA_PACS)
+       SET (SRCS
+               ${PRIMITIVE_SRCS}
+               )
+endif (BUILD_CREA_PACS)
+
+
+
 
 OPTION(${LIBRARY_NAME}_BUILD_SHARED 
   "Build ${LIBRARY_NAME} as a shared library (dynamic) ?" ON)
@@ -80,7 +121,6 @@ crea_DEFINE(CREAIMAGEIO_EXPORT_SYMBOLS)
 ADD_LIBRARY(${LIBRARY_NAME} ${CREAIMAGEIO_BUILD_SHARED} ${SRCS})
 
 
-
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} 
   ${crea_LIBRARIES}
   ${creaBruker_LIBRARIES}
@@ -97,6 +137,8 @@ INSTALL(
   FILES ${HEADERS}
   DESTINATION include/${LIBRARY_NAME}
   )
+  
+
 IF (WIN32)
   SET(CREAIMAGEIO_LIB_PATH bin)
 ELSE (WIN32)
@@ -106,9 +148,8 @@ ENDIF(WIN32)
 INSTALL(
   TARGETS ${LIBRARY_NAME} 
   DESTINATION ${CREAIMAGEIO_LIB_PATH})
-   
-  
-   # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
+
+     # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE
   SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME})
   SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME})
   

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index ac204d9227960bcccb940168b6bf7662f5880c2e..bc12bf4694b22acd6110a7723746ee31b7ee5d90 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -49,6 +49,7 @@ namespace creaImageIO
         TOOL_SETTINGS_ID    = 7,
         TOOL_TOOLS_ID       = 8,
         TOOL_CREATEDB_ID    = 9,
+               TOOL_PACS_ID                    = 10
     };
   //======================================================================
 
@@ -256,7 +257,13 @@ namespace creaImageIO
                                      mIcon->GetBitmap(Icon_create_database),
                                      _T("Create DB from an Attributes Descriptor file")
                                      );
-
+#if defined(BUILD_PACS)
+       mToolAddFile = mToolBar->AddTool( TOOL_PACS_ID, 
+                                     _T("PACS Connection,"),
+                                     mIcon->GetBitmap(Icon_create_database),
+                                     _T("Echo, Find and Get to a PACS")
+                                     );
+#endif
     //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL)
 
     mToolBar->Realize();