X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=3d4413be34a071a8f99afdf762f7b8e8ee747966;hb=b467cd27f8b79c7e33d1f44dd4eaaf4030c65151;hp=617dce59520bbb9db6365a86d28add0a4af07306;hpb=26dd3c6c6654b059eaaa1d1af9c7c1bec0e435a5;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 617dce5..3d4413b 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -1194,11 +1194,22 @@ void wxContourMainFrame::saveFileWithContours( std::string filename )
 	fprintf(pFileData,"NumberOfContours %d\n", sizeLstNameThings );
 //------------------------------------------------------------------------------------------------------------
 
+
+// EED 2017-05-30
+	double spc[3];
+	spc[0]=1; 
+	spc[1]=1; 
+	spc[2]=1; 
+
 	for (i=0 ; i<sizeLstNameThings ; i++)
 	{
 //CMRU 03-09-09-----------------------------------------------------------------------------------------------
 		manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(lstNameThings[i]);
-		double sizeInPixel = manualModel ->GetPathSize();
+
+// EED 2017-05-30
+//		double sizeInPixel = manualModel ->GetPathSize(  );
+		double sizeInPixel = manualModel ->GetPathSize( spc );
+
 		double realContourSize = sizeInPixel*_onePixelSize;
 		manualModel ->SetRealSize(realContourSize);
 //------------------------------------------------------------------------------------------------------------
@@ -3227,10 +3238,18 @@ double wxContourMainFrame::getContourSizeInPixels()
 		std::string cloneName = currentSelection [0];
 
 		manualBaseModel * manualModel = kernelManager->getOutlineByKeyName(cloneName);//_modelManager->getOutlineByKeyName( cloneName )->getModel();
-		contourSize = manualModel-> GetPathSize();
+
+// EED 2017-05-30
+//		contourSize = manualModel->GetPathSize();
+		double spc[3];
+		spc[0]=1; 
+		spc[1]=1; 
+		spc[2]=1; 
+		contourSize = manualModel->GetPathSize( spc );
 	}
 	return contourSize;
 }
+
 manualBaseModel * wxContourMainFrame::getContour ()
 {
 	std::vector<std::string> currentSelection = _theViewPanel->getSelectedObjects();
@@ -3260,9 +3279,16 @@ void wxContourMainFrame::onPrintLabel (wxString label, manualBaseModel* manualMo
 }
 void wxContourMainFrame::onInsertCalculation(manualBaseModel* manualModel)
 {
-	double sizeInPixel = manualModel ->GetPathSize();
+// EED 2017-05-30
+//	double sizeInPixel 	= manualModel ->GetPathSize(  );
+	double spc[3];
+	spc[0]=1; // ????
+	spc[1]=1; // ????
+	spc[2]=1; // ????
+	double sizeInPixel 	= manualModel ->GetPathSize( spc );
+
 	double onePixelRealSize = interfMainPanel::getInstance()->GetPixelValue();;
-	double realContourSize = sizeInPixel*onePixelRealSize;
+	double realContourSize 	= sizeInPixel*onePixelRealSize;
 	manualModel ->SetRealSize(realContourSize);
 }