From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 4 Jun 2012 03:17:09 +0000 (+0000)
Subject: no message
X-Git-Tag: v1.0.4~19
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1de95298bf58390db895afe85ee95f76626ca342;p=creaMaracasVisu.git

no message
---

diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
index 2f49d5a..7ac9774 100644
--- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
+++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session
@@ -1,10 +1,10 @@
 window_sizes 1396 856 303 1087 759 42
 diagrams
   active  classdiagram_ref 128002 // wxVtkViewer class Diagram 1
-    952 1238 140 4 471 241
+    952 1238 140 4 471 110
 end
 show_stereotypes
-selected class_ref 129410 // wxPanel
+selected classdiagram_ref 128002 // wxVtkViewer class Diagram 1
 open
   classview_ref 128002 // wxVtkViewer
 end
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index 4fee498..ceaa1c2 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -174,7 +174,8 @@ void manualViewContour::RefreshText()  // virtual
 }
 
 // ----------------------------------------------------------------------------
-bool manualViewContour::ifTouchContour(int x,int y,int z){
+bool manualViewContour::ifTouchContour(int x,int y,int z)
+{
 	bool result=false;
 	double xx=x;
 	double yy=y;
@@ -207,7 +208,6 @@ bool manualViewContour::ifTouchContour(int x,int y,int z){
 		d2= sqrt( (ppB[0]-xx)*(ppB[0]-xx) + (ppB[1]-yy)*(ppB[1]-yy) + (ppB[2]-zz)*(ppB[2]-zz));
 		d3= sqrt( (ppB[0]-ppA[0])*(ppB[0]-ppA[0]) + (ppB[1]-ppA[1])*(ppB[1]-ppA[1]) + (ppB[2]-ppA[2])*(ppB[2]-ppA[2]));
 
-
 		if (  ((d1+d2)>=d3) &&  ((d1+d2)<=d3*1.3) ) 
 		{
 			result=true;