]> Creatis software - creaContours.git/commitdiff
*** empty log message ***
authordonadio <donadio>
Wed, 3 Jun 2009 12:06:48 +0000 (12:06 +0000)
committerdonadio <donadio>
Wed, 3 Jun 2009 12:06:48 +0000 (12:06 +0000)
lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h

index 0c8433570f22364d0e07e1108b16f6ba24cdef6f..32b80834d096367324716684955499d520573c2a 100644 (file)
@@ -99,13 +99,13 @@ char wxContourMainFrame::COPY = 'C';
 
                if(images.size() > 0)
                {
-                       _images = images;
-                       this->setVectImages();
+                       _images = imgs;
+                       this->setVectImages(imgs);
                }
 
 }
 
-void wxContourMainFrame::setVectImages( )
+void wxContourMainFrame::setVectImages(std::vector<vtkImageData*> imgs)
 {
 
        #if defined(__GNUC__)
@@ -121,7 +121,7 @@ void wxContourMainFrame::setVectImages( )
        notebook = this->createNotebook();              
 
 
-       kernelManager = new KernelManagerContour( _images , _datadir+"/data/" , strCreaContourDataTmp );
+       kernelManager = new KernelManagerContour( imgs , _datadir+"/data/" , strCreaContourDataTmp );
 
 
        _instantPanel                           = new wxInstantChooserPanel( notebook, "Instant Chooser", true, false, "c" );
@@ -784,12 +784,14 @@ void wxContourMainFrame::onLoad(){
                fscanf(pFile,"%s",tmp); // Version
                fscanf(pFile,"%s",tmp); // 1.0.1 || 1.0.0
                std::string version(tmp);
-
+               
+               //AD:02-06-09
                if (version=="1.0.1")
                {
                        openContours(pFile,false);
                }
-
+               
+               //AD:02-06-09
                else if (version=="1.0.0")
                {
                        openContours(pFile,true);
index ebb1715d920d624e54b1e00750082e52dedb2fe8..d70c1eb7407ae0d48f65a2350d33dff3e737ea95 100644 (file)
@@ -134,7 +134,7 @@ class wxContourMainFrame : public wxPanel {
        // Creational and initialization methods
        //------------------------------------------------------------------------------------------------------------
 
-       void setVectImages( );
+       void setVectImages(std::vector<vtkImageData*> imgs);
 
        bool configurePanels( );