0028066: Samples - mfc ocaf sample could not read/save any document without environme...

Persistence libs are loaded using DefineFormat() in OCAF sample

diff --git a/samples/mfc/standard/06_Ocaf/CMakeLists.txt b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
index eb2c5001acbdc2b0bfa0d539d5aec539be895c2e..8186e5042975f338ad99c5e70e97895bcf90ea6a 100644 (file)
--- a/samples/mfc/standard/06_Ocaf/CMakeLists.txt
+++ b/samples/mfc/standard/06_Ocaf/CMakeLists.txt
@@ -67,4 +67,4 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Ocaf_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (Ocaf mfcsample TKLCAF TKVCAF TKBO)
+target_link_libraries (Ocaf mfcsample TKLCAF TKVCAF TKBO TKBin TKXml)

diff --git a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
index 940c21a3ddf7d6ac85294d92a0a5ec89a7030109..ff43d3c36ede08febff69200510916bfed77c738 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
@@ -13,6 +13,9 @@
 #include "direct.h"
 #include <OSD_Environment.hxx>
 
+#include <BinDrivers.hxx>
+#include <XmlDrivers.hxx>
+
 /////////////////////////////////////////////////////////////////////////////
 // COcafApp
 
@@ -39,6 +42,10 @@ COcafApp::COcafApp() : OCC_App()
   SampleName = "OCAF"; //for about dialog
   SetSamplePath (L"..\\..\\06_Ocaf");
 
+  // load persistence
+  BinDrivers::DefineFormat (myApp);
+  XmlDrivers::DefineFormat (myApp);
+
   try
   {
     UnitsAPI::SetLocalSystem(UnitsAPI_MDTV);

diff --git a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.cxx b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.cxx
index 8ad4f831b2796770ec38fe2ad99ae19bbc820b5a..26da43527d15388cae09b94b578299c156e61749 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.cxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.cxx
@@ -22,42 +22,16 @@
 
 TOcaf_Application::TOcaf_Application()
 {
-       // Instanciate a TOcafFunction_BoxDriver and add it to the TFunction_DriverTable
-       TFunction_DriverTable::Get()->AddDriver(TOcafFunction_BoxDriver::GetID(), 
-                                                                                       new TOcafFunction_BoxDriver());
-
-       // Instanciate a TOcafFunction_CylDriver and add it to the TFunction_DriverTable
-       TFunction_DriverTable::Get()->AddDriver(TOcafFunction_CylDriver::GetID(),
-                                                                                       new TOcafFunction_CylDriver());
-
-       // Instanciate a TOcafFunction_CutDriver and add it to the TFunction_DriverTable
-       Handle(TOcafFunction_CutDriver) myCutDriver = new TOcafFunction_CutDriver();
-       TFunction_DriverTable::Get()->AddDriver(TOcafFunction_CutDriver::GetID(), 
-                                                                                       new TOcafFunction_CutDriver());
-
-}
-
-
-//=======================================================================
-//function : Formats
-//purpose  : 
-//=======================================================================
-
-void TOcaf_Application::Formats(TColStd_SequenceOfExtendedString& Formats) 
-{
-  Formats.Append(TCollection_ExtendedString("BinOcaf"));
-  Formats.Append(TCollection_ExtendedString("XmlOcaf"));
+  // Instanciate a TOcafFunction_BoxDriver and add it to the TFunction_DriverTable
+  TFunction_DriverTable::Get()->AddDriver (TOcafFunction_BoxDriver::GetID(),
+                                           new TOcafFunction_BoxDriver());
+
+  // Instanciate a TOcafFunction_Cyl  Driver and add it to the TFunction_DriverTable
+  TFunction_DriverTable::Get()->AddDriver (TOcafFunction_CylDriver::GetID(),
+                                           new TOcafFunction_CylDriver());
+
+  // Instanciate a TOcafFunction_CutDriver and add it to the TFunction_DriverTable
+  Handle(TOcafFunction_CutDriver) myCutDriver = new TOcafFunction_CutDriver();
+  TFunction_DriverTable::Get()->AddDriver (TOcafFunction_CutDriver::GetID(),
+                                           new TOcafFunction_CutDriver());
 }
-
-
-//=======================================================================
-//function : ResourcesName
-//purpose  : 
-//=======================================================================
-
-Standard_CString TOcaf_Application::ResourcesName() 
-{
-  return Standard_CString ("Standard");
-}
-
-

diff --git a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx
index 34eefd436e3d5d0b6381b98b3d50fb782a5f9f36..2efd45809bb10963c2bfa067135ab14d5e2a7efa 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.hxx
@@ -33,12 +33,6 @@ public:
  // Methods PUBLIC
  // 
 Standard_EXPORT TOcaf_Application();
-Standard_EXPORT virtual  void Formats(TColStd_SequenceOfExtendedString& Formats) ;
-Standard_EXPORT   Standard_CString ResourcesName() ;
-Standard_EXPORT ~TOcaf_Application();
-
-
-
 
  // Type management
  //

diff --git a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.ixx b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.ixx
index 95609794c1d99da713ebe972fd336ac585a1e6e7..5fec9994d93d6062d52e6a451e6ed249eb5e13a1 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.ixx
+++ b/samples/mfc/standard/06_Ocaf/src/TOcaf_Application.ixx
@@ -18,8 +18,6 @@
 #include <Standard_TypeMismatch.hxx>
 #endif
 
-TOcaf_Application::~TOcaf_Application() {}
-
 // DownCast method
 //   allow safe downcasting
 //