BUG 1439 and 1438

The visualisation of the contour propagation is  working

Documentation of the General architecture, integration with doxygen and classes

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index e80cc4a74bd92dcc09142563fa8913d267641568..be3aa7622c2262b1f40a2810dead5df3c48a3a3d 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -196,7 +196,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                manViewerContour->SetModel( manModelContour );
                manViewerContour->SetWxVtkBaseView( _wxVtk_BaseView );
                manViewerContour->SetRange( _widthOfControlPoint );
-               manViewerContour->SetZ( 1000 );
+               manViewerContour->SetZ( -900 ); 
 
                manViewerContour->SetSpacing(spc);
 
@@ -227,7 +227,7 @@ DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )
                _viewerSelectionROI->SetModel( _modelSelectionROI );
                _viewerSelectionROI->SetWxVtkBaseView( _wxVtk_BaseView );
                _viewerSelectionROI->SetRange( 2 );
-               _viewerSelectionROI->SetZ( 1000 );
+               _viewerSelectionROI->SetZ( -900 );
                _viewerSelectionROI->SetColorNormalContour(0.6, 0.8, 0);
 
                _viewerSelectionROI->SetSpacing( spc );

diff --git a/lib/doxygen/CMakeLists.txt b/lib/doxygen/CMakeLists.txt
index f9b0826af2954891725a0bd294b757285ed02a92..5b84851ef313fd404a1bcf316ebef15e58c808c2 100644 (file)
--- a/lib/doxygen/CMakeLists.txt
+++ b/lib/doxygen/CMakeLists.txt
@@ -58,16 +58,7 @@ MACRO(CREA_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
 
 #IF ( ${${PROJECT_NAME}_DOC} STREQUAL ON)
 IF ( ${PROJECT_NAME}_DOC STREQUAL ON)
-  CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/GeneralArchitecture/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/GeneralArchitecture_Diagrams/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/wxVtkViewer_classDiagram1_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/wxVtkViewer_classDiagram2_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_MVC_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_MVC_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_Model_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_Model_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_View_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_View_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_Controler_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_Controler_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_SeqCreateContour_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_SeqCreateContour_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/CutModule/CutModuleDiagrams_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/CutModuleDiagrams_HTML/ )
-  #CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/GeneralArchitecture/GeneralArchitecture_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/GeneralArchitecture_HTML/ )
+  CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/GeneralArchitecture/GeneralArchitecture_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/GeneralArchitecture_HTML/ )
 
   ADD_CUSTOM_TARGET(doxygen_${NAME} ALL
     DEPENDS  ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/index.html

diff --git a/lib/doxygen/DoxyMainPage.txt.in b/lib/doxygen/DoxyMainPage.txt.in
index 5b4c1d1f08fc3db94b907758b4c1943d94fbfa36..988b3d21622e53fd202c86bdfd830cb9a007ef95 100644 (file)
--- a/lib/doxygen/DoxyMainPage.txt.in
+++ b/lib/doxygen/DoxyMainPage.txt.in
@@ -1,5 +1,5 @@
 /**
- * \mainpage creaMaracasVisu documentation
+ * \mainpage creaContours documentation
 
 \htmlonly 
 
@@ -84,6 +84,14 @@ extract statistical information out of these images. </span></h2>
 <hr />
 <h2 style="text-align: left;" class="style4">Architecture
 Description</h2>
+
+<h2>
+  <span class="text">
+    Here the <a class="el" href="../GeneralArchitecture_HTML/index.html">General Architecture</a>
+  </span>
+</h2>
+
+
 <h2><span class="text">A gross approximation
 of&nbsp;<strong><a class="el"
  href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>'

diff --git a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
index 1fb5e3f9416463d5a98bc6b7a83885e8789bb151..e7f99c8d89b8e6607bbf8152a5d2286ce7891a77 100644 (file)
--- a/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/KernelManagerContour.cxx
@@ -370,7 +370,7 @@ manualBaseModel* KernelManagerContour::GetPoints(int z,int type, std::vector<dou
                for (int j=0 ; j<sizeCtrPt ; j++)
                {
 //JSTG_16-07-08_----------------------------------------------------------------
-                       manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , 900  );
+                       manModelContour->AddPoint( (*vecCtrlPointX)[j] , (*vecCtrlPointY)[j] , -900  );
 //--------------------------------------------------------------------
                } // for j