*** empty log message ***

diff --git a/data/Icons/test.png b/data/Icons/test.png
new file mode 100644 (file)
index 0000000..4084656
Binary files /dev/null and b/data/Icons/test.png differ

diff --git a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
index 762a16d9493bedfa4d991eff27585cf43f7c1de9..baee7dd7aa1d0286a62b89f18109bd21c92b2f5d 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
+++ b/lib/Interface_Icons_NDimensions/interfIOMenu.cxx
@@ -26,8 +26,9 @@ 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.
+       /******            ******
+       ******* New Button *******
+       *******            ******/
        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);

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
index fcf7d0d2b9f744b3959cf7bebae3ffb080eccfdc..f3e4129201d23b8f60606f60631d0ce3b78a908c 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx
@@ -35,6 +35,7 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH
        mirrorPanel             = NULL;
        thresholdPanel          = NULL;
        currentWindow           = NULL;
+       testPanel = NULL;
 
 //CMRU 17-08-09 ------------------------------------------------------------------
        infoPanelCalibration = NULL;
@@ -439,7 +440,25 @@ void interfMainPanel::onImport(){
 }
 
 void interfMainPanel::onTest(){
-       wxContourMainFrame::getInstance()->onTest();
+       if(testPanel==NULL)
+       {
+               testPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, 
+                       wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
+               wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);    
+               testPanel->SetSizer(flexsizer, true);
+               testPanel->SetAutoLayout( true );       
+               panelTest = new interfTestPanel(testPanel);
+
+               wxStaticText* stattext = new wxStaticText(mirrorPanel,  -1, 
+                       wxString(_T("   Test Panel   ")), 
+                       wxDefaultPosition, wxDefaultSize, 
+                       wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
+
+               flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
+               flexsizer->Add(panelTest, wxEXPAND);
+               testPanel->Layout();
+               showPanel(testPanel);
+       }       
 }
 
 void interfMainPanel::RefreshInterface()

diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h
index bc572799a66a7e2d841bdec7db1ce5d3a8bc2283..5881936dc3c764360bcafa62523e9975078d10c2 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfMainPanel.h
+++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h
@@ -257,8 +257,13 @@ private:
        wxWindow* infoWin;
        wxPanel* informationPanel;
        
+       wxPanel *testPanel;
+       interfTestPanel *panelTest;
+
        wxPanel* mirrorPanel;
        interfMirrorPanel* panelMirror; 
+
+
        wxPanel* thresholdPanel;
        
        bool axisshown;

diff --git a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
index 04f8fd86e57980500516df105b5e49ed740bbaba..7e65d44f7402c50b3d1d60e4c1c4a698cf500245 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
@@ -273,3 +273,36 @@ void interfMirrorPanel::onChangeWidth(wxScrollEvent& event)
 BEGIN_EVENT_TABLE(interfMirrorPanel, wxPanel)
 EVT_SCROLL(interfMirrorPanel :: onChangeWidth)
 END_EVENT_TABLE()
+
+//////////////////////////////////////////////////////////////
+
+interfTestPanel::interfTestPanel(wxWindow* parent)
+: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
+{
+       wxButton *button1 = new wxButton(this,wxID_ANY,_T("Button 1"), wxDefaultPosition, wxSize(200,35) );
+       wxButton *button2 = new wxButton(this,wxID_ANY,_T("Button 2"), wxDefaultPosition, wxSize(200,35) );
+       
+       Connect( button1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfTestPanel::onButton1Pressed );
+       Connect( button2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfTestPanel::onButton2Pressed ); 
+       
+       wxFlexGridSizer * sizer         = new wxFlexGridSizer(1);
+       sizer -> Add( button1, 1, wxGROW );
+       sizer -> Add( button2, 1, wxGROW );
+
+       this->SetSizer( sizer );
+       this->SetAutoLayout( true );
+       this->Layout();
+}
+
+interfTestPanel::~interfTestPanel(){
+}
+
+void interfTestPanel::onButton1Pressed(wxCommandEvent& event)
+{
+       std::cout << "Button 1 has been pressed" << std::endl;
+}
+
+void interfTestPanel::onButton2Pressed(wxCommandEvent& event)
+{
+       std::cout << "Button 2 has been pressed" << std::endl;
+}
\ No newline at end of file

diff --git a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.h b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.h
index ad0055a37d645f403b6d2417b326abee68444f07..a2e8cbf0639f57d0105705f26e1edd054344020b 100644 (file)
--- a/lib/Interface_Icons_NDimensions/interfSegmentationPanels.h
+++ b/lib/Interface_Icons_NDimensions/interfSegmentationPanels.h
@@ -100,6 +100,20 @@ private:
        DECLARE_EVENT_TABLE()
 };
 
+class interfTestPanel
+       : public wxPanel
+{
+public:
+       interfTestPanel(wxWindow * parent);             
+       ~interfTestPanel();
+
+private:
+       void onButton1Pressed(wxCommandEvent& event);
+
+       void onButton2Pressed(wxCommandEvent& event);
+
+};
+
 
 #endif
  

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 1e6ff4c9337394ae6d46937c305884932a33ccf8..83863e8d5827ec67a3b2d0741b7ef81d9a1c1e3e 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1008,20 +1008,14 @@ void wxContourMainFrame::onImport(){
 
        }
 }
-
 void wxContourMainFrame::onTest(){
        std::string filename, filenamecontours;
-       wxFileDialog dialog(NULL, _T("Choose a XML Osirix File"), _T(""), _T(""), _T("*.xml"), wxOPEN );
+       wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxOPEN );
 
        if (dialog.ShowModal() == wxID_OK)
        {
                filename = dialog.GetPath().mb_str();           
-               filenamecontours = kernelManager->parseOsirixFile(filename);
-
-               if(filenamecontours.compare("") != 0){
-                       onLoadContours(filenamecontours);
-               }
-
+               std::cout << "This is the filename: " << filename << std::endl;
        }
 }
 

diff --git a/lib/doxygen/TemplateHomeLibDoxygen.html b/lib/doxygen/TemplateHomeLibDoxygen.html
index 7ae82580f8093d0987b06aeb026b9b3e9599feff..4f328413a06e4f8a768001d6fa1250d776b024b5 100644 (file)
--- a/lib/doxygen/TemplateHomeLibDoxygen.html
+++ b/lib/doxygen/TemplateHomeLibDoxygen.html
@@ -57,73 +57,74 @@ text-align: center;
 }
 </style></head>
 <body>
-<h2 style="text-align: left;" class="style4">General
-Description</h2>
-<h2 style="text-align: justify;"><span class="text"><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>
-is a C++ application developed by the <a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/creatools">CreaTools</a>
-software team. As such, it is contained within the&nbsp;CreaTools <a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreaToolsArchitecture">general
-architecture</a>. Its principal objective as a standalone
-application is to let the user create flexible contour shapes over
+<h2 style="text-align: left;" class="style4"><big>General
+Description</big></h2>
+<big><big><big><big><big><big><big><big><span class="text"><big><strong style="font-family: Helvetica,Arial,sans-serif;"><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong><span style="font-family: Helvetica,Arial,sans-serif;">
+is a C++ application developed by the </span><a style="font-family: Helvetica,Arial,sans-serif;" class="el" href="http://www.creatis.insa-lyon.fr/site/fr/creatools">CreaTools</a><span style="font-family: Helvetica,Arial,sans-serif;">
+software team. As such, it is contained within the&nbsp;CreaTools </span><a style="font-family: Helvetica,Arial,sans-serif;" class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreaToolsArchitecture">general
+architecture</a><span style="font-family: Helvetica,Arial,sans-serif;">. Its principal objective as a standalone
+application is to let the user create flexible</span><span style="font-family: Helvetica,Arial,sans-serif;">contour shapes over
 different kinds of images. The drawn contours can afterwards by used to
-extract statistical information out of these images.</span></h2><h2 style="text-align: justify;"><span class="text">A gross approximation
+extract statistical information out of these images.</span></big> </span></big></big></big></big></big></big></big></big><h2 style="text-align: justify;"><span class="text"><big>A gross approximation
 of&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>'
 general architectural
 distribution can be seen in this diagram. In short<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">
 creaContours</a></strong> can be
-thought of as being divided in three parts, each one of which will be explained and detailed in this document.&nbsp;</span></h2>
+thought of as being divided in three parts, each one of which will be explained and detailed in this document.</big>&nbsp;</span></h2>
 <hr />
-<h2 style="text-align: left;" class="style4">Table of Contents</h2><h4>Libraries</h4><h2><span class="text">The first three sections of this guide shall be dedicated to the three main&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong> libraries:</span></h2>
+<h2 style="text-align: left;" class="style4"><big>Table of Contents</big></h2><h4><big><big>Libraries</big></big></h4><h2><big><span class="text">T<big>he first three sections of this guide shall be dedicated to the three main&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong> libraries:</big></span></big></h2>
 
-<ul>
-<li>
-<h2><span class="text"><a class="el" href="#Interface_Icons_NDimensions_lib">Interface_Icons_NDimensions_lib</a>.
-The set of classes that represents&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>'
+<ul><big><big>
+</big></big><li><big><big>
+</big></big><h2><big><big><span class="text"><big><a class="el" href="#Interface_Icons_NDimensions_lib">Interface_Icons_NDimensions_lib</a></big>.
+<big>The set of classes that represents&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>'
 menus and the buttons
-contained within.</span>&nbsp;<span class="text"></span></h2></li><li><h2><span class="text"><a class="el" href="#Interface_ManagerContour_NDimensions_lib">Interface_ManagerContour_NDimensions_lib</a>.
-This is where are found the classes that define the functions
-associated to the creation and edition of the contours.</span></h2></li><li><h2><span class="text"><a class="el" href="#kernel_ManagerContour_NDimensions_li">kernel_ManagerContour_NDimensions_lib</a>.
-As its name suggests, this is the group of classes that constitute the
+contained within.</big></span>&nbsp;<span class="text"></span></big></big></h2></li><li><h2><big><big><span class="text"><big><a class="el" href="#Interface_ManagerContour_NDimensions_lib">Interface_ManagerContour_NDimensions_lib</a></big>.
+<big>This is where are found the classes that define the functions
+associated to the creation and edition of the contours. It's also here
+where the main class, wxContourMainFrame, is defined.&nbsp;</big></span></big></big></h2></li><li><h2><big><big><span class="text"><big><a class="el" href="#kernel_ManagerContour_NDimensions_li">kernel_ManagerContour_NDimensions_lib</a></big>.
+<big>As its name suggests, this is the group of classes that constitute the
 kernel of the application. These are multiple-purpose classes that
-serve as building blocks for the rest of&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong></span></h2></li></ul><h4>Tutorials</h4><span class="text"><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>
+serve as building blocks for the rest of&nbsp;<strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong></big></span></big></big></h2></li></ul><h4><big><big>Tutorials</big></big></h4><big><span class="text"><big><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></strong>
 is continously evolving. Its development it's not yet finished and tha
 application sees new features being added to it on a regular basis. The
 tutorials give a rough idea of how to contribute to the development of
-certain aspects of the application.<br /></span><ul><li><a href="#tutorials">How to add a new button</a>. Quick step-by-step guide on how to add&nbsp;to the application. a new button&nbsp;and its associated functionality.</li></ul>
+certain aspects of the application.</big><br /></span></big><ul style="font-family: Helvetica,Arial,sans-serif;"><li><a href="#tutorials">How to add a new button</a>. Quick step-by-step guide on how to add&nbsp;to the application. a new button&nbsp;and its associated functionality.</li></ul>
 <ul>
 </ul>
 <hr />
-<h2 style="text-align: left;" class="style4">Modules
-Description</h2>
-<p class="text">In this section, each module of<span class="text"><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">
+<h2 style="text-align: left;" class="style4"><big>Modules
+Description</big></h2>
+<p class="text"><big>In this section, each module of<span class="text"><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">
 creaContours</a></strong></span> is fleshed out
 through class,&nbsp;sequence and component diagrams. The objective
 is to provide as much useful information about each component as it is
-possible.</p>
+possible.</big></p>
 <a name="Interface_Icons_NDimensions_lib"></a>
 <span class="text">
-<div class="style3"> Interface_Icons_NDimensions_lib</div>
+<div class="style3"><big> Interface_Icons_NDimensions_lib</big></div>
 <ul>
-<li>Class diagram.</li>
-<li>Adding an additional button. <span style="font-family: Geneva,Arial,Helvetica,sans-serif;">Adding
+<li><big>Class diagram.</big></li>
+<li><big>Adding an additional button. <span style="font-family: Geneva,Arial,Helvetica,sans-serif;">Adding
 a new button to </span><span class="text"><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a><span style="font-weight: normal;">
 is an important part of its development. Therefore, a small how-to guide
-has been included in the documentation..</span></strong></span></li>
+has been included in the documentation..</span></strong></span></big></li>
 </ul>
 <span class="text"></span><span style="font-weight: normal;" class="listDiagrams"></span>
 <br />
 <hr /><span class="subtitles"><a name="Interface_ManagerContour_NDimensions_lib"></a></span>
 <br />
-<div class="style3">Interface_ManagerContour_NDimensions_lib</div>
+<div class="style3"><big>Interface_ManagerContour_NDimensions_lib</big></div>
 </span>
-<ul><span class="text"><li>Class diagram</li>
+<ul><big><span class="text"><li><big>Class</big> <big>diagram</big></li>
 </span>
-</ul>
+</big></ul>
 <span class="text">
 <hr /><a name="kernel_ManagerContour_NDimensions_li"></a>
-<div class="style3">kernel_ManagerContour_NDimensions_lib</div>
-</span><ul><li><span class="text">Class diagram</span></li></ul><span class="text">
-<hr /></span><h2 style="text-align: left;" class="style4"><a name="tutorials"></a>Tutorials</h2><ul><li>How to add a new button. In this tutorial is explained how to add new button to&nbsp;<span class="text"><span class="text"><strong><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a><span style="font-weight: normal;"></span></strong></span></span><span class="text"><span class="text"><strong>. <span style="font-weight: normal;">For
+<div class="style3"><big>kernel_ManagerContour_NDimensions_lib</big></div>
+</span><ul><li><big><span class="text"><big>Class</big><small> </small><big>diagram</big></span></big></li></ul><span class="text">
+<hr /></span><h2 style="text-align: left;" class="style4"><a name="tutorials"></a><big>Tutorials</big></h2><ul><li><big>How to add a new button. In this tutorial is explained how to add new button to&nbsp;<span class="text"><span class="text"><strong><big><a class="el" href="http://www.creatis.insa-lyon.fr/site/fr/CreatoolsCreaContours">creaContours</a></big><span style="font-weight: normal;"></span></strong></span></span><span class="text"><span class="text"><strong>. <big><span style="font-weight: normal;">For
 that purpose, a step-by-step detailed guide is presented alongside
-diagrams and images that aid the comprehension of the process.</span></strong></span></span></li></ul><h2></h2><h2><span class="text">
+diagrams and images that aid the comprehension of the process.</span></big></strong></span></span></big></li></ul><h2></h2><h2><span class="text">
 </span></h2>
 </body></html>
\ No newline at end of file

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/classdiagrams.html b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/classdiagrams.html
new file mode 100644 (file)
index 0000000..5590a38
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/classdiagrams.html
@@ -0,0 +1,22 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Class Diagram Index</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Class Diagram Index</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128002" target = "projectFrame"><b>GeneralArchitecture</b></a></td><td></td><td></td></tr>
+</table>
+</body>
+</html>

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/classes_list.html b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/classes_list.html
new file mode 100644 (file)
index 0000000..f124784
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/classes_list.html
@@ -0,0 +1,24 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>Classes</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">Classes</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table border="0" width="100%">
+<tr>
+<td nowrap></td>
+</tr>
+</table>
+</body>
+</html>

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/fig128002.png b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/fig128002.png
new file mode 100644 (file)
index 0000000..87ae100
Binary files /dev/null and b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/fig128002.png differ

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index-withframe.html b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index-withframe.html
new file mode 100644 (file)
index 0000000..45eb5a9
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index-withframe.html
@@ -0,0 +1,19 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>c:/VSProjets/creaContours/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index-withframe</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+<FRAMESET cols="20%,80%">
+  <FRAME src="classes_list.html" name="classesListFrame">
+  <FRAMESET rows="150,*">
+    <FRAME src="navig.html" name="navigFrame">
+    <FRAME src="index.html" name="projectFrame">
+  </FRAMESET>
+</FRAMESET>
+<NOFRAMES>
+<H2>Frame Alert</H2><P>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.<BR>Link to <A HREF="index.html">Non-frame version.</A></NOFRAMES></body>
+</html>

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index.html b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index.html
new file mode 100644 (file)
index 0000000..5ce149b
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>GeneralArchitecture
+Documentation</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">GeneralArchitecture<br />Documentation</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<a name="refclass diagram128002"></a>
+<p align="center"><img src="fig128002.png" alt="" /></p>
+ <p align="center"><b>GeneralArchitecture</b></p><p><br /></p><p><br /></p>
+</body>
+</html>

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index_71.html b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index_71.html
new file mode 100644 (file)
index 0000000..8ef324d
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/index_71.html
@@ -0,0 +1,23 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>G</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+
+<body bgcolor="#ffffff">
+
+<div class = "title">G</div>
+<p></p>
+
+<!-- ============================================================= -->
+
+<table>
+<tr bgcolor=#f0f0f0><td align=center><b>Name</b></td><td align=center><b>Kind</b></td><td align=center><b>Description</b></td></tr>
+<tr bgcolor=#f0f0f0><td><a href="index.html#refclass diagram128002" target = "projectFrame"><b>GeneralArchitecture</b></a></td><td>class diagram</td><td></td></tr>
+</table>
+</body>
+</html>

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/navig.html b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/navig.html
new file mode 100644 (file)
index 0000000..3254736
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/navig.html
@@ -0,0 +1,17 @@
+<!-- Documentation produced by the Html generator of Bouml (http://bouml.free.fr) -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<title>c:/VSProjets/creaContours/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/navig</title>
+<link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+<body bgcolor="#ffffff">
+<p><hr noshade></p>
+<p><a href="index.html" target = "projectFrame"><b> -Top- </b></a><a href="classdiagrams.html" target = "projectFrame"><b> -Class Diagrams- </b></a></p>
+<p>
+</p>
+<p><a href="index_71.html" target = "projectFrame"><b> G </b></a></p>
+</body>
+</html>

diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/style.css b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/style.css
new file mode 100644 (file)
index 0000000..3a10a81
--- /dev/null
+++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture_HTML/style.css
@@ -0,0 +1,30 @@
+div.title { font-size: 150%; background: #87ceff; text-align: center; font-weight: bold; }
+
+div.sub { margin-left : 20px; }
+div.element { background: #d3d3d3; }
+
+h1.package { background: #ffe4c4; }
+h1.view { background: #98fb98; }
+
+h2.package { background: #ffe4c4; }
+h2.view { background: #98fb98; }
+h2.class { background: #87ceff; }
+h2.usecase { background: #87ceff; }
+h2.state { background: #87ceff; }
+h2.activity { background: #87ceff; }
+
+h3.package { background: #ffe4c4; }
+h3.view { background: #98fb98; }
+h3.class { background: #87ceff; }
+h3.usecase { background: #87ceff; }
+h3.state { background: #87ceff; }
+h3.stateregion { background: #87ceff; }
+h3.activity { background: #87ceff; }
+
+h4.package { background: #ffe4c4; }
+h4.view { background: #98fb98; }
+h4.class { background: #87ceff; }
+h4.usecase { background: #87ceff; }
+h4.state { background: #87ceff; }
+h4.stateregion { background: #87ceff; }
+h4.activity { background: #87ceff; }

diff --git a/lib/doxygen/bouml/buttons/all_panels.png b/lib/doxygen/bouml/buttons/all_panels.png
new file mode 100644 (file)
index 0000000..8431aa1
Binary files /dev/null and b/lib/doxygen/bouml/buttons/all_panels.png differ

diff --git a/lib/doxygen/bouml/buttons/buttons.png b/lib/doxygen/bouml/buttons/buttons.png
new file mode 100644 (file)
index 0000000..5eaedf2
Binary files /dev/null and b/lib/doxygen/bouml/buttons/buttons.png differ

diff --git a/lib/doxygen/bouml/buttons/callback_action.png b/lib/doxygen/bouml/buttons/callback_action.png
new file mode 100644 (file)
index 0000000..27512a4
Binary files /dev/null and b/lib/doxygen/bouml/buttons/callback_action.png differ

diff --git a/lib/doxygen/bouml/buttons/callback_functions.png b/lib/doxygen/bouml/buttons/callback_functions.png
new file mode 100644 (file)
index 0000000..72f1c4f
Binary files /dev/null and b/lib/doxygen/bouml/buttons/callback_functions.png differ

diff --git a/lib/doxygen/bouml/buttons/classes.png b/lib/doxygen/bouml/buttons/classes.png
new file mode 100644 (file)
index 0000000..9df8457
Binary files /dev/null and b/lib/doxygen/bouml/buttons/classes.png differ

diff --git a/lib/doxygen/bouml/buttons/code_add_button.png b/lib/doxygen/bouml/buttons/code_add_button.png
new file mode 100644 (file)
index 0000000..2e29690
Binary files /dev/null and b/lib/doxygen/bouml/buttons/code_add_button.png differ

diff --git a/lib/doxygen/bouml/buttons/file_selector_popsup.png b/lib/doxygen/bouml/buttons/file_selector_popsup.png
new file mode 100644 (file)
index 0000000..03d4547
Binary files /dev/null and b/lib/doxygen/bouml/buttons/file_selector_popsup.png differ

diff --git a/lib/doxygen/bouml/buttons/header_interfIOMenu.png b/lib/doxygen/bouml/buttons/header_interfIOMenu.png
new file mode 100644 (file)
index 0000000..9cbdd4c
Binary files /dev/null and b/lib/doxygen/bouml/buttons/header_interfIOMenu.png differ

diff --git a/lib/doxygen/bouml/buttons/interfMainPanel.png b/lib/doxygen/bouml/buttons/interfMainPanel.png
new file mode 100644 (file)
index 0000000..acbce20
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfMainPanel.png differ

diff --git a/lib/doxygen/bouml/buttons/interfMainPanel_callback.png b/lib/doxygen/bouml/buttons/interfMainPanel_callback.png
new file mode 100644 (file)
index 0000000..c3eecc1
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfMainPanel_callback.png differ

diff --git a/lib/doxygen/bouml/buttons/interfMainPanel_newPanel.png b/lib/doxygen/bouml/buttons/interfMainPanel_newPanel.png
new file mode 100644 (file)
index 0000000..b889251
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfMainPanel_newPanel.png differ

diff --git a/lib/doxygen/bouml/buttons/interfMainPanel_onShowPanel.png b/lib/doxygen/bouml/buttons/interfMainPanel_onShowPanel.png
new file mode 100644 (file)
index 0000000..5b13d62
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfMainPanel_onShowPanel.png differ

diff --git a/lib/doxygen/bouml/buttons/interfMirrorPanel.png b/lib/doxygen/bouml/buttons/interfMirrorPanel.png
new file mode 100644 (file)
index 0000000..0a5c9df
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfMirrorPanel.png differ

diff --git a/lib/doxygen/bouml/buttons/interfSegmentationPanels.png b/lib/doxygen/bouml/buttons/interfSegmentationPanels.png
new file mode 100644 (file)
index 0000000..a00ed53
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfSegmentationPanels.png differ

diff --git a/lib/doxygen/bouml/buttons/interfTestPanel.png b/lib/doxygen/bouml/buttons/interfTestPanel.png
new file mode 100644 (file)
index 0000000..573106b
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfTestPanel.png differ

diff --git a/lib/doxygen/bouml/buttons/interfTestPanel_final.png b/lib/doxygen/bouml/buttons/interfTestPanel_final.png
new file mode 100644 (file)
index 0000000..a17c207
Binary files /dev/null and b/lib/doxygen/bouml/buttons/interfTestPanel_final.png differ

diff --git a/lib/doxygen/bouml/buttons/mirroring_panel.png b/lib/doxygen/bouml/buttons/mirroring_panel.png
new file mode 100644 (file)
index 0000000..b948e47
Binary files /dev/null and b/lib/doxygen/bouml/buttons/mirroring_panel.png differ

diff --git a/lib/doxygen/bouml/buttons/newPanel_newButtons.png b/lib/doxygen/bouml/buttons/newPanel_newButtons.png
new file mode 100644 (file)
index 0000000..e897348
Binary files /dev/null and b/lib/doxygen/bouml/buttons/newPanel_newButtons.png differ

diff --git a/lib/doxygen/bouml/buttons/new_button.html b/lib/doxygen/bouml/buttons/new_button.html
index 10d857dd966d26efa4f2499e02456b2ad1640967..7eb3fc7d635a41fee30f0c23dbbd9c0b350fd9aa 100644 (file)
--- a/lib/doxygen/bouml/buttons/new_button.html
+++ b/lib/doxygen/bouml/buttons/new_button.html
@@ -55,11 +55,11 @@ 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>
+</style></head>
+<body>
+<h2 style="text-align: left; font-family: Helvetica,Arial,sans-serif;" class="style4"><big>Adding
+a new button to creaContours</big></h2>
+<span style="font-family: Helvetica,Arial,sans-serif;" class="text"><big>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;
@@ -69,6 +69,173 @@ segmentation. All this is accomplished by pressing on the right button.
 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">
+once a button is pressed.</big> <big>It
+also details the process of displaying a panel, often used alongside
+buttons to configure the different segmentation tools offered by
+creaContours. Finally, a short tutorial on adding a new contour-drawing
+button is included.<br><a name="beginning"></a><br></big></span><ol><li style="font-family: Helvetica,Arial,sans-serif;"><span style="font-weight: bold;"><a href="#1._Finding_where_to_start">Finding where to star</a>t. </span>How to figure out where to start writing the code that will let you add a new button to creaContours.</li><li style="font-family: Helvetica,Arial,sans-serif;"><span style="font-weight: bold;"><a href="#2._Adding_the_button_">Adding the button</a>. </span>As soon as we've found the right place to start, we have to add the actual button. Here such process is detailed.</li><li style="font-family: Helvetica,Arial,sans-serif;"><span style="font-weight: bold;"><a href="#3._The_callback_function_">The callback function</a>. </span>It's
+not enough to add a new button; a functionality must be associated to
+it. Here we describe how to create the callback function, which does
+just that.</li><li style="font-family: Helvetica,Arial,sans-serif;"><span style="font-weight: bold;"><a href="#4._The_callback_action_">The callback action</a>. </span>Once
+the callback function is called, something must happen. To explain how
+to assign a callback action to a button (and its respective function)
+is the objective of this section.</li><li style="font-family: Helvetica,Arial,sans-serif;"><span style="font-weight: bold;"><a href="#5._Button-click_pipeline_sequence_">Button-click pipeline</a>. </span>The sequence diagram which shows the pipeline the program goes through when a button is clicked.</li><li><span style="font-weight: bold; font-family: Helvetica,Arial,sans-serif;"><a href="#6._Adding_a_panel_">Adding a panel</a>. </span><span style="font-family: Helvetica,Arial,sans-serif;">What
+if the functionality associated to a button requires the user to
+configure a few parameters? In that case, it could be useful to have a
+panel. Here we show how to create and display one.</span></li></ol><hr style="width: 100%; height: 2px; font-family: Helvetica,Arial,sans-serif;"><h3 style="font-family: Helvetica,Arial,sans-serif;"><big><a name="1._Finding_where_to_start"></a>1. Finding where to start</big></h3><span style="font-family: Helvetica,Arial,sans-serif;">Taking
+a cursory look at creaContours' buttons panel, one can easily see that
+its buttons are divided into categories: "New Contour" buttons, "I/O"
+buttons, etc. This division of the interface is not arbitrary and
+suggests that before creating a new button one has to decide into which
+category it'll fit! Will it let the user perform a new kind of
+segmentation? If yes, it must be added to the "Segmentation"
+categories. Or will it permit the serial lecture of many contour .roi
+files? Should it be that way, "I/O" is the place to go.</span><br style="font-family: Helvetica,Arial,sans-serif;"><br style="font-family: Helvetica,Arial,sans-serif;"><div style="text-align: center; font-family: Helvetica,Arial,sans-serif;"><img style="height: 771px; width: 305px;" alt="Image which shows creaContours' button panel, in which one can find all of the buttons that form the core of the application's functionality" title="creaContours' button interface" src="buttons.png"><br><h5>Figure [1]. Button panel (creaContours).</h5></div><span style="font-family: Helvetica,Arial,sans-serif;">As
+soon as the correct placement of the button has been decided, the next
+step is to write the necessary code so that it is correctly added to
+the interface. Remembering that creaContours'
+&lt;link&gt;architecture&lt;link&gt; is divided into three main
+components, this would mean first identifying in which one of these the
+modifcations have to be made. </span><br style="font-family: Helvetica,Arial,sans-serif;"><br style="font-family: Helvetica,Arial,sans-serif;"><span style="font-weight: bold; font-family: Helvetica,Arial,sans-serif;">kernel_ManagerContour_NDimensions_lib</span><span style="font-family: Helvetica,Arial,sans-serif;">
+is constituted by the building blocks of
+&lt;link&gt;creaContours&lt;link&gt;. This is the where the most basic
+classes of the application are and as such it's not the right place to
+look. </span><span style="font-weight: bold; font-family: Helvetica,Arial,sans-serif;">Interface_ManagerContour_NDimensions_lib</span><span style="font-family: Helvetica,Arial,sans-serif;">
+contains many visual elements and sembles to be a good choice to look
+in. But in reality, this library deals with the creation and edition of
+contours and the management of "main" interface. It is therefore a high
+level representation of the interface. This leaves only one option...</span><br style="font-family: Helvetica,Arial,sans-serif;"><br style="font-family: Helvetica,Arial,sans-serif;"><div style="text-align: center; font-family: Helvetica,Arial,sans-serif;"><img style="width: 253px; height: 244px;" alt="Image which graphically displays the classes that are within the Interface_Icons_NDimensions_lib library" title="Classes of Interface_Icons_NDimensions_lib" src="classes.png"><br><h5>Figure [2]. Interface_Icon_NDimensions_lib, where new buttons are added</h5></div><span style="font-family: Helvetica,Arial,sans-serif;">This
+is clearly the right place! Each of the button panel's categories is
+represented by a class, named accordingly: "interfIOMenu" is where the
+buttons corresponding to the "I/O" category are. Having finally found
+where to start, we must now choose which kind of button we want to
+create so that we modify the appropriate class. Since the process is
+similar for each category, we will choose an arbitrary one to
+illustrate the process; "I/O" in this case.</span><br><div style="text-align: right;"><a href="#beginning"><span style="font-family: Helvetica,Arial,sans-serif;">Back to top</span></a></div><hr style="width: 100%; height: 2px; font-family: Helvetica,Arial,sans-serif;"><h3 style="font-family: Helvetica,Arial,sans-serif;"><a name="2._Adding_the_button_"></a><big><a name="2._Adding_the_button"></a>2. Adding the button</big></h3><span style="font-family: Helvetica,Arial,sans-serif;">Now
+that we have choosen which kind of button to add, we can take a good
+look to the corresponding class. As we just said, we're going to add a
+new "I/O" button. It is therefore in interfIOMenu where we have to look.</span><br style="font-family: Helvetica,Arial,sans-serif;"><br style="font-family: Helvetica,Arial,sans-serif;"><div style="text-align: center; font-family: Helvetica,Arial,sans-serif;"><img style="width: 947px; height: 426px;" alt="This image shows the code contained within the hader file of the interfIOMenu class" title="Header file of interfIOMenu" src="header_interfIOMenu.png"><br><h5>Figure [3]. Header file of interfIOMenu</h5></div><span style="font-family: Helvetica,Arial,sans-serif;">Taking
+a quick look a it we can identify the usual constructor/destructor pair
+and a virtual "initButtons" method. Each class that represents a button
+category must have implimented this virtual method, where all of the
+buttons that belong to it have to be created and added. Other than
+that, there is a method for each of the functions performed by each of
+the category's button. In this case, "I/O" contains the Load, Save and
+Import buttons and therefore there is a "On" method for each function.
+These functions receive as parameters wxCommandEvent events. This basic
+structure is replicated in each category class (interfSegmentationMenu,
+interfToolsMenu, etc).</span><br style="font-family: Helvetica,Arial,sans-serif;"><br style="font-family: Helvetica,Arial,sans-serif;"><span style="font-family: Helvetica,Arial,sans-serif;">Hence, in order to add the new button we must go to the initButtons method in the .cxx.</span><br style="font-family: Helvetica,Arial,sans-serif;"><br style="font-family: Helvetica,Arial,sans-serif;"><div style="text-align: center; font-family: Helvetica,Arial,sans-serif;"><div style="text-align: center;"><img style="width: 735px; height: 315px;" alt="Code where a new button is added to the category. The image also shows what's to be written when adding a new button." title="Code where a new button is added" src="code_add_button.png"><br><h5>Figure [4]. &nbsp;Where to add the new button.</h5><div style="text-align: left;">As
+we can see, adding a new button it's just a matter or replicating the
+code that's been already written for the previous buttons. In this
+case, we have added a new test button, underneath the big "New Button"
+heading. In orther for this to work as expected, it's necessary to add
+the button's image (in this case, test.png <img style="width: 27px; height: 27px;" alt="Image which is shown over the test button once it is sucessfully added to the interface" title="Test button image" src="test.png">)
+to the data/Icons folder of the creaContours' CMake project. It's also
+worth nothing that once a button is being added, its callback function
+it's specified. In this case, it's the function OnTest, as shown in
+Figure [4], which must also be added to the header file. If we go back
+to it in Figure [3] we'll notice that it's already there.<br><br>If we
+run the application now, we'll see that the button's been successfully
+added to the interface. Finally, the callback function has to be
+written!<br><div style="text-align: right;"><div style="text-align: right;"><a href="new_button.html#beginning"><span style="font-family: Helvetica,Arial,sans-serif;">Back to top</span></a></div></div><h3><a name="3._The_callback_function_"></a><big><a name="3._The_callback_function"></a>3. The callback function</big></h3>We now have a new button in our interface.<br><div style="text-align: center;"><img style="width: 200px; height: 70px;" alt="In this image we can see the original I/O buttons alongside the new test button" title="The new button's been added" src="new_button_added.png"><br><h5>Figure [5]. The I/O buttons alongside the new test button.</h5></div>It's
+time to create a new callback function to associate a function to it.
+For that purpose, we take a look at the existing callback functions.<br><br><div style="text-align: center;"><img style="width: 406px; height: 244px;" alt="Image which shows the code of the existing callback functions as well as that of the new callback function. The latter is marked in red." title="Existing callback functions" src="callback_functions.png"><br><h5>Figure [6]. The callback functions for each of the buttons.</h5><div style="text-align: left;">As
+we can see, all that this function does is call the corresponding
+callback function on the interfMainPanel class. This mean that there
+we'll have to define at least one more callback function! The first
+step is to find the interfMainPanel class header file
+(interfMainPanel.h) and include a new function, "OnTest". <br><br><div style="text-align: center;"><img style="width: 317px; height: 174px;" alt="An image which shows how in the interfMainPanel class the callback functions are defined" title="The interfMainPanel callback functions" src="interfMainPanel.png"><br></div></div><h5><span style="font-weight: bold;">Figure [7]. The callback functions in interfMainPanel.</span></h5><div style="text-align: left;">By
+principle, interfMainPanel is not a class where the "business logic" is
+to be defined. It can be thought of as the agglomeration of the
+different menu categories. We can thus expect the onLoad, onSave,
+onImport and onTest functions to simply call another function on a
+class where it's pertinent to perform the callback action. Taking a
+look at the interfMainPanel.cxx file, we find out that this is
+effectively the case.<br><br><div style="text-align: center;"><img style="width: 433px; height: 394px;" alt="An image that shows the piece of code where the interfMainPanel's callback function are defined (for the I/O menu category)" title="The callback functions in interfMainPanel" src="interfMainPanel_callback.png"><br><h5><span style="font-weight: bold;">Figure [8]. &nbsp;The callback functions in the interfMainPanel class.</span></h5></div></div><div style="text-align: left;">Once
+again, we see that we have to go deeper into
+&lt;link&gt;creaContours'&lt;link&gt; architecture. Each callback
+function calls another function in another class, this time the
+wxContourMainFrame class. But we're finally getting closer!<br><div style="text-align: right;"><div style="text-align: right;"><a href="new_button.html#beginning"><span style="font-family: Helvetica,Arial,sans-serif;">Back to top</span></a></div></div><h3><a name="4._The_callback_action_"></a><big><a name="4._The_callback_action"></a>4. The callback action</big></h3>Since
+we must define a new callback function within wxContourMainFrame, it
+goes without saying that it's declaration must be included in this
+class' header file. Having done that, it's time to define the actual
+callback function. Now, as wxContourMainFrame is where all callback
+functions eventually end up, this is where the callback action has to
+be defined. A callback action can be many things: opening a new window,
+showing a new panel to configure the parameters of a segmentation (and
+then execute it by pressing on the appropiate button) or drawing a new
+contour. For this part of the example, we'll be satisfied by just
+showing a File Selector window.<br><br><div style="text-align: center;"><img style="width: 758px; height: 267px;" alt="The code that shows the callback action code that's necessary so that a File Selector pops up when clicking on the button" title="The callback action code" src="callback_action.png"><br><h5>Figure [9]. &nbsp;The callback action, opening a file selector window.</h5></div>&nbsp;And
+that's it! Now, we have to run creaContours and click on the newly
+created button... and the File Selector window will pop up!<br><div style="text-align: center;"><a href="file_selector_popsup.png"><img style="border: 0px solid ; width: 757px; height: 573px;" alt="Image which shows the file selector window being shown once one clicks on the newly created button" title="The file selector window pops up" src="file_selector_popsup.png"></a><br><h5><span style="font-weight: bold;">Figure [10]. The file selector window pops up!</span></h5><div style="text-align: right;"><div style="text-align: right;"><a href="new_button.html#beginning"><span style="font-family: Helvetica,Arial,sans-serif;">Back to top</span></a></div></div><div style="text-align: justify;"><h3><a name="5._Button-click_pipeline_sequence_"></a><big><a name="5._Button-click_pipeline_sequence"></a>5.</big> <big>Button-click pipeline (sequence diagram)</big></h3><div style="text-align: right;"><div style="text-align: right;"><a href="new_button.html#beginning"><span style="font-family: Helvetica,Arial,sans-serif;">Back to top</span></a></div></div><h3><a name="6._Adding_a_panel_"></a><big><a name="6._Adding_a_panel"></a>6. Adding a panel</big></h3>It
+must be said that a button that shows a file selector window is not
+really the most interesting thing that can be done. By playing around
+for a bit with creaContours' other buttons, we'll quickly notice that
+many of them add small panels to the space underneath all the buttons.
+These panels let the user configure the parameters of the function
+associated to the button's he's pressed. These panels are particularly
+important&nbsp;when doing segmentations. As one of creaContours' main
+functions is to let the user segment the images he's working with,
+knowing how to create a panel and use it afterwards it's very
+important. This part of the guide deals precisely with this process.<br><br>We'll
+start with the button that we just created, which causes a file
+selector window to pop up. In order to add a panel to the window, we
+follow the same process until the onTest method in interfMainPanel.
+This is where the process starts to diverge as it is precisely in this
+method where we'll create the panel and add it to the window. <br><br>However, before doing that, we have created the panel that we're going to add!<br><br>At this moment we can pose ourselves the questions: where exactly do we have to add this new panel? Let's take a look at <span style="font-weight: bold;">Interface_Icons_NDimensions_lib</span>, where all of creaContours' graphical elements are to be found:<br><div style="text-align: center;"><img style="width: 244px; height: 234px;" alt="Image which shows creaContours' graphical classes, with the panel classes being highlighted" title="The panel classes highlighted" src="panels-highlighted.png"><br><h5>Figure [11]. The panel classes highlighted</h5><div style="text-align: justify;">Clearly,
+interfSegmentationPanels.cxx and interfToolsPanels.cxx are the two
+files we have to take a look&nbsp;at! Intuitively, we know that the
+prefix associated to each class (<span style="font-weight: bold;">Segmentation</span>Panels and <span style="font-weight: bold;">Tools</span>Panels)
+represents to which button category the panels belong to it. The former
+are the panels that are displayed once we press on a segmentation
+button; the latter are the panels that are displayed once we press on a
+Tools button. For the purpose of this guide, we will assume that our
+button is going to be a Segmentation Button and therefore the panel
+associated to it will be added to interfSegmentationPanels.<br><br>As a
+matter of fact, these two files have within them the definition of each
+panel that makes part of each particular category. For example, if we
+go to interfSegmentationPanels.cxx and examine which class definitions
+are contained within it, we'll see that there's three, one for each
+panel.<br><br><div style="text-align: center;"><img style="width: 679px; height: 125px;" alt="Image which shows that within the interfSegmentationPanels.cxx file there's 3 class definiotns" title="All the panels" src="all_panels.png"><br><h5>Figure [12]. The three classes inside the interfSegmentationPanel class</h5></div></div><div style="text-align: justify;">If
+we know look at the interfSegmentationPanels.h file, we'll see that in
+it there's a brief definition of each of the three aforementioned
+classes. This is where we must start, then. To get an idea of how to
+proceed, let's look at the class definition for interfMirrorPanel:<br><div style="text-align: center;"><img style="width: 403px; height: 503px;" alt="Fragment of code whiwh shows the definition of the interfMirrorPanel class" title="InterfMirrorPanel" src="interfMirrorPanel.png"><br><h5>Figure [13]. The definition of the interfMirrorPanel class.</h5><div style="text-align: justify;">As
+we can see, the class in itself it's not very complicated, but this is
+also because the panel that it represents is fairly basic. Let's take a
+quick look at it:<br><div style="text-align: center;"><img style="width: 206px; height: 163px;" alt="Image which shows the mirroring segmentation panel, in order to give the reader a rough idea of its graphical distribution" title="The mirroring panel" src="mirroring_panel.png"><br><h5>Figure [14]. The graphical distribution of the mirroring panel.</h5><div style="text-align: justify;">What
+we're going to try to achieve in this guide is actually a very similar
+panel; it'll have just two buttons, each one of which will have an
+associated functionality. We must begin by writing down the class
+definition of our new panel, that we'll name interfTestPanel. Following
+the pattern shown above, we'll have:<br><br><div style="text-align: center;"><img style="width: 434px; height: 306px;" alt="Fragment of code showing the declaration of the new panel" title="interfTestPanel" src="interfTestPanel.png"><br><h5><span style="font-weight: bold;">Figure [15]. The declaration of the interfTestPanel class.</span></h5></div></div></div>As
+we can see, we have two methods, onButton1Pressed and onButton2Pressed,
+which receive two wxCommandEvent&amp; events. These are the callback
+methods that are called once we click on a button. <br><br>Now that we have our class definition, we proceed to declare each method of our class.<br><br><div style="text-align: center;"><img style="width: 1033px; height: 623px;" alt="The full declaration of the interfTestPanel class" title="interfTestPanel" src="interfTestPanel_final.png"><br><h5>Figure [16]. The declaration of the new interfTestPanel class</h5></div>The
+button callback methods, as we can see, do nothing in particular; they
+just print into std::cout a message informing the use that the
+respective button's been pressed. Inside the constructor, we create
+both buttons as new <span style="font-weight: bold;">wxButtons. </span>These
+take as parameters the panel into which they're going to be added, an
+ID, a label, and a position. Explaining in detail these parameters (as
+well as those used in the call to the <span style="font-weight: bold;">wxPanel</span> constructor) goes beyond the scope of this guide. <br><br>We associated an event to each button with the Connect method. In this case it's a <span style="font-weight: bold;">wxEVT_COMMAND_BUTTON_CLICKED </span>event.
+Furthermore, each button has an associated callback function, which
+must also be specified through the Connect method. The <span style="font-weight: bold;">wxFlexGridSizer </span>which is added immediately afterwards serves as a way to organize the elements on the interface.<br><br>Having
+done that, we must now make sure that once we click on our button the
+panel is added to the interface. In order to make sure of this, we have
+to remember the "pipeline" that is followed when we click on a button.
+This time around, we will folllow it all the way to the "onTest" method
+in <span style="font-weight: bold;">interfMainPanel</span>, as it's
+here that we have the necessary tools to display our new panel. Before
+getting down to it, we have to add to new parameters to the <span style="font-weight: bold;">interfMainPanel.h</span> file:<br><div style="text-align: center;"><img style="width: 329px; height: 188px;" alt="Fragment of code which shows the new parameters added to an existing class so that the new panels can be created" title="The new panel" src="interfMainPanel_newPanel.png"><br><h5>Figure [17]. The declaration of the new panel parameters.</h5><div style="text-align: justify;">The first parameter is a regular <span style="font-weight: bold;">wxPanel </span>which will contain within it the actual <span style="font-weight: bold;">interfTestPanel, </span>which is the second parameter that's been added. As soon as we have them in our header file, we can go to the <span style="font-weight: bold;">OnTest </span>method and modify it so the panel is shown in the right place. Basing ourselves on the existing <span style="font-weight: bold;">onMirrorPressed </span>method, we get the following code which does exactly what we want it to:<br><br><div style="text-align: center;"><img style="width: 836px; height: 421px;" alt="Fragment of code which shows where the panel is actually shown" title="Showing the new panel" src="interfMainPanel_onShowPanel.png"><br><h5>Figure [18]. The fragment of code that serves to show the new panel</h5><div style="text-align: justify;">What is done here is actually quite simple. The new <span style="font-weight: bold;">testPanel</span> (of object type <span style="font-weight: bold;">wxPanel</span>)
+contains within it the panel where the actual test panel is going to be
+added. In other words, this is where we will store an instance of the
+space underneath &nbsp;the buttons, represented as a panel. Having
+created it, we further configure it before creating an instance of the
+actual <span style="font-weight: bold;">interfMirrorPanel. </span>&nbsp;This is added to the <span style="font-weight: bold;">wxFlexGridSizer </span>which in turn has been set as the <span style="font-weight: bold;">testPanel</span>'<span style="font-weight: bold;">s </span>Sizer. It is why by doing so we're adding the <span style="font-weight: bold;">interfMirrorPanel </span>to
+the space beneath the buttons, which is exactly what we wanted to do!
+We end by adding a little bit of text (just for the purpose of staying
+close to the other, already existing buttons) and we end by showing our
+panel by invoking the <span style="font-weight: bold;">showPanel </span>method&nbsp;and passing it an instance of <span style="font-weight: bold;">testPanel, </span>which now contains within it the <span style="font-weight: bold;">interfMirrorPanel.</span><br><br>If we now run the interface and click on the new button, we'll obtain the following result...<br><div style="text-align: center;"><a href="newPanel_newButtons.png"><img style="border: 0px solid ; width: 724px; height: 632px;" alt="Image which shows the new panel and the buttons it contains, as well as the result that's printed out when you click on one of the buttons" title="new panel with new buttons" src="newPanel_newButtons.png"></a><br><h5>Figure [19]. The resulting panel</h5></div></div><div style="text-align: justify;">Mission accomplished!<br><div style="text-align: right;"><div style="text-align: right;"><a href="new_button.html#beginning"><span style="font-family: Helvetica,Arial,sans-serif;">Back to top</span></a></div></div></div></div></div><div style="text-align: justify;"></div></div></div></div></div></div> </div></div></div></div></div></div></div><span style="font-family: Helvetica,Arial,sans-serif;" class="text">
 </span>
 </body></html>
\ No newline at end of file

diff --git a/lib/doxygen/bouml/buttons/new_button_added.png b/lib/doxygen/bouml/buttons/new_button_added.png
new file mode 100644 (file)
index 0000000..1e2f145
Binary files /dev/null and b/lib/doxygen/bouml/buttons/new_button_added.png differ

diff --git a/lib/doxygen/bouml/buttons/panels-highlighted.png b/lib/doxygen/bouml/buttons/panels-highlighted.png
new file mode 100644 (file)
index 0000000..6ad787a
Binary files /dev/null and b/lib/doxygen/bouml/buttons/panels-highlighted.png differ

diff --git a/lib/doxygen/bouml/buttons/test.png b/lib/doxygen/bouml/buttons/test.png
new file mode 100644 (file)
index 0000000..4084656
Binary files /dev/null and b/lib/doxygen/bouml/buttons/test.png differ