*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 997c9bd30dbccfaf9ca4b2909fd3891a8fdf6575..637ef1751ab248da6b7912c28641184af61f9038 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,8 @@ SET(USE_ITK ON)
 SET(USE_BOOST ON)
 SET(USE_XERCES ON)
 
+OPTION (${PROJECT_NAME}_DOC "${PROJECT_NAME}_DOC" OFF)
+
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})

diff --git a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
index 5fc1d49ae3f10068373422d8e961fba4532d3edb..762a16d9493bedfa4d991eff27585cf43f7c1de9 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
@@ -26,6 +26,12 @@ void interfIOMenu::initButtons(wxEvtHandler* evtHandler) {
        nom.push_back("Import an OSIRIX XML file with contours");
        funct.push_back((wxObjectEventFunction) &interfIOMenu:: onImport);
 
+       //First step, include the image and the alternate text of the button.
+       //Obviously, a callback function must also be specified.
+       path.push_back(datadir + "/test.png");
+       nom.push_back("Performing a test on how to add a new button");
+       funct.push_back((wxObjectEventFunction) &interfIOMenu:: onTest);
+
        this->addButtons(path, nom);
        this->setVectorFunction(funct);
 
@@ -46,6 +52,10 @@ void interfIOMenu::onImport(wxCommandEvent& event){
        interfMainPanel::getInstance()->onImport();
 }
 
+void interfIOMenu::onTest(wxCommandEvent& event){
+       interfMainPanel::getInstance()->onTest();
+}
+
 interfIOMenu::~interfIOMenu()
 {
 }

diff --git a/lib/Interface_Icons_NDimensions/interfIOMenu.h b/lib/Interface_Icons_NDimensions/interfIOMenu.h
index 3edd182db62ca5b98e837e0b914358a3b323bf83..4b599d7d10d6ae0cef40425ac20529e53cdb5812 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfIOMenu.h
+++ b/lib/Interface_Icons_NDimensions/interfIOMenu.h
@@ -20,6 +20,7 @@ public:
        void onSave(wxCommandEvent& event);
 
        void onImport(wxCommandEvent& event);
+       void onTest(wxCommandEvent& event);
 
 private:
        //wxEvtHandler* eventHandler;

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index d4f34a045f94cecdfc774bfe9d1977e98c2c7c68..fcf7d0d2b9f744b3959cf7bebae3ffb080eccfdc 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -438,6 +438,10 @@ void interfMainPanel::onImport(){
        wxContourMainFrame::getInstance()->onImport();
 }
 
+void interfMainPanel::onTest(){
+       wxContourMainFrame::getInstance()->onTest();
+}
+
 void interfMainPanel::RefreshInterface()
 {
        wxContourMainFrame::getInstance()->RefreshInterface();

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index 5181f2920dbf79294078a9bdc7def97ba9dc936f..bc572799a66a7e2d841bdec7db1ce5d3a8bc2283 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -118,6 +118,7 @@ public:
        void onLoad();
        void onSave();
        void onImport();
+       void onTest();
 /////////////////////////////7
        void RefreshInterface();
        vtkImageData* getImageData();

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 8c8beb05edb61a3fae3d56edcde0459c526bc5da..1e6ff4c9337394ae6d46937c305884932a33ccf8 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1009,6 +1009,23 @@ void wxContourMainFrame::onImport(){
        }
 }
 
+void wxContourMainFrame::onTest(){
+       std::string filename, filenamecontours;
+       wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxOPEN );
+
+       if (dialog.ShowModal() == wxID_OK)
+       {
+               filename = dialog.GetPath().mb_str();           
+               filenamecontours = kernelManager->parseOsirixFile(filename);
+
+               if(filenamecontours.compare("") != 0){
+                       onLoadContours(filenamecontours);
+               }
+
+       }
+}
+
+
 //AD: 29-05-09
 void wxContourMainFrame::onSave(){
 //CMRU 03-09-09-----------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 9c50da0afd030bf51d8881996113a0619818707e..b412f669144ebd18b984d2f1546737ed7e648cc7 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -244,6 +244,7 @@ class wxContourMainFrame : public wxPanel {
        void onLoad();
        void onSave();
        void onImport();
+       void onTest();
        void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour );
 
        void RefreshInterface();

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002 b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002
index ac213aa3fc1467f661437c0617966cbf2aa0f673..98cce42664b802443b0216ca9f72636476335c10 100644 (file)
--- a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002
@@ -1,7 +1,7 @@
-format 66
+format 67
 "GeneralArchitecture" // GeneralArchitecture
-  revision 8
-  modified_by 2 "davila"
+  revision 9
+  modified_by 89 "vargas"
   // class settings
   //class diagram settings
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/GeneralArchitecture.prj b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/GeneralArchitecture.prj
index a5637d302cc7acd487b2a1d5736cb9c143f707ad..a5a797494062b709ee0ad5b510cc411429309bbf 100644 (file)
--- a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/GeneralArchitecture.prj
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/GeneralArchitecture.prj
@@ -1,7 +1,7 @@
-format 66
+format 67
 "GeneralArchitecture"
-  revision 1
-  modified_by 2 "davila"
+  revision 2
+  modified_by 89 "vargas"
 
 
   
@@ -36,5 +36,7 @@ format 66
 
   mark_for_import
   
+  ncouples 1
+  key "html dir" value "C:/Users/vargas/Documents/moi/Fichiers Importants/point-html/"
   package_ref 128002 // GeneralArchitecture
 end

diff --git a/lib/doxygen/bouml/buttons/new_button.html b/lib/doxygen/bouml/buttons/new_button.html
new file mode 100644 (file)
index 0000000..10d857d
--- /dev/null
+++ b/lib/doxygen/bouml/buttons/new_button.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html><head>
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Adding a new Button</title>
+
+<style type="text/css">
+.titles {
+font-family: Geneva, Arial, Helvetica, sans-serif;
+color: #000000;
+font-size: large;
+font-weight: bold;
+}
+.text {
+font-family: Geneva, Arial, Helvetica, sans-serif;
+font-size: small;
+font-weight: normal;
+}
+a.el {
+font-weight:bold;
+text-decoration:none;
+}
+a {
+color:#1A41A8;
+}
+.subtitles {
+font-family: Geneva, Arial, Helvetica, sans-serif;
+font-size: 90%;
+font-weight: bold;
+text-decoration: underline;
+}
+.listDiagrams {
+font-family: Geneva, Arial, Helvetica, sans-serif;
+margin-left: 25px;
+font-size: small;
+font-weight: bold;
+}
+.paragraph {
+margin-left: 40px;
+font-family: Geneva, Arial, Helvetica, sans-serif;
+font-size: small;
+}
+.style1 {
+text-decoration: underline;
+font-weight: bold;
+}
+.style3 {
+font-family: Geneva, Arial, Helvetica, sans-serif;
+font-size: 21px;
+text-decoration: underline;
+text-align: justify;
+}
+.style4 {
+font-family: Geneva, Arial, Helvetica, sans-serif;
+color: #000000;
+font-size: x-large;
+font-weight: bold;
+text-align: center;
+}
+</style>
+</head><body>
+<h2 style="text-align: left;" class="style4">Adding
+a new button to creaContours</h2>
+<span class="text">After taking a quick look at <a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours'</a>
+interface,
+it's easy to agree that buttons are a very important part of it!
+Adding, editing and deleting contours; extracting statistical data;
+performing basic and complex
+segmentation. All this is accomplished by pressing on the right button.
+<br><br>This guide is concerned with the process of adding a new button to <a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a>.
+For that purpose, a detailed how-to guide is included in this
+documentation alongside a sequence diagram that serves as an example of
+the process that takes place
+once a button is pressed.<br></span><hr style="width: 100%; height: 2px;"><br><span class="text">
+</span>
+</body></html>
\ No newline at end of file