From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 29 Jan 2009 12:19:17 +0000 (+0000)
Subject: EED ˆ Bogota
X-Git-Tag: EED.02Oct2009~71
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6845cec6ae737963ac13903041ed1e543421e1df;p=creaContours.git

EED ˆ Bogota
---

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 9849c42..9543a5c 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -41,11 +41,23 @@ wxContourMainFrame* wxTheApplication::frame = 0;
 
 IMPLEMENT_APP( wxTheApplication );
 
+/*
 wxContourGUIExample :: wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size)
 : wxFrame((wxFrame *) NULL, -1, title, pos, size)
 {
 	
 }
+*/
+
+#ifdef _DEBUG
+void wxAppConsole::OnAssert(char const *,int,char const *,char const *)
+{
+}
+
+void wxAppConsole::OnAssertFailure(char const *,int,char const *,char const *,char const *)
+{
+}
+#endif
 
 bool wxTheApplication :: OnInit()
 {
@@ -233,7 +245,7 @@ JCP 17-10-2008*/
 
 	}else if (w.GetReturnCode() == wxID_CANCEL){
 	   vtkMetaImageReader *reader = vtkMetaImageReader::New();
-	   reader->SetFileName( "D:/CAT08/Datos/Imagenes/image06.mhd"); //"data/hola.mhd" );
+	   reader->SetFileName( "data/hola.mhd" );
 	   reader->Update();
 	   images.push_back(reader->GetOutput());
   	}else{        
@@ -241,7 +253,7 @@ JCP 17-10-2008*/
 	}   
 
 
-	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 23 Oct 2008 "), wxPoint(400,50), wxSize(800, 600) );
+	wxFrame* frame1 = new wxFrame(NULL, wxID_ANY, wxT("ROI Application  -    Evaluation version, 28 Jan 2009 "), wxPoint(400,50), wxSize(800, 600) );
 	//frame = new wxContourMainFrame( frame1, wxID_ANY, wxString(_T("")), wxPoint(50,50), wxSize(800, 600), images ); 
 	frame = wxContourMainFrame::getInstance(frame1, wxID_ANY, wxString(_T("")), wxPoint(200,50), wxSize(800, 600), images );
 	frame1->CreateStatusBar();
diff --git a/appli/wxContourGUIExample/wxContourGUIExample.h b/appli/wxContourGUIExample/wxContourGUIExample.h
index b61ccb6..ca18f23 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.h
+++ b/appli/wxContourGUIExample/wxContourGUIExample.h
@@ -18,11 +18,14 @@
 #include <string.h>
 #include "wxContourMainFrame.h"
 
+/*
+eed
 
 class wxContourGUIExample : public wxFrame
 {
 public:
-	wxContourGUIExample/*(wxWindow *parent,wxString title);*/(const wxString& title, const wxPoint& pos, const wxSize& size);
+//	wxContourGUIExample(wxWindow *parent,wxString title);
+	wxContourGUIExample(const wxString& title, const wxPoint& pos, const wxSize& size);
 
     void OnBtnRun(wxCommandEvent& event);
 	
@@ -35,7 +38,7 @@ private:
 	//DECLARE_CLASS(wxContourGUIExample)    
 
 };
-
+*/
 
 class wxTheApplication : public wxApp
 {
diff --git a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx
index 44d91fa..89d0b6d 100644
--- a/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx
+++ b/lib/kernel_ManagerContour_NDimensions/OutlineModelManager.cxx
@@ -78,6 +78,7 @@
 	* @param theCommand Is the command to execute
 	* @param fromRegistration Indicates if the execution is directed from the registration, by default comes from the GUI = false.
 	*/
+
 	bool OutlineModelManager :: executeCommand_OutlineModel(std::string outKName, CommandObject * theCommand, bool fromRegistration)
 	{
 		ContourThing * theOutline = *outlinesEnvironment->getThingByName( outKName );