0027737: Remove hardcoded paths to data folders in mfc samples

Data shapes (used in samples) were moved into CSF_OCCTDataPath location.

samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp

@@ -1155,9 +1155,9 @@ static Standard_Boolean fixParam(Standard_Real& theParam)
 
 void CGeometryDoc::OnSimplify() 
 {
-  CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir());
+  CString anOCCTDataPathValue;
-  initfile += L"\\..\\..\\..\\samples\\mfc\\standard\\01_Geometry\\Data\\";
+  anOCCTDataPathValue.GetEnvironmentVariable(L"CSF_OCCTDataPath");
-  initfile += L"shell1.brep";
+  CString initfile = (anOCCTDataPathValue + L"\\occ\\shell1.brep");
 
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);

samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp

@@ -136,11 +136,12 @@ Handle(AIS_TexturedShape) TexturesExt_Presentation::Texturize(const TopoDS_Shape
   TCollection_AsciiString TFileName;
   // load texture from file if it is not an integer value
   // integer value indicates a number of texture in predefined TexturesExt enumeration
-  CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir());
+  CString anOCCTDataPathValue;
-  initfile += "..\\..\\..\\04_Viewer3d\\Data\\";
+  anOCCTDataPathValue.GetEnvironmentVariable(L"CSF_OCCTDataPath");
+  CString initfile = (anOCCTDataPathValue + L"\\images\\");
   if (!aTFileName.IsIntegerValue())
   {
-	initfile += aTFileName.ToCString();
+    initfile += aTFileName.ToCString();
   }
 
   aTShape->SetTextureFileName (TCollection_AsciiString ((const wchar_t* )initfile));
@@ -165,9 +166,9 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape,
                                          TCollection_AsciiString aFileName)
 {
   // create a TopoDS_Shape -> read from a brep file
-  CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir());
+  CString anOCCTDataPathValue;
-  initfile += "..\\..\\..\\04_Viewer3d\\Data\\";
+  anOCCTDataPathValue.GetEnvironmentVariable(L"CSF_OCCTDataPath");
-  initfile += aFileName.ToCString();
+  CString initfile = (anOCCTDataPathValue + L"\\occ\\" + aFileName.ToCString());
 
   std::filebuf aFileBuf;
   std::istream aStream (&aFileBuf);
@@ -331,7 +332,7 @@ void TexturesExt_Presentation::sampleKitchen()
 {
   TopoDS_Shape aShape;
 
-  if (!loadShape(aShape, "Kitchen\\Room.brep"))
+  if (!loadShape(aShape, "Room.brep"))
     return;
 
   gp_Trsf aTrsf;
@@ -361,17 +362,17 @@ void TexturesExt_Presentation::sampleKitchen()
 //  DISP(drawShape(aFaces(4), Quantity_NOC_LIGHTPINK, Standard_False));
 
   // texturize furniture items with "wooden" texture
-  if (loadShape(aShape, "Kitchen\\MODERN_Table_1.brep"))
+  if (loadShape(aShape, "MODERN_Table_1.brep"))
   {
     moveScale(aShape);
     DISP(Texturize(aShape, "chataignier.gif"));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Chair_1.brep"))
+  if (loadShape(aShape, "MODERN_Chair_1.brep"))
   {
     moveScale(aShape);
     DISP(Texturize(aShape, "chataignier.gif"));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Cooker_1.brep"))
+  if (loadShape(aShape, "MODERN_Cooker_1.brep"))
   {
     moveScale(aShape);
 
@@ -391,27 +392,27 @@ void TexturesExt_Presentation::sampleKitchen()
         DISP(Texturize(aFaces(i), "chataignier.gif"));
     }
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Cooker_1_opened.brep"))
+  if (loadShape(aShape, "MODERN_Cooker_1_opened.brep"))
   {
     moveScale(aShape);
     DISP(Texturize(aShape, "chataignier.gif"));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Exhaust_1.brep"))
+  if (loadShape(aShape, "MODERN_Exhaust_1.brep"))
   {
     moveScale(aShape);
     DISP(drawShape(aShape, Graphic3d_NOM_STONE, Standard_False));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_MVCooker_1.brep"))
+  if (loadShape(aShape, "MODERN_MVCooker_1.brep"))
   {
     moveScale(aShape);
     DISP(drawShape(aShape, Graphic3d_NOM_SILVER, Standard_False));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_MVCooker_1_opened.brep"))
+  if (loadShape(aShape, "MODERN_MVCooker_1_opened.brep"))
   {
     moveScale(aShape);
     DISP(drawShape(aShape, Graphic3d_NOM_SILVER, Standard_False));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Sink_1.brep"))
+  if (loadShape(aShape, "MODERN_Sink_1.brep"))
   {
     moveScale(aShape);
 
@@ -429,17 +430,17 @@ void TexturesExt_Presentation::sampleKitchen()
         DISP(Texturize(aFaces(i), "chataignier.gif"));
     }
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Sink_1_opened.brep"))
+  if (loadShape(aShape, "MODERN_Sink_1_opened.brep"))
   {
     moveScale(aShape);
     DISP(Texturize(aShape, "chataignier.gif"));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Refrigerator_1.brep"))
+  if (loadShape(aShape, "MODERN_Refrigerator_1.brep"))
   {
     moveScale(aShape);
     DISP(drawShape(aShape, Graphic3d_NOM_CHROME, Standard_False));
   }
-  if (loadShape(aShape, "Kitchen\\MODERN_Refrigerator_1_opened.brep"))
+  if (loadShape(aShape, "MODERN_Refrigerator_1_opened.brep"))
   {
     moveScale(aShape);
     DISP(drawShape(aShape, Graphic3d_NOM_CHROME, Standard_False));

samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp

@@ -395,9 +395,9 @@ void Tesselate_Presentation::tesselateShape(const TopoDS_Shape& aShape)
 
 void Tesselate_Presentation::sample(const Standard_CString aFileName)
 {
-  CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir());
+  CString anOCCTDataPathValue;
-  initfile += "..\\..\\..\\Data\\";
+  anOCCTDataPathValue.GetEnvironmentVariable(L"CSF_OCCTDataPath");
-  initfile += aFileName;
+  CString initfile = (anOCCTDataPathValue + L"\\occ\\" + aFileName);
 
 /*  
   ResetView();

samples/mfc/standard/Data/Kitchen/Room.brep

@@ -1,359 +0,0 @@
-DBRep_DrawableShape
-
-CASCADE Topology V1, (c) Matra-Datavision
-Locations 1
-1
-              1               0               0               0 
-              0               1               0               0 
-              0               0               1               0 
-Curve2ds 24
-1 0 0 1 0 
-1 0 0 1 0 
-1 300 0 0 -1 
-1 0 0 0 1 
-1 0 -400 1 0 
-1 0 0 1 0 
-1 0 0 0 -1 
-1 0 0 0 1 
-1 0 0 1 0 
-1 0 400 1 0 
-1 300 0 0 -1 
-1 400 0 0 1 
-1 0 -400 1 0 
-1 0 400 1 0 
-1 0 0 0 -1 
-1 400 0 0 1 
-1 0 0 0 1 
-1 0 0 1 0 
-1 300 0 0 1 
-1 0 0 1 0 
-1 0 0 0 1 
-1 0 400 1 0 
-1 300 0 0 1 
-1 0 400 1 0 
-Curves 12
-1 0 0 0 0 0 1 
-1 0 0 300 -0 1 0 
-1 0 400 0 0 0 1 
-1 0 0 0 -0 1 0 
-1 400 0 0 0 0 1 
-1 400 0 300 0 1 0 
-1 400 400 0 0 0 1 
-1 400 0 0 -0 1 0 
-1 0 0 0 1 0 -0 
-1 0 0 300 1 0 -0 
-1 0 400 0 1 0 -0 
-1 0 400 300 1 0 -0 
-Polygon3D 0
-PolygonOnTriangulations 24
-2 1 2 
-p 1.6000000008 1 0 300 
-2 1 4 
-p 1.6000000008 1 0 300 
-2 2 3 
-p 1.6000000008 1 0 400 
-2 1 2 
-p 1.6000000008 1 0 400 
-2 4 3 
-p 1.6000000008 1 0 300 
-2 1 4 
-p 1.6000000008 1 0 300 
-2 1 4 
-p 1.6000000008 1 0 400 
-2 1 2 
-p 1.6000000008 1 0 400 
-2 1 2 
-p 1.6000000008 1 0 300 
-2 2 3 
-p 1.6000000008 1 0 300 
-2 2 3 
-p 1.6000000008 1 0 400 
-2 4 3 
-p 1.6000000008 1 0 400 
-2 4 3 
-p 1.6000000008 1 0 300 
-2 2 3 
-p 1.6000000008 1 0 300 
-2 1 4 
-p 1.6000000008 1 0 400 
-2 4 3 
-p 1.6000000008 1 0 400 
-2 1 2 
-p 1.6000000008 1 0 400 
-2 1 4 
-p 1.6000000008 1 0 400 
-2 4 3 
-p 1.6000000008 1 0 400 
-2 1 4 
-p 1.6000000008 1 0 400 
-2 1 2 
-p 1.6000000008 1 0 400 
-2 2 3 
-p 1.6000000008 1 0 400 
-2 4 3 
-p 1.6000000008 1 0 400 
-2 2 3 
-p 1.6000000008 1 0 400 
-Surfaces 6
-1 0 0 0 1 0 -0 0 0 1 0 -1 0 
-1 0 0 0 -0 1 0 0 0 1 1 0 -0 
-1 0 0 300 0 0 1 1 0 -0 -0 1 0 
-1 0 400 0 -0 1 0 0 0 1 1 0 -0 
-1 0 0 0 0 0 1 1 0 -0 -0 1 0 
-1 400 0 0 1 0 -0 0 0 1 0 -1 0 
-Triangulations 6
-4 2 1 1.6000000008
-0 0 0 0 0 300 0 400 300 0 400 0 0 0 300 0 300 -400 0 -400 1 4 3 3 2 1 
-4 2 1 1.6000000008
-0 0 0 400 0 0 400 0 300 0 0 300 0 0 0 400 300 400 300 0 2 1 4 4 3 2 
-4 2 1 1.6000000008
-0 0 300 0 400 300 400 400 300 400 0 300 0 0 0 400 400 400 400 0 2 1 4 4 3 2 
-4 2 1 1.6000000008
-0 400 0 400 400 0 400 400 300 0 400 300 0 0 0 400 300 400 300 0 2 1 4 4 3 2 
-4 2 1 1.6000000008
-0 0 0 0 400 0 400 400 0 400 0 0 0 0 0 400 400 400 400 0 2 1 4 4 3 2 
-4 2 1 1.6000000008
-400 0 0 400 0 300 400 400 300 400 400 0 0 0 300 0 300 -400 0 -400 1 4 3 3 2 1 
-
-TShapes 31
-Ve
-1e-07
-0 0 300
-0 0
-
-0101100
-*
-Ve
-1e-07
-0 0 0
-0 0
-
-0101100
-*
-Ed
- 1e-07 1 1 0
-1  1 0 0 300
-2  1 1 0 0 300
-2  2 2 0 0 300
-6  1 1 0
-6  2 2 0
-0
-
-0101000
--31 0 +30 0 *
-Ve
-1e-07
-0 400 300
-0 0
-
-0101100
-*
-Ed
- 1e-07 1 1 0
-1  2 0 0 400
-2  3 1 0 0 400
-2  4 3 0 0 400
-6  3 1 0
-6  4 3 0
-0
-
-0101000
--28 0 +31 0 *
-Ve
-1e-07
-0 400 0
-0 0
-
-0101100
-*
-Ed
- 1e-07 1 1 0
-1  3 0 0 300
-2  5 1 0 0 300
-2  6 4 0 0 300
-6  5 1 0
-6  6 4 0
-0
-
-0101000
--28 0 +26 0 *
-Ed
- 1e-07 1 1 0
-1  4 0 0 400
-2  7 1 0 0 400
-2  8 5 0 0 400
-6  7 1 0
-6  8 5 0
-0
-
-0101000
--26 0 +30 0 *
-Wi
-
-0101000
--29 0 -27 0 +25 0 +24 0 *
-Fa
-0  1e-07 1 0
-2  1
-0111000
-+23 0 *
-Ve
-1e-07
-400 0 300
-0 0
-
-0101100
-*
-Ve
-1e-07
-400 0 0
-0 0
-
-0101100
-*
-Ed
- 1e-07 1 1 0
-1  5 0 0 300
-2  9 6 0 0 300
-2  10 2 0 0 300
-6  9 6 0
-6  10 2 0
-0
-
-0101000
--21 0 +20 0 *
-Ve
-1e-07
-400 400 300
-0 0
-
-0101100
-*
-Ed
- 1e-07 1 1 0
-1  6 0 0 400
-2  11 6 0 0 400
-2  12 3 0 0 400
-6  11 6 0
-6  12 3 0
-0
-
-0101000
--18 0 +21 0 *
-Ve
-1e-07
-400 400 0
-0 0
-
-0101100
-*
-Ed
- 1e-07 1 1 0
-1  7 0 0 300
-2  13 6 0 0 300
-2  14 4 0 0 300
-6  13 6 0
-6  14 4 0
-0
-
-0101000
--18 0 +16 0 *
-Ed
- 1e-07 1 1 0
-1  8 0 0 400
-2  15 6 0 0 400
-2  16 5 0 0 400
-6  15 6 0
-6  16 5 0
-0
-
-0101000
--16 0 +20 0 *
-Wi
-
-0101000
--19 0 -17 0 +15 0 +14 0 *
-Fa
-0  1e-07 6 0
-2  6
-0111000
-+13 0 *
-Ed
- 1e-07 1 1 0
-1  9 0 0 400
-2  17 2 0 0 400
-2  18 5 0 0 400
-6  17 2 0
-6  18 5 0
-0
-
-0101000
--20 0 +30 0 *
-Ed
- 1e-07 1 1 0
-1  10 0 0 400
-2  19 2 0 0 400
-2  20 3 0 0 400
-6  19 2 0
-6  20 3 0
-0
-
-0101000
--21 0 +31 0 *
-Wi
-
-0101000
--11 0 -19 0 +10 0 +29 0 *
-Fa
-0  1e-07 2 0
-2  2
-0111000
-+9 0 *
-Ed
- 1e-07 1 1 0
-1  11 0 0 400
-2  21 4 0 0 400
-2  22 5 0 0 400
-6  21 4 0
-6  22 5 0
-0
-
-0101000
--16 0 +26 0 *
-Ed
- 1e-07 1 1 0
-1  12 0 0 400
-2  23 4 0 0 400
-2  24 3 0 0 400
-6  23 4 0
-6  24 3 0
-0
-
-0101000
--18 0 +28 0 *
-Wi
-
-0101000
--7 0 -15 0 +6 0 +25 0 *
-Fa
-0  1e-07 4 0
-2  4
-0111000
-+5 0 *
-Wi
-
-0101000
--24 0 -7 0 +14 0 +11 0 *
-Fa
-0  1e-07 5 0
-2  5
-0111000
-+3 0 *
-Co
-
-1100000
--22 1 +12 1 -8 1 +4 1 -2 1 *
-
-+1 0 
-0
-