#3388 wxContourMainFrame_tool box BBTK

[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 986a08ef45278f6de839d0090a7d12c740a34cbb..92600cd969d8240fb56ffb7a969e0bae5f1fcf97 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1710,7 +1710,7 @@ void wxContourMainFrame::SegmentationOneSliceITK(int x, int y, int z, wxString d
 
 }
 
-void wxContourMainFrame::onSegmentationOneSlice(int isovalue,int sampling,int method){
+void wxContourMainFrame::onSegmentationOneSlice(double isovalue,int sampling,int method){
 
        //JCP 20-10-08 Undo redo implementation
        saveState();
@@ -1725,7 +1725,7 @@ void wxContourMainFrame::onSegmentationOneSlice(int isovalue,int sampling,int me
 }
 
 
-void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, int isovalue, int sampling, int method , vtkImageData *imagedata)
+void wxContourMainFrame::SegmentationOneSlice( int x, int y, int z, double isovalue, int sampling, int method , vtkImageData *imagedata)
 {
        int typeofcontour = 1;
        //--Extracting Contour
@@ -1977,10 +1977,8 @@ void wxContourMainFrame::GetImageDataRange(double *range)
        _theViewPanel->GetImageDataRange(range);
 }
 
-void wxContourMainFrame::onSegmentationAllSlices2(int step ,int isovalue,int sampling,int method,vtkImageData* imagedata)
+void wxContourMainFrame::onSegmentationAllSlices2(int step ,double isovalue,int sampling,int method,int minZ, int maxZ,vtkImageData* imagedata)
 {
-    printf("wxContourMainFrame::onSegmentationAllSlices2 start\n");
-    
     //JCP 20-10-08 Undo redo implementation
     saveState();
     //JCP 20-10-08 Undo redo implementation
@@ -1991,13 +1989,13 @@ void wxContourMainFrame::onSegmentationAllSlices2(int step ,int isovalue,int sam
 //    double              porcent;
 //    wxString            tmpString;
 //    double              totalZ = maxZ-minZ+1;
-    
     int ext[6];
     imagedata->GetExtent(ext);
-    int maxZ = ext[5]-ext[4]+1;
-    for( z=0 ; z<=maxZ ; z=z+step )
+    int sizeZ = ext[5]-ext[4]+1;
+    if (minZ<0) { minZ=0; }
+    if (maxZ>=sizeZ) { maxZ=sizeZ-1; }
+    for( z=minZ ; z<=maxZ ; z=z+step )
     {
-        printf("wxContourMainFrame::onSegmentationAllSlices2 z=%d \n",z );
 //        porcent = 100.0* (z-minZ)/totalZ;
 //       tmpString.Printf(_T("  %d %c            %d/%d            %d"), (int)porcent , 37 , z-minZ+1, (int)totalZ,z );
 //        interfMainPanel::getInstance()->setLabelSegmentationPanelVTK(tmpString);
@@ -2006,11 +2004,9 @@ void wxContourMainFrame::onSegmentationAllSlices2(int step ,int isovalue,int sam
     }
 //    interfMainPanel::getInstance()->setLabelSegmentationPanelVTK(_T("   "));
     RefreshInterface();
-    printf("wxContourMainFrame::onSegmentationAllSlices2 end\n");
-
 }
 
-void wxContourMainFrame::onSegmentationAllSlices(int minZ,int maxZ,int isovalue,int sampling,int method)
+void wxContourMainFrame::onSegmentationAllSlices(int minZ,int maxZ,double isovalue,int sampling,int method)
 {
        //JCP 20-10-08 Undo redo implementation
        saveState();