From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 9 Nov 2009 18:38:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~40
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaContours.git;a=commitdiff_plain;h=fc4ccca3b37e5aafdf697270402489971a44b1dd

*** empty log message ***
---

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 62d9125..a679b72 100644
--- a/appli/wxContourGUIExample/wxContourGUIExample.cxx
+++ b/appli/wxContourGUIExample/wxContourGUIExample.cxx
@@ -273,11 +273,20 @@ bool wxTheApplication :: OnInit()
 
 	std::vector<vtkImageData*> images;
 
-	//creaImageIO::WxGimmickDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),max_image_type,threads);
-
-	creaImageIO::WxGimmickReaderDialog w(0,-1,_T("WxGimmickDialog test"),wxDefaultPosition,wxSize(1200,800),min_image_type,max_image_type,output_dim,threads);
+	creaImageIO::WxGimmickReaderDialog w(0,
+										-1,
+										"creaContours_Descriptor.dscp",
+										"creatisContours DB", 
+										_T("WxGimmickDialog test"),
+										wxDefaultPosition,wxSize(1200,800)
+										,min_image_type,
+										max_image_type,
+										output_dim,
+										threads);
+  
 	w.ShowModal();
 
+
 //JCP
 	//std::string datadir(  crea::wx2std(GetExecutablePath()) );	
 	std::string datadir(  GetExecutablePath() );
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 793fea1..370d5a3 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -15,4 +15,9 @@ ELSE(WIN32)
 	CREA_CPDIR(${INPUT_DATA_DIR} ${OUTPUT_DATA_DIR})
 ENDIF(WIN32)
 
+SET(FILE_NAME_DESCRIPTOR "creaContours_Descriptor.dscp")
+CONFIGURE_FILE(	  ${PROJECT_SOURCE_DIR}/data/${FILE_NAME_DESCRIPTOR} ${PROJECT_BINARY_DIR}/bin/Shared/gimmick/${FILE_NAME_DESCRIPTOR}  COPYONLY )
+INSTALL( FILES ${PROJECT_SOURCE_DIR}/data/${FILE_NAME_DESCRIPTOR} DESTINATION bin/Shared/gimmick )
+
+
 
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 98929b8..7272497 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -43,6 +43,8 @@ FOREACH( iLST  ${DATA_FILES} )
 ENDFOREACH(iLST)
 
 
+
+
 #SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaContours-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 
diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 4491a01..4e810ca 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1026,7 +1026,6 @@ void wxContourMainFrame::saveFileWithContours( std::string filename )
 	fprintf(pFileData,"--CreaContour--\n");
 	fprintf(pFileData,"Version %s\n", "1.0.2" );
 	fprintf(pFileData,"OnePixelSize %f\n", _onePixelSize);
-	std::cout<<"Valor de un pixel: "<<_onePixelSize<<std::endl;		
 	
 //------------------------------------------------------------------------------------------------------------
 	
diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
index a3611aa..e0aa086 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
@@ -786,8 +786,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	void wxContourViewPanel::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel){
 		wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)getWxVtkBaseView();
 		vtkImageViewer2 *imageviewer = wxvtk2dbaseview->_imageViewer2XYZ->GetVtkImageViewer2();
-		//AMP//imageviewer->SetColorWindow(colorwindow);
-		//AMP//imageviewer->SetColorLevel(windowlevel);	
+		imageviewer->SetColorWindow(colorwindow);
+		imageviewer->SetColorLevel(windowlevel);	
 	}
 
 	void wxContourViewPanel::onInterpolation(bool interpolate){