no message

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.cxx

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 0b9b0093ca848863a0138a948bc5c5e52e9132bc..277a87a0a19ab8134f1543f79c4c2fc46fad0cd4 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -2320,35 +2320,25 @@ void wxContourMainFrame::onSpreadAdd(){
 
 
 void wxContourMainFrame::onSpreadAddAll(){
-    printf("EED wxContourMainFrame::onSpreadAddAll \n");
 //EED02
-
        std::vector<int> tempVector;
        _instantPanel->getInstant( tempVector );
-
        int minZ,maxZ;
     minZ       = 0;
     maxZ       = interfMainPanel::getInstance()->GetImageDataSizeZ();
-
        int z;
        int sizeLstContourThings;
-
        for ( z=minZ ; z<=maxZ ; z++ )
        {
                tempVector[1]=z;
                Instant instant(&tempVector);
                std::vector<ContourThing**> lstContourThings = kernelManager->getOutlinesAtInstant( &instant );
                sizeLstContourThings = lstContourThings.size();
-
-               printf("EED wxContourMainFrame::onSpreadAddAll z=%d size=%d\n",z,sizeLstContourThings);
-
                if (sizeLstContourThings>=1)
         {
-
             std::vector<double> vecX;
             std::vector<double> vecY;
             std::vector<double> vecZ;
-
             ContourThing **contourthing = lstContourThings[0];
                        manualBaseModel *cModel                         =  (*contourthing)->getModel();
                        int i,size = cModel->GetNumberOfPointsSpline();
@@ -2359,17 +2349,11 @@ void wxContourMainFrame::onSpreadAddAll(){
                                vecX.push_back(x);
                                vecY.push_back(y);
                                vecZ.push_back(z);
-                       }
-
+                       } // for i
             std::string val = kernelManager->onSpreadAdd(&vecX , &vecY , &vecZ, tempVector);
             interfMainPanel::getInstance()->appendStringSpread(val);
-
-               printf("EED wxContourMainFrame::onSpreadAddAll       ->  val=%s\n",val.c_str() );
-
-        }
-
-    }
-
+        }// if sizeLstContourThings
+    } // for z
 }
 
 
@@ -2998,44 +2982,41 @@ void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value
 void wxContourMainFrame::SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value)
 {
 
-       std::string temp = directory + "/" + namefile + "-Value.mhd";
+       double spc[3];
+       kernelManager->GetSpacing(spc,0);   // returns the spacing of the first image
+       
+       std::string temp = directory + "/" + namefile + "-image-Value.mhd";
 
        wxString filename = crea::std2wx(temp);
-       // LG
-       //      filename.Printf(_T(temp.c_str()));
-       //filename.Printf(_T("%s\\%s-Value.mhd",directory.c_str(),namefile.c_str(),z);
-       /*filename.Printf(_T("%s"),directory.c_str());
-       filename.append(_T("\\"));
-       filename.append(_T("%s"),namefile.c_str());
-       filename.append(_T("-Value.mhd"));*/
 
 // Image Value
+       
+       vtkImageChangeInformation *valueChInfo = vtkImageChangeInformation::New();
+       valueChInfo->SetInput(value);
+       valueChInfo->SetSpacingScale(spc);      
        vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( );
-       writerValueImage->SetInput( value );
-       writerValueImage->SetInput( value );
+       writerValueImage->SetInput( valueChInfo->GetOutput() );
        writerValueImage->SetFileName( (const char *)filename.mb_str() );
        writerValueImage->SetFileDimensionality( 3 );
        writerValueImage->SetCompression(false);
        writerValueImage->Write( );
 
 // Image Mask
-       //              filename.Printf("%s\\%s-Mask.mhd",directory.c_str(),namefile.c_str(),z);
-       temp = directory + "/" + namefile + "-Mask.mhd";
+       temp = directory + "/" + namefile + "-image-Mask.mhd";
 
        // LG 14/01/09 : using crea
        filename = crea::std2wx(temp);
        //      filename.Printf(_T(temp.c_str()));
 
-       /*filename.Printf(_T("%s"),directory.c_str());
-       filename.append(_T("\\"));
-       filename.append(_T("%s"),namefile.c_str());
-       filename.append(_T("-Mask.mhd"));*/
 
+       vtkImageChangeInformation *maskChInfo = vtkImageChangeInformation::New();
+       maskChInfo->SetInput(mask);
+       maskChInfo->SetSpacingScale(spc);       
        vtkMetaImageWriter *writerMaskImage = vtkMetaImageWriter::New( );
-       writerMaskImage->SetInput( mask );
+       writerMaskImage->SetInput( maskChInfo->GetOutput() );
        writerMaskImage->SetFileName( (const char *)filename.mb_str() );
        writerMaskImage->SetFileDimensionality( 3 );
-       writerValueImage->SetCompression(false);
+       writerMaskImage->SetCompression(false);
        writerMaskImage->Write( );
 
        interfMainPanel::getInstance()->setStringInfoPanel( _T("") );