]> Creatis software - creaImageIO.git/commitdiff
git://git.creatis.insa-lyon.fr / creaImageIO.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8cde70)
Fixed Bugs with filter. Added Layer Diagram to documentation.
authorcaballero <caballero>
Mon, 16 Mar 2009 15:25:44 +0000 (15:25 +0000)
committercaballero <caballero>
Mon, 16 Mar 2009 15:25:44 +0000 (15:25 +0000)
src2/creaImageIORFImageReader.cpp patch | blob | history
src2/creaImageIOWxTreeView.cpp patch | blob | history
src2/creaImageIOWxViewer.cpp patch | blob | history
src2/doxygen/DoxyMainPage.txt.in patch | blob | history
src2/doxygen/LayerDiagram.htm [new file with mode: 0644] patch | blob
src2/doxygen/LayerDiagram.jpg [new file with mode: 0644] patch | blob

diff --git a/src2/creaImageIORFImageReader.cpp b/src2/creaImageIORFImageReader.cpp
index 35df630bb07ac213eb84cae9761a21a78fa9be13..a207a4aa249927ab7ae5bc6b42ddad969b746b8c 100644 (file)
--- a/src2/creaImageIORFImageReader.cpp
+++ b/src2/creaImageIORFImageReader.cpp
@@ -1,4 +1,4 @@
-+#include <creaImageIORFImageReader.h>
+#include <creaImageIORFImageReader.h>
 #include <creaVtk.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
diff --git a/src2/creaImageIOWxTreeView.cpp b/src2/creaImageIOWxTreeView.cpp
index a790c03bf78b3b492021bcfe8f0e1873e3ff0c90..8f0e1f5ad000f8cfde982fab15c68c1a1aee2b65 100644 (file)
--- a/src2/creaImageIOWxTreeView.cpp
+++ b/src2/creaImageIOWxTreeView.cpp
@@ -602,6 +602,10 @@ namespace creaImageIO
        GimmickDebugMessage(7,
                        "WxTreeView::OnBeginLabelEdit" 
                        <<std::endl);
+       if(event.m_itemIndex!=0)
+       {
+               event.Veto();
+       }
 
   }
 
diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index cec086bd381c56442a42df12002cee75bac7e479..2b473a22703f87773c3abe9c668fbe6c538d010a 100644 (file)
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -329,12 +329,14 @@ namespace creaImageIO
       { 
                if(!TestDestroy())
            { 
+                       
                        mWxViewer->ShowNextImage();
                        //                      mWxViewer->Refresh();
                        ::wxWakeUpIdle();
                        clock_t endwait;
                        endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
                        while (clock() < endwait) {}
+                       
                }
                else
                {
diff --git a/src2/doxygen/DoxyMainPage.txt.in b/src2/doxygen/DoxyMainPage.txt.in
index 652e92bea1f22ec4c51015c335765762eeff8526..0e647298d0f169cc5a7568050153bc51b77dd698 100644 (file)
--- a/src2/doxygen/DoxyMainPage.txt.in
+++ b/src2/doxygen/DoxyMainPage.txt.in
@@ -13,6 +13,8 @@
 <br>
 <a href="../../ComponentDiagram.htm"> Component Diagram </a>
 <br>
+<a href="../../LayerDiagram.htm"> Layer Diagram </a>
+<br>
 
 <H2>Sequence Diagrams</H2>
 <br>
diff --git a/src2/doxygen/LayerDiagram.htm b/src2/doxygen/LayerDiagram.htm
new file mode 100644 (file)
index 0000000..cd5a33d
--- /dev/null
+++ b/src2/doxygen/LayerDiagram.htm
@@ -0,0 +1,22 @@
+<!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>
+<meta http-equiv="Content-Language" content="es-co" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Layer Diagram</title>
+<style type="text/css">
+.style1 {
+       font-size: x-large;
+}
+</style>
+</head>
+
+<body>
+
+<p class="style1"><strong>Currently implemented Layer Architecture (includes  GUI less applications and wxWidgets derived applications)</strong></p>
+<img src="LayerDiagram.jpg"/>
+
+</body>
+
+</html>
diff --git a/src2/doxygen/LayerDiagram.jpg b/src2/doxygen/LayerDiagram.jpg
new file mode 100644 (file)
index 0000000..e55caeb
Binary files /dev/null and b/src2/doxygen/LayerDiagram.jpg differ
Input/Output medical images