Skip to content

Commit

Permalink
wip exposing Font_BRep
Browse files Browse the repository at this point in the history 
TODO:

use:
set(FREETYPE_INCLUDE_DIR_ft2build ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE)
 in CMakeList.txt
to include of OCE_Visualization package ( required by Font_BRep )

514 jelleferinga:build$ /usr/bin/g++   -DCSFDB -DHAVE_CONFIG_H -DOCC_CONVERT_SIGNALS -D_Font_EXPORTS -D_OCC64 -stdlib=libstdc++ -Os -DNDEBUG -fPIC -I/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/freetype2  -I/Users/jelleferinga/GIT/pythonocc-core -I/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/python2.7 -I/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce -I/Users/jelleferinga/GIT/pythonocc-core/src/Visualization    -o CMakeFiles/_Font.dir/Darwin/x86_64-MinSizeRel-64/FontPYTHON_wrap.cxx.o -c /Users/jelleferinga/GIT/pythonocc-core/build/Darwin/x86_64-MinSizeRel-64/FontPYTHON_wrap.cxx
/Users/jelleferinga/GIT/pythonocc-core/build/Darwin/x86_64-MinSizeRel-64/FontPYTHON_wrap.cxx:6984:33: error: 'operator new' is a
      private member of 'Standard_Transient'
      result = (Font_BRepFont *)new Font_BRepFont();
                                ^
/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce/Font_BRepFont.hxx:41:24: note: constrained by implicitly private
      inheritance here
class Font_BRepFont :  Font_FTFont
                       ^~~~~~~~~~~
/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce/Standard_Transient_proto.hxx:36:5: note: member is declared here
    DEFINE_STANDARD_ALLOC
    ^
/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce/Standard_DefineAlloc.hxx:57:9: note: expanded from macro
      'DEFINE_STANDARD_ALLOC'
  void* operator new (size_t theSize)                                  \
        ^
/Users/jelleferinga/GIT/pythonocc-core/build/Darwin/x86_64-MinSizeRel-64/FontPYTHON_wrap.cxx:7036:33: error: 'operator new' is a
      private member of 'Standard_Transient'
      result = (Font_BRepFont *)new Font_BRepFont((NCollection_String const &)*arg1,arg2);
                                ^
/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce/Font_BRepFont.hxx:41:24: note: constrained by implicitly private
      inheritance here
class Font_BRepFont :  Font_FTFont
                       ^~~~~~~~~~~
/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce/Standard_Transient_proto.hxx:36:5: note: member is declared here
    DEFINE_STANDARD_ALLOC
    ^
/Users/jelleferinga/miniconda/envs/PyRAPID_QML/include/oce/Standard_DefineAlloc.hxx:57:9: note: expanded from macro
      'DEFINE_STANDARD_ALLOC'
  void* operator new (size_t theSize)
  • Loading branch information
@jf---
jf--- committed Apr 10, 2016
1 parent 3d92ce8 commit 5ae76b0
Show file tree
Hide file tree
Showing 10 changed files with 1,093 additions and 45 deletions.
12 changes: 12 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ find_package(PythonInterp)
find_package(PythonLibs)
include_directories(${PYTHON_INCLUDE_PATH})

################################
# freetype, for handling fonts #
################################

find_package(Freetype REQUIRED)
#set(FREETYPE_INCLUDE_DIR_freetype2 ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE)
#set(FREETYPE_INCLUDE_DIR_ft2build ${OCE_BUNDLE_ROOT_PATH}/include/freetype CACHE PATH "" FORCE)


##############################################################
# 32/64 bit detection
###############################################################
Expand Down Expand Up @@ -227,6 +236,9 @@ if(PYTHONOCC_WRAP_VISU)
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory src/Visualization)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Visualization.i PROPERTIES CPLUSPLUS ON)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization)

#add_dependencies( freetype )

set(VISUALIZATION_SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Visualization.i
${CMAKE_CURRENT_SOURCE_DIR}/src/Visualization/Display3d.cpp
Expand Down
1 change: 1 addition & 0 deletions cmake/OCE_Modules.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ LIST(APPEND OCE_TOOLKIT_VISUALIZATION
Image
InterfaceGraphic
TColQuantity
Font
# TKV3d
V3d
Graphic3d
Expand Down
24 changes: 12 additions & 12 deletions src/SWIG_files/wrapper/Aspect_headers.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Aspect_AspectMarkerDefinitionError.hxx>
#include<Aspect_Background.hxx>
#include<Aspect_BadAccess.hxx>
#include<Aspect_CLayer2d.hxx>
#include<Aspect_CardinalPoints.hxx>
#include<Aspect_CircularGrid.hxx>
#include<Aspect_CLayer2d.hxx>
#include<Aspect_ColorScale.hxx>
#include<Aspect_Convert.hxx>
#include<Aspect_Display.hxx>
Expand Down Expand Up @@ -146,9 +146,9 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Quantity_Mass.hxx>
#include<Quantity_MassFlow.hxx>
#include<Quantity_MolarConcentration.hxx>
#include<Quantity_Molarity.hxx>
#include<Quantity_MolarMass.hxx>
#include<Quantity_MolarVolume.hxx>
#include<Quantity_Molarity.hxx>
#include<Quantity_MomentOfAForce.hxx>
#include<Quantity_MomentOfInertia.hxx>
#include<Quantity_Momentum.hxx>
Expand Down Expand Up @@ -320,9 +320,9 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Standard_Atomic.hxx>
#include<Standard_Boolean.hxx>
#include<Standard_Byte.hxx>
#include<Standard_CString.hxx>
#include<Standard_Character.hxx>
#include<Standard_ConstructionError.hxx>
#include<Standard_CString.hxx>
#include<Standard_DefineAlloc.hxx>
#include<Standard_DefineException.hxx>
#include<Standard_DefineHandle.hxx>
Expand All @@ -337,20 +337,19 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Standard_Failure.hxx>
#include<Standard_GUID.hxx>
#include<Standard_HandlerStatus.hxx>
#include<Standard_IStream.hxx>
#include<Standard_ImmutableObject.hxx>
#include<Standard_Integer.hxx>
#include<Standard_InternalType.hxx>
#include<Standard_IStream.hxx>
#include<Standard_JmpBuf.hxx>
#include<Standard_KindOfType.hxx>
#include<Standard_LicenseError.hxx>
#include<Standard_LicenseNotFound.hxx>
#include<Standard_Macro.hxx>
#include<Standard_math.hxx>
#include<Standard_MMgrOpt.hxx>
#include<Standard_MMgrRaw.hxx>
#include<Standard_MMgrRoot.hxx>
#include<Standard_MMgrTBBalloc.hxx>
#include<Standard_Macro.hxx>
#include<Standard_MultiplyDefined.hxx>
#include<Standard_Mutex.hxx>
#include<Standard_NegativeValue.hxx>
Expand All @@ -367,16 +366,16 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Standard_PByte.hxx>
#include<Standard_PCharacter.hxx>
#include<Standard_PErrorHandler.hxx>
#include<Standard_PExtCharacter.hxx>
#include<Standard_Persistent.hxx>
#include<Standard_Persistent_proto.hxx>
#include<Standard_PExtCharacter.hxx>
#include<Standard_PrimitiveTypes.hxx>
#include<Standard_ProgramError.hxx>
#include<Standard_RangeError.hxx>
#include<Standard_Real.hxx>
#include<Standard_SStream.hxx>
#include<Standard_ShortReal.hxx>
#include<Standard_Size.hxx>
#include<Standard_SStream.hxx>
#include<Standard_Storable.hxx>
#include<Standard_Stream.hxx>
#include<Standard_ThreadId.hxx>
Expand All @@ -387,10 +386,11 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Standard_Type.hxx>
#include<Standard_TypeDef.hxx>
#include<Standard_TypeMismatch.hxx>
#include<Standard_Underflow.hxx>
#include<Standard_UUID.hxx>
#include<Standard_Underflow.hxx>
#include<Standard_Version.hxx>
#include<Standard_WayOfLife.hxx>
#include<Standard_math.hxx>
#include<Standard_values.h>
#include<MMgt_TShared.hxx>
#include<TColgp_Array1OfCirc2d.hxx>
Expand Down Expand Up @@ -604,25 +604,24 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Storage_Error.hxx>
#include<Storage_HArrayOfCallBack.hxx>
#include<Storage_HArrayOfSchema.hxx>
#include<Storage_HeaderData.hxx>
#include<Storage_HPArray.hxx>
#include<Storage_HSeqOfRoot.hxx>
#include<Storage_HeaderData.hxx>
#include<Storage_IndexedDataMapNodeOfPType.hxx>
#include<Storage_InternalData.hxx>
#include<Storage_Macros.hxx>
#include<Storage_MapOfCallBack.hxx>
#include<Storage_MapOfPers.hxx>
#include<Storage_OpenMode.hxx>
#include<Storage_PArray.hxx>
#include<Storage_Position.hxx>
#include<Storage_PType.hxx>
#include<Storage_Position.hxx>
#include<Storage_Root.hxx>
#include<Storage_RootData.hxx>
#include<Storage_Schema.hxx>
#include<Storage_SeqOfRoot.hxx>
#include<Storage_SequenceNodeOfSeqOfRoot.hxx>
#include<Storage_SolveMode.hxx>
#include<Storage_stCONSTclCOM.hxx>
#include<Storage_StreamExtCharParityError.hxx>
#include<Storage_StreamFormatError.hxx>
#include<Storage_StreamModeError.hxx>
Expand All @@ -631,6 +630,7 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
#include<Storage_StreamWriteError.hxx>
#include<Storage_TypeData.hxx>
#include<Storage_TypedCallBack.hxx>
#include<Storage_stCONSTclCOM.hxx>
%};
%import Quantity.i
%import TCollection.i
Expand Down
Loading

0 comments on commit 5ae76b0

Please sign in to comment.