From 2915f0b590ccce22b70f370ef8bbd0a0e5378527 Mon Sep 17 00:00:00 2001 From: abv Date: Tue, 8 Nov 2016 07:22:06 +0300 Subject: [PATCH] 0028066: Samples - mfc ocaf sample could not read/save any document without environment variables Persistence libs are loaded using DefineFormat() in OCAF sample --- samples/mfc/standard/06_Ocaf/CMakeLists.txt | 2 +- samples/mfc/standard/06_Ocaf/src/OcafApp.cpp | 7 +++ .../06_Ocaf/src/TOcaf_Application.cxx | 46 ++++--------------- .../06_Ocaf/src/TOcaf_Application.hxx | 6 --- .../06_Ocaf/src/TOcaf_Application.ixx | 2 - 5 files changed, 18 insertions(+), 45 deletions(-) diff --git a/samples/mfc/standard/06_Ocaf/CMakeLists.txt b/samples/mfc/standard/06_Ocaf/CMakeLists.txt index eb2c5001ac..8186e50429 100644 --- 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 940c21a3dd..ff43d3c36e 100755 --- 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 +#include +#include + ///////////////////////////////////////////////////////////////////////////// // 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 8ad4f831b2..26da43527d 100755 --- 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_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()); + // 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 : Formats -//purpose : -//======================================================================= - -void TOcaf_Application::Formats(TColStd_SequenceOfExtendedString& Formats) -{ - Formats.Append(TCollection_ExtendedString("BinOcaf")); - Formats.Append(TCollection_ExtendedString("XmlOcaf")); -} - - -//======================================================================= -//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 34eefd436e..2efd45809b 100755 --- 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 95609794c1..5fec9994d9 100755 --- 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 #endif -TOcaf_Application::~TOcaf_Application() {} - // DownCast method // allow safe downcasting //