]> Creatis software - creaContours.git/commitdiff
use wx2std
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 15 Apr 2009 10:21:26 +0000 (10:21 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 15 Apr 2009 10:21:26 +0000 (10:21 +0000)
lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx

index 43b374f304e7bf9693067517b240d25e9bc82f22..3070d426e1bf0325c8ae1fa9655246512d548af6 100644 (file)
@@ -1025,23 +1025,23 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d
                               InternalImageType, 
                               InternalImageType >    ZeroCrossingFilterType;
 ZeroCrossingFilterType::Pointer zeroCrossing =
-                                                                       ZeroCrossingFilterType::New();
+                                               ZeroCrossingFilterType::New();
 
-const double propagationScaling = atof( prop );
+const double propagationScaling = atof( crea::wx2std(prop).c_str() );
 
   geodesicActiveContour->SetPropagationScaling( propagationScaling );
   geodesicActiveContour->SetCurvatureScaling( 1.0 );
   geodesicActiveContour->SetAdvectionScaling( 1.0 );
 
   geodesicActiveContour->SetMaximumRMSError( 0.02 );
-  int it=atoi( iter );
+  int it=atoi(  crea::wx2std(iter).c_str() );
   geodesicActiveContour->SetNumberOfIterations( it );
 
   smoothing->SetInput( filter2->GetOutput() );
   gradientMagnitude->SetInput( smoothing->GetOutput() );
   sigmoid->SetInput( gradientMagnitude->GetOutput() );
   fastMarching->SetInput( sigmoid->GetOutput() );
-  geodesicActiveContour->SetInput(  fastMarching->GetOutput() );
+  geodesicActiveContour->SetInput( fastMarching->GetOutput() );
   geodesicActiveContour->SetFeatureImage( sigmoid->GetOutput() );
   
   zeroCrossing->SetInput( geodesicActiveContour->GetOutput() );
@@ -1055,11 +1055,11 @@ const double propagationScaling = atof( prop );
   smoothing->SetConductanceParameter( 9.0 );
 
 
-  const double sigma = atof( sigm );
+  const double sigma = atof(  crea::wx2std(sigm).c_str() );
   gradientMagnitude->SetSigma(  sigma  );
 
-  const double alpha =  atof( alf );
-  const double beta  =  atof( bet );
+  const double alpha =  atof(  crea::wx2std(alf).c_str() );
+  const double beta  =  atof(  crea::wx2std(bet).c_str() );
 
   sigmoid->SetAlpha( alpha );
   sigmoid->SetBeta(  beta  );
@@ -1073,7 +1073,7 @@ const double propagationScaling = atof( prop );
   seedPosition[0] = x;
   seedPosition[1] = y;
 
-  const double initialDistance = atof( distanc );
+  const double initialDistance = atof( crea::wx2std(distanc).c_str() );
 
   NodeType node;
 
@@ -1085,7 +1085,7 @@ const double propagationScaling = atof( prop );
   seeds->Initialize();
   seeds->InsertElement( 0, node );
 
-  fastMarching->SetTrialPoints(  seeds  );
+  fastMarching->SetTrialPoints( seeds );
 
   fastMarching->SetSpeedConstant( 1.0 );
   
index cd697ef36fb8042a3c986eb656c90472cd48ba0d..0bc1fed8ada8d0a0db23621834c96200bf0d1953 100644 (file)
@@ -498,4 +498,5 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
                                addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1);
                        } // if
                }
-       }
\ No newline at end of file
+       }
+