*** empty log message ***

diff --git a/appli/wxContourGUIExample/wxContourGUIExample.cxx b/appli/wxContourGUIExample/wxContourGUIExample.cxx
index 62d9125ff7c15c2bbfbbfbb15bee5cdb73f48ed3..a679b72b006ad4b39d67e0b248995fd494e6a0da 100644 (file)
--- 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 793fea136046332f1bf70f0fe09f2d0dafbc0ffc..370d5a367a0d56f1f0e78ab66fcf3be8f61bef72 100644 (file)
--- 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 98929b86df3f8795efdaf2f2fe3582fde0b8d27d..72724974490525126c7f3411ee91241b11d24890 100644 (file)
--- 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 4491a012dc333ccbb0161625a03068428ea55ea5..4e810cae54fe05a8a5bb78e44665db12ee571ddd 100644 (file)
--- 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 a3611aaffffff8bb25f559dbcdfff15324e53003..e0aa08666d0f7fa419996ebb333867fdaefada3b 100644 (file)
--- 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){