From f47afe531d1f3892837a0ed8eec90298245d8f9f Mon Sep 17 00:00:00 2001 From: szy Date: Tue, 1 Dec 2015 18:26:55 +0300 Subject: [PATCH] 0026290: It is neccessary to separate visualization part from TKCAF - Package TPrsStd is moved into new toolkit TKVCAF. This is the only toolkit in OCAF that depends on visualization libraries. - All persistent data stored in TPrsStd_AISPresentation attribute are moved to new attribute TDataXtd_Presentation, which is maintained automatically on the same label as TPrsStd_AISPresentation. All parameters used by TPrsStd_AISPresentation are stored in corresponding TDataXtd_Presentation attribute. - TPrsStd_AISPresentation is not stored in file any more; when OCAF document is loaded from a file, these attributes are created at all labels where TDataXtd_Presentation attribute is located, by TPrsStd_AISViewer::New(). - File src/StdResources/MigrationSheet.txt necessary for reading files written by previous versions of OCCT (lost in one of previous integrations) is restored and updated as necessary to handle this change (defines replacement of TPrsStd_AISPresentation by TDataXtd_Presentation). Environment variable CSF_MIGRATION_TYPES should be defined, pointing to this file. - Packages BinMPrsStd and XmlMPrsStd are removed; their drivers are moved into BinMDataXtd and XmlMDataXtd respectively. - Version numbers of BinOCAF and XmlOCAF formats are increased, new files cannot be read by previous versions of OCCT - New tests added - Adding new TKVCAF toolkit in sample projects - Restore IsDisplayed(false) in TPrsStd_AISPresentation::Erase() --- adm/MODULES | 4 +- adm/UDLIST | 3 +- dox/dev_guides/upgrade/upgrade.md | 10 + .../01_Geometry/adm/win/vc10/Geometry.vcxproj | 8 +- .../01_Geometry/adm/win/vc11/Geometry.vcxproj | 8 +- .../01_Geometry/adm/win/vc12/Geometry.vcxproj | 8 +- .../01_Geometry/adm/win/vc8/Geometry.vcproj | 8 +- .../01_Geometry/adm/win/vc9/Geometry.vcproj | 8 +- .../02_Modeling/adm/win/vc10/Modeling.vcxproj | 8 +- .../02_Modeling/adm/win/vc11/Modeling.vcxproj | 8 +- .../02_Modeling/adm/win/vc12/Modeling.vcxproj | 8 +- .../02_Modeling/adm/win/vc8/Modeling.vcproj | 8 +- .../02_Modeling/adm/win/vc9/Modeling.vcproj | 8 +- .../03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj | 8 +- .../03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj | 8 +- .../03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj | 8 +- .../03_Viewer2d/adm/win/vc8/Viewer2d.vcproj | 8 +- .../03_Viewer2d/adm/win/vc9/Viewer2d.vcproj | 8 +- .../04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj | 8 +- .../04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj | 8 +- .../04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj | 8 +- .../04_Viewer3d/adm/win/vc8/Viewer3d.vcproj | 8 +- .../04_Viewer3d/adm/win/vc9/Viewer3d.vcproj | 8 +- .../adm/win/vc10/ImportExport.vcxproj | 8 +- .../adm/win/vc11/ImportExport.vcxproj | 8 +- .../adm/win/vc12/ImportExport.vcxproj | 8 +- .../adm/win/vc8/ImportExport.vcproj | 8 +- .../adm/win/vc9/ImportExport.vcproj | 8 +- .../06_Ocaf/adm/win/vc10/Ocaf.vcxproj | 8 +- .../06_Ocaf/adm/win/vc11/Ocaf.vcxproj | 8 +- .../06_Ocaf/adm/win/vc12/Ocaf.vcxproj | 8 +- .../standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj | 8 +- .../standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj | 8 +- .../adm/win/vc10/Triangulation.vcxproj | 8 +- .../adm/win/vc11/Triangulation.vcxproj | 8 +- .../adm/win/vc12/Triangulation.vcxproj | 8 +- .../adm/win/vc8/Triangulation.vcproj | 8 +- .../adm/win/vc9/Triangulation.vcproj | 8 +- .../standard/08_HLR/adm/win/vc10/HLR.vcxproj | 8 +- .../standard/08_HLR/adm/win/vc11/HLR.vcxproj | 8 +- .../standard/08_HLR/adm/win/vc12/HLR.vcxproj | 8 +- .../standard/08_HLR/adm/win/vc8/HLR.vcproj | 8 +- .../standard/08_HLR/adm/win/vc9/HLR.vcproj | 8 +- .../adm/win/vc10/Animation.vcxproj | 8 +- .../adm/win/vc11/Animation.vcxproj | 8 +- .../adm/win/vc12/Animation.vcxproj | 8 +- .../09_Animation/adm/win/vc8/Animation.vcproj | 8 +- .../09_Animation/adm/win/vc9/Animation.vcproj | 8 +- .../10_Convert/adm/win/vc10/Convert.vcxproj | 8 +- .../10_Convert/adm/win/vc11/Convert.vcxproj | 8 +- .../10_Convert/adm/win/vc12/Convert.vcxproj | 8 +- .../10_Convert/adm/win/vc8/Convert.vcproj | 8 +- .../10_Convert/adm/win/vc9/Convert.vcproj | 8 +- .../mfcsample/adm/win/vc10/mfcsample.vcxproj | 8 +- .../mfcsample/adm/win/vc11/mfcsample.vcxproj | 8 +- .../mfcsample/adm/win/vc12/mfcsample.vcxproj | 8 +- .../mfcsample/adm/win/vc8/mfcsample.vcproj | 8 +- .../mfcsample/adm/win/vc9/mfcsample.vcproj | 8 +- src/BinDrivers/BinDrivers.cxx | 2 - src/BinLDrivers/BinLDrivers.cxx | 4 +- .../BinLDrivers_DocumentRetrievalDriver.cxx | 2 +- src/BinMDataXtd/BinMDataXtd.cxx | 4 + .../BinMDataXtd_PositionDriver.cxx} | 18 +- .../BinMDataXtd_PositionDriver.hxx} | 20 +- .../BinMDataXtd_PresentationDriver.cxx | 159 +++ .../BinMDataXtd_PresentationDriver.hxx} | 23 +- src/BinMDataXtd/FILES | 4 + src/BinMPrsStd/BinMPrsStd.cxx | 32 - src/BinMPrsStd/BinMPrsStd.hxx | 65 - .../BinMPrsStd_AISPresentationDriver.cxx | 139 --- src/BinMPrsStd/FILES | 6 - .../DPrsStd_AISPresentationCommands.cxx | 19 +- src/OS/ApplicationFramework.tcl | 1 + src/OSD/OSD_File.cxx | 19 - src/QABugs/QABugs_3.cxx | 5 +- src/StdResource/FILES | 1 + src/StdResource/MigrationSheet.txt | 12 + src/TDataXtd/FILES | 2 + src/TDataXtd/TDataXtd_Presentation.cxx | 587 +++++++++ src/TDataXtd/TDataXtd_Presentation.hxx | 160 +++ src/TKBin/CMakeLists.txt | 2 +- src/TKBin/EXTERNLIB | 1 - src/TKBin/PACKAGES | 1 - src/TKCAF/EXTERNLIB | 2 - src/TKCAF/PACKAGES | 1 - src/TKDCAF/EXTERNLIB | 1 + src/TKQADraw/EXTERNLIB | 1 + src/TKVCAF/CMakeLists.txt | 3 + src/TKVCAF/EXTERNLIB | 13 + src/TKVCAF/FILES | 2 + src/TKVCAF/PACKAGES | 1 + src/TKXCAF/EXTERNLIB | 1 + src/TKXDEDRAW/EXTERNLIB | 1 + src/TKXml/EXTERNLIB | 1 - src/TKXml/PACKAGES | 1 - src/TPrsStd/GUID.txt | 2 +- src/TPrsStd/TPrsStd_AISPresentation.cxx | 1093 +++++++++-------- src/TPrsStd/TPrsStd_AISPresentation.hxx | 40 +- src/TPrsStd/TPrsStd_AISViewer.cxx | 25 + src/XmlDrivers/XmlDrivers.cxx | 2 - src/XmlLDrivers/XmlLDrivers.cxx | 2 +- src/XmlMDataXtd/FILES | 4 + src/XmlMDataXtd/XmlMDataXtd.cxx | 22 +- .../XmlMDataXtd_PositionDriver.cxx} | 17 +- .../XmlMDataXtd_PositionDriver.hxx} | 29 +- .../XmlMDataXtd_PresentationDriver.cxx} | 50 +- .../XmlMDataXtd_PresentationDriver.hxx} | 28 +- src/XmlMPrsStd/FILES | 6 - src/XmlMPrsStd/XmlMPrsStd.cxx | 32 - src/XmlMPrsStd/XmlMPrsStd.hxx | 65 - tests/bugs/caf/bug26290_compatibility | 27 + tests/bugs/caf/bug26290_newattribute_1 | 47 + tests/bugs/caf/bug26290_newattribute_2 | 72 ++ 113 files changed, 2051 insertions(+), 1285 deletions(-) rename src/{BinMPrsStd/BinMPrsStd_PositionDriver.cxx => BinMDataXtd/BinMDataXtd_PositionDriver.cxx} (85%) rename src/{BinMPrsStd/BinMPrsStd_PositionDriver.hxx => BinMDataXtd/BinMDataXtd_PositionDriver.hxx} (74%) create mode 100644 src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx rename src/{BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx => BinMDataXtd/BinMDataXtd_PresentationDriver.hxx} (71%) delete mode 100644 src/BinMPrsStd/BinMPrsStd.cxx delete mode 100644 src/BinMPrsStd/BinMPrsStd.hxx delete mode 100644 src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx delete mode 100644 src/BinMPrsStd/FILES create mode 100644 src/StdResource/MigrationSheet.txt create mode 100644 src/TDataXtd/TDataXtd_Presentation.cxx create mode 100644 src/TDataXtd/TDataXtd_Presentation.hxx create mode 100644 src/TKVCAF/CMakeLists.txt create mode 100644 src/TKVCAF/EXTERNLIB create mode 100644 src/TKVCAF/FILES create mode 100644 src/TKVCAF/PACKAGES rename src/{XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx => XmlMDataXtd/XmlMDataXtd_PositionDriver.cxx} (90%) rename src/{XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx => XmlMDataXtd/XmlMDataXtd_PositionDriver.hxx} (72%) rename src/{XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx => XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx} (80%) rename src/{XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx => XmlMDataXtd/XmlMDataXtd_PresentationDriver.hxx} (70%) delete mode 100644 src/XmlMPrsStd/FILES delete mode 100644 src/XmlMPrsStd/XmlMPrsStd.cxx delete mode 100644 src/XmlMPrsStd/XmlMPrsStd.hxx create mode 100644 tests/bugs/caf/bug26290_compatibility create mode 100644 tests/bugs/caf/bug26290_newattribute_1 create mode 100644 tests/bugs/caf/bug26290_newattribute_2 diff --git a/adm/MODULES b/adm/MODULES index 67bd30b551..f9f9327ef4 100644 --- a/adm/MODULES +++ b/adm/MODULES @@ -2,6 +2,6 @@ FoundationClasses TKernel TKMath ModelingData TKG2d TKG3d TKGeomBase TKBRep ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost -ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml FWOSPlugin TKTObj TKBinTObj TKXmlTObj +ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml FWOSPlugin TKTObj TKBinTObj TKXmlTObj TKVCAF DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF -Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE \ No newline at end of file +Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE diff --git a/adm/UDLIST b/adm/UDLIST index 027f83c73d..585f68d306 100644 --- a/adm/UDLIST +++ b/adm/UDLIST @@ -237,7 +237,6 @@ n BinMDataXtd n BinMDocStd n BinMFunction n BinMNaming -n BinMPrsStd n BinObjMgt n BinTools n CDF @@ -260,7 +259,6 @@ n XmlMDataXtd n XmlMDocStd n XmlMFunction n XmlMNaming -n XmlMPrsStd n XmlObjMgt r StdResource r XmlOcafResource @@ -432,3 +430,4 @@ t TKIVtk n IVtkDraw t TKIVtkDraw n Geom2dEvaluator +t TKVCAF diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md index 518c3f199a..795679e54a 100644 --- a/dox/dev_guides/upgrade/upgrade.md +++ b/dox/dev_guides/upgrade/upgrade.md @@ -568,3 +568,13 @@ Conception of Local Context has been deprecated. Related classes (AIS_LocalContext) and methods (AIS_InteractiveContext::OpenLocalContext() and others) will be removed within some future OCCT release. The main functionality provided by Local Context - selection of object subparts - can be now used within Neutral Point without opening any Local Context. + +@subsection upgrade_occt700_separate_caf_visualisation Separation of visualization part from TKCAF + +Visualization CAF attributes moved into new toolkit TKVCAF. +If your application uses the classes from TPrsStd package then add link to TKVCAF library. + +Verson numbers of BinOCAF and XmlOCAF formats are incremented; new files cannot be read by previous versions of OCCT. + +For loading OCAF files saved by previous versions and containing attribute TPrsStd_AISPresentation it is necessary that environment variable CSF_MIGRATION_TYPES should be defined, pointing to file src/StdResources/MigrationSheet.txt. +When using documents loaded from a file, make sure to call method TPrsStd_AISViewer::New() prior to accessing TPrsStd_AISPresentation attributes in this document (that method will create them). diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj index dff201bc84..1476dab4c5 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj @@ -112,7 +112,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Geometry.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -155,7 +155,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Geometry.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -198,7 +198,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Geometry.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc10\bind/Geometry.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj index e0bb4f8c2e..22d8ce182c 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Geometry.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -159,7 +159,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Geometry.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Geometry.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc11\bind/Geometry.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj index 996256ad2d..e0e3794ab7 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Geometry.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -159,7 +159,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Geometry.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Geometry.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies) ../../../..\win64\vc12\bind/Geometry.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj index 10d426b0a5..f949bf385b 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Modeling.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -153,7 +153,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Modeling.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) @@ -196,7 +196,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Modeling.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -238,7 +238,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Modeling.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj index 7c6c81e665..7c80e6a5ec 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Modeling.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Modeling.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Modeling.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Modeling.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj index ca9816ca0a..b6720303fb 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Modeling.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Modeling.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Modeling.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Modeling.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj index 6feed04b4b..2e82cb23f7 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -80,7 +80,7 @@ /> 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Viewer2d.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Viewer2d.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Viewer2d.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Viewer2d.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj index 6848982bc7..82d76c3e0f 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Viewer2d.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Viewer2d.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Viewer2d.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Viewer2d.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj index 8dae73f12c..ce3268aeb3 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Viewer2d.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Viewer2d.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Viewer2d.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Viewer2d.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj index e4b0706e45..e8ee6c42fc 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Viewer3d.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Viewer3d.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -196,7 +196,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Viewer3d.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -239,7 +239,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Viewer3d.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj index 67ad3aa235..7f8d79b84d 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Viewer3d.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Viewer3d.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Viewer3d.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Viewer3d.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj index be79f86e73..0236ff3ef8 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Viewer3d.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Viewer3d.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Viewer3d.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Viewer3d.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj index 122042b6fd..470534b3e0 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/ImportExport.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/ImportExport.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/ImportExport.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/ImportExport.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj index 8582ad4df6..b3d617a841 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/ImportExport.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/ImportExport.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/ImportExport.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/ImportExport.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj index 15d403ea14..715b18c990 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/ImportExport.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/ImportExport.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/ImportExport.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/ImportExport.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj index cb50ffd9ac..fc45493a65 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Ocaf.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Ocaf.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Ocaf.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Ocaf.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj index d590d83559..25411e599e 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Ocaf.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Ocaf.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Ocaf.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Ocaf.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj index 78b8895d73..7b3af0f900 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Ocaf.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Ocaf.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Ocaf.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Ocaf.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj index b89eda0d8d..3cb7255326 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Triangulation.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Triangulation.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Triangulation.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Triangulation.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj index 573065f2bb..b1654cae1b 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Triangulation.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Triangulation.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Triangulation.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Triangulation.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj index 358260e04f..934b2bfb1f 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Triangulation.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Triangulation.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Triangulation.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Triangulation.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj index bc0ab91cb4..8b41ddf9bf 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/HLR.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/HLR.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -195,7 +195,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/HLR.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -237,7 +237,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/HLR.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj index 240b7d4ca8..726953d2e5 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/HLR.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/HLR.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/HLR.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/HLR.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj index 71347b3d47..8aad934058 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -116,7 +116,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/HLR.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/HLR.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -199,7 +199,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/HLR.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -241,7 +241,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/HLR.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj index b23cc58990..11b94acd4b 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Animation.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -153,7 +153,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Animation.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) @@ -196,7 +196,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Animation.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -239,7 +239,7 @@ true - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Animation.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj index ff89f798f1..ad18f7ae1e 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Animation.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Animation.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Animation.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ true - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Animation.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj index 997842ed67..d592c276b7 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Animation.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Animation.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) @@ -200,7 +200,7 @@ 0x0409 - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Animation.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -243,7 +243,7 @@ true - TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) + TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Animation.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj index e82f0efba5..93fd6b5ce9 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -80,7 +80,7 @@ /> 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Convert.exe true ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Convert.exe true ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Convert.exe true ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Convert.exe true ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj index 201a8a82f4..68a933fa85 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -117,7 +117,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Convert.exe true ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -162,7 +162,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Convert.exe true ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) @@ -206,7 +206,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Convert.exe true ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -250,7 +250,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Convert.exe true ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj index 54760da764..a4acb4379d 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -117,7 +117,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Convert.exe true ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -162,7 +162,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Convert.exe true ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) @@ -206,7 +206,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Convert.exe true ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -250,7 +250,7 @@ 0x0409 - FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) + TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Convert.exe true ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj index c528f3a366..3a4a3f9889 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -81,7 +81,7 @@ /> 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/mfcsample.dll true $(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) @@ -154,7 +154,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/mfcsample.dll true $(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) @@ -198,7 +198,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/mfcsample.dll true $(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) @@ -242,7 +242,7 @@ $(IntDir)%(Filename).res - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/mfcsample.dll true $(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 612269f89e..2d7010728b 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/mfcsample.dll true $(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/mfcsample.dll true $(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/mfcsample.dll true $(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ $(IntDir)%(Filename).res - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/mfcsample.dll true $(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index bb56cb124f..7f3a815ef7 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -115,7 +115,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/mfcsample.dll true $(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) @@ -158,7 +158,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/mfcsample.dll true $(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) @@ -202,7 +202,7 @@ 0x0409 - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/mfcsample.dll true $(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) @@ -246,7 +246,7 @@ $(IntDir)%(Filename).res - TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) + TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/mfcsample.dll true $(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 38d91c43cb..067df07bec 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -80,7 +80,7 @@ /> #include #include -#include #include #include #include @@ -83,7 +82,6 @@ Handle(BinMDF_ADriverTable) BinDrivers::AttributeDrivers BinMNaming ::AddDrivers (aTable, aMsgDrv); BinMDocStd ::AddDrivers (aTable, aMsgDrv); BinMFunction ::AddDrivers (aTable, aMsgDrv); - BinMPrsStd ::AddDrivers (aTable, aMsgDrv); return aTable; } diff --git a/src/BinLDrivers/BinLDrivers.cxx b/src/BinLDrivers/BinLDrivers.cxx index 29b9dc588e..6b597ac465 100644 --- a/src/BinLDrivers/BinLDrivers.cxx +++ b/src/BinLDrivers/BinLDrivers.cxx @@ -32,7 +32,7 @@ //#include static Standard_GUID BinLStorageDriver ("13a56835-8269-11d5-aab2-0050044b1af1"); static Standard_GUID BinLRetrievalDriver("13a56836-8269-11d5-aab2-0050044b1af1"); -#define CURRENT_DOCUMENT_VERSION 7 +#define CURRENT_DOCUMENT_VERSION 8 //======================================================================= //function : Factory @@ -80,8 +80,6 @@ Handle(BinMDF_ADriverTable) BinLDrivers::AttributeDrivers BinMFunction ::AddDrivers (aTable, aMsgDrv); BinMDocStd ::AddDrivers (aTable, aMsgDrv); -// BinMNaming ::AddDrivers (aTable, aMsgDrv); -// BinMPrsStd ::AddDrivers (aTable, aMsgDrv); return aTable; } diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx index 5a0338ab14..87bcb5f47c 100644 --- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx +++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx @@ -161,7 +161,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read else if (aStr == END_TYPES) break; else if (begin) { - if(aFileVer < 5) { + if ( aFileVer < 8 ) { #ifdef DATATYPE_MIGRATION TCollection_AsciiString newName; if(Storage_Schema::CheckTypeMigration(aStr, newName)) { diff --git a/src/BinMDataXtd/BinMDataXtd.cxx b/src/BinMDataXtd/BinMDataXtd.cxx index 54fc994ba4..c4c187131b 100644 --- a/src/BinMDataXtd/BinMDataXtd.cxx +++ b/src/BinMDataXtd/BinMDataXtd.cxx @@ -26,6 +26,8 @@ #include #include #include +#include +#include static Standard_Integer myDocumentVersion = -1; //======================================================================= @@ -45,6 +47,8 @@ void BinMDataXtd::AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, theDriverTable->AddDriver (new BinMDataXtd_PlaneDriver (theMsgDriver) ); theDriverTable->AddDriver (new BinMDataXtd_PlacementDriver (theMsgDriver) ); + theDriverTable->AddDriver (new BinMDataXtd_PresentationDriver(theMsgDriver) ); + theDriverTable->AddDriver (new BinMDataXtd_PositionDriver (theMsgDriver) ); } //======================================================================= diff --git a/src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx similarity index 85% rename from src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx rename to src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx index 0bc90570df..2a4491a8c0 100644 --- a/src/BinMPrsStd/BinMPrsStd_PositionDriver.cxx +++ b/src/BinMDataXtd/BinMDataXtd_PositionDriver.cxx @@ -15,23 +15,23 @@ // modified 13.04.2009 Sergey ZARITCHNY -#include -#include -#include +#include + #include #include #include #include +#include -IMPLEMENT_STANDARD_RTTIEXT(BinMPrsStd_PositionDriver,BinMDF_ADriver) +IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PositionDriver,BinMDF_ADriver) //======================================================================= //function : BinMDataStd_PositionDriver //purpose : Constructor //======================================================================= -BinMPrsStd_PositionDriver::BinMPrsStd_PositionDriver +BinMDataXtd_PositionDriver::BinMDataXtd_PositionDriver (const Handle(CDM_MessageDriver)& theMsgDriver) - : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Position)->Name()) +: BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TDataXtd_Position)->Name()) { } @@ -40,7 +40,7 @@ BinMPrsStd_PositionDriver::BinMPrsStd_PositionDriver //purpose : //======================================================================= -Handle(TDF_Attribute) BinMPrsStd_PositionDriver::NewEmpty() const +Handle(TDF_Attribute) BinMDataXtd_PositionDriver::NewEmpty() const { return new TDataXtd_Position(); } @@ -50,7 +50,7 @@ Handle(TDF_Attribute) BinMPrsStd_PositionDriver::NewEmpty() const //purpose : persistent -> transient (retrieve) //======================================================================= -Standard_Boolean BinMPrsStd_PositionDriver::Paste +Standard_Boolean BinMDataXtd_PositionDriver::Paste (const BinObjMgt_Persistent& theSource, const Handle(TDF_Attribute)& theTarget, BinObjMgt_RRelocationTable& ) const @@ -80,7 +80,7 @@ Standard_Boolean BinMPrsStd_PositionDriver::Paste //purpose : transient -> persistent (store) //======================================================================= -void BinMPrsStd_PositionDriver::Paste (const Handle(TDF_Attribute)& theSource, +void BinMDataXtd_PositionDriver::Paste (const Handle(TDF_Attribute)& theSource, BinObjMgt_Persistent& theTarget, BinObjMgt_SRelocationTable& ) const { diff --git a/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PositionDriver.hxx similarity index 74% rename from src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx rename to src/BinMDataXtd/BinMDataXtd_PositionDriver.hxx index 0d0df88bfe..b747858fb4 100644 --- a/src/BinMPrsStd/BinMPrsStd_PositionDriver.hxx +++ b/src/BinMDataXtd/BinMDataXtd_PositionDriver.hxx @@ -1,4 +1,4 @@ -// Created on: 2004-05-17 +// Created on: 2004-05-13 // Created by: Sergey ZARITCHNY // Copyright (c) 2004-2014 OPEN CASCADE SAS // @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _BinMPrsStd_PositionDriver_HeaderFile -#define _BinMPrsStd_PositionDriver_HeaderFile +#ifndef _BinMDataXtd_PositionDriver_HeaderFile +#define _BinMDataXtd_PositionDriver_HeaderFile #include #include @@ -28,17 +28,17 @@ class TDF_Attribute; class BinObjMgt_Persistent; -class BinMPrsStd_PositionDriver; -DEFINE_STANDARD_HANDLE(BinMPrsStd_PositionDriver, BinMDF_ADriver) +class BinMDataXtd_PositionDriver; +DEFINE_STANDARD_HANDLE(BinMDataXtd_PositionDriver, BinMDF_ADriver) //! Position Attribute Driver. -class BinMPrsStd_PositionDriver : public BinMDF_ADriver +class BinMDataXtd_PositionDriver : public BinMDF_ADriver { public: - Standard_EXPORT BinMPrsStd_PositionDriver(const Handle(CDM_MessageDriver)& theMessageDriver); + Standard_EXPORT BinMDataXtd_PositionDriver(const Handle(CDM_MessageDriver)& theMessageDriver); Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; @@ -49,14 +49,14 @@ public: - DEFINE_STANDARD_RTTIEXT(BinMPrsStd_PositionDriver,BinMDF_ADriver) + DEFINE_STANDARD_RTTIEXT(BinMDataXtd_PositionDriver, BinMDF_ADriver) protected: -private: +private: @@ -69,4 +69,4 @@ private: -#endif // _BinMPrsStd_PositionDriver_HeaderFile +#endif diff --git a/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx new file mode 100644 index 0000000000..feab732ef8 --- /dev/null +++ b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.cxx @@ -0,0 +1,159 @@ +// Created on: 2004-05-17 +// Created by: Sergey ZARITCHNY +// Copyright (c) 2004-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#include + +#include +#include +#include + +IMPLEMENT_STANDARD_RTTIEXT(BinMDataXtd_PresentationDriver,BinMDF_ADriver) + + //======================================================================= +//function : BinMDataStd_AISPresentationDriver +//purpose : Constructor +//======================================================================= +BinMDataXtd_PresentationDriver::BinMDataXtd_PresentationDriver + (const Handle(CDM_MessageDriver)& theMsgDriver) +: BinMDF_ADriver(theMsgDriver, STANDARD_TYPE(TDataXtd_Presentation)->Name()) +{ +} + +//======================================================================= +//function : NewEmpty +//purpose : +//======================================================================= + +Handle(TDF_Attribute) BinMDataXtd_PresentationDriver::NewEmpty() const +{ + return new TDataXtd_Presentation(); +} + +//======================================================================= +//function : Paste +//purpose : persistent -> transient (retrieve) +//======================================================================= + +Standard_Boolean BinMDataXtd_PresentationDriver::Paste + (const BinObjMgt_Persistent& theSource, + const Handle(TDF_Attribute)& theTarget, + BinObjMgt_RRelocationTable& /*theRT*/) const +{ + Standard_Boolean ok = Standard_False; + Handle(TDataXtd_Presentation) anAttribute = Handle(TDataXtd_Presentation)::DownCast(theTarget); + + // Display status + Standard_Integer aValue; + ok = theSource >> aValue; + if (!ok) return ok; + anAttribute->SetDisplayed(static_cast(aValue)); + + // GUID + Standard_GUID aGUID; + ok = theSource >> aGUID; + if (!ok) return ok; + anAttribute->SetDriverGUID(aGUID); + + // Color + ok = theSource >> aValue; + if (!ok) return ok; + if ( aValue != -1 ) + anAttribute->SetColor((Quantity_NameOfColor)aValue); + else + anAttribute->UnsetColor(); + + // Material + ok = theSource >> aValue; + if ( !ok ) return ok; + if (aValue != -1) + anAttribute->SetMaterialIndex(aValue); + else + anAttribute->UnsetMaterial(); + + // Transparency + Standard_Real aRValue; + ok = theSource >> aRValue; + if ( !ok ) return ok; + if ( aRValue != -1. ) + anAttribute->SetTransparency(aRValue); + else + anAttribute->UnsetTransparency(); + + // Width + ok = theSource >> aRValue; + if ( !ok ) return ok; + if ( aRValue != -1. ) + anAttribute->SetWidth(aRValue); + else + anAttribute->UnsetWidth(); + + // Mode + ok = theSource >> aValue; + if ( !ok ) return ok; + if ( aValue != -1 ) + anAttribute->SetMode(aValue); + else + anAttribute->UnsetMode(); + + return ok; +} + +//======================================================================= +//function : Paste +//purpose : transient -> persistent (store) +//======================================================================= + +void BinMDataXtd_PresentationDriver::Paste(const Handle(TDF_Attribute)& theSource, + BinObjMgt_Persistent& theTarget, + BinObjMgt_SRelocationTable& /*theSRT*/) const +{ + Handle(TDataXtd_Presentation) anAttribute = Handle(TDataXtd_Presentation)::DownCast(theSource); + + // Display status + theTarget.PutBoolean(anAttribute->IsDisplayed()); + + // GUID + theTarget.PutGUID(anAttribute->GetDriverGUID()); + + // Color + if (anAttribute->HasOwnColor()) + theTarget.PutInteger(anAttribute->Color()); + else + theTarget.PutInteger(-1); + + // Material + if (anAttribute->HasOwnMaterial()) + theTarget.PutInteger(anAttribute->MaterialIndex()); + else + theTarget.PutInteger(-1); + + // Transparency + if (anAttribute->HasOwnTransparency()) + theTarget.PutReal(anAttribute->Transparency()); + else + theTarget.PutReal(-1.); + + // Width + if (anAttribute->HasOwnWidth()) + theTarget.PutReal(anAttribute->Width()); + else + theTarget.PutReal(-1.); + + // Mode + if (anAttribute->HasOwnMode()) + theTarget.PutInteger(anAttribute->Mode()); + else + theTarget.PutInteger(-1); +} diff --git a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.hxx similarity index 71% rename from src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx rename to src/BinMDataXtd/BinMDataXtd_PresentationDriver.hxx index e9541906a2..206bdc952e 100644 --- a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.hxx +++ b/src/BinMDataXtd/BinMDataXtd_PresentationDriver.hxx @@ -1,4 +1,4 @@ -// Created on: 2004-05-17 +// Created on: 2004-05-13 // Created by: Sergey ZARITCHNY // Copyright (c) 2004-2014 OPEN CASCADE SAS // @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _BinMPrsStd_AISPresentationDriver_HeaderFile -#define _BinMPrsStd_AISPresentationDriver_HeaderFile +#ifndef _BinMDataXtd_PresentationDriver_HeaderFile +#define _BinMDataXtd_PresentationDriver_HeaderFile #include #include @@ -28,17 +28,18 @@ class TDF_Attribute; class BinObjMgt_Persistent; -class BinMPrsStd_AISPresentationDriver; -DEFINE_STANDARD_HANDLE(BinMPrsStd_AISPresentationDriver, BinMDF_ADriver) +class BinMDataXtd_PresentationDriver; +DEFINE_STANDARD_HANDLE(BinMDataXtd_PresentationDriver, BinMDF_ADriver) -//! AISPresentation Attribute Driver. -class BinMPrsStd_AISPresentationDriver : public BinMDF_ADriver + +//! Presentation Attribute Driver. +class BinMDataXtd_PresentationDriver : public BinMDF_ADriver { public: - Standard_EXPORT BinMPrsStd_AISPresentationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); + Standard_EXPORT BinMDataXtd_PresentationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; @@ -49,14 +50,14 @@ public: - DEFINE_STANDARD_RTTIEXT(BinMPrsStd_AISPresentationDriver,BinMDF_ADriver) + DEFINE_STANDARD_RTTIEXT(BinMDataXtd_PresentationDriver, BinMDF_ADriver) protected: -private: +private: @@ -69,4 +70,4 @@ private: -#endif // _BinMPrsStd_AISPresentationDriver_HeaderFile +#endif diff --git a/src/BinMDataXtd/FILES b/src/BinMDataXtd/FILES index 10cebb8e7a..57782cd0f9 100644 --- a/src/BinMDataXtd/FILES +++ b/src/BinMDataXtd/FILES @@ -16,3 +16,7 @@ BinMDataXtd_PointDriver.cxx BinMDataXtd_PointDriver.hxx BinMDataXtd_ShapeDriver.cxx BinMDataXtd_ShapeDriver.hxx +BinMDataXtd_PresentationDriver.hxx +BinMDataXtd_PresentationDriver.cxx +BinMDataXtd_PositionDriver.hxx +BinMDataXtd_PositionDriver.cxx diff --git a/src/BinMPrsStd/BinMPrsStd.cxx b/src/BinMPrsStd/BinMPrsStd.cxx deleted file mode 100644 index 76f9a00ee9..0000000000 --- a/src/BinMPrsStd/BinMPrsStd.cxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2004-05-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - - -#include -#include -#include -#include -#include - -//======================================================================= -//function : AddDrivers -//purpose : -//======================================================================= -void BinMPrsStd::AddDrivers (const Handle(BinMDF_ADriverTable)& aDriverTable, - const Handle(CDM_MessageDriver)& aMessageDriver) -{ - aDriverTable->AddDriver (new BinMPrsStd_AISPresentationDriver(aMessageDriver)); - aDriverTable->AddDriver (new BinMPrsStd_PositionDriver(aMessageDriver)); -} diff --git a/src/BinMPrsStd/BinMPrsStd.hxx b/src/BinMPrsStd/BinMPrsStd.hxx deleted file mode 100644 index fb683363a1..0000000000 --- a/src/BinMPrsStd/BinMPrsStd.hxx +++ /dev/null @@ -1,65 +0,0 @@ -// Created on: 2004-05-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _BinMPrsStd_HeaderFile -#define _BinMPrsStd_HeaderFile - -#include -#include -#include - -class BinMDF_ADriverTable; -class CDM_MessageDriver; -class BinMPrsStd_AISPresentationDriver; -class BinMPrsStd_PositionDriver; - - - -class BinMPrsStd -{ -public: - - DEFINE_STANDARD_ALLOC - - - //! Adds the attribute storage-retrieval driver to . - Standard_EXPORT static void AddDrivers (const Handle(BinMDF_ADriverTable)& theDriverTable, const Handle(CDM_MessageDriver)& theMessageDriver); - - - - -protected: - - - - - -private: - - - - -friend class BinMPrsStd_AISPresentationDriver; -friend class BinMPrsStd_PositionDriver; - -}; - - - - - - - -#endif // _BinMPrsStd_HeaderFile diff --git a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx deleted file mode 100644 index 168588c89b..0000000000 --- a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cxx +++ /dev/null @@ -1,139 +0,0 @@ -// Created on: 2004-05-17 -// Created by: Sergey ZARITCHNY -// Copyright (c) 2004-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - - -#include -#include -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(BinMPrsStd_AISPresentationDriver,BinMDF_ADriver) - -//======================================================================= -//function : BinMDataStd_AISPresentationDriver -//purpose : Constructor -//======================================================================= -BinMPrsStd_AISPresentationDriver::BinMPrsStd_AISPresentationDriver - (const Handle(CDM_MessageDriver)& theMsgDriver) - : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TPrsStd_AISPresentation)->Name()) -{ -} - -//======================================================================= -//function : NewEmpty -//purpose : -//======================================================================= - -Handle(TDF_Attribute) BinMPrsStd_AISPresentationDriver::NewEmpty() const -{ - return new TPrsStd_AISPresentation(); -} - -//======================================================================= -//function : Paste -//purpose : persistent -> transient (retrieve) -//======================================================================= - -Standard_Boolean BinMPrsStd_AISPresentationDriver::Paste - (const BinObjMgt_Persistent& theSource, - const Handle(TDF_Attribute)& theTarget, - BinObjMgt_RRelocationTable& ) const -{ - Handle(TPrsStd_AISPresentation) anAtt = Handle(TPrsStd_AISPresentation)::DownCast(theTarget); - Standard_Integer aValue; -//Display status - Standard_Boolean ok = theSource >> aValue; - if (!ok) return ok; - anAtt->SetDisplayed((Standard_Boolean)aValue); - -//GUID - Standard_GUID aGUID; - ok = theSource >> aGUID; - if (!ok) return ok; - anAtt->SetDriverGUID(aGUID); - -//Color - ok = theSource >> aValue; - if (!ok) return ok; - if(aValue != -1) anAtt->SetColor( (Quantity_NameOfColor)(aValue) ); - else anAtt->UnsetColor(); - -//Material - ok = theSource >> aValue; - if (!ok) return ok; - if(aValue != -1) anAtt->SetMaterial( (Graphic3d_NameOfMaterial)(aValue) ); - else anAtt->UnsetMaterial(); - -//Transparency - Standard_Real aRValue; - ok = theSource >> aRValue; - if (!ok) return ok; - if(aRValue != -1.) anAtt->SetTransparency(aRValue); - else anAtt->UnsetTransparency(); - -//Width - ok = theSource >> aRValue; - if (!ok) return ok; - if(aRValue != -1.) anAtt->SetWidth( aRValue ); - else anAtt->UnsetWidth(); - -//Mode - ok = theSource >> aValue; - if (!ok) return ok; - if(aValue != -1) anAtt->SetMode(aValue); - else anAtt->UnsetMode(); - - return ok; -} - -//======================================================================= -//function : Paste -//purpose : transient -> persistent (store) -//======================================================================= - -void BinMPrsStd_AISPresentationDriver::Paste (const Handle(TDF_Attribute)& theSource, - BinObjMgt_Persistent& theTarget, - BinObjMgt_SRelocationTable& ) const -{ - Handle(TPrsStd_AISPresentation) anAtt = Handle(TPrsStd_AISPresentation)::DownCast(theSource); -//1 - theTarget.PutBoolean(anAtt->IsDisplayed());//Bool -//2 - theTarget.PutGUID(anAtt->GetDriverGUID());//GUID -//3 - if(anAtt->HasOwnColor()) - theTarget.PutInteger((Standard_Integer)anAtt->Color());//Color - else theTarget.PutInteger(-1); -//4 - if(anAtt->HasOwnMaterial()) - theTarget.PutInteger((Standard_Integer)anAtt->Material()); - else theTarget.PutInteger(-1); -//5 - if(anAtt->HasOwnTransparency()) - theTarget.PutReal(anAtt->Transparency()); //Real - else theTarget.PutReal(-1.); -//6 - if(anAtt->HasOwnWidth()) - theTarget.PutReal(anAtt->Width());// Real - else theTarget.PutReal(-1.); -//7 - if(anAtt->HasOwnMode()) - theTarget.PutInteger(anAtt->Mode()); //Int - else theTarget.PutInteger(-1); -} diff --git a/src/BinMPrsStd/FILES b/src/BinMPrsStd/FILES deleted file mode 100644 index 0b21d6f35e..0000000000 --- a/src/BinMPrsStd/FILES +++ /dev/null @@ -1,6 +0,0 @@ -BinMPrsStd.cxx -BinMPrsStd.hxx -BinMPrsStd_AISPresentationDriver.cxx -BinMPrsStd_AISPresentationDriver.hxx -BinMPrsStd_PositionDriver.cxx -BinMPrsStd_PositionDriver.hxx diff --git a/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx b/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx index ebd6a605d3..51fce65e51 100644 --- a/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx +++ b/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx @@ -63,24 +63,17 @@ static Standard_Integer DPrsStd_AISDisplay (Draw_Interpretor&, Standard_Integer nb, const char** arg) -{ - +{ Handle(TDocStd_Document) D; if (!DDocStd::GetDocument(arg[1],D)) return 1; TDF_Label L; if (!DDF::FindLabel(D->GetData(),arg[2],L)) return 1; Handle(TPrsStd_AISPresentation) prs; - if(!L.FindAttribute( TPrsStd_AISPresentation::GetID(), prs) ) return 1; - if (nb == 3) { - prs->Display(Standard_True); - TPrsStd_AISViewer::Update(L); - return 0; - } - else { - prs->Display(); - TPrsStd_AISViewer::Update(L); - return 0; - } + if(!L.FindAttribute( TPrsStd_AISPresentation::GetID(), prs) ) + return 1; + prs->Display(nb == 3); + TPrsStd_AISViewer::Update(L); + return 0; } //======================================================================= diff --git a/src/OS/ApplicationFramework.tcl b/src/OS/ApplicationFramework.tcl index 622df211cf..1a72892b67 100644 --- a/src/OS/ApplicationFramework.tcl +++ b/src/OS/ApplicationFramework.tcl @@ -18,6 +18,7 @@ proc ApplicationFramework:toolkits { } { return [list \ TKCDF \ TKLCAF \ + TKVCAF \ TKCAF \ TKBinL \ TKXmlL \ diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx index 0e6fdc5f50..1630c1ce3a 100644 --- a/src/OSD/OSD_File.cxx +++ b/src/OSD/OSD_File.cxx @@ -1451,25 +1451,6 @@ OSD_KindFile OSD_File :: KindOfFile () const { } // end OSD_File :: KindOfFile -#ifdef VAC - char tmpbuf [MAX_PATH]; - if (GetTempPath (MAX_PATH, tmpbuf) == 0) - { - perror ("ERROR in GetTempPath"); - exit (10); - } - char tmpbuf2 [MAX_PATH]; - if (GetTempFileName (tmpbuf, NULL, 0, tmpbuf2) == 0) - { - perror ("ERROR in GetTempFileName"); - exit (10); - } - TCollection_AsciiString fileName ( tmpbuf2 ); -#else - TCollection_AsciiString fileName ( _ttmpnam ( NULL ) ); -#endif - - //-------------------------------------------------debutpri???980424 typedef struct _osd_wnt_key { diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx index d2c53f518d..9101db347a 100644 --- a/src/QABugs/QABugs_3.cxx +++ b/src/QABugs/QABugs_3.cxx @@ -1590,9 +1590,8 @@ static int BUC60910(Draw_Interpretor& di, Standard_Integer argc, const char ** a TDF_Label L; DDF::AddLabel(aDF, "0:2", L); - Handle(TPrsStd_AISPresentation) AISP = new TPrsStd_AISPresentation; - - AISP->Set(L,TDataXtd_Constraint::GetID()); + Handle(TPrsStd_AISPresentation) AISP = + TPrsStd_AISPresentation::Set(L,TDataXtd_Constraint::GetID()); if (AISP->HasOwnMode()) {di<<3;return 0;} AISP->SetMode(3); diff --git a/src/StdResource/FILES b/src/StdResource/FILES index ae028a63a4..abde0859d1 100755 --- a/src/StdResource/FILES +++ b/src/StdResource/FILES @@ -2,4 +2,5 @@ appresource:::Standard appresource:::StandardLite appresource:::TObj appresource:::XCAF +appresource:::MigrationSheet.txt loginfile:::Plugin diff --git a/src/StdResource/MigrationSheet.txt b/src/StdResource/MigrationSheet.txt new file mode 100644 index 0000000000..bb963ee94d --- /dev/null +++ b/src/StdResource/MigrationSheet.txt @@ -0,0 +1,12 @@ +TDataStd_Shape TDataXtd_Shape +TDataStd_Constraint TDataXtd_Constraint +TDataStd_Geometry TDataXtd_Geometry +TDataStd_Axis TDataXtd_Axis +TDataStd_Point TDataXtd_Point +TDataStd_Plane TDataXtd_Plane +TDataStd_Position TDataXtd_Position +TDataStd_Placement TDataXtd_Placement +TDataStd_PatternStd TDataXtd_PatternStd +TPrsStd_AISPresentation TDataXtd_Presentation + + diff --git a/src/TDataXtd/FILES b/src/TDataXtd/FILES index 1791966878..1c2ca6c769 100644 --- a/src/TDataXtd/FILES +++ b/src/TDataXtd/FILES @@ -23,5 +23,7 @@ TDataXtd_Point.cxx TDataXtd_Point.hxx TDataXtd_Position.cxx TDataXtd_Position.hxx +TDataXtd_Presentation.hxx +TDataXtd_Presentation.cxx TDataXtd_Shape.cxx TDataXtd_Shape.hxx diff --git a/src/TDataXtd/TDataXtd_Presentation.cxx b/src/TDataXtd/TDataXtd_Presentation.cxx new file mode 100644 index 0000000000..53d3d9fea6 --- /dev/null +++ b/src/TDataXtd/TDataXtd_Presentation.cxx @@ -0,0 +1,587 @@ +// Created on: 2015-04-20 +// Created by: Alexander Zaikin +// Copyright (c) 1998-1999 Matra Datavision +// Copyright (c) 1999-2015 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#include + +#include +#include +#include +#include +#include + +IMPLEMENT_STANDARD_RTTIEXT(TDataXtd_Presentation,TDF_Attribute) + +//======================================================================= +//function : TDataXtd_Presentation +//purpose : Default constructor. +//======================================================================= +TDataXtd_Presentation::TDataXtd_Presentation() +: myDriverGUID ("00000000-0000-0000-0000-000000000000"), + myColor (Quantity_NOC_WHITE), + myMaterialIndex (0), + myMode (0), + mySelectionMode (0), + myTransparency (0.0), + myWidth (0.0), + myIsDisplayed (Standard_False), + myHasOwnColor (Standard_False), + myHasOwnMaterial (Standard_False), + myHasOwnTransparency (Standard_False), + myHasOwnWidth (Standard_False), + myHasOwnMode (Standard_False), + myHasOwnSelectionMode (Standard_False) +{} + + +//======================================================================= +//function : Set +//purpose : +//======================================================================= +Handle(TDataXtd_Presentation) TDataXtd_Presentation::Set (const TDF_Label& theLabel, + const Standard_GUID& theDriverId) +{ + Handle(TDataXtd_Presentation) aPresentation; + + if ( !theLabel.FindAttribute(TDataXtd_Presentation::GetID(), aPresentation) ) + { + aPresentation = new TDataXtd_Presentation(); + theLabel.AddAttribute(aPresentation); + } + + aPresentation->SetDriverGUID(theDriverId); + return aPresentation; +} + +//======================================================================= +//function : Unset +//purpose : +//======================================================================= +void TDataXtd_Presentation::Unset(const TDF_Label& theLabel) +{ + Handle(TDataXtd_Presentation) aPresentation; + if (theLabel.FindAttribute(TDataXtd_Presentation::GetID(), aPresentation)) + theLabel.ForgetAttribute(aPresentation); +} + + +//======================================================================= +//function : GetID +//purpose : +//======================================================================= +const Standard_GUID& TDataXtd_Presentation::GetID() +{ + static Standard_GUID TDataXtd_PresentationID("04fb4d00-5690-11d1-8940-080009dc3333"); + return TDataXtd_PresentationID; +} + + +//======================================================================= +//function : ID +//purpose : +//======================================================================= +const Standard_GUID& TDataXtd_Presentation::ID() const +{ + return GetID(); +} + + +//======================================================================= +//function :GetDriverGUID +//purpose : +//======================================================================= +Standard_GUID TDataXtd_Presentation::GetDriverGUID() const +{ + return myDriverGUID; +} + + +//======================================================================= +//function :SetDriverGUID +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetDriverGUID(const Standard_GUID& theGUID) +{ + if ( myDriverGUID != theGUID ) + { + Backup(); + myDriverGUID = theGUID; + } +} + + +//======================================================================= +//function : IsDisplayed +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::IsDisplayed() const +{ + return myIsDisplayed; +} + + +//======================================================================= +//function : HasOwnMaterial +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::HasOwnMaterial() const +{ + return myHasOwnMaterial; +} + + +//======================================================================= +//function : HasOwnTransparency +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::HasOwnTransparency() const +{ + return myHasOwnTransparency; +} + + +//======================================================================= +//function : HasOwnColor +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::HasOwnColor() const +{ + return myHasOwnColor; +} + + +//======================================================================= +//function : HasOwnWidth +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::HasOwnWidth() const +{ + return myHasOwnWidth; +} + + +//======================================================================= +//function : HasOwnMode +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::HasOwnMode() const +{ + return myHasOwnMode; +} + + +//======================================================================= +//function : HasOwnSelectionMode +//purpose : +//======================================================================= +Standard_Boolean TDataXtd_Presentation::HasOwnSelectionMode() const +{ + return myHasOwnSelectionMode; +} + + +//======================================================================= +//function : SetDisplayed +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetDisplayed(const Standard_Boolean theIsDisplayed) +{ + if (myIsDisplayed != theIsDisplayed) + { + Backup(); + myIsDisplayed = theIsDisplayed; + } +} + + +//======================================================================= +//function : SetMaterialIndex +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetMaterialIndex(const Standard_Integer theMaterialIndex) +{ + if (! myHasOwnMaterial || myMaterialIndex != theMaterialIndex) + { + Backup(); + myMaterialIndex = theMaterialIndex; + myHasOwnMaterial = Standard_True; + } +} + + +//======================================================================= +//function : SetTransparency +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetTransparency(const Standard_Real theValue) +{ + if (! myHasOwnTransparency || myTransparency != theValue) + { + Backup(); + myTransparency = theValue; + myHasOwnTransparency = Standard_True; + } +} + + +//======================================================================= +//function : SetColor +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetColor(const Quantity_NameOfColor theColor) +{ + if (! myHasOwnColor || myColor != theColor) + { + Backup(); + myColor = theColor; + myHasOwnColor = Standard_True; + } +} + + +//======================================================================= +//function : SetWidth +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetWidth(const Standard_Real theWidth) +{ + if (! myHasOwnWidth || myWidth != theWidth) + { + Backup(); + myWidth = theWidth; + myHasOwnWidth = Standard_True; + } +} + + +//======================================================================= +//function : SetMode +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetMode(const Standard_Integer theMode) +{ + if (! myHasOwnMode || myMode != theMode) + { + Backup(); + myMode = theMode; + myHasOwnMode = Standard_True; + } +} + + +//======================================================================= +//function : SetSelectionMode +//purpose : +//======================================================================= +void TDataXtd_Presentation::SetSelectionMode(const Standard_Integer theSelectionMode) +{ + if (! myHasOwnSelectionMode || mySelectionMode != theSelectionMode) + { + Backup(); + mySelectionMode = theSelectionMode; + myHasOwnSelectionMode = Standard_True; + } +} + + +//======================================================================= +//function : MaterialIndex +//purpose : +//======================================================================= +Standard_Integer TDataXtd_Presentation::MaterialIndex() const +{ + return myMaterialIndex; +} + + +//======================================================================= +//function : Transparency +//purpose : +//======================================================================= +Standard_Real TDataXtd_Presentation::Transparency() const +{ + return myTransparency; +} + + +//======================================================================= +//function : Color +//purpose : +//======================================================================= +Quantity_NameOfColor TDataXtd_Presentation::Color() const +{ + return myColor; +} + + +//======================================================================= +//function : Width +//purpose : +//======================================================================= +Standard_Real TDataXtd_Presentation::Width() const +{ + return myWidth; +} + + +//======================================================================= +//function : Mode +//purpose : +//======================================================================= +Standard_Integer TDataXtd_Presentation::Mode() const +{ + return myMode; +} + + +//======================================================================= +//function : SelectionMode +//purpose : +//======================================================================= +Standard_Integer TDataXtd_Presentation::SelectionMode() const +{ + return mySelectionMode; +} + + +//======================================================================= +//function : UnsetMaterial +//purpose : +//======================================================================= +void TDataXtd_Presentation::UnsetMaterial() +{ + if (myHasOwnMaterial) + { + Backup(); + myHasOwnMaterial = Standard_False; + } +} + + +//======================================================================= +//function : UnsetTransparency +//purpose : +//======================================================================= +void TDataXtd_Presentation::UnsetTransparency() +{ + if (myHasOwnTransparency) + { + Backup(); + myHasOwnTransparency = Standard_False; + } +} + + +//======================================================================= +//function : UnsetColor +//purpose : +//======================================================================= +void TDataXtd_Presentation::UnsetColor() +{ + if (myHasOwnColor) + { + Backup(); + myHasOwnColor = Standard_False; + } +} + + +//======================================================================= +//function : UnsetWidth +//purpose : +//======================================================================= +void TDataXtd_Presentation::UnsetWidth() +{ + if (myHasOwnWidth) + { + Backup(); + myHasOwnWidth = Standard_False; + } +} + + +//======================================================================= +//function : UnsetMode +//purpose : +//======================================================================= +void TDataXtd_Presentation::UnsetMode() +{ + if (myHasOwnMode) + { + Backup(); + myHasOwnMode = Standard_False; + } +} + + +//======================================================================= +//function : UnsetSelectionMode +//purpose : +//======================================================================= +void TDataXtd_Presentation::UnsetSelectionMode() +{ + if (myHasOwnSelectionMode) + { + Backup(); + myHasOwnSelectionMode = Standard_False; + } +} + + +//======================================================================= +//function : BackupCopy +//purpose : +//======================================================================= +Handle(TDF_Attribute) TDataXtd_Presentation::BackupCopy() const +{ + Handle(TDataXtd_Presentation) aCopy = new TDataXtd_Presentation; + + aCopy->myIsDisplayed = myIsDisplayed; + aCopy->myDriverGUID = myDriverGUID; + aCopy->mySelectionMode = mySelectionMode; + aCopy->myTransparency = myTransparency; + aCopy->myColor = myColor; + aCopy->myMode = myMode; + aCopy->myWidth = myWidth; + aCopy->myMaterialIndex = myMaterialIndex; + + aCopy->myHasOwnColor = myHasOwnColor; + aCopy->myHasOwnMaterial = myHasOwnMaterial; + aCopy->myHasOwnWidth = myHasOwnWidth; + aCopy->myHasOwnMode = myHasOwnMode; + aCopy->myHasOwnTransparency = myHasOwnTransparency; + aCopy->myHasOwnSelectionMode = myHasOwnSelectionMode; + + return aCopy; +} + + +//======================================================================= +//function : NewEmpty +//purpose : +//======================================================================= +Handle(TDF_Attribute) TDataXtd_Presentation::NewEmpty() const +{ + return new TDataXtd_Presentation(); +} + + +//======================================================================= +//function : Restore +//purpose : +//======================================================================= +void TDataXtd_Presentation::Restore(const Handle(TDF_Attribute)& theAttribute) +{ + Handle(TDataXtd_Presentation) aPresentation = + Handle(TDataXtd_Presentation)::DownCast(theAttribute); + + myHasOwnMaterial = aPresentation->HasOwnMaterial(); + myMaterialIndex = aPresentation->MaterialIndex(); + + myHasOwnColor = aPresentation->HasOwnColor(); + myColor = aPresentation->Color(); + + myHasOwnWidth = aPresentation->HasOwnWidth(); + myWidth = aPresentation->Width(); + + myHasOwnMode = aPresentation->HasOwnMode(); + myMode = aPresentation->Mode(); + + myHasOwnSelectionMode = aPresentation->HasOwnSelectionMode(); + mySelectionMode = aPresentation->SelectionMode(); + + myHasOwnTransparency = aPresentation->HasOwnTransparency(); + myTransparency = aPresentation->Transparency(); + + myIsDisplayed = aPresentation->IsDisplayed(); + myDriverGUID = aPresentation->GetDriverGUID(); +} + + +//======================================================================= +//function : Paste +//purpose : +//======================================================================= +void TDataXtd_Presentation::Paste(const Handle(TDF_Attribute)& theInto, + const Handle(TDF_RelocationTable)&) const +{ + Handle(TDataXtd_Presentation) anInto = + Handle(TDataXtd_Presentation)::DownCast(theInto); + + anInto->Backup(); + + if (myHasOwnMaterial) + { + anInto->myMaterialIndex = myMaterialIndex; + anInto->myHasOwnMaterial = Standard_True; + } + else + { + anInto->myHasOwnMaterial = Standard_False; + } + + if (myHasOwnColor) + { + anInto->myColor = myColor; + anInto->myHasOwnColor = Standard_True; + } + else + { + anInto->myHasOwnColor = Standard_False; + } + + if(myHasOwnWidth) + { + anInto->myWidth = myWidth; + anInto->myHasOwnWidth = Standard_True; + } + else + { + anInto->myHasOwnWidth = Standard_False; + } + + if (myHasOwnMode) + { + anInto->myMode = myMode; + anInto->myHasOwnMode = Standard_True; + } + else + { + anInto->myHasOwnMode = Standard_False; + } + + if (myHasOwnSelectionMode) + { + anInto->mySelectionMode = mySelectionMode; + anInto->myHasOwnSelectionMode = Standard_True; + } + else + { + anInto->myHasOwnSelectionMode = Standard_False; + } + + if (myHasOwnTransparency) + { + anInto->myTransparency = myTransparency; + anInto->myHasOwnTransparency = Standard_True; + } + else + { + anInto->myHasOwnTransparency = Standard_False; + } + + anInto->myIsDisplayed = myIsDisplayed; + anInto->myDriverGUID = myDriverGUID; +} diff --git a/src/TDataXtd/TDataXtd_Presentation.hxx b/src/TDataXtd/TDataXtd_Presentation.hxx new file mode 100644 index 0000000000..e92dc574ca --- /dev/null +++ b/src/TDataXtd/TDataXtd_Presentation.hxx @@ -0,0 +1,160 @@ +// Created on: 2009-04-06 +// Created by: Sergey ZARITCHNY +// Copyright (c) 2009-2014 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _TDataXtd_Presentation_HeaderFile +#define _TDataXtd_Presentation_HeaderFile + +#include +#include +#include + +#include +#include +#include + +class TDF_Label; +class gp_Pnt; +class Standard_GUID; +class TDF_Attribute; +class TDF_RelocationTable; + + +class TDataXtd_Presentation; +DEFINE_STANDARD_HANDLE(TDataXtd_Presentation, TDF_Attribute) + +//! Attribute containing parameters of presentation of the shape, +//! e.g. the shape attached to the same label and displayed using +//! TPrsStd tools (see TPrsStd_AISPresentation). +class TDataXtd_Presentation : public TDF_Attribute +{ +public: + //!@name Attribute mechanics + + //! Empty constructor + Standard_EXPORT TDataXtd_Presentation(); + + //! Create if not found the TDataXtd_Presentation attribute and set its driver GUID + Standard_EXPORT static Handle(TDataXtd_Presentation) Set(const TDF_Label& theLabel, const Standard_GUID& theDriverId); + + //! Remove attribute of this type from the label + Standard_EXPORT static void Unset(const TDF_Label& theLabel); + + //! Returns the ID of the attribute. + Standard_EXPORT const Standard_GUID& ID() const Standard_OVERRIDE; + + //! Returns the ID of the attribute. + Standard_EXPORT static const Standard_GUID& GetID(); + + //! Restores the contents from into this + //! one. It is used when aborting a transaction. + Standard_EXPORT virtual void Restore (const Handle(TDF_Attribute)& anAttribute) Standard_OVERRIDE; + + //! Returns an new empty attribute from the good end + //! type. It is used by the copy algorithm. + Standard_EXPORT virtual Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; + + //! This method is different from the "Copy" one, + //! because it is used when copying an attribute from + //! a source structure into a target structure. This + //! method pastes the current attribute to the label + //! corresponding to the insertor. The pasted + //! attribute may be a brand new one or a new version + //! of the previous one. + Standard_EXPORT virtual void Paste (const Handle(TDF_Attribute)& intoAttribute, + const Handle(TDF_RelocationTable)& aRelocTationable) const Standard_OVERRIDE; + + Standard_EXPORT Handle(TDF_Attribute) BackupCopy() const Standard_OVERRIDE; + + DEFINE_STANDARD_RTTIEXT(TDataXtd_Presentation,TDF_Attribute) + +public: + //!@name Access to data + + //! Returns the GUID of the driver managing display of associated AIS object + Standard_EXPORT Standard_GUID GetDriverGUID() const; + + //! Sets the GUID of the driver managing display of associated AIS object + Standard_EXPORT void SetDriverGUID(const Standard_GUID& theGUID); + + Standard_EXPORT Standard_Boolean IsDisplayed() const; + + Standard_EXPORT Standard_Boolean HasOwnMaterial() const; + + Standard_EXPORT Standard_Boolean HasOwnTransparency() const; + + Standard_EXPORT Standard_Boolean HasOwnColor() const; + + Standard_EXPORT Standard_Boolean HasOwnWidth() const; + + Standard_EXPORT Standard_Boolean HasOwnMode() const; + + Standard_EXPORT Standard_Boolean HasOwnSelectionMode() const; + + Standard_EXPORT void SetDisplayed(const Standard_Boolean theIsDisplayed); + + Standard_EXPORT void SetMaterialIndex(const Standard_Integer theMaterialIndex); + + Standard_EXPORT void SetTransparency(const Standard_Real theValue); + + Standard_EXPORT void SetColor(const Quantity_NameOfColor theColor); + + Standard_EXPORT void SetWidth(const Standard_Real theWidth); + + Standard_EXPORT void SetMode(const Standard_Integer theMode); + + Standard_EXPORT void SetSelectionMode(const Standard_Integer theSelectionMode); + + Standard_EXPORT Standard_Integer MaterialIndex() const; + + Standard_EXPORT Standard_Real Transparency() const; + + Standard_EXPORT Quantity_NameOfColor Color() const; + + Standard_EXPORT Standard_Real Width() const; + + Standard_EXPORT Standard_Integer Mode() const; + + Standard_EXPORT Standard_Integer SelectionMode() const; + + Standard_EXPORT void UnsetMaterial(); + + Standard_EXPORT void UnsetTransparency(); + + Standard_EXPORT void UnsetColor(); + + Standard_EXPORT void UnsetWidth(); + + Standard_EXPORT void UnsetMode(); + + Standard_EXPORT void UnsetSelectionMode(); + +private: + Standard_GUID myDriverGUID; + Quantity_NameOfColor myColor; + Standard_Integer myMaterialIndex; + Standard_Integer myMode; + Standard_Integer mySelectionMode; + Standard_Real myTransparency; + Standard_Real myWidth; + Standard_Boolean myIsDisplayed; + Standard_Boolean myHasOwnColor; + Standard_Boolean myHasOwnMaterial; + Standard_Boolean myHasOwnTransparency; + Standard_Boolean myHasOwnWidth; + Standard_Boolean myHasOwnMode; + Standard_Boolean myHasOwnSelectionMode; +}; + +#endif // _TDataXtd_Presentation_HeaderFile diff --git a/src/TKBin/CMakeLists.txt b/src/TKBin/CMakeLists.txt index 9111f3011a..6d1a9f9bcb 100644 --- a/src/TKBin/CMakeLists.txt +++ b/src/TKBin/CMakeLists.txt @@ -1,3 +1,3 @@ project(TKBin) -OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) \ No newline at end of file +OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKBin/EXTERNLIB b/src/TKBin/EXTERNLIB index 27b51d73ab..5f24c3518f 100755 --- a/src/TKBin/EXTERNLIB +++ b/src/TKBin/EXTERNLIB @@ -6,5 +6,4 @@ TKG3d TKCAF TKCDF TKLCAF -TKV3d TKBinL diff --git a/src/TKBin/PACKAGES b/src/TKBin/PACKAGES index 8778d0a0fe..fcd751ccb1 100755 --- a/src/TKBin/PACKAGES +++ b/src/TKBin/PACKAGES @@ -1,4 +1,3 @@ BinDrivers BinMDataXtd -BinMPrsStd BinMNaming diff --git a/src/TKCAF/EXTERNLIB b/src/TKCAF/EXTERNLIB index e1cae0b332..1265220edb 100755 --- a/src/TKCAF/EXTERNLIB +++ b/src/TKCAF/EXTERNLIB @@ -3,10 +3,8 @@ TKGeomBase TKBRep TKTopAlgo TKMath -TKService TKG2d TKG3d TKCDF TKLCAF -TKV3d TKBO diff --git a/src/TKCAF/PACKAGES b/src/TKCAF/PACKAGES index 241a01ff1e..6c5156383f 100755 --- a/src/TKCAF/PACKAGES +++ b/src/TKCAF/PACKAGES @@ -1,4 +1,3 @@ TDataXtd TNaming -TPrsStd AppStd diff --git a/src/TKDCAF/EXTERNLIB b/src/TKDCAF/EXTERNLIB index 9e47b4e21c..4e73baabbc 100755 --- a/src/TKDCAF/EXTERNLIB +++ b/src/TKDCAF/EXTERNLIB @@ -16,4 +16,5 @@ TKPrim TKBool TKBO TKCAF +TKVCAF TKViewerTest diff --git a/src/TKQADraw/EXTERNLIB b/src/TKQADraw/EXTERNLIB index 122b92fca4..29172c3e32 100755 --- a/src/TKQADraw/EXTERNLIB +++ b/src/TKQADraw/EXTERNLIB @@ -22,6 +22,7 @@ TKShHealing TKOffset TKFeat TKCAF +TKVCAF TKIGES TKXSBase TKMesh diff --git a/src/TKVCAF/CMakeLists.txt b/src/TKVCAF/CMakeLists.txt new file mode 100644 index 0000000000..4c2f04e077 --- /dev/null +++ b/src/TKVCAF/CMakeLists.txt @@ -0,0 +1,3 @@ +project(TKVCAF) + +OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKVCAF/EXTERNLIB b/src/TKVCAF/EXTERNLIB new file mode 100644 index 0000000000..593952685b --- /dev/null +++ b/src/TKVCAF/EXTERNLIB @@ -0,0 +1,13 @@ +TKernel +TKGeomBase +TKBRep +TKTopAlgo +TKMath +TKService +TKG2d +TKG3d +TKCDF +TKLCAF +TKBO +TKCAF +TKV3d diff --git a/src/TKVCAF/FILES b/src/TKVCAF/FILES new file mode 100644 index 0000000000..ca4f0e567b --- /dev/null +++ b/src/TKVCAF/FILES @@ -0,0 +1,2 @@ +EXTERNLIB +PACKAGES diff --git a/src/TKVCAF/PACKAGES b/src/TKVCAF/PACKAGES new file mode 100644 index 0000000000..7acb218afa --- /dev/null +++ b/src/TKVCAF/PACKAGES @@ -0,0 +1 @@ +TPrsStd diff --git a/src/TKXCAF/EXTERNLIB b/src/TKXCAF/EXTERNLIB index a82c32bc9d..b23eb5c108 100755 --- a/src/TKXCAF/EXTERNLIB +++ b/src/TKXCAF/EXTERNLIB @@ -9,3 +9,4 @@ TKCDF TKLCAF TKG3d TKCAF +TKVCAF diff --git a/src/TKXDEDRAW/EXTERNLIB b/src/TKXDEDRAW/EXTERNLIB index 19941cab28..6ee84b823c 100755 --- a/src/TKXDEDRAW/EXTERNLIB +++ b/src/TKXDEDRAW/EXTERNLIB @@ -9,6 +9,7 @@ TKService TKXSBase TKG2d TKCAF +TKVCAF TKDraw TKTopAlgo TKLCAF diff --git a/src/TKXml/EXTERNLIB b/src/TKXml/EXTERNLIB index 28cccd904f..02c5575dc4 100755 --- a/src/TKXml/EXTERNLIB +++ b/src/TKXml/EXTERNLIB @@ -1,6 +1,5 @@ TKCDF TKernel -TKV3d TKMath TKBRep TKG2d diff --git a/src/TKXml/PACKAGES b/src/TKXml/PACKAGES index aa2c6823df..be38b360a3 100755 --- a/src/TKXml/PACKAGES +++ b/src/TKXml/PACKAGES @@ -1,4 +1,3 @@ XmlDrivers XmlMDataXtd XmlMNaming -XmlMPrsStd diff --git a/src/TPrsStd/GUID.txt b/src/TPrsStd/GUID.txt index fb50befa12..bc9b7e7de1 100755 --- a/src/TPrsStd/GUID.txt +++ b/src/TPrsStd/GUID.txt @@ -1,7 +1,7 @@ 00000000-0000-0000-0000-000000000000 Reserved ffffffff-ffff-ffff-ffff-ffffffffffff Reserved -04fb4d00-5690-11d1-8940-080009dc3333 TPrsStd_AISPresentation +3680ac6c-47ae-4366-bb94-26abb6e07341 TPrsStd_AISPresentation 04fb4d01-5690-11d1-8940-080009dc3333 TPrsStd_ColorAttribute 04fb4d02-5690-11d1-8940-080009dc3333 TPrsStd_TransparencyAttribute 04fb4d04-5690-11d1-8940-080009dc3333 TPrsStd_GraphicAttribute diff --git a/src/TPrsStd/TPrsStd_AISPresentation.cxx b/src/TPrsStd/TPrsStd_AISPresentation.cxx index 465dc52452..6eb16a2a86 100644 --- a/src/TPrsStd/TPrsStd_AISPresentation.cxx +++ b/src/TPrsStd/TPrsStd_AISPresentation.cxx @@ -14,15 +14,12 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -// Lastly modified by : -// +---------------------------------------------------------------------------+ -// ! ivan ! SetMode ! 5-04-2001! 3.0-00-1! -// +---------------------------------------------------------------------------+ #include #include #include -#include +#include +#include #include #include #include @@ -35,109 +32,113 @@ #include #include #include +#include #include #include #include IMPLEMENT_STANDARD_RTTIEXT(TPrsStd_AISPresentation,TDF_Attribute) +#define NO_MORE_OBJECT "TPrsStd_AISPresentation has no associated TDataXtd_PresentationData" + //======================================================================= -//function : Set -//purpose : +//function : TPrsStd_AISPresentation +//purpose : Constructor //======================================================================= -Handle(TPrsStd_AISPresentation) TPrsStd_AISPresentation::Set(const TDF_Label& L,const Standard_GUID& driver) -{ - - Handle(TPrsStd_AISPresentation) P; - - if (!L.FindAttribute(TPrsStd_AISPresentation::GetID(),P)) { - P = new TPrsStd_AISPresentation (); - L.AddAttribute(P); - } - P->SetDriverGUID(driver); - return P; +TPrsStd_AISPresentation::TPrsStd_AISPresentation () +{ } //======================================================================= -//function : Unset +//function : Set //purpose : //======================================================================= -void TPrsStd_AISPresentation::Unset (const TDF_Label& L) -{ - Handle(TPrsStd_AISPresentation) P; - - if (L.FindAttribute(TPrsStd_AISPresentation::GetID(),P)) { - L.ForgetAttribute(P); +Handle(TPrsStd_AISPresentation) TPrsStd_AISPresentation::Set + ( const TDF_Label& theLabel, const Standard_GUID& theDriver ) +{ + Handle(TPrsStd_AISPresentation) aPresentation; + // create associated data (unless already there) + Handle(TDataXtd_Presentation) aData = TDataXtd_Presentation::Set (theLabel, theDriver); + if(aData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( !theLabel.FindAttribute(TPrsStd_AISPresentation::GetID(), aPresentation) ) + { + aPresentation = new TPrsStd_AISPresentation(); + aPresentation->myData = aData; + theLabel.AddAttribute(aPresentation); } -} + return aPresentation; +} //======================================================================= //function : Set //purpose : //======================================================================= -Handle(TPrsStd_AISPresentation) TPrsStd_AISPresentation::Set (const Handle(TDF_Attribute)& master) -{ - Handle(TPrsStd_AISPresentation) P; - - if (!master->Label().FindAttribute(TPrsStd_AISPresentation::GetID(),P)) { - P = new TPrsStd_AISPresentation (); - master->Label().AddAttribute(P); - } - - P->SetDriverGUID( master->ID() ); +Handle(TPrsStd_AISPresentation) TPrsStd_AISPresentation::Set(const Handle(TDF_Attribute)& theMaster) +{ + Handle(TPrsStd_AISPresentation) aPresentation; + // create associated data (unless already there) + Handle(TDataXtd_Presentation) aData = TDataXtd_Presentation::Set (theMaster->Label(), theMaster->ID()); + if(aData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( !theMaster->Label().FindAttribute(TPrsStd_AISPresentation::GetID(), aPresentation) ) + { + aPresentation = new TPrsStd_AISPresentation (); + aPresentation->myData = aData; + theMaster->Label().AddAttribute(aPresentation); + } - return P; + return aPresentation; } +//======================================================================= +//function : Unset +//purpose : +//======================================================================= +void TPrsStd_AISPresentation::Unset (const TDF_Label& theLabel) +{ + Handle(TPrsStd_AISPresentation) aPresentation; + if ( theLabel.FindAttribute(TPrsStd_AISPresentation::GetID(), aPresentation) ) + theLabel.ForgetAttribute(aPresentation); - + // remove associated data + TDataXtd_Presentation::Unset (theLabel); +} //======================================================================= -//function : GetID +//function : getData //purpose : //======================================================================= -const Standard_GUID& TPrsStd_AISPresentation::GetID() +Handle(TDataXtd_Presentation) TPrsStd_AISPresentation::getData () const { - static Standard_GUID TPrsStd_AISPresentationID("04fb4d00-5690-11d1-8940-080009dc3333"); - return TPrsStd_AISPresentationID; + Handle(TDataXtd_Presentation) aData; + Label().FindAttribute(TDataXtd_Presentation::GetID(), aData); + return aData; } - //======================================================================= -//function : TPrsStd_AISPresentation +//function : GetID //purpose : //======================================================================= -TPrsStd_AISPresentation::TPrsStd_AISPresentation () : -myDriverGUID("00000000-0000-0000-0000-000000000000"), -myTransparency(0.), -myColor(Quantity_NOC_WHITE), -myMaterial(Graphic3d_NOM_BRASS), -myWidth(0.), -myMode(0), -mySelectionMode(0), -isDisplayed(Standard_False), -hasOwnColor(Standard_False), -hasOwnMaterial(Standard_False), -hasOwnTransparency(Standard_False), -hasOwnWidth(Standard_False), -hasOwnMode(Standard_False), -hasOwnSelectionMode(Standard_False) -{} +const Standard_GUID& TPrsStd_AISPresentation::GetID() +{ + static Standard_GUID TPrsStd_AISPresentationID("3680ac6c-47ae-4366-bb94-26abb6e07341"); + return TPrsStd_AISPresentationID; +} //======================================================================= //function : Display //purpose : //======================================================================= -void TPrsStd_AISPresentation::Display (const Standard_Boolean update) +void TPrsStd_AISPresentation::Display(const Standard_Boolean theIsUpdate) { - - if( update || myAIS.IsNull() ) { + if ( theIsUpdate || myAIS.IsNull() ) AISUpdate(); - } - AISDisplay(); + + AISDisplay(); } @@ -145,17 +146,21 @@ void TPrsStd_AISPresentation::Display (const Standard_Boolean update) //function : Erase //purpose : //======================================================================= -void TPrsStd_AISPresentation::Erase (const Standard_Boolean remove) -{ - if( isDisplayed ) AISErase(remove); +void TPrsStd_AISPresentation::Erase(const Standard_Boolean theIsRemove) +{ + if ( IsDisplayed() ) + { + AISErase(theIsRemove); + //SetDisplayed (Standard_False); + } } //======================================================================= //function : Update //purpose : //======================================================================= -void TPrsStd_AISPresentation::Update () -{ +void TPrsStd_AISPresentation::Update() +{ AISUpdate(); } @@ -164,23 +169,37 @@ void TPrsStd_AISPresentation::Update () //function : IsDisplayed //purpose : //======================================================================= -Standard_Boolean TPrsStd_AISPresentation::IsDisplayed () const +Standard_Boolean TPrsStd_AISPresentation::IsDisplayed() const { - return isDisplayed; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->IsDisplayed(); } //======================================================================= -//function :SetDriverGUID +//function : SetDisplayed //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetDriverGUID(const Standard_GUID& guid) +void TPrsStd_AISPresentation::SetDisplayed(const Standard_Boolean theIsDisplayed) { - // OCC2932 correction - if(myDriverGUID == guid) return; + // this method can be called by AISUpdate() in the process of removal, + // while data attribute may be already removed + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + myData->SetDisplayed(theIsDisplayed); +} - Backup(); - myDriverGUID = guid; + +//======================================================================= +//function :SetDriverGUID +//purpose : +//======================================================================= +void TPrsStd_AISPresentation::SetDriverGUID(const Standard_GUID& theGUID) +{ + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + myData->SetDriverGUID (theGUID); } @@ -190,7 +209,9 @@ void TPrsStd_AISPresentation::SetDriverGUID(const Standard_GUID& guid) //======================================================================= Standard_GUID TPrsStd_AISPresentation::GetDriverGUID() const { - return myDriverGUID; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->GetDriverGUID(); } @@ -200,7 +221,9 @@ Standard_GUID TPrsStd_AISPresentation::GetDriverGUID() const //======================================================================= Graphic3d_NameOfMaterial TPrsStd_AISPresentation::Material() const { - return myMaterial; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return (Graphic3d_NameOfMaterial)myData->MaterialIndex(); } //======================================================================= @@ -209,201 +232,229 @@ Graphic3d_NameOfMaterial TPrsStd_AISPresentation::Material() const //======================================================================= Standard_Boolean TPrsStd_AISPresentation::HasOwnMaterial() const { - return hasOwnMaterial; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->HasOwnMaterial(); } //======================================================================= -//function :UnsetMaterial +//function : UnsetMaterial //purpose : //======================================================================= void TPrsStd_AISPresentation::UnsetMaterial() { - // OCC2932 correction - if(hasOwnMaterial == Standard_False && !myAIS.IsNull()) { - if(!myAIS->HasMaterial()) - return; - } - - Backup(); - hasOwnMaterial = Standard_False; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() && myAIS->HasMaterial() ) { - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->UnsetMaterial(myAIS, Standard_False); - else + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( ! myData->HasOwnMaterial() && ! myAIS.IsNull() && !myAIS->HasMaterial() ) + return; + + myData->UnsetMaterial(); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() && myAIS->HasMaterial() ) + { + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if ( !aContext.IsNull() ) + aContext->UnsetMaterial(myAIS, Standard_False); + else myAIS->UnsetMaterial(); } } + //======================================================================= -//function :SetMaterial +//function : SetMaterial //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetMaterial(const Graphic3d_NameOfMaterial aName) -{ - // OCC2932 correction - if(myMaterial == aName && hasOwnMaterial == Standard_True && !myAIS.IsNull()) { - if(myAIS->HasMaterial() && myAIS->Material() == aName) - return; - } +void TPrsStd_AISPresentation::SetMaterial(const Graphic3d_NameOfMaterial theName) +{ + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); - Backup(); - myMaterial = aName; - hasOwnMaterial = Standard_True; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() ) { - if( myAIS->HasMaterial() && myAIS->Material() == aName ) return; // AIS has already had that material - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->SetMaterial(myAIS, aName, Standard_False); - else - myAIS->SetMaterial(aName); + if ( myData->HasOwnMode() && myData->MaterialIndex() == theName ) + if ( !myAIS.IsNull() && myAIS->HasMaterial() && myAIS->Material() == theName ) + return; + + myData->SetMaterialIndex(theName); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() ) + { + if ( myAIS->HasMaterial() && myAIS->Material() == theName ) + return; // AIS has already had that material + + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if ( !aContext.IsNull() ) + aContext->SetMaterial(myAIS, theName, Standard_False); + else + myAIS->SetMaterial(theName); } } - //======================================================================= -//function :SetTransparency +//function :Transparency //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetTransparency(const Standard_Real aValue) +Standard_Real TPrsStd_AISPresentation::Transparency() const { - // OCC2932 correction - if(hasOwnTransparency == Standard_True && myTransparency == aValue && !myAIS.IsNull()) - if(myAIS->Transparency() == aValue) - return; - - Backup(); - myTransparency = aValue; - hasOwnTransparency = Standard_True; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() ) { - if( myAIS->Transparency() == aValue ) return; // AIS has already had that transparency - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->SetTransparency(myAIS, aValue, Standard_False); - else - myAIS->SetTransparency(aValue); - } + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->Transparency(); } - //======================================================================= -//function :Transparency +//function :SetTransparency //purpose : //======================================================================= -Standard_Real TPrsStd_AISPresentation::Transparency() const +void TPrsStd_AISPresentation::SetTransparency(const Standard_Real theValue) { - return myTransparency; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if (myData->HasOwnTransparency() && myData->Transparency() == theValue) + if ( !myAIS.IsNull() && myAIS->Transparency() == theValue ) + return; + + myData->SetTransparency(theValue); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() ) + { + if ( myAIS->Transparency() == theValue ) + return; // AIS has already had that transparency + + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if ( !aContext.IsNull() ) + aContext->SetTransparency(myAIS, theValue, Standard_False); + else + myAIS->SetTransparency(theValue); + } } + //======================================================================= //function :UnsetTransparency //purpose : //======================================================================= void TPrsStd_AISPresentation::UnsetTransparency() { - // OCC2932 correction - if(!hasOwnTransparency) + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if (! myData->HasOwnTransparency()) return; - Backup(); - hasOwnTransparency = Standard_False; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() ) { - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->UnsetTransparency(myAIS, Standard_False); - else + myData->UnsetTransparency(); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() ) + { + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if( !aContext.IsNull() ) + aContext->UnsetTransparency(myAIS, Standard_False); + else myAIS->UnsetTransparency(); } } //======================================================================= -//function :HasTransparency +//function : HasTransparency //purpose : //======================================================================= Standard_Boolean TPrsStd_AISPresentation::HasOwnTransparency() const { - return hasOwnTransparency; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->HasOwnTransparency(); } + //======================================================================= -//function :Color +//function : Color //purpose : //======================================================================= Quantity_NameOfColor TPrsStd_AISPresentation::Color() const { - return myColor; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->Color(); } //======================================================================= -//function :HasColor +//function : HasOwnColor //purpose : //======================================================================= Standard_Boolean TPrsStd_AISPresentation::HasOwnColor() const { - return hasOwnColor; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->HasOwnColor(); } //======================================================================= -//function :UnsetColor +//function : UnsetColor //purpose : //======================================================================= void TPrsStd_AISPresentation::UnsetColor() { - // OCC2932 correction - if(!hasOwnColor && !myAIS.IsNull()) - if(!myAIS->HasColor()) - return; - - Backup(); - hasOwnColor = Standard_False; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() && myAIS->HasColor() ) { - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->UnsetColor(myAIS, Standard_False); - else + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if (!myData->HasOwnColor() && ! myAIS.IsNull() && !myAIS->HasColor()) + return; + myData->UnsetColor(); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() && myAIS->HasColor() ) + { + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if ( !aContext.IsNull() ) + aContext->UnsetColor(myAIS, Standard_False); + else myAIS->UnsetColor(); } } //======================================================================= -//function :SetColor +//function : SetColor //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetColor(const Quantity_NameOfColor aColor) +void TPrsStd_AISPresentation::SetColor(const Quantity_NameOfColor theColor) { - // OCC2932 correction - if(hasOwnColor && myColor == aColor && ! myAIS.IsNull()) - if(myAIS->HasColor() && myAIS->Color() == aColor ) + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( myData->HasOwnColor() && myData->Color() == theColor ) + if ( !myAIS.IsNull() && myAIS->HasColor() && myAIS->Color() == theColor ) return; - - Backup(); - myColor = aColor; - hasOwnColor = Standard_True; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() ) { - if( myAIS->HasColor() && myAIS->Color() == aColor ) return; // AIS has already had that color - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->SetColor(myAIS, aColor, Standard_False); + + myData->SetColor(theColor); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() ) + { + if ( myAIS->HasColor() && myAIS->Color() == theColor ) + return; // AIS has already had that color + + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if( !aContext.IsNull() ) + aContext->SetColor(myAIS, theColor, Standard_False); else - myAIS->SetColor(aColor); + myAIS->SetColor(theColor); } } @@ -414,72 +465,79 @@ void TPrsStd_AISPresentation::SetColor(const Quantity_NameOfColor aColor) //======================================================================= Standard_Real TPrsStd_AISPresentation::Width() const { - return myWidth; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->Width(); } //======================================================================= -//function :HasWidth +//function : HasWidth //purpose : //======================================================================= Standard_Boolean TPrsStd_AISPresentation::HasOwnWidth() const { - return hasOwnWidth; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->HasOwnWidth(); } //======================================================================= -//function :SetWidth +//function : SetWidth //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetWidth(const Standard_Real aWidth) +void TPrsStd_AISPresentation::SetWidth(const Standard_Real theWidth) { - // OCC2932 correction - if(hasOwnWidth && myWidth == aWidth && myAIS.IsNull()) - if(myAIS->HasWidth() && myAIS->Width() == aWidth ) + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( myData->HasOwnWidth() && myData->Width() == theWidth ) + if ( !myAIS.IsNull() && myAIS->HasWidth() && myAIS->Width() == theWidth ) return; - Backup(); - myWidth = aWidth; - hasOwnWidth = Standard_True; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() ) { - if( myAIS->HasWidth() && myAIS->Width() == aWidth ) return; // AIS has already had that width - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->SetWidth(myAIS, aWidth, Standard_False); + myData->SetWidth(theWidth); + + if( !myAIS.IsNull() ) + { + if ( myAIS->HasWidth() && myAIS->Width() == theWidth ) + return; // AIS has already had that width + + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if( !aContext.IsNull() ) + aContext->SetWidth(myAIS, theWidth, Standard_False); else - myAIS->SetWidth(aWidth); + myAIS->SetWidth(theWidth); } } //======================================================================= -//function :UnsetWidth +//function : UnsetWidth //purpose : //======================================================================= void TPrsStd_AISPresentation::UnsetWidth() { - // OCC2932 correction - if(!hasOwnWidth && !myAIS.IsNull()) - if(!myAIS->HasWidth()) + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( !myData->HasOwnWidth() ) + if ( !myAIS.IsNull() && !myAIS->HasWidth() ) return; - Backup(); - hasOwnWidth = Standard_False; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() && myAIS->HasWidth() ) { - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->UnsetWidth(myAIS, Standard_False); - else + myData->UnsetWidth(); + + if( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() && myAIS->HasWidth() ) + { + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if ( !aContext.IsNull() ) + aContext->UnsetWidth(myAIS, Standard_False); + else myAIS->UnsetWidth(); } } - //======================================================================= //function : Mode //purpose : @@ -487,69 +545,80 @@ void TPrsStd_AISPresentation::UnsetWidth() Standard_Integer TPrsStd_AISPresentation::Mode() const { - return myMode; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->Mode(); } //======================================================================= -//function :HasOwnMode +//function : HasOwnMode //purpose : //======================================================================= Standard_Boolean TPrsStd_AISPresentation::HasOwnMode() const { - return hasOwnMode; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->HasOwnMode(); } + //======================================================================= -//function :SetMode +//function : SetMode //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetMode(const Standard_Integer theMode) +void TPrsStd_AISPresentation::SetMode(const Standard_Integer theMode) { - // OCC2932 correction - if(hasOwnMode && myMode == theMode && !myAIS.IsNull()) - if(myAIS->DisplayMode() == theMode ) + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( myData->HasOwnMode() && myData->Mode() == theMode ) + if ( !myAIS.IsNull() && myAIS->DisplayMode() == theMode ) return; - Backup(); - myMode = theMode; - hasOwnMode = Standard_True; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() ) { - if( myAIS->DisplayMode() == theMode ) return; // AIS has already had that mode - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) - ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->SetDisplayMode(myAIS, theMode, Standard_False); + myData->SetMode(theMode); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if ( !myAIS.IsNull() ) + { + if ( myAIS->DisplayMode() == theMode ) + return; // AIS has already had that mode + + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if( !aContext.IsNull() ) + aContext->SetDisplayMode(myAIS, theMode, Standard_False); else myAIS->SetDisplayMode(theMode); } } + //======================================================================= -//function :UnsetMode +//function : UnsetMode //purpose : //======================================================================= void TPrsStd_AISPresentation::UnsetMode() { - // OCC2932 correction - if(HasOwnMode() == Standard_False && myAIS.IsNull() == Standard_False) - if(!myAIS->HasDisplayMode()) + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + if ( !myData->HasOwnMode() ) + if ( !myAIS.IsNull() && !myAIS->HasDisplayMode() ) return; - Backup(); - hasOwnMode = Standard_False; - if( myAIS.IsNull() ) AISUpdate(); - if( !myAIS.IsNull() && myAIS->HasDisplayMode() ) { - Handle(AIS_InteractiveContext) ctx; - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) - ctx = viewer->GetInteractiveContext(); - if( !ctx.IsNull() ) - ctx->UnsetDisplayMode(myAIS, Standard_False); - else - myAIS->UnsetDisplayMode(); + myData->UnsetMode(); + + if ( myAIS.IsNull() ) + AISUpdate(); + + if( !myAIS.IsNull() && myAIS->HasDisplayMode() ) + { + Handle(AIS_InteractiveContext) aContext = getAISContext(); + + if ( !aContext.IsNull() ) + aContext->UnsetDisplayMode(myAIS, Standard_False); + else + myAIS->UnsetDisplayMode(); } } @@ -560,55 +629,56 @@ void TPrsStd_AISPresentation::UnsetMode() Standard_Integer TPrsStd_AISPresentation::SelectionMode() const { - return mySelectionMode; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->SelectionMode(); } //======================================================================= -//function :HasOwnSelectionMode +//function : HasOwnSelectionMode //purpose : //======================================================================= Standard_Boolean TPrsStd_AISPresentation::HasOwnSelectionMode() const { - return hasOwnSelectionMode; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + return myData->HasOwnSelectionMode(); } //======================================================================= -//function :SetSelectionMode +//function : SetSelectionMode //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetSelectionMode(const Standard_Integer theSelectionMode) +void TPrsStd_AISPresentation::SetSelectionMode(const Standard_Integer theSelectionMode) { - // OCC2932 correction - if(hasOwnSelectionMode && mySelectionMode == theSelectionMode && !myAIS.IsNull()) - return; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + myData->SetSelectionMode (theSelectionMode); - Backup(); - mySelectionMode = theSelectionMode; - hasOwnSelectionMode = Standard_True; - if( myAIS.IsNull() ) AISUpdate(); + AISUpdate(); } //======================================================================= -//function :UnsetSelectionMode +//function : UnsetSelectionMode //purpose : //======================================================================= void TPrsStd_AISPresentation::UnsetSelectionMode() { - if(!hasOwnSelectionMode && !myAIS.IsNull()) - return; + if(myData.IsNull()) + Standard_NoMoreObject::Raise (NO_MORE_OBJECT); + myData->UnsetSelectionMode (); - Backup(); - hasOwnSelectionMode = Standard_False; - if( myAIS.IsNull() ) AISUpdate(); - mySelectionMode = myAIS->GlobalSelectionMode(); + AISUpdate(); } //======================================================================= //function : ID //purpose : //======================================================================= -const Standard_GUID& TPrsStd_AISPresentation::ID() const { return GetID(); } - +const Standard_GUID& TPrsStd_AISPresentation::ID() const +{ + return GetID(); +} //======================================================================= //function : BackupCopy @@ -616,23 +686,7 @@ const Standard_GUID& TPrsStd_AISPresentation::ID() const { return GetID(); } //======================================================================= Handle(TDF_Attribute) TPrsStd_AISPresentation::BackupCopy() const { - Handle(TPrsStd_AISPresentation) copy = new TPrsStd_AISPresentation; - copy->myTransparency = myTransparency; - copy->myColor = myColor; - copy->myMode= myMode; - copy->myWidth= myWidth; - copy->myMaterial = myMaterial; - copy->hasOwnColor = hasOwnColor; - copy->hasOwnMaterial = hasOwnMaterial; - copy->hasOwnWidth = hasOwnWidth; - copy->hasOwnMode=hasOwnMode; - copy->hasOwnTransparency = hasOwnTransparency; - copy->myAIS.Nullify(); - copy->isDisplayed = isDisplayed; - copy->myDriverGUID = myDriverGUID; - copy->mySelectionMode= mySelectionMode; - copy->hasOwnSelectionMode = hasOwnSelectionMode; - return copy; + return new TPrsStd_AISPresentation; } @@ -642,120 +696,41 @@ Handle(TDF_Attribute) TPrsStd_AISPresentation::BackupCopy() const //======================================================================= Handle(TDF_Attribute) TPrsStd_AISPresentation::NewEmpty() const { - return new TPrsStd_AISPresentation (); + return new TPrsStd_AISPresentation(); } //======================================================================= -//function : Restore +//function : Paste //purpose : //======================================================================= -void TPrsStd_AISPresentation::Restore (const Handle(TDF_Attribute)& With) -{ - Handle(TPrsStd_AISPresentation) with = Handle(TPrsStd_AISPresentation)::DownCast(With); - +void TPrsStd_AISPresentation::Restore(const Handle(TDF_Attribute)& /*theWith*/) +{ myAIS.Nullify(); - - if(!with->HasOwnMaterial()) hasOwnMaterial = Standard_False; - else { - hasOwnMaterial = Standard_True; - } - myMaterial = with->Material(); - - if(!with->HasOwnColor()) hasOwnColor = Standard_False; - else { - hasOwnColor = Standard_True; - } - myColor = with->Color(); - - if(!with->HasOwnWidth()) hasOwnWidth = Standard_False; - else { - hasOwnWidth = Standard_True; - } - myWidth = with->Width(); - - if(!with->HasOwnMode()) hasOwnMode = Standard_False; - else { - hasOwnMode = Standard_True; - } - myMode = with->Mode(); - - if(!with->HasOwnSelectionMode()) hasOwnSelectionMode = Standard_False; - else { - hasOwnSelectionMode = Standard_True; - } - mySelectionMode = with->SelectionMode(); - - if(!with->HasOwnTransparency()) hasOwnTransparency = Standard_False; - else { - hasOwnTransparency = Standard_True; - } - myTransparency = with->Transparency(); - - isDisplayed = with->IsDisplayed(); - myDriverGUID = with->GetDriverGUID(); } + //======================================================================= //function : Paste //purpose : //======================================================================= -void TPrsStd_AISPresentation::Paste (const Handle(TDF_Attribute)& Into, - const Handle(TDF_RelocationTable)& ) const -{ - Handle(TPrsStd_AISPresentation) into = Handle(TPrsStd_AISPresentation)::DownCast(Into); - - into->Backup(); - - if(!hasOwnMaterial) into->hasOwnMaterial = Standard_False; - else { - into->myMaterial = myMaterial; - into->hasOwnMaterial = Standard_True; - } - - if(!hasOwnColor) into->hasOwnColor = Standard_False; - else { - into->myColor = myColor; - into->hasOwnColor = Standard_True; - } - - if(!hasOwnWidth) into->hasOwnWidth = Standard_False; - else { - into->myWidth = myWidth; - into->hasOwnWidth = Standard_True; - } - if(!hasOwnMode) into->hasOwnMode = Standard_False; - else { - into->myMode = myMode; - into->hasOwnMode = Standard_True; - } - - if(!hasOwnSelectionMode) into->hasOwnSelectionMode = Standard_False; - else { - into->mySelectionMode = mySelectionMode; - into->hasOwnSelectionMode = Standard_True; - } - - if(!hasOwnTransparency) into->hasOwnTransparency = Standard_False; - else { - into->myTransparency = myTransparency; - into->hasOwnTransparency = Standard_True; - } - - if (into->isDisplayed) - into->AISErase(Standard_True); - - into->isDisplayed = isDisplayed; - into->myDriverGUID = myDriverGUID; +void TPrsStd_AISPresentation::Paste (const Handle(TDF_Attribute)& theInto, + const Handle(TDF_RelocationTable)& ) const +{ + Handle(TPrsStd_AISPresentation) anInto = + Handle(TPrsStd_AISPresentation)::DownCast(theInto); - into->myAIS.Nullify(); + anInto->Backup(); + anInto->myAIS.Nullify(); + anInto->myData.Nullify(); } + //======================================================================= //function : AfterAddition //purpose : erase if displayed //======================================================================= void TPrsStd_AISPresentation::AfterAddition() -{ +{ AfterResume(); } @@ -764,8 +739,8 @@ void TPrsStd_AISPresentation::AfterAddition() //purpose : erase if displayed //======================================================================= void TPrsStd_AISPresentation::BeforeRemoval() -{ - BeforeForget(); +{ + BeforeForget(); } //======================================================================= @@ -774,9 +749,11 @@ void TPrsStd_AISPresentation::BeforeRemoval() //======================================================================= void TPrsStd_AISPresentation::BeforeForget() { - if( !myAIS.IsNull() ) { - AISErase(Standard_True); //Remove AISObject from context + if ( !myAIS.IsNull() ) + { // Remove AISObject from context. + AISErase(Standard_True); myAIS.Nullify(); + myData.Nullify(); } } @@ -785,11 +762,14 @@ void TPrsStd_AISPresentation::BeforeForget() //function : AfterResume //purpose : display if displayed //======================================================================= -void TPrsStd_AISPresentation::AfterResume() +void TPrsStd_AISPresentation::AfterResume() { + myData = getData(); AISUpdate(); - if( IsDisplayed() ) AISDisplay(); - else AISErase(); + if ( IsDisplayed() ) + AISDisplay(); + else + AISErase(); } //======================================================================= @@ -801,16 +781,20 @@ Standard_Boolean TPrsStd_AISPresentation::BeforeUndo (const Handle(TDF_Attribute const Standard_Boolean ) { Handle(TPrsStd_AISPresentation) P; - AD->Label().FindAttribute(TPrsStd_AISPresentation::GetID(), P); + AD->Label().FindAttribute(TPrsStd_AISPresentation::GetID(), P); - if (AD->IsKind(STANDARD_TYPE(TDF_DeltaOnAddition))) { - if( !P.IsNull() ) P->BeforeForget(); + if (AD->IsKind(STANDARD_TYPE(TDF_DeltaOnAddition))) + { + if ( !P.IsNull() ) + P->BeforeForget(); } else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnRemoval))) { - } - else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnModification))) { - if( !P.IsNull() ) P->BeforeForget(); - } + } + else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnModification))) + { + if ( !P.IsNull() ) + P->BeforeForget(); + } return Standard_True; } @@ -822,112 +806,146 @@ Standard_Boolean TPrsStd_AISPresentation::BeforeUndo (const Handle(TDF_Attribute //======================================================================= Standard_Boolean TPrsStd_AISPresentation::AfterUndo (const Handle(TDF_AttributeDelta)& AD, - const Standard_Boolean ) + const Standard_Boolean ) { Handle(TPrsStd_AISPresentation) P; AD->Label().FindAttribute(TPrsStd_AISPresentation::GetID(), P); - if (AD->IsKind(STANDARD_TYPE(TDF_DeltaOnAddition))) { + if (AD->IsKind(STANDARD_TYPE(TDF_DeltaOnAddition))) + {} + else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnRemoval))) + { + if ( !P.IsNull() ) + P->AfterAddition(); } - else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnRemoval))) { - if( !P.IsNull() ) P->AfterAddition(); - } - else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnModification))) { - if( !P.IsNull() ) P->AfterResume(); + else if (AD->IsKind(STANDARD_TYPE(TDF_DefaultDeltaOnModification))) + { + if ( !P.IsNull() ) + P->AfterResume(); } return Standard_True; } - //======================================================================= //function : AISUpdate //purpose : //======================================================================= - -void TPrsStd_AISPresentation::AISUpdate () -{ +void TPrsStd_AISPresentation::AISUpdate() +{ Backup(); - - Handle(AIS_InteractiveContext) ctx; - if(!Label().IsNull()) { - Handle(TPrsStd_AISViewer) viewer; - if( TPrsStd_AISViewer::Find(Label(), viewer) ) ctx = viewer->GetInteractiveContext(); - - Handle(TPrsStd_Driver) driver; - if (TPrsStd_DriverTable::Get()->FindDriver(GetDriverGUID(), driver)) { - if (myAIS.IsNull()) { // build a new AIS - Handle(AIS_InteractiveObject) newais; - if (driver->Update (Label(), newais)) { - myAIS = newais; - newais->SetOwner(this); - } + myData->Backup(); + Handle(AIS_InteractiveContext) aContext; + if ( !Label().IsNull() ) + { + aContext = getAISContext(); + + Handle(TPrsStd_Driver) aDriver; + if ( TPrsStd_DriverTable::Get()->FindDriver(GetDriverGUID(), aDriver) ) + { + // Build a new AIS. + if ( myAIS.IsNull() ) + { + Handle(AIS_InteractiveObject) aNewObj; + if ( aDriver->Update(Label(), aNewObj) ) + { + myAIS = aNewObj; + myData = getData(); + aNewObj->SetOwner(this); + } } - else { - Handle(AIS_InteractiveObject) theais = myAIS; - if (driver->Update (Label(), theais)) { - if (! (theais == myAIS)) { - if(!ctx.IsNull()) ctx->Remove(myAIS); - myAIS = theais; //Driver has built new AIS - theais->SetOwner(this); - } - } + else + { + Handle(AIS_InteractiveObject) anObj = myAIS; + if ( aDriver->Update(Label(), anObj) ) + if ( !(anObj == myAIS) ) + { + if ( !aContext.IsNull() ) + aContext->Remove(myAIS); + + // Driver has built new AIS. + myAIS = anObj; + myData = getData(); + anObj->SetOwner(this); + } } } } else return; -//Apply the visualization settings - if( !myAIS.IsNull() ) { - - if( hasOwnColor ) { - if( !(myAIS->HasColor()) || (myAIS->HasColor() && myAIS->Color() != myColor) ) { - if(!ctx.IsNull()) ctx->SetColor(myAIS, myColor, Standard_False); - else myAIS->SetColor(myColor); + // Apply the visualization settings. + if ( !myAIS.IsNull() ) + { + if ( HasOwnColor() ) + { + Quantity_NameOfColor aColor = Color(); + if ( !(myAIS->HasColor()) || (myAIS->HasColor() && myAIS->Color() != aColor) ) + { + if ( !aContext.IsNull() ) + aContext->SetColor(myAIS, aColor, Standard_False); + else + myAIS->SetColor(aColor); } - } + } - if( hasOwnMaterial ) { - if( !(myAIS->HasMaterial()) || (myAIS->HasMaterial() && myAIS->Material() != myMaterial) ) { - if(!ctx.IsNull()) ctx->SetMaterial(myAIS, myMaterial, Standard_False ); - else myAIS->SetMaterial(myMaterial); + if ( HasOwnMaterial() ) + { + Graphic3d_NameOfMaterial aMaterial = Material(); + if ( !(myAIS->HasMaterial()) || (myAIS->HasMaterial() && myAIS->Material() != aMaterial) ) + { + if ( !aContext.IsNull() ) + aContext->SetMaterial(myAIS, aMaterial, Standard_False ); + else + myAIS->SetMaterial(aMaterial); } - } - - if( hasOwnTransparency ) { - if( myAIS->Transparency() != myTransparency ) { - if(!ctx.IsNull()) ctx->SetTransparency(myAIS, myTransparency, Standard_False); - else myAIS->SetTransparency(myTransparency); + } + + if ( HasOwnTransparency() ) + { + const Standard_Real aTransparency = Transparency(); + if ( myAIS->Transparency() != aTransparency ) + { + if( !aContext.IsNull() ) + aContext->SetTransparency(myAIS, aTransparency, Standard_False); + else + myAIS->SetTransparency(aTransparency); } } - if( hasOwnWidth ) { - if( !(myAIS->HasWidth()) || (myAIS->HasWidth() && myAIS->Width() != myWidth) ) { - if(!ctx.IsNull()) ctx->SetWidth(myAIS, myWidth, Standard_False); - else myAIS->SetWidth(myWidth); + if ( HasOwnWidth() ) + { + const Standard_Real aWidth = Width(); + if ( !(myAIS->HasWidth()) || (myAIS->HasWidth() && myAIS->Width() != aWidth) ) + { + if ( !aContext.IsNull() ) + aContext->SetWidth(myAIS, aWidth, Standard_False); + else + myAIS->SetWidth(aWidth); } } - if( hasOwnMode) { - if( myAIS->DisplayMode() != myMode ) { - myAIS->SetDisplayMode(myMode); - } - - + if ( HasOwnMode() ) + { + const Standard_Integer aMode = Mode(); + if ( myAIS->DisplayMode() != aMode ) + myAIS->SetDisplayMode(aMode); } - if (hasOwnSelectionMode) { - const Handle(AIS_InteractiveContext) aContext = - ctx.IsNull() ? myAIS->GetContext() : ctx; + if ( !aContext.IsNull() && IsDisplayed() ) + aContext->Redisplay(myAIS, Standard_False); + + if (HasOwnSelectionMode()) { + //aContext = aContext.IsNull() ? myAIS->GetContext() : aContext; if (!aContext.IsNull()) { TColStd_ListOfInteger anActivatedModes; aContext->ActivatedModes (myAIS, anActivatedModes); Standard_Boolean isActivated = Standard_False; + Standard_Integer aSelectionMode = SelectionMode(); for (TColStd_ListIteratorOfListOfInteger aModeIter (anActivatedModes); aModeIter.More(); aModeIter.Next()) { - if (aModeIter.Value() == mySelectionMode) + if (aModeIter.Value() == aSelectionMode) { isActivated = Standard_True; break; @@ -935,40 +953,41 @@ void TPrsStd_AISPresentation::AISUpdate () } if (!isActivated) - aContext->Activate (myAIS, mySelectionMode, Standard_False); + aContext->Activate (myAIS, aSelectionMode, Standard_False); } } } - if( isDisplayed && !ctx.IsNull() ) ctx->Redisplay(myAIS, Standard_False); - - return; + if (IsDisplayed() && !aContext.IsNull()) + aContext->Redisplay(myAIS, Standard_False); } //======================================================================= //function : AISDisplay //purpose : //======================================================================= +void TPrsStd_AISPresentation::AISDisplay() +{ + if ( !Label().IsNull() ) + { + Handle(AIS_InteractiveContext) aContext = getAISContext(); -void TPrsStd_AISPresentation::AISDisplay () -{ - - if (!Label().IsNull()) { - Handle(TPrsStd_AISViewer) viewer; - if( !TPrsStd_AISViewer::Find(Label(), viewer) ) return; - Handle(AIS_InteractiveContext) ctx = viewer->GetInteractiveContext(); - if( ctx.IsNull() ) return; + if ( aContext.IsNull() ) + return; + + if ( !myAIS.IsNull() ) + { + if ( !(myAIS->GetContext()).IsNull() && (myAIS->GetContext()) != aContext ) + myAIS->GetContext()->Remove(myAIS); - if (!myAIS.IsNull()) { + if ( IsDisplayed() && aContext->IsDisplayed(myAIS) ) + return; - if( !(myAIS->GetContext()).IsNull() && (myAIS->GetContext()) != ctx ) myAIS->GetContext()->Remove(myAIS); - - if( isDisplayed && ctx->IsDisplayed(myAIS) ) return; + aContext->Display(myAIS, Standard_False); - ctx->Display(myAIS, Standard_False); - - if( ctx->IsDisplayed(myAIS) ) SetDisplayed(Standard_True); + if ( aContext->IsDisplayed(myAIS) ) + SetDisplayed(Standard_True); } } } @@ -978,37 +997,53 @@ void TPrsStd_AISPresentation::AISDisplay () //function : AISErase //purpose : //======================================================================= +void TPrsStd_AISPresentation::AISErase(const Standard_Boolean theIsRemove) +{ + Handle(AIS_InteractiveContext) aContext, anOwnContext; + + if ( !myAIS.IsNull() ) + { + Backup(); + myData->Backup(); + SetDisplayed(Standard_False); + if ( !Label().IsNull() ) + { + Handle(TPrsStd_AISViewer) viewer; + if( !TPrsStd_AISViewer::Find(Label(), viewer) ) + return; + anOwnContext = myAIS->GetContext(); + aContext = viewer->GetInteractiveContext(); -void TPrsStd_AISPresentation::AISErase (const Standard_Boolean remove) -{ - SetDisplayed(Standard_False); - Handle(AIS_InteractiveContext) ctx, ownctx; + if ( theIsRemove ) + { + if ( !aContext.IsNull() ) + aContext->Remove(myAIS, Standard_False); + if ( !anOwnContext.IsNull() && anOwnContext != aContext ) + anOwnContext->Remove(myAIS, Standard_False); - if ( !myAIS.IsNull() ) { - - if ( !Label().IsNull()) { - Handle(TPrsStd_AISViewer) viewer; - if( !TPrsStd_AISViewer::Find(Label(), viewer) ) return; - ownctx = myAIS->GetContext(); - ctx = viewer->GetInteractiveContext(); - if( remove ) { - if( !ctx.IsNull() ) ctx->Remove (myAIS,Standard_False); - if( !ownctx.IsNull() && ownctx != ctx ) ownctx->Remove (myAIS,Standard_False); myAIS->SetToUpdate(); } - else { - if( !ctx.IsNull() ) ctx->Erase (myAIS,Standard_False); - if( !ownctx.IsNull() && ownctx != ctx ) ownctx->Erase (myAIS,Standard_False); + else + { + if ( !aContext.IsNull() ) + aContext->Erase(myAIS, Standard_False); + if ( !anOwnContext.IsNull() && anOwnContext != aContext ) + anOwnContext->Erase(myAIS, Standard_False); } } - else { - if( remove ) { - if( !ownctx.IsNull() ) { - ownctx->Remove (myAIS,Standard_False); - myAIS->SetToUpdate(); + else + { + if ( theIsRemove ) + { + if ( !anOwnContext.IsNull() ) + { + anOwnContext->Remove(myAIS, Standard_False); + myAIS->SetToUpdate(); + } } - } else - if( !ownctx.IsNull() ) ownctx->Erase (myAIS,Standard_False); + else + if( !anOwnContext.IsNull() ) + anOwnContext->Erase(myAIS, Standard_False); } } } @@ -1025,12 +1060,14 @@ Handle(AIS_InteractiveObject) TPrsStd_AISPresentation::GetAIS() const //======================================================================= -//function :SetDisplayed +//function : getAISContext //purpose : //======================================================================= -void TPrsStd_AISPresentation::SetDisplayed(const Standard_Boolean B) +Handle(AIS_InteractiveContext) TPrsStd_AISPresentation::getAISContext() const { - Backup(); - isDisplayed = B; -} + Handle(TPrsStd_AISViewer) aViewer; + if ( TPrsStd_AISViewer::Find(Label(), aViewer) ) + return aViewer->GetInteractiveContext(); + return Handle_AIS_InteractiveContext(); +} diff --git a/src/TPrsStd/TPrsStd_AISPresentation.hxx b/src/TPrsStd/TPrsStd_AISPresentation.hxx index 7d648fda23..316caa0ce9 100644 --- a/src/TPrsStd/TPrsStd_AISPresentation.hxx +++ b/src/TPrsStd/TPrsStd_AISPresentation.hxx @@ -27,6 +27,9 @@ #include #include #include +#include +#include + class AIS_InteractiveObject; class Standard_GUID; class TDF_Label; @@ -34,7 +37,6 @@ class TDF_Attribute; class TDF_RelocationTable; class TDF_AttributeDelta; - class TPrsStd_AISPresentation; DEFINE_STANDARD_HANDLE(TPrsStd_AISPresentation, TDF_Attribute) @@ -185,18 +187,14 @@ public: //! update AIS viewer according to delta Standard_EXPORT virtual Standard_Boolean AfterUndo (const Handle(TDF_AttributeDelta)& anAttDelta, const Standard_Boolean forceIt = Standard_False) Standard_OVERRIDE; - - - DEFINE_STANDARD_RTTIEXT(TPrsStd_AISPresentation,TDF_Attribute) -protected: - - - - private: + //! Returns attribute storing presentation data + Handle(TDataXtd_Presentation) getData () const; + + Handle(AIS_InteractiveContext) getAISContext() const; //! Updates AIS_InteractiveObject stored in the attribute //! and applies the visualization settings @@ -210,29 +208,9 @@ private: //! from AIS_InteractiveContext instead of simple erasing in the viewer Standard_EXPORT void AISErase (const Standard_Boolean remove = Standard_False); - Standard_GUID myDriverGUID; - Standard_Real myTransparency; - Quantity_NameOfColor myColor; - Graphic3d_NameOfMaterial myMaterial; - Standard_Real myWidth; - Standard_Integer myMode; - Standard_Integer mySelectionMode; - Standard_Boolean isDisplayed; - Standard_Boolean hasOwnColor; - Standard_Boolean hasOwnMaterial; - Standard_Boolean hasOwnTransparency; - Standard_Boolean hasOwnWidth; - Standard_Boolean hasOwnMode; - Standard_Boolean hasOwnSelectionMode; +private: Handle(AIS_InteractiveObject) myAIS; - - + Handle(TDataXtd_Presentation) myData; }; - - - - - - #endif // _TPrsStd_AISPresentation_HeaderFile diff --git a/src/TPrsStd/TPrsStd_AISViewer.cxx b/src/TPrsStd/TPrsStd_AISViewer.cxx index 77ba8299b3..437a485083 100644 --- a/src/TPrsStd/TPrsStd_AISViewer.cxx +++ b/src/TPrsStd/TPrsStd_AISViewer.cxx @@ -19,8 +19,11 @@ #include #include #include +#include #include #include +#include +#include #include #include @@ -50,6 +53,17 @@ Handle(TPrsStd_AISViewer) TPrsStd_AISViewer::New (const TDF_Label& acces, V = new TPrsStd_AISViewer(); V->SetInteractiveContext (new AIS_InteractiveContext(viewer)); acces.Root().AddAttribute(V); + + // put TPrsStd_AISPresentation attribute at all labels containing + // TDataXtd_Presentation attribute + for (TDF_ChildIterator anIt(acces.Root(), Standard_True); anIt.More(); anIt.Next()) + { + Handle(TDataXtd_Presentation) aPrsData; + if (anIt.Value().FindAttribute(TDataXtd_Presentation::GetID(), aPrsData)) { + TPrsStd_AISPresentation::Set (anIt.Value(), aPrsData->GetDriverGUID()); + } + } + return V; } @@ -67,6 +81,17 @@ Handle(TPrsStd_AISViewer) TPrsStd_AISViewer::New (const TDF_Label& acces, V = new TPrsStd_AISViewer(); V->SetInteractiveContext (IC); acces.Root().AddAttribute(V); + + // put TPrsStd_AISPresentation attribute at all labels containing + // TDataXtd_Presentation attribute + for (TDF_ChildIterator anIt(acces.Root(), Standard_True); anIt.More(); anIt.Next()) + { + Handle(TDataXtd_Presentation) aPrsData; + if (anIt.Value().FindAttribute(TDataXtd_Presentation::GetID(), aPrsData)) { + TPrsStd_AISPresentation::Set (anIt.Value(), aPrsData->GetDriverGUID()); + } + } + return V; } diff --git a/src/XmlDrivers/XmlDrivers.cxx b/src/XmlDrivers/XmlDrivers.cxx index ebb96b73ba..34d858dcc6 100644 --- a/src/XmlDrivers/XmlDrivers.cxx +++ b/src/XmlDrivers/XmlDrivers.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -82,7 +81,6 @@ Handle(XmlMDF_ADriverTable) XmlDrivers::AttributeDrivers XmlMNaming ::AddDrivers (aTable, theMessageDriver); XmlMFunction ::AddDrivers (aTable, theMessageDriver); XmlMDocStd ::AddDrivers (aTable, theMessageDriver); - XmlMPrsStd ::AddDrivers (aTable, theMessageDriver); // return aTable; } diff --git a/src/XmlLDrivers/XmlLDrivers.cxx b/src/XmlLDrivers/XmlLDrivers.cxx index 6af927b04c..4f365b83c2 100644 --- a/src/XmlLDrivers/XmlLDrivers.cxx +++ b/src/XmlLDrivers/XmlLDrivers.cxx @@ -32,7 +32,7 @@ #include static Standard_GUID XmlLStorageDriver ("13a56820-8269-11d5-aab2-0050044b1af1"); static Standard_GUID XmlLRetrievalDriver("13a56822-8269-11d5-aab2-0050044b1af1"); -#define CURRENT_DOCUMENT_VERSION 7 +#define CURRENT_DOCUMENT_VERSION 8 //======================================================================= //function : Factory diff --git a/src/XmlMDataXtd/FILES b/src/XmlMDataXtd/FILES index 226708ff02..da67ae8e59 100644 --- a/src/XmlMDataXtd/FILES +++ b/src/XmlMDataXtd/FILES @@ -16,3 +16,7 @@ XmlMDataXtd_PointDriver.cxx XmlMDataXtd_PointDriver.hxx XmlMDataXtd_ShapeDriver.cxx XmlMDataXtd_ShapeDriver.hxx +XmlMDataXtd_PositionDriver.hxx +XmlMDataXtd_PositionDriver.cxx +XmlMDataXtd_PresentationDriver.hxx +XmlMDataXtd_PresentationDriver.cxx diff --git a/src/XmlMDataXtd/XmlMDataXtd.cxx b/src/XmlMDataXtd/XmlMDataXtd.cxx index 6f96a7b3a8..7059f9c541 100644 --- a/src/XmlMDataXtd/XmlMDataXtd.cxx +++ b/src/XmlMDataXtd/XmlMDataXtd.cxx @@ -27,6 +27,9 @@ #include #include +#include +#include + static Standard_Integer myDocumentVersion = -1; //======================================================================= //function : AddDrivers @@ -35,14 +38,17 @@ static Standard_Integer myDocumentVersion = -1; void XmlMDataXtd::AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, const Handle(CDM_MessageDriver)& anMsgDrv) { - aDriverTable-> AddDriver (new XmlMDataXtd_ShapeDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_PointDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_AxisDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_PlaneDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_GeometryDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_ConstraintDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_PlacementDriver (anMsgDrv)); - aDriverTable-> AddDriver (new XmlMDataXtd_PatternStdDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_ShapeDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_PointDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_AxisDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_PlaneDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_GeometryDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_ConstraintDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_PlacementDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_PatternStdDriver (anMsgDrv)); + + aDriverTable->AddDriver(new XmlMDataXtd_PresentationDriver (anMsgDrv)); + aDriverTable->AddDriver(new XmlMDataXtd_PositionDriver (anMsgDrv)); } //======================================================================= diff --git a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PositionDriver.cxx similarity index 90% rename from src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx rename to src/XmlMDataXtd/XmlMDataXtd_PositionDriver.cxx index ba19aaae36..60aaa106fd 100644 --- a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cxx +++ b/src/XmlMDataXtd/XmlMDataXtd_PositionDriver.cxx @@ -13,33 +13,34 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include #include #include -#include #include #include #include -IMPLEMENT_STANDARD_RTTIEXT(XmlMPrsStd_PositionDriver,XmlMDF_ADriver) + +IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PositionDriver,XmlMDF_ADriver) //======================================================================= -//function : XmlMPrsStd_PositionDriver +//function : XmlMDataXtd_PositionDriver //purpose : Constructor //======================================================================= -XmlMPrsStd_PositionDriver::XmlMPrsStd_PositionDriver +XmlMDataXtd_PositionDriver::XmlMDataXtd_PositionDriver (const Handle(CDM_MessageDriver)& theMsgDriver) - : XmlMDF_ADriver (theMsgDriver, NULL) +: XmlMDF_ADriver (theMsgDriver, NULL) {} //======================================================================= //function : NewEmpty //purpose : //======================================================================= -Handle(TDF_Attribute) XmlMPrsStd_PositionDriver::NewEmpty() const +Handle(TDF_Attribute) XmlMDataXtd_PositionDriver::NewEmpty() const { return (new TDataXtd_Position()); } @@ -48,7 +49,7 @@ Handle(TDF_Attribute) XmlMPrsStd_PositionDriver::NewEmpty() const //function : Paste //purpose : persistent -> transient (retrieve) //======================================================================= -Standard_Boolean XmlMPrsStd_PositionDriver::Paste +Standard_Boolean XmlMDataXtd_PositionDriver::Paste (const XmlObjMgt_Persistent& theSource, const Handle(TDF_Attribute)& theTarget, XmlObjMgt_RRelocationTable& ) const @@ -112,7 +113,7 @@ Standard_Boolean XmlMPrsStd_PositionDriver::Paste //function : Paste //purpose : transient -> persistent (store) //======================================================================= -void XmlMPrsStd_PositionDriver::Paste +void XmlMDataXtd_PositionDriver::Paste (const Handle(TDF_Attribute)& theSource, XmlObjMgt_Persistent& theTarget, XmlObjMgt_SRelocationTable& ) const diff --git a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_PositionDriver.hxx similarity index 72% rename from src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx rename to src/XmlMDataXtd/XmlMDataXtd_PositionDriver.hxx index 0b4ba8e9b5..c6496c247e 100644 --- a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.hxx +++ b/src/XmlMDataXtd/XmlMDataXtd_PositionDriver.hxx @@ -1,5 +1,5 @@ -// Created on: 2001-09-04 -// Created by: Julia DOROVSKIKH +// Created on: 2001-08-24 +// Created by: Alexander GRIGORIEV // Copyright (c) 2001-2014 OPEN CASCADE SAS // // This file is part of Open CASCADE Technology software library. @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _XmlMPrsStd_PositionDriver_HeaderFile -#define _XmlMPrsStd_PositionDriver_HeaderFile +#ifndef _XmlMDataXtd_PositionDriver_HeaderFile +#define _XmlMDataXtd_PositionDriver_HeaderFile #include #include @@ -28,17 +28,18 @@ class TDF_Attribute; class XmlObjMgt_Persistent; -class XmlMPrsStd_PositionDriver; -DEFINE_STANDARD_HANDLE(XmlMPrsStd_PositionDriver, XmlMDF_ADriver) +class XmlMDataXtd_PositionDriver; +DEFINE_STANDARD_HANDLE(XmlMDataXtd_PositionDriver, XmlMDF_ADriver) + //! Attribute Driver. -class XmlMPrsStd_PositionDriver : public XmlMDF_ADriver +class XmlMDataXtd_PositionDriver : public XmlMDF_ADriver { public: - Standard_EXPORT XmlMPrsStd_PositionDriver(const Handle(CDM_MessageDriver)& theMessageDriver); + Standard_EXPORT XmlMDataXtd_PositionDriver(const Handle(CDM_MessageDriver)& theMessageDriver); Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; @@ -49,24 +50,18 @@ public: - DEFINE_STANDARD_RTTIEXT(XmlMPrsStd_PositionDriver,XmlMDF_ADriver) + DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_PositionDriver, XmlMDF_ADriver) protected: -private: +private: }; - - - - - - -#endif // _XmlMPrsStd_PositionDriver_HeaderFile +#endif diff --git a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx b/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx similarity index 80% rename from src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx rename to src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx index e5e6002a59..27bf61ba21 100644 --- a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cxx +++ b/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.cxx @@ -13,16 +13,18 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include #include #include -#include -#include #include #include -IMPLEMENT_STANDARD_RTTIEXT(XmlMPrsStd_AISPresentationDriver,XmlMDF_ADriver) +#include + +IMPLEMENT_STANDARD_RTTIEXT(XmlMDataXtd_PresentationDriver,XmlMDF_ADriver) + IMPLEMENT_DOMSTRING (GuidString, "guid") IMPLEMENT_DOMSTRING (IsDisplayedString, "isdisplayed") IMPLEMENT_DOMSTRING (ColorString, "color") @@ -34,37 +36,37 @@ IMPLEMENT_DOMSTRING (ModeString, "mode") IMPLEMENT_DOMSTRING (DisplayedString, "true") //======================================================================= -//function : XmlMPrsStd_AISPresentationDriver +//function : XmlMDataXtd_PresentationDriver //purpose : Constructor //======================================================================= -XmlMPrsStd_AISPresentationDriver::XmlMPrsStd_AISPresentationDriver - (const Handle(CDM_MessageDriver)& theMsgDriver) - : XmlMDF_ADriver (theMsgDriver, NULL) +XmlMDataXtd_PresentationDriver::XmlMDataXtd_PresentationDriver + (const Handle(CDM_MessageDriver)& theMsgDriver) + : XmlMDF_ADriver (theMsgDriver, NULL) {} //======================================================================= //function : NewEmpty //purpose : //======================================================================= -Handle(TDF_Attribute) XmlMPrsStd_AISPresentationDriver::NewEmpty() const +Handle(TDF_Attribute) XmlMDataXtd_PresentationDriver::NewEmpty() const { - return (new TPrsStd_AISPresentation()); + return (new TDataXtd_Presentation()); } //======================================================================= //function : Paste //purpose : persistent -> transient (retrieve) //======================================================================= -Standard_Boolean XmlMPrsStd_AISPresentationDriver::Paste - (const XmlObjMgt_Persistent& theSource, - const Handle(TDF_Attribute)& theTarget, - XmlObjMgt_RRelocationTable& ) const +Standard_Boolean XmlMDataXtd_PresentationDriver::Paste + (const XmlObjMgt_Persistent& theSource, + const Handle(TDF_Attribute)& theTarget, + XmlObjMgt_RRelocationTable& ) const { TCollection_ExtendedString aMessageString; XmlObjMgt_DOMString aDOMStr; - Handle(TPrsStd_AISPresentation) aTPrs = - Handle(TPrsStd_AISPresentation)::DownCast(theTarget); + Handle(TDataXtd_Presentation) aTPrs = + Handle(TDataXtd_Presentation)::DownCast(theTarget); const XmlObjMgt_Element& anElem = theSource; //convert attribute value into GUID @@ -112,7 +114,7 @@ Standard_Boolean XmlMPrsStd_AISPresentationDriver::Paste WriteMessage (aMessageString); return Standard_False; } - aTPrs->SetMaterial((Graphic3d_NameOfMaterial)anIValue); + aTPrs->SetMaterialIndex(anIValue); } else { @@ -182,13 +184,13 @@ Standard_Boolean XmlMPrsStd_AISPresentationDriver::Paste //function : Paste //purpose : transient -> persistent (store) //======================================================================= -void XmlMPrsStd_AISPresentationDriver::Paste - (const Handle(TDF_Attribute)& theSource, - XmlObjMgt_Persistent& theTarget, - XmlObjMgt_SRelocationTable& ) const +void XmlMDataXtd_PresentationDriver::Paste + (const Handle(TDF_Attribute)& theSource, + XmlObjMgt_Persistent& theTarget, + XmlObjMgt_SRelocationTable&) const { - Handle(TPrsStd_AISPresentation) aTPrs = - Handle(TPrsStd_AISPresentation)::DownCast(theSource); + Handle(TDataXtd_Presentation) aTPrs = + Handle(TDataXtd_Presentation)::DownCast(theSource); if (aTPrs.IsNull()) return; //convert GUID into attribute value @@ -207,14 +209,14 @@ void XmlMPrsStd_AISPresentationDriver::Paste // color if (aTPrs->HasOwnColor()) { - aNb = (Standard_Integer)(aTPrs->Color()); + aNb = aTPrs->Color(); theTarget.Element().setAttribute(::ColorString(), aNb); } // material if (aTPrs->HasOwnMaterial()) { - aNb = (Standard_Integer)(aTPrs->Material()); + aNb = aTPrs->MaterialIndex(); theTarget.Element().setAttribute(::MaterialString(), aNb); } diff --git a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx b/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.hxx similarity index 70% rename from src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx rename to src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.hxx index d00b0d196e..db477dcd43 100644 --- a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.hxx +++ b/src/XmlMDataXtd/XmlMDataXtd_PresentationDriver.hxx @@ -1,5 +1,5 @@ -// Created on: 2001-09-04 -// Created by: Julia DOROVSKIKH +// Created on: 2001-08-24 +// Created by: Alexander GRIGORIEV // Copyright (c) 2001-2014 OPEN CASCADE SAS // // This file is part of Open CASCADE Technology software library. @@ -13,8 +13,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#ifndef _XmlMPrsStd_AISPresentationDriver_HeaderFile -#define _XmlMPrsStd_AISPresentationDriver_HeaderFile +#ifndef _XmlMDataXtd_PresentationDriver_HeaderFile +#define _XmlMDataXtd_PresentationDriver_HeaderFile #include #include @@ -28,17 +28,17 @@ class TDF_Attribute; class XmlObjMgt_Persistent; -class XmlMPrsStd_AISPresentationDriver; -DEFINE_STANDARD_HANDLE(XmlMPrsStd_AISPresentationDriver, XmlMDF_ADriver) +class XmlMDataXtd_PresentationDriver; +DEFINE_STANDARD_HANDLE(XmlMDataXtd_PresentationDriver, XmlMDF_ADriver) //! Attribute Driver. -class XmlMPrsStd_AISPresentationDriver : public XmlMDF_ADriver +class XmlMDataXtd_PresentationDriver : public XmlMDF_ADriver { public: - Standard_EXPORT XmlMPrsStd_AISPresentationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); + Standard_EXPORT XmlMDataXtd_PresentationDriver(const Handle(CDM_MessageDriver)& theMessageDriver); Standard_EXPORT Handle(TDF_Attribute) NewEmpty() const Standard_OVERRIDE; @@ -49,24 +49,18 @@ public: - DEFINE_STANDARD_RTTIEXT(XmlMPrsStd_AISPresentationDriver,XmlMDF_ADriver) + DEFINE_STANDARD_RTTIEXT(XmlMDataXtd_PresentationDriver, XmlMDF_ADriver) protected: -private: +private: }; - - - - - - -#endif // _XmlMPrsStd_AISPresentationDriver_HeaderFile +#endif diff --git a/src/XmlMPrsStd/FILES b/src/XmlMPrsStd/FILES deleted file mode 100644 index 4a2d548cdd..0000000000 --- a/src/XmlMPrsStd/FILES +++ /dev/null @@ -1,6 +0,0 @@ -XmlMPrsStd.cxx -XmlMPrsStd.hxx -XmlMPrsStd_AISPresentationDriver.cxx -XmlMPrsStd_AISPresentationDriver.hxx -XmlMPrsStd_PositionDriver.cxx -XmlMPrsStd_PositionDriver.hxx diff --git a/src/XmlMPrsStd/XmlMPrsStd.cxx b/src/XmlMPrsStd/XmlMPrsStd.cxx deleted file mode 100644 index 8fef9cd914..0000000000 --- a/src/XmlMPrsStd/XmlMPrsStd.cxx +++ /dev/null @@ -1,32 +0,0 @@ -// Created on: 2001-07-09 -// Created by: Julia DOROVSKIKH -// Copyright (c) 2001-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - - -#include -#include -#include -#include -#include - -///======================================================================= -//function : AddDrivers -//purpose : -//======================================================================= -void XmlMPrsStd::AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, - const Handle(CDM_MessageDriver)& aMessageDriver) -{ - aDriverTable->AddDriver(new XmlMPrsStd_PositionDriver(aMessageDriver)); - aDriverTable->AddDriver(new XmlMPrsStd_AISPresentationDriver(aMessageDriver)); -} diff --git a/src/XmlMPrsStd/XmlMPrsStd.hxx b/src/XmlMPrsStd/XmlMPrsStd.hxx deleted file mode 100644 index 9dee220662..0000000000 --- a/src/XmlMPrsStd/XmlMPrsStd.hxx +++ /dev/null @@ -1,65 +0,0 @@ -// Created on: 2001-07-09 -// Created by: Julia DOROVSKIKH -// Copyright (c) 2001-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _XmlMPrsStd_HeaderFile -#define _XmlMPrsStd_HeaderFile - -#include -#include -#include - -class XmlMDF_ADriverTable; -class CDM_MessageDriver; -class XmlMPrsStd_PositionDriver; -class XmlMPrsStd_AISPresentationDriver; - - - -class XmlMPrsStd -{ -public: - - DEFINE_STANDARD_ALLOC - - - //! Adds the attribute storage drivers to . - Standard_EXPORT static void AddDrivers (const Handle(XmlMDF_ADriverTable)& aDriverTable, const Handle(CDM_MessageDriver)& theMessageDriver); - - - - -protected: - - - - - -private: - - - - -friend class XmlMPrsStd_PositionDriver; -friend class XmlMPrsStd_AISPresentationDriver; - -}; - - - - - - - -#endif // _XmlMPrsStd_HeaderFile diff --git a/tests/bugs/caf/bug26290_compatibility b/tests/bugs/caf/bug26290_compatibility new file mode 100644 index 0000000000..73a9cfc383 --- /dev/null +++ b/tests/bugs/caf/bug26290_compatibility @@ -0,0 +1,27 @@ +# OCAF VISUALIZATION +# Presentation attributes +# +# Testing attribute: TPrsStd_AISPresentation & TDataXtd_Presentation +# +# Testing command: standard set of commands +# +# The test checks compatibility with old format files. Old files: bug26290_oldformat1.cbf & bug26290_oldformat2.cbf +pload FULL +set Lab1 0:1:1 +set Lab2 0:1:2 + +Open [locate_data_file bug26290_oldformat1.cbf] D +# DFBrowse D +AISInitViewer D +vsetdispmode 1 +vfit +AISErase D $Lab1 +Close D + +Open [locate_data_file bug26290_oldformat2.cbf] D +AISInitViewer D +vsetdispmode 1 +vfit +AISErase D $Lab1 +AISErase D $Lab2 +Close D diff --git a/tests/bugs/caf/bug26290_newattribute_1 b/tests/bugs/caf/bug26290_newattribute_1 new file mode 100644 index 0000000000..023dc9ecfe --- /dev/null +++ b/tests/bugs/caf/bug26290_newattribute_1 @@ -0,0 +1,47 @@ +# OCAF VISUALIZATION +# Presentation attributes +# +# Testing attributes: TPrsStd_AISPresentation & TDataXtd_Presentation +# +# Testing command: standard set of commands +# +# The test checks joint work of these attributes (including Undo/Redo) and keeps result in 'bug26290_new_1.cbf' file + +pload FULL + +box b 100 200 300 +NewDocument D BinOcaf +UndoLimit D 100 +NewCommand D +set Lab1 [Label D 0:1:1] +SetShape D $Lab1 b +AISInitViewer D +vsetdispmode 1 +AISSet D $Lab1 NS +AISDisplay D $Lab1 +vfit +NewCommand D +Undo D 1 +Redo D 1 +AISColor D $Lab1 11 +NewCommand D +SaveAs D $imagedir/bug26290_new_1.cbf + +AISErase D $Lab1 +## DFBrowse D # - for debug purpose only +AISUnset D $Lab1 +NewCommand D +Undo D 1 +Redo D 1 +Close D + +## reopen just kept file +Open $imagedir/bug26290_new_1.cbf D + +## DFBrowse D +AISInitViewer D +vsetdispmode 1 +vfit +AISColor D $Lab1 9 +AISErase D $Lab1 +Close D diff --git a/tests/bugs/caf/bug26290_newattribute_2 b/tests/bugs/caf/bug26290_newattribute_2 new file mode 100644 index 0000000000..6450f68211 --- /dev/null +++ b/tests/bugs/caf/bug26290_newattribute_2 @@ -0,0 +1,72 @@ +# OCAF VISUALIZATION +# Presentation attributes +# +# Testing attribute: TPrsStd_AISPresentation & TDataXtd_Presentation +# +# Testing command: standard set of commands +# +# The test checks joint work of these attributes, opens kept before file 'bug26290_new_1.cbf', modifies it, +# checks Undo/Redo work and keeps it in 'bug26290_new_2.cbf' +pload FULL + +# prepare document +box b 100 200 300 +NewDocument D BinOcaf +UndoLimit D 100 +NewCommand D +set Lab1 [Label D 0:1:1] +SetShape D $Lab1 b +AISInitViewer D +vsetdispmode 1 +AISSet D $Lab1 NS +AISDisplay D $Lab1 +vfit +NewCommand D +Undo D 1 +Redo D 1 +AISColor D $Lab1 11 +NewCommand D +SaveAs D $imagedir/bug26290_new_1.cbf +Close D + +# test +Open $imagedir/bug26290_new_1.cbf D +UndoLimit D 100 +NewCommand D + +## DFBrowse D +AISInitViewer D +vsetdispmode 1 +vfit +NewCommand D +set Lab2 [Label D 0:1:2] +pcylinder cy 50 190 +ttranslate cy 200 0 0 +SetShape D $Lab2 cy +AISSet D $Lab2 NS +AISDisplay D $Lab2 +NewCommand D +vfit +AISTransparency D $Lab2 0.7 +NewCommand D +Undo D 1 +Redo D 1 + +SaveAs D $imagedir/bug26290_new_2.cbf +AISErase D $Lab2 +set Lab1 [Label D 0:1:1] +AISErase D $Lab1 +NewCommand D +Close D + +Open $imagedir/bug26290_new_2.cbf D + +## DFBrowse D +AISInitViewer D +vsetdispmode 1 +vfit +AISColor D $Lab2 44 +AISErase D $Lab2 +AISErase D $Lab1 +AISUnset D $Lab2 +Close D -- 2.20.1