mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
0029520: Visualization - drop deprecated V3d_View::Export() functionality and dependency from gl2ps
This commit is contained in:
kgv
bugmaster
parent
7775636a15
commit
e52ba46e3b
@ -481,7 +481,6 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_FreeImagePlus CAN_USE_FREEIMAGE)
|
||||
OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
|
||||
OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
|
||||
OCCT_IS_PRODUCT_REQUIRED (CSF_OpenGlLibs CAN_USE_GLES2)
|
||||
OCCT_IS_PRODUCT_REQUIRED (CSF_GL2PS CAN_USE_GL2PS)
|
||||
OCCT_IS_PRODUCT_REQUIRED (CSF_TBB CAN_USE_TBB)
|
||||
OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN)
|
||||
|
||||
@ -609,24 +608,6 @@ else()
|
||||
OCCT_CHECK_AND_UNSET ("INSTALL_GLES2")
|
||||
endif()
|
||||
|
||||
# GL2PS
|
||||
if (NOT DEFINED ANDROID AND CAN_USE_GL2PS)
|
||||
set (USE_GL2PS OFF CACHE BOOL "${USE_GL2PS_DESCR}")
|
||||
|
||||
if (USE_GL2PS)
|
||||
add_definitions (-DHAVE_GL2PS)
|
||||
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/gl2ps")
|
||||
else()
|
||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
|
||||
OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
|
||||
endif()
|
||||
else()
|
||||
OCCT_CHECK_AND_UNSET ("USE_GL2PS")
|
||||
|
||||
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
|
||||
OCCT_CHECK_AND_UNSET ("INSTALL_GL2PS")
|
||||
endif()
|
||||
|
||||
# TBB
|
||||
if (NOT DEFINED ANDROID AND CAN_USE_TBB)
|
||||
set (USE_TBB OFF CACHE BOOL "${USE_TBB_DESCR}")
|
||||
|
||||
12
adm/CMPLRS
12
adm/CMPLRS
@ -1,17 +1,17 @@
|
||||
wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
|
||||
lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
|
||||
|
||||
wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
|
||||
wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
|
||||
|
||||
wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||
wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
|
||||
|
||||
lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
||||
lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_GL2PS -DHAVE_TBB -DHAVE_OPENCL
|
||||
lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||
lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
|
||||
|
||||
lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
|
||||
lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
|
||||
|
||||
@ -277,26 +277,6 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if("${PRODUCT_NAME}" STREQUAL "GL2PS")
|
||||
get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
|
||||
|
||||
if (SINGLE_GENERATOR)
|
||||
install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${GL2PSLIB}.1)
|
||||
else()
|
||||
install (FILES "${ABS_PATH}"
|
||||
CONFIGURATIONS Release
|
||||
DESTINATION "${INSTALL_DIR_LIB}"
|
||||
RENAME ${GL2PSLIB}.1)
|
||||
install (FILES "${ABS_PATH}"
|
||||
CONFIGURATIONS RelWithDebInfo
|
||||
DESTINATION "${INSTALL_DIR_LIB}i"
|
||||
RENAME ${GL2PSLIB}.1)
|
||||
install (FILES "${ABS_PATH}"
|
||||
CONFIGURATIONS Debug
|
||||
DESTINATION "${INSTALL_DIR_LIB}d"
|
||||
RENAME ${GL2PSLIB}.1)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
# the library directory for using by the executable
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
#GL2PS
|
||||
|
||||
THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "CSF_GL2PS" "d")
|
||||
@ -58,15 +58,6 @@ if (USE_TCL)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# GL2PS
|
||||
if (NOT DEFINED ANDROID)
|
||||
if (USE_GL2PS)
|
||||
set (CSF_GL2PS "gl2ps")
|
||||
else()
|
||||
set (CSF_GL2PS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (WIN32)
|
||||
set (CSF_advapi32 "advapi32.lib")
|
||||
set (CSF_gdi32 "gdi32.lib")
|
||||
|
||||
@ -40,7 +40,7 @@ Precompiled headers are generated automatically by Cotire tool.")
|
||||
# install variables
|
||||
set (INSTALL_DIR_DESCR
|
||||
"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
|
||||
samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
|
||||
samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
|
||||
other similar variables) will be placed during the installation process (building INSTALL project)")
|
||||
|
||||
set (INSTALL_DIR_WITH_VERSION_DESCR
|
||||
@ -88,7 +88,6 @@ INSTALL_MESSAGE (INSTALL_EIGEN "EIGEN header files")
|
||||
INSTALL_MESSAGE (INSTALL_EGL "EGL binaries")
|
||||
INSTALL_MESSAGE (INSTALL_GLES2 "OpenGL ES 2.0 binaries")
|
||||
INSTALL_MESSAGE (INSTALL_FREETYPE "FreeType binaries")
|
||||
INSTALL_MESSAGE (INSTALL_GL2PS "GL2PS binaries")
|
||||
INSTALL_MESSAGE (INSTALL_TBB "TBB binaries")
|
||||
INSTALL_MESSAGE (INSTALL_TCL "TCL binaries")
|
||||
INSTALL_MESSAGE (INSTALL_TK "TK binaries")
|
||||
@ -165,10 +164,6 @@ set (USE_GLES2_DESCR
|
||||
"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization
|
||||
module instead of desktop OpenGL")
|
||||
|
||||
set (USE_GL2PS_DESCR
|
||||
"Indicates whether GL2PS product should be used in OCCT visualization
|
||||
module for support of vector image formats (PS, EPS etc)")
|
||||
|
||||
set (USE_TBB_DESCR
|
||||
"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
|
||||
the technology of Intel Corp, which comes with different mechanisms and patterns for
|
||||
|
||||
@ -139,9 +139,6 @@ proc wokdep:gui:UpdateList {} {
|
||||
wokdep:SearchFreeType anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||
wokdep:SearchX11 anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||
if { "$::HAVE_GLES2" == "true" } {
|
||||
if { "$::HAVE_GL2PS" == "true" } {
|
||||
lappend anIncErrs "Error: gl2ps can not be used with OpenGL ES"
|
||||
}
|
||||
wokdep:SearchEGL anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||
wokdep:SearchGLES anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||
}
|
||||
@ -151,9 +148,6 @@ proc wokdep:gui:UpdateList {} {
|
||||
if { "$::HAVE_FFMPEG" == "true" } {
|
||||
wokdep:SearchFFmpeg anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||
}
|
||||
if { "$::HAVE_GL2PS" == "true" } {
|
||||
wokdep:SearchStandardLibrary anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "gl2ps" "gl2ps.h" "gl2ps" {"gl2ps"}
|
||||
}
|
||||
if { "$::HAVE_TBB" == "true" } {
|
||||
wokdep:SearchTBB anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs
|
||||
}
|
||||
@ -415,8 +409,6 @@ entry .myFrame.mySrchEntry -textvariable PRODUCTS_PATH -width 80
|
||||
ttk::button .myFrame.mySrchBrowseBtn -text "Browse" -command wokdep:gui:BrowsePartiesRoot
|
||||
checkbutton .myFrame.myChecks.myFImageCheck -offvalue "false" -onvalue "true" -variable HAVE_FREEIMAGE -command wokdep:gui:UpdateList
|
||||
ttk::label .myFrame.myChecks.myFImageLbl -text "Use FreeImage"
|
||||
checkbutton .myFrame.myChecks.myGl2psCheck -offvalue "false" -onvalue "true" -variable HAVE_GL2PS -command wokdep:gui:UpdateList
|
||||
ttk::label .myFrame.myChecks.myGl2psLbl -text "Use GL2PS"
|
||||
checkbutton .myFrame.myChecks.myTbbCheck -offvalue "false" -onvalue "true" -variable HAVE_TBB -command wokdep:gui:UpdateList
|
||||
ttk::label .myFrame.myChecks.myTbbLbl -text "Use Intel TBB"
|
||||
if { "$::tcl_platform(os)" != "Darwin" } {
|
||||
@ -545,9 +537,6 @@ if { "$::tcl_platform(os)" != "Darwin" } {
|
||||
grid .myFrame.myChecks.myZLibCheck -row $aCheckRowIter -column 6 -sticky e
|
||||
grid .myFrame.myChecks.myZLibLbl -row $aCheckRowIter -column 7 -sticky w
|
||||
|
||||
grid .myFrame.myChecks.myGl2psCheck -row $aCheckRowIter -column 8 -sticky e
|
||||
grid .myFrame.myChecks.myGl2psLbl -row $aCheckRowIter -column 9 -sticky w
|
||||
|
||||
grid .myFrame.myChecks.myQt4Check -row $aCheckRowIter -column 10 -sticky e
|
||||
grid .myFrame.myChecks.myQt4Lbl -row $aCheckRowIter -column 11 -sticky w
|
||||
|
||||
|
||||
@ -65,7 +65,7 @@ if { [info exists ::env(SHORTCUT_HEADERS)] } {
|
||||
}
|
||||
|
||||
# fetch environment variables (e.g. set by custom.sh or custom.bat) and set them as tcl variables with the same name
|
||||
set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_GL2PS HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
|
||||
set THE_ENV_VARIABLES {HAVE_FREEIMAGE HAVE_FFMPEG HAVE_TBB HAVE_GLES2 HAVE_D3D HAVE_VTK HAVE_ZLIB HAVE_LIBLZMA HAVE_OPENCL CHECK_QT4 CHECK_JDK MACOSX_USE_GLX HAVE_RelWithDebInfo}
|
||||
foreach anEnvIter $THE_ENV_VARIABLES {
|
||||
set ${anEnvIter} "false"
|
||||
if { [info exists ::env(${anEnvIter})] } {
|
||||
|
||||
@ -1318,9 +1318,6 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
|
||||
if { "$::HAVE_FFMPEG" == "true" } {
|
||||
set aLibsMap(CSF_FFmpeg) "avcodec avformat swscale avutil"
|
||||
}
|
||||
if { "$::HAVE_GL2PS" == "true" } {
|
||||
set aLibsMap(CSF_GL2PS) "gl2ps"
|
||||
}
|
||||
if { "$::HAVE_TBB" == "true" } {
|
||||
set aLibsMap(CSF_TBB) "tbb tbbmalloc"
|
||||
}
|
||||
|
||||
@ -58,7 +58,6 @@ set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
|
||||
set (OpenCASCADE_WITH_TCL @USE_TCL@)
|
||||
set (OpenCASCADE_WITH_FREETYPE @USE_FREETYPE@)
|
||||
set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
|
||||
set (OpenCASCADE_WITH_GL2PS @USE_GL2PS@)
|
||||
set (OpenCASCADE_WITH_TBB @USE_TBB@)
|
||||
set (OpenCASCADE_WITH_VTK @USE_VTK@)
|
||||
set (OpenCASCADE_WITH_FFMPEG @USE_FFMPEG@)
|
||||
|
||||
@ -11,7 +11,6 @@ if /I "%VCVER%" == "@COMPILER@" (
|
||||
set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
|
||||
set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
|
||||
set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
|
||||
set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIRS@"
|
||||
set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
|
||||
set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
|
||||
set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
|
||||
|
||||
@ -9,7 +9,6 @@ if [ "$1" == "@BIN_LETTER@" ]; then
|
||||
export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
|
||||
export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
|
||||
export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
|
||||
export GL2PS_DIR="@3RDPARTY_GL2PS_LIBRARY_DIRS@"
|
||||
export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
|
||||
export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
|
||||
export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
|
||||
|
||||
@ -13,7 +13,6 @@ if /I "%VCVER%" == "@COMPILER@" (
|
||||
set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIRS@"
|
||||
set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
|
||||
set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
|
||||
set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIRS@"
|
||||
set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
|
||||
set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
|
||||
set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
|
||||
|
||||
@ -9,7 +9,6 @@ if [ "$1" == "@BIN_LETTER@" ]; then
|
||||
export TK_DIR="@USED_3RDPARTY_TK_DIR@"
|
||||
export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
|
||||
export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIRS@"
|
||||
export GL2PS_DIR="@USED_3RDPARTY_GL2PS_DIRS@"
|
||||
export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
|
||||
export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
|
||||
export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
|
||||
|
||||
@ -19,7 +19,6 @@ set "HAVE_TBB=false"
|
||||
set "HAVE_OPENCL=false"
|
||||
set "HAVE_FREEIMAGE=false"
|
||||
set "HAVE_FFMPEG=false"
|
||||
set "HAVE_GL2PS=false"
|
||||
set "HAVE_VTK=false"
|
||||
set "HAVE_GLES2=false"
|
||||
set "HAVE_D3D=false"
|
||||
@ -156,7 +155,6 @@ set "CSF_OPT_CMPL="
|
||||
set "PRODUCTS_DEFINES="
|
||||
if ["%HAVE_TBB%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_TBB" & set "CSF_DEFINES=HAVE_TBB;%CSF_DEFINES%"
|
||||
if ["%HAVE_OPENCL%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_OPENCL" & set "CSF_DEFINES=HAVE_OPENCL;%CSF_DEFINES%"
|
||||
if ["%HAVE_GL2PS%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_GL2PS" & set "CSF_DEFINES=HAVE_GL2PS;%CSF_DEFINES%"
|
||||
if ["%HAVE_FREEIMAGE%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FREEIMAGE" & set "CSF_DEFINES=HAVE_FREEIMAGE;%CSF_DEFINES%"
|
||||
if ["%HAVE_FFMPEG%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_FFMPEG" & set "CSF_DEFINES=HAVE_FFMPEG;%CSF_DEFINES%"
|
||||
if ["%HAVE_VTK%"] == ["true"] set "PRODUCTS_DEFINES=%PRODUCTS_DEFINES% -DHAVE_VTK" & set "CSF_DEFINES=HAVE_VTK;%CSF_DEFINES%"
|
||||
|
||||
@ -126,7 +126,6 @@ if not ["%FREETYPE_DIR%"] == [""] set "PATH=%FREETYPE_DIR%;%PATH%"
|
||||
if not ["%FREEIMAGE_DIR%"] == [""] set "PATH=%FREEIMAGE_DIR%;%PATH%"
|
||||
if not ["%EGL_DIR%"] == [""] set "PATH=%EGL_DIR%;%PATH%"
|
||||
if not ["%GLES2_DIR%"] == [""] set "PATH=%GLES2_DIR%;%PATH%"
|
||||
if not ["%GL2PS_DIR%"] == [""] set "PATH=%GL2PS_DIR%;%PATH%"
|
||||
if not ["%TBB_DIR%"] == [""] set "PATH=%TBB_DIR%;%PATH%"
|
||||
if not ["%VTK_DIR%"] == [""] set "PATH=%VTK_DIR%;%PATH%"
|
||||
if not ["%FFMPEG_DIR%"] == [""] set "PATH=%FFMPEG_DIR%;%PATH%"
|
||||
|
||||
@ -11,7 +11,6 @@ export HAVE_TBB="false";
|
||||
export HAVE_OPENCL="false";
|
||||
export HAVE_FREEIMAGE="false";
|
||||
export HAVE_FFMPEG="false";
|
||||
export HAVE_GL2PS="false";
|
||||
export HAVE_VTK="false";
|
||||
export HAVE_GLES2="false";
|
||||
export HAVE_ZLIB="false";
|
||||
@ -96,7 +95,6 @@ if [ "$HAVE_TBB" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -D
|
||||
if [ "$HAVE_OPENCL" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_OPENCL"; fi
|
||||
if [ "$HAVE_FREEIMAGE" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FREEIMAGE"; fi
|
||||
if [ "$HAVE_FFMPEG" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_FFMPEG"; fi
|
||||
if [ "$HAVE_GL2PS" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GL2PS"; fi
|
||||
if [ "$HAVE_GLES2" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_GLES2"; fi
|
||||
if [ "$HAVE_VTK" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_VTK"; fi
|
||||
if [ "$HAVE_ZLIB" == "true" ]; then export CSF_OPT_CMPL="${CSF_OPT_CMPL} -DHAVE_ZLIB"; fi
|
||||
|
||||
@ -57,10 +57,6 @@ if [ "$FREEIMAGE_DIR" != "" ]; then
|
||||
THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
|
||||
fi
|
||||
|
||||
if [ "$GL2PS_DIR" != "" ]; then
|
||||
THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
|
||||
fi
|
||||
|
||||
if [ "$TBB_DIR" != "" ]; then
|
||||
THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
|
||||
fi
|
||||
|
||||
@ -19,7 +19,6 @@ There are two types of third-party products, which are necessary to build OCCT:
|
||||
* FreeType 2.4.10 - 2.5.3;
|
||||
* Optional products:
|
||||
* TBB 3.x - 4.x;
|
||||
* gl2ps 1.3.5 - 1.3.8;
|
||||
* FreeImage 3.14.1 - 3.16.0;
|
||||
* VTK 6.1.0.
|
||||
|
||||
@ -108,32 +107,6 @@ This third-party product is installed with binaries from the archive that can b
|
||||
Go to the **Download** page, find the release version you need and pick the archive for Linux platform.
|
||||
To install, unpack the downloaded archive of TBB product.
|
||||
|
||||
@subsection dev_guides__building_3rdparty_linux_3_2 gl2ps
|
||||
|
||||
Download the necessary archive from http://geuz.org/gl2ps/ and unpack it.
|
||||
|
||||
1. Install or build *cmake* product from the source file.
|
||||
2. Start *cmake* in GUI mode with the directory where the source files of gl2ps are located:
|
||||
|
||||
ccmake GL2PS_SRC_DIR
|
||||
|
||||
* Press <i>[c]</i> to make the initial configuration;
|
||||
* Define the necessary options in *CMAKE_INSTALL_PREFIX*
|
||||
* Press <i>[c]</i> to make the final configuration
|
||||
* Press <i>[g]</i> to generate Makefile and exit
|
||||
|
||||
or just run the following command:
|
||||
|
||||
cmake –DCMAKE_INSTALL_PREFIX=GL2PS_INSTALL_DIR –DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
3. Start the building of gl2ps:
|
||||
|
||||
make
|
||||
|
||||
4. Start the installation of gl2ps. Binaries will be installed according to the *CMAKE_INSTALL_PREFIX* option.
|
||||
|
||||
make install
|
||||
|
||||
@subsection dev_guides__building_3rdparty_linux_3_3 FreeImage
|
||||
|
||||
Download the necessary archive from http://sourceforge.net/projects/freeimage/files/Source%20Distribution/
|
||||
@ -221,7 +194,7 @@ Download the necessary archive from http://www.vtk.org/VTK/resources/software.ht
|
||||
|
||||
make
|
||||
|
||||
4. Start the installation of gl2ps. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
|
||||
4. Start the installation of VTK. Binaries will be installed according to the *VTK_INSTALL_PREFIX* option.
|
||||
|
||||
make install
|
||||
|
||||
@ -232,7 +205,7 @@ Download the necessary archive from http://www.vtk.org/VTK/resources/software.ht
|
||||
All 3rd-party products required for building of OCCT could be installed
|
||||
from official repositories. You may install them from console using apt-get utility:
|
||||
|
||||
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev libgl2ps-dev
|
||||
sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev libfreeimage-dev libtbb-dev
|
||||
|
||||
To launch binaries built with WOK you need to install C shell and 32-bit libraries on x86_64 distributives:
|
||||
|
||||
|
||||
28
dox/dev_guides/building/3rdparty/3rdparty_osx.md
vendored
28
dox/dev_guides/building/3rdparty/3rdparty_osx.md
vendored
@ -17,7 +17,6 @@ There are two types of third-party products, which are necessary to build OCCT:
|
||||
* FreeType 2.4.10 - 2.5.3.
|
||||
* Optional products:
|
||||
* TBB 3.x - 4.x;
|
||||
* gl2ps 1.3.5 - 1.3.8;
|
||||
* FreeImage 3.14.1 - 3.16.0
|
||||
|
||||
@section dev_guides__building_3rdparty_osx_2 Building Mandatory Third-party Products
|
||||
@ -106,33 +105,6 @@ Go to the **Download** page, find the release version you need (e.g. *tbb30_018o
|
||||
and pick the archive for Mac OS X platform.
|
||||
To install, unpack the downloaded archive of TBB 3.0 product (*tbb30_018oss_osx.tgz*).
|
||||
|
||||
@subsection dev_guides__building_3rdparty_osx_3_2 gl2ps 1.3.5
|
||||
|
||||
Download the necessary archive from http://geuz.org/gl2ps/ and unpack it.
|
||||
|
||||
1. Install or build cmake product from the source file.
|
||||
|
||||
2. Start cmake in GUI mode with the directory, where the source files of *fl2ps* are located:
|
||||
|
||||
ccmake GL2PS_SRC_DIR
|
||||
|
||||
* Press <i>[c]</i> to make the initial configuration;
|
||||
* Define the necessary options in *CMAKE_INSTALL_PREFIX*;
|
||||
* Press <i>[c]</i> to make the final configuration;
|
||||
* Press <i>[g]</i> to generate Makefile and exit.
|
||||
|
||||
or just run the following command:
|
||||
|
||||
cmake –DCMAKE_INSTALL_PREFIX=GL2PS_INSTALL_DIR –DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
3. Start the building of gl2ps
|
||||
|
||||
make
|
||||
|
||||
4. Start the installation of gl2ps. Binaries will be installed according to the *CMAKE_INSTALL_PREFIX* option
|
||||
|
||||
make install
|
||||
|
||||
@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage 3.14.1 or 3.15.x
|
||||
|
||||
Download the necessary archive from
|
||||
|
||||
@ -17,7 +17,6 @@ There are two types of third-party products used by OCCT:
|
||||
* FreeType 2.4.10 -- 2.5.3.
|
||||
* Optional products:
|
||||
* TBB 3.x -- 4.x;
|
||||
* gl2ps 1.3.5 -- 1.3.8;
|
||||
* FreeImage 3.14.1 -- 3.16.0;
|
||||
* VTK 6.1.0.
|
||||
|
||||
@ -156,85 +155,6 @@ Unpack the downloaded archive of TBB product into the *3rdparty* folder.
|
||||
|
||||
Further in this document, this folder is referred to as *tbb*.
|
||||
|
||||
@subsection dev_guides__building_3rdparty_win_3_2 gl2ps
|
||||
|
||||
This third-party product should be built as a dynamically loadable library (dll file).
|
||||
You can download its sources from http://geuz.org/gl2ps/src/.
|
||||
|
||||
### The building procedure
|
||||
|
||||
1. Unpack the downloaded archive of gl2ps product (e.g. *gl2ps-1.3.5.tgz*) into the *3rdparty* folder.
|
||||
|
||||
As a result, you will get a folder named, for example, *3rdparty\\gl2ps-1.3.5-source*.
|
||||
|
||||
Rename it into <i>gl2ps-platform-compiler-building mode</i>, where
|
||||
* **platform** -- *win32* or *win64*;
|
||||
* **compiler** -- *vc8*, *vc9* or *vc10*;
|
||||
* **building mode** -- *opt* (for release) or *deb* (for debug).
|
||||
|
||||
For example, <i>gl2ps-win64-vc10-deb</i>
|
||||
|
||||
Further in this document, this folder is referred to as *gl2ps*.
|
||||
|
||||
2. Download (from http://www.cmake.org/cmake/resources/software.html)
|
||||
and install the *CMake* build system.
|
||||
|
||||
3. Edit the file *gl2ps\\CMakeLists.txt*.
|
||||
|
||||
After line 113 in *CMakeLists.txt*:
|
||||
|
||||
set_target_properties(shared PROPERTIES COMPILE_FLAGS \"-DGL2PSDLL -DGL2PSDLL_EXPORTS\")
|
||||
|
||||
add the following line:
|
||||
|
||||
add_definitions(-D_USE_MATH_DEFINES)
|
||||
|
||||
Attention: If Cygwin was installed on your computer, make sure that there is no path to it in the *PATH* variable to avoid possible conflicts during the configuration.
|
||||
|
||||
4. Launch CMake <i>(cmake-gui.exe)</i> using the Program menu.
|
||||
|
||||
In CMake:
|
||||
|
||||
* Define where the source code is.
|
||||
This path must point to *gl2ps* folder.
|
||||
|
||||
* Define where to build the binaries.
|
||||
This path must point to the folder where generated gl2ps project binaries will be placed
|
||||
(for example, *gl2ps\\bin*).
|
||||
Further in this document, this folder is referred to as *gl2ps_bin*.
|
||||
|
||||
* Press **Configure** button.
|
||||
|
||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image004.png}
|
||||
|
||||
* Select the generator (the compiler and the target platform -- 32 or 64 bit) in the pop-up window.
|
||||
|
||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image005.png}
|
||||
|
||||
* Press **Finish** button to return to the main CMake window.
|
||||
Expand the ENABLE group and uncheck ENABLE_PNG and ENABLE_ZLIB check boxes.
|
||||
|
||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image006.png}
|
||||
|
||||
* Expand the CMAKE group and define *CMAKE_INSTALL_PREFIX* which is the path where you want to install the build results, for example, *c:\\occ3rdparty\\gl2ps-1.3.5*.
|
||||
|
||||
@figure{/dev_guides/building/3rdparty/images/3rdparty_image007.png}
|
||||
|
||||
* Press **Configure** button again, then press **Generate** button to generate Visual Studio projects. After completion, close CMake application.
|
||||
|
||||
5. Open the solution file *gl2ps_bin\\gl2ps.sln* in Visual Studio.
|
||||
|
||||
* Select a configuration to build
|
||||
* Choose **Release** to build Release binaries.
|
||||
* Choose **Debug** to build Debug binaries.
|
||||
* Select a platform to build.
|
||||
* Choose **Win32** to build for a 32 bit platform.
|
||||
* Choose **x64** to build for a 64 bit platform.
|
||||
* Build the solution.
|
||||
* Build the *INSTALL* project.
|
||||
|
||||
As a result, you should have the installed gl2ps product in the *CMAKE_INSTALL_PREFIX* path.
|
||||
|
||||
@subsection dev_guides__building_3rdparty_win_3_3 FreeImage
|
||||
|
||||
This third-party product should be built as a dynamically loadable library (.dll file).
|
||||
|
||||
@ -82,14 +82,12 @@ The following table gives the full list of environment variables used at the con
|
||||
|----------|------|---------|
|
||||
| CMAKE_BUILD_TYPE | String | Specifies the build type on single-configuration generators (such as make). Possible values are Debug, Release and RelWithDebInfo |
|
||||
| USE_FREEIMAGE | Boolean flag | Indicates whether FreeImage product should be used in OCCT visualization module for support of popular graphics image formats (PNG, BMP, etc.) |
|
||||
| USE_GL2PS | Boolean flag | Indicates whether GL2PS product should be used in OCCT visualization module for support of vector image formats (PS, EPS, etc.) |
|
||||
| USE_TBB | Boolean flag | Indicates whether TBB 3rd party is used or not. TBB stands for Threading Building Blocks, the technology of Intel Corp, which comes with different mechanisms and patterns for injecting parallelism into your application. OCCT remains parallel even without TBB product |
|
||||
| USE_VTK | Boolean flag | Indicates whether VTK 3rd party is used or not. VTK stands for Visualization ToolKit, the technology of Kitware Inc intended for general-purpose scientific visualization. OCCT comes with a bridge between CAD data representation and VTK by means of its dedicated VIS component (VTK Integration Services). You may skip this 3rd party unless you are planning to use VTK visualization for OCCT geometry. See the official documentation @ref occt_user_guides__vis for the details on VIS |
|
||||
| 3RDPARTY_DIR | Path | Defines the root directory where all required 3rd party products will be searched. Once you define this path it is very convenient to click "Configure" button in order to let CMake automatically detect all necessary products|
|
||||
| 3RDPARTY_FREETYPE_* | Path | Path to Freetype binaries |
|
||||
| 3RDPARTY_TCL_* 3RDPARTY_TK_* | Path | Path to Tcl/Tk binaries |
|
||||
| 3RDPARTY_FREEIMAGE* | Path | Path to Freeimage binaries |
|
||||
| 3RDPARTY_GL2PS_* | Path | Path to GL2PS binaries |
|
||||
| 3RDPARTY_TBB* | Path | Path to TBB binaries |
|
||||
| 3RDPARTY_VTK_* | Path | Path to VTK binaries |
|
||||
| BUILD_MODULE_<MODULE>| Boolean flag | Indicates whether the corresponding OCCT module should be built or not. It should be noted that some toolkits of a module can be built even if this module is not checked (this happens if some other modules depend on these toolkits). The main modules and their descriptions can be found in @ref user_guides |
|
||||
@ -117,7 +115,6 @@ The following table gives the full list of environment variables used at the con
|
||||
| INSTALL_DIR_DOC | Path | Relative path to the documentation installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_DOC}) |
|
||||
| INSTALL_FREETYPE | Boolean flag | Indicates whether Freetype binaries should be installed into the installation directory |
|
||||
| INSTALL_FREEIMAGE* | Boolean flag | Indicates whether Freeimage binaries should be installed into the installation directory |
|
||||
| INSTALL_GL2PS | Boolean flag | Indicates whether GL2PS binaries should be installed into the installation directory |
|
||||
| INSTALL_TBB | Boolean flag | Indicates whether TBB binaries should be installed into the installation directory |
|
||||
| INSTALL_VTK | Boolean flag | Indicates whether VTK binaries should be installed into the installation directory |
|
||||
| INSTALL_TCL | Boolean flag | Indicates whether TCL binaries should be installed into the installation directory |
|
||||
|
||||
@ -26,7 +26,7 @@ The environment is defined in the file *custom.sh* (on Linux and OS X) or *custo
|
||||
* "HardLink* - hard links to headers located in *src* will be created.
|
||||
* For optional third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*, e.g.:
|
||||
~~~~~
|
||||
export HAVE_GL2PS=false
|
||||
export HAVE_FREEIMAGE=false
|
||||
~~~~~
|
||||
|
||||
Alternatively, or when *custom.sh* or *custom.bat* does not exist, you can launch **genconf** tool to configure environment interactively:
|
||||
|
||||
@ -27,7 +27,7 @@ The environment is defined in the file *custom.sh* which can be edited directly:
|
||||
* "HardLink* - hard links to headers located in *src* will be created.
|
||||
* For optional third-party libraries, set corresponding environment variable <i>HAVE_<LIBRARY_NAME></i> to either *false*, e.g.:
|
||||
~~~~~
|
||||
export HAVE_GL2PS=false
|
||||
export HAVE_FREEIMAGE=false
|
||||
~~~~~
|
||||
|
||||
Alternatively, or when *custom.sh* does not exist, you can launch *genconf.sh* to configure environment interactively:
|
||||
|
||||
@ -1546,6 +1546,8 @@ Since the new version, the method *BRepAdaptor_CompCurve::IsPeriodic()* will alw
|
||||
|
||||
@subsection upgrade_730_removed Removed features
|
||||
* The methods *SetDeflection*, *SetEpsilonT*, *SetDiscretize* of the class *IntTools_EdgeFace* have been removed as redundant.
|
||||
* Deprecated functionality *V3d_View::Export()*, related enumerations Graphic3d_ExportFormat, Graphic3d_SortType
|
||||
as well as optional dependency from gl2ps library have been removed.
|
||||
|
||||
@subsection upgrade_730_BuilderSolid Boolean Operations - Solid Builder algorithm
|
||||
|
||||
|
||||
@ -90,10 +90,6 @@ the copyright allows you to use, modify, and redistribute Tcl/Tk for any purpose
|
||||
explicit license agreement and without paying any license fees or royalties.
|
||||
To use Tcl/Tk, please refer to the Licensing Terms (https://www.tcl.tk/software/tcltk/license.html).
|
||||
|
||||
**GL2PS** is developed by Christophe Geuzaine and others. It is optionally used by OCCT to
|
||||
export content of OpenGL scene to vector graphics formats (PS, PDF, EMF, SVG).
|
||||
The library is licensed under GL2PS license (http://www.geuz.org/gl2ps/COPYING.GL2PS).
|
||||
|
||||
**FreeType 2** is developed by Antoine Leca, David Turner, Werner Lemberg and others.
|
||||
It is a software font engine that is designed to be small, efficient, highly customizable and
|
||||
portable while capable of producing high-quality output (glyph images). This product
|
||||
@ -226,7 +222,6 @@ for which OCCT is certified to work.
|
||||
| Freetype (for text rendering) | FreeType 2.4.11-2.7.1 https://sourceforge.net/projects/freetype/files/ |
|
||||
| FreeImage (optional, for support of common 2D graphic formats) | FreeImage 3.17.0+ https://sourceforge.net/projects/freeimage/files |
|
||||
| FFmpeg (optional, for video recording) | FFmpeg 3.1+ https://www.ffmpeg.org/download.html |
|
||||
| gl2ps (optional, for export contents of OCCT viewer to vector formats) | gl2ps-1.3.8+ http://geuz.org/gl2ps/ |
|
||||
| Intel TBB (optional, for multithreaded algorithms) | TBB 4.x or 5.x https://www.threadingbuildingblocks.org/ |
|
||||
| VTK (for VTK Integration Services | VTK 6.1+ http://www.vtk.org/download/ |
|
||||
| Doxygen (optional for building documentation) | Doxygen 1.8.5+ https://www.stack.nl/~dimitri/doxygen/download.html |
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
#include "OCC_3dBaseDoc.h"
|
||||
#include <res\OCC_Resource.h>
|
||||
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_Camera.hxx>
|
||||
|
||||
#include <OpenGl_GraphicDriver.hxx>
|
||||
|
||||
@ -55,7 +55,6 @@
|
||||
#include <Graphic3d_HorizontalTextAlignment.hxx>
|
||||
#include <Graphic3d_VerticalTextAlignment.hxx>
|
||||
#include <Graphic3d_ArrayOfPolylines.hxx>
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_ArrayOfPolylines.hxx>
|
||||
#include <Graphic3d_AspectFillArea3d.hxx>
|
||||
#include <Graphic3d_AspectText3d.hxx>
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_GraphicDriver.hxx>
|
||||
#include <Graphic3d_TextureEnv.hxx>
|
||||
|
||||
|
||||
@ -340,11 +340,6 @@ static Standard_Integer dversion(Draw_Interpretor& di, Standard_Integer, const c
|
||||
#else
|
||||
di << "TBB disabled\n";
|
||||
#endif
|
||||
#ifdef HAVE_GL2PS
|
||||
di << "GL2PS enabled (HAVE_GL2PS)\n";
|
||||
#else
|
||||
di << "GL2PS disabled\n";
|
||||
#endif
|
||||
#ifdef HAVE_FREEIMAGE
|
||||
di << "FreeImage enabled (HAVE_FREEIMAGE)\n";
|
||||
#else
|
||||
|
||||
@ -43,7 +43,6 @@ Graphic3d_CView.hxx
|
||||
Graphic3d_DataStructureManager.cxx
|
||||
Graphic3d_DataStructureManager.hxx
|
||||
Graphic3d_DiagnosticInfo.hxx
|
||||
Graphic3d_ExportFormat.hxx
|
||||
Graphic3d_GraduatedTrihedron.hxx
|
||||
Graphic3d_GraphicDriver.cxx
|
||||
Graphic3d_GraphicDriver.hxx
|
||||
@ -95,7 +94,6 @@ Graphic3d_ShaderProgram.hxx
|
||||
Graphic3d_ShaderVariable.cxx
|
||||
Graphic3d_ShaderVariable.hxx
|
||||
Graphic3d_ShaderVariable.lxx
|
||||
Graphic3d_SortType.hxx
|
||||
Graphic3d_StereoMode.hxx
|
||||
Graphic3d_Structure.cxx
|
||||
Graphic3d_Structure.hxx
|
||||
|
||||
@ -23,14 +23,12 @@
|
||||
#include <Graphic3d_CStructure.hxx>
|
||||
#include <Graphic3d_DataStructureManager.hxx>
|
||||
#include <Graphic3d_DiagnosticInfo.hxx>
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_GraduatedTrihedron.hxx>
|
||||
#include <Graphic3d_MapOfStructure.hxx>
|
||||
#include <Graphic3d_NMapOfTransient.hxx>
|
||||
#include <Graphic3d_RenderingParams.hxx>
|
||||
#include <Graphic3d_SequenceOfHClipPlane.hxx>
|
||||
#include <Graphic3d_SequenceOfStructure.hxx>
|
||||
#include <Graphic3d_SortType.hxx>
|
||||
#include <Graphic3d_Structure.hxx>
|
||||
#include <Graphic3d_TextureEnv.hxx>
|
||||
#include <Graphic3d_TypeOfAnswer.hxx>
|
||||
@ -271,14 +269,6 @@ public:
|
||||
//! Dump active rendering buffer into specified memory buffer.
|
||||
virtual Standard_Boolean BufferDump (Image_PixMap& theImage, const Graphic3d_BufferType& theBufferType) = 0;
|
||||
|
||||
//! Export scene into the one of the Vector graphics formats (SVG, PS, PDF...).
|
||||
//! In contrast to Bitmaps, Vector graphics is scalable (so you may got quality benefits
|
||||
//! on printing to laser printer). Notice however that results may differ a lot and
|
||||
//! do not contain some elements.
|
||||
virtual Standard_Boolean Export (const Standard_CString theFileName,
|
||||
const Graphic3d_ExportFormat theFormat,
|
||||
const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree) = 0;
|
||||
|
||||
//! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated.
|
||||
virtual void InvalidateBVHData (const Graphic3d_ZLayerId theLayerId) = 0;
|
||||
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
// Created on: 1993-03-31
|
||||
// Created by: NW,JPB,CAL
|
||||
// Copyright (c) 1993-1999 Matra Datavision
|
||||
// Copyright (c) 1999-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 _Graphic3d_ExportFormat_HeaderFile
|
||||
#define _Graphic3d_ExportFormat_HeaderFile
|
||||
|
||||
|
||||
enum Graphic3d_ExportFormat
|
||||
{
|
||||
Graphic3d_EF_PostScript,
|
||||
Graphic3d_EF_EnhPostScript,
|
||||
Graphic3d_EF_TEX,
|
||||
Graphic3d_EF_PDF,
|
||||
Graphic3d_EF_SVG,
|
||||
Graphic3d_EF_PGF,
|
||||
Graphic3d_EF_EMF
|
||||
};
|
||||
|
||||
#endif // _Graphic3d_ExportFormat_HeaderFile
|
||||
@ -40,8 +40,6 @@
|
||||
#include <Graphic3d_BufferType.hxx>
|
||||
#include <Aspect_GenId.hxx>
|
||||
#include <Aspect_Handle.hxx>
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_SortType.hxx>
|
||||
#include <Graphic3d_ZLayerId.hxx>
|
||||
#include <Graphic3d_ZLayerSettings.hxx>
|
||||
#include <Graphic3d_CLight.hxx>
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
// Created on: 1993-03-31
|
||||
// Created by: NW,JPB,CAL
|
||||
// Copyright (c) 1993-1999 Matra Datavision
|
||||
// Copyright (c) 1999-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 _Graphic3d_SortType_HeaderFile
|
||||
#define _Graphic3d_SortType_HeaderFile
|
||||
|
||||
|
||||
enum Graphic3d_SortType
|
||||
{
|
||||
Graphic3d_ST_Simple,
|
||||
Graphic3d_ST_BSP_Tree
|
||||
};
|
||||
|
||||
#endif // _Graphic3d_SortType_HeaderFile
|
||||
@ -63,14 +63,6 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Context,Standard_Transient)
|
||||
#include <GL/glx.h> // glXGetProcAddress()
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_GL2PS
|
||||
#include <gl2ps.h>
|
||||
#ifdef _MSC_VER
|
||||
#pragma comment (lib, "gl2ps.lib")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
namespace
|
||||
{
|
||||
static const Handle(OpenGl_Resource) NULL_GL_RESOURCE;
|
||||
@ -3323,13 +3315,6 @@ void OpenGl_Context::SetTypeOfLine (const Aspect_TypeOfLine theType,
|
||||
#if !defined(GL_ES_VERSION_2_0)
|
||||
if (aPattern != 0xFFFF)
|
||||
{
|
||||
#ifdef HAVE_GL2PS
|
||||
if (IsFeedback())
|
||||
{
|
||||
gl2psEnable (GL2PS_LINE_STIPPLE);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (core11 != NULL)
|
||||
{
|
||||
core11fwd->glEnable (GL_LINE_STIPPLE);
|
||||
@ -3344,13 +3329,6 @@ void OpenGl_Context::SetTypeOfLine (const Aspect_TypeOfLine theType,
|
||||
{
|
||||
core11fwd->glDisable (GL_LINE_STIPPLE);
|
||||
}
|
||||
|
||||
#ifdef HAVE_GL2PS
|
||||
if (IsFeedback())
|
||||
{
|
||||
gl2psDisable (GL2PS_LINE_STIPPLE);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -3366,12 +3344,6 @@ void OpenGl_Context::SetLineWidth (const Standard_ShortReal theWidth)
|
||||
// glLineWidth() is still defined within Core Profile, but has no effect with values != 1.0f
|
||||
core11fwd->glLineWidth (theWidth * myLineWidthScale);
|
||||
}
|
||||
#ifdef HAVE_GL2PS
|
||||
if (IsFeedback())
|
||||
{
|
||||
gl2psLineWidth (theWidth);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
|
||||
@ -33,8 +33,6 @@
|
||||
#include <Graphic3d_VerticalTextAlignment.hxx>
|
||||
#include <Graphic3d_GraduatedTrihedron.hxx>
|
||||
#include <Graphic3d_TypeOfComposition.hxx>
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_SortType.hxx>
|
||||
#include <Graphic3d_BufferType.hxx>
|
||||
#include <NCollection_DataMap.hxx>
|
||||
#include <OpenGl_Context.hxx>
|
||||
|
||||
@ -29,10 +29,6 @@
|
||||
#include <Graphic3d_TransformUtils.hxx>
|
||||
#include <TCollection_HAsciiString.hxx>
|
||||
|
||||
#ifdef HAVE_GL2PS
|
||||
#include <gl2ps.h>
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
static const GLdouble THE_IDENTITY_MATRIX[16] =
|
||||
@ -43,101 +39,6 @@ namespace
|
||||
0.0, 0.0, 0.0, 1.0
|
||||
};
|
||||
|
||||
#ifdef HAVE_GL2PS
|
||||
static char const* TheFamily[] = {"Helvetica", "Courier", "Times"};
|
||||
static char const* TheItalic[] = {"Oblique", "Oblique", "Italic"};
|
||||
static char const* TheBase[] = {"", "", "-Roman"};
|
||||
|
||||
//! Convert font name used for rendering to some "good" font names
|
||||
//! that produce good vector text.
|
||||
static void getGL2PSFontName (const char* theSrcFont,
|
||||
char* thePsFont)
|
||||
{
|
||||
if (strstr (theSrcFont, "Symbol"))
|
||||
{
|
||||
sprintf (thePsFont, "%s", "Symbol");
|
||||
return;
|
||||
}
|
||||
else if (strstr (theSrcFont, "ZapfDingbats"))
|
||||
{
|
||||
sprintf (thePsFont, "%s", "WingDings");
|
||||
return;
|
||||
}
|
||||
|
||||
int aFontId = 0;
|
||||
bool isBold = false;
|
||||
bool isItalic = false;
|
||||
if (strstr (theSrcFont, "Courier"))
|
||||
{
|
||||
aFontId = 1;
|
||||
}
|
||||
else if (strstr (theSrcFont, "Times"))
|
||||
{
|
||||
aFontId = 2;
|
||||
}
|
||||
|
||||
if (strstr (theSrcFont, "Bold"))
|
||||
{
|
||||
isBold = true;
|
||||
}
|
||||
if (strstr (theSrcFont, "Italic")
|
||||
|| strstr (theSrcFont, "Oblique"))
|
||||
{
|
||||
isItalic = true;
|
||||
}
|
||||
|
||||
if (isBold)
|
||||
{
|
||||
if (isItalic)
|
||||
{
|
||||
sprintf (thePsFont, "%s-Bold%s", TheFamily[aFontId], TheItalic[aFontId]);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf (thePsFont, "%s-Bold", TheFamily[aFontId]);
|
||||
}
|
||||
}
|
||||
else if (isItalic)
|
||||
{
|
||||
sprintf (thePsFont, "%s-%s", TheFamily[aFontId], TheItalic[aFontId]);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf (thePsFont, "%s%s", TheFamily[aFontId], TheBase[aFontId]);
|
||||
}
|
||||
}
|
||||
|
||||
static void exportText (const NCollection_String& theText,
|
||||
const Standard_Boolean theIs2d,
|
||||
const OpenGl_AspectText& theAspect,
|
||||
const Standard_Integer theHeight)
|
||||
{
|
||||
|
||||
char aPsFont[64];
|
||||
getGL2PSFontName (theAspect.Aspect()->Font().ToCString(), aPsFont);
|
||||
|
||||
(void)theIs2d;
|
||||
#if !defined(GL_ES_VERSION_2_0)
|
||||
if (theIs2d)
|
||||
{
|
||||
glRasterPos2f (0.0f, 0.0f);
|
||||
}
|
||||
else
|
||||
{
|
||||
glRasterPos3f (0.0f, 0.0f, 0.0f);
|
||||
}
|
||||
|
||||
GLubyte aZero = 0;
|
||||
glBitmap (1, 1, 0, 0, 0, 0, &aZero);
|
||||
#endif
|
||||
|
||||
// Standard GL2PS's alignment isn't used, because it doesn't work correctly
|
||||
// for all formats, therefore alignment is calculated manually relative
|
||||
// to the bottom-left corner, which corresponds to the GL2PS_TEXT_BL value
|
||||
gl2psTextOpt (theText.ToCString(), aPsFont, (GLshort)theHeight, GL2PS_TEXT_BL, (float )theAspect.Aspect()->GetTextAngle());
|
||||
}
|
||||
#endif
|
||||
|
||||
//! Auxiliary tool for setting polygon offset temporarily.
|
||||
struct BackPolygonOffsetSentry
|
||||
{
|
||||
@ -606,17 +507,7 @@ void OpenGl_Text::setupMatrix (const Handle(OpenGl_Context)& theCtx,
|
||||
void OpenGl_Text::drawText (const Handle(OpenGl_Context)& theCtx,
|
||||
const OpenGl_AspectText& theTextAspect) const
|
||||
{
|
||||
#ifdef HAVE_GL2PS
|
||||
if (theCtx->IsFeedback())
|
||||
{
|
||||
// position of the text and alignment is calculated by transformation matrix
|
||||
exportText (myString, myIs2d, theTextAspect, (Standard_Integer )myExportHeight);
|
||||
return;
|
||||
}
|
||||
#else
|
||||
(void )theTextAspect;
|
||||
#endif
|
||||
|
||||
if (myVertsVbo.Length() != myTextures.Length()
|
||||
|| myTextures.IsEmpty())
|
||||
{
|
||||
|
||||
@ -38,10 +38,6 @@
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_View,Graphic3d_CView)
|
||||
|
||||
#ifdef HAVE_GL2PS
|
||||
#include <gl2ps.h>
|
||||
#endif
|
||||
|
||||
// =======================================================================
|
||||
// function : Constructor
|
||||
// purpose :
|
||||
@ -741,112 +737,6 @@ void OpenGl_View::FBOChangeViewport (const Handle(Standard_Transient)& theFbo,
|
||||
aFrameBuffer->ChangeViewport (theWidth, theHeight);
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : Export
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
#ifdef HAVE_GL2PS
|
||||
Standard_Boolean OpenGl_View::Export (const Standard_CString theFileName,
|
||||
const Graphic3d_ExportFormat theFormat,
|
||||
const Graphic3d_SortType theSortType)
|
||||
{
|
||||
// gl2psBeginPage() will call OpenGL functions
|
||||
// so we should activate correct GL context before redraw scene call
|
||||
if (!myWorkspace->Activate())
|
||||
{
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
Standard_Integer aFormat = -1;
|
||||
Standard_Integer aSortType = Graphic3d_ST_BSP_Tree;
|
||||
switch (theFormat)
|
||||
{
|
||||
case Graphic3d_EF_PostScript:
|
||||
aFormat = GL2PS_PS;
|
||||
break;
|
||||
case Graphic3d_EF_EnhPostScript:
|
||||
aFormat = GL2PS_EPS;
|
||||
break;
|
||||
case Graphic3d_EF_TEX:
|
||||
aFormat = GL2PS_TEX;
|
||||
break;
|
||||
case Graphic3d_EF_PDF:
|
||||
aFormat = GL2PS_PDF;
|
||||
break;
|
||||
case Graphic3d_EF_SVG:
|
||||
aFormat = GL2PS_SVG;
|
||||
break;
|
||||
case Graphic3d_EF_PGF:
|
||||
aFormat = GL2PS_PGF;
|
||||
break;
|
||||
case Graphic3d_EF_EMF:
|
||||
//aFormat = GL2PS_EMF;
|
||||
aFormat = GL2PS_PGF + 1; // 6
|
||||
break;
|
||||
default:
|
||||
// unsupported format
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
switch (theSortType)
|
||||
{
|
||||
case Graphic3d_ST_Simple:
|
||||
aSortType = GL2PS_SIMPLE_SORT;
|
||||
break;
|
||||
case Graphic3d_ST_BSP_Tree:
|
||||
aSortType = GL2PS_BSP_SORT;
|
||||
break;
|
||||
}
|
||||
|
||||
GLint aViewport[4];
|
||||
aViewport[0] = 0;
|
||||
aViewport[1] = 0;
|
||||
aViewport[2] = myWindow->Width();
|
||||
aViewport[3] = myWindow->Height();
|
||||
|
||||
GLint aBufferSize = 1024 * 1024;
|
||||
GLint anErrCode = GL2PS_SUCCESS;
|
||||
|
||||
// gl2ps uses standard write functions and do not check locale
|
||||
Standard_CLocaleSentry aLocaleSentry;
|
||||
|
||||
while (aBufferSize > 0)
|
||||
{
|
||||
// current patch for EMF support in gl2ps uses WinAPI functions to create file
|
||||
FILE* aFileH = (theFormat != Graphic3d_EF_EMF) ? fopen (theFileName, "wb") : NULL;
|
||||
anErrCode = gl2psBeginPage ("", "", aViewport, aFormat, aSortType,
|
||||
GL2PS_DRAW_BACKGROUND | GL2PS_OCCLUSION_CULL | GL2PS_BEST_ROOT/* | GL2PS_SIMPLE_LINE_OFFSET*/,
|
||||
GL_RGBA, 0, NULL,
|
||||
0, 0, 0, aBufferSize, aFileH, theFileName);
|
||||
if (anErrCode != GL2PS_SUCCESS)
|
||||
{
|
||||
// initialization failed
|
||||
if (aFileH != NULL)
|
||||
fclose (aFileH);
|
||||
break;
|
||||
}
|
||||
Redraw();
|
||||
|
||||
anErrCode = gl2psEndPage();
|
||||
if (aFileH != NULL)
|
||||
fclose (aFileH);
|
||||
|
||||
if (anErrCode == GL2PS_OVERFLOW)
|
||||
aBufferSize *= 2;
|
||||
else
|
||||
break;
|
||||
}
|
||||
return anErrCode == GL2PS_SUCCESS;
|
||||
}
|
||||
#else
|
||||
Standard_Boolean OpenGl_View::Export (const Standard_CString /*theFileName*/,
|
||||
const Graphic3d_ExportFormat /*theFormat*/,
|
||||
const Graphic3d_SortType /*theSortType*/)
|
||||
{
|
||||
return Standard_False;
|
||||
}
|
||||
#endif
|
||||
|
||||
//=======================================================================
|
||||
//function : displayStructure
|
||||
//purpose :
|
||||
|
||||
@ -148,14 +148,6 @@ public:
|
||||
Standard_EXPORT virtual Standard_Boolean BufferDump (Image_PixMap& theImage,
|
||||
const Graphic3d_BufferType& theBufferType) Standard_OVERRIDE;
|
||||
|
||||
//! Export scene into the one of the Vector graphics formats (SVG, PS, PDF...).
|
||||
//! In contrast to Bitmaps, Vector graphics is scalable (so you may got quality benefits
|
||||
//! on printing to laser printer). Notice however that results may differ a lot and
|
||||
//! do not contain some elements.
|
||||
Standard_EXPORT virtual Standard_Boolean Export (const Standard_CString theFileName,
|
||||
const Graphic3d_ExportFormat theFormat,
|
||||
const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree) Standard_OVERRIDE;
|
||||
|
||||
//! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated.
|
||||
Standard_EXPORT virtual void InvalidateBVHData (const Graphic3d_ZLayerId theLayerId) Standard_OVERRIDE;
|
||||
|
||||
|
||||
@ -39,15 +39,6 @@
|
||||
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Workspace,Standard_Transient)
|
||||
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_RaytraceFilter,OpenGl_RenderFilter)
|
||||
|
||||
#ifdef HAVE_GL2PS
|
||||
#include <gl2ps.h>
|
||||
/* OCC22216 NOTE: linker dependency can be switched off by undefining macro.
|
||||
Pragma comment for gl2ps.lib is defined only here. */
|
||||
#ifdef _MSC_VER
|
||||
#pragma comment( lib, "gl2ps.lib" )
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
static const OpenGl_Vec4 THE_WHITE_COLOR (1.0f, 1.0f, 1.0f, 1.0f);
|
||||
@ -409,9 +400,6 @@ const OpenGl_AspectMarker* OpenGl_Workspace::ApplyAspectMarker()
|
||||
{
|
||||
#if !defined(GL_ES_VERSION_2_0)
|
||||
glPointSize (myAspectMarkerSet->Aspect()->Scale());
|
||||
#ifdef HAVE_GL2PS
|
||||
gl2psPointSize (myAspectMarkerSet->Aspect()->Scale());
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
myAspectMarkerApplied = myAspectMarkerSet->Aspect();
|
||||
|
||||
@ -4,7 +4,6 @@ TKMath
|
||||
TKV3d
|
||||
CSF_TBB
|
||||
CSF_FREETYPE
|
||||
CSF_GL2PS
|
||||
CSF_OpenGlLibs
|
||||
CSF_user32
|
||||
CSF_gdi32
|
||||
|
||||
@ -2666,17 +2666,6 @@ void V3d_View::Init()
|
||||
}
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
//function : Export
|
||||
//purpose :
|
||||
//=============================================================================
|
||||
Standard_Boolean V3d_View::Export (const Standard_CString theFileName,
|
||||
const Graphic3d_ExportFormat theFormat,
|
||||
const Graphic3d_SortType theSortType)
|
||||
{
|
||||
return myView->Export (theFileName, theFormat, theSortType);
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
//function : Dump
|
||||
//purpose :
|
||||
|
||||
@ -796,15 +796,6 @@ public:
|
||||
//! Returns FALSE when the dump has failed
|
||||
Standard_EXPORT Standard_Boolean Dump (const Standard_CString theFile, const Graphic3d_BufferType& theBufferType = Graphic3d_BT_RGB);
|
||||
|
||||
//! Export scene into the one of the Vector graphics formats (SVG, PS, PDF...).
|
||||
//! In contrast to Bitmaps, Vector graphics is scalable (so you may got quality benefits
|
||||
//! on printing to laser printer). Notice however that results may differ a lot and
|
||||
//! do not contain some elements.
|
||||
Standard_DEPRECATED("Export to Vector graphic is incompatible with Programmable Pipeline and should not be used")
|
||||
Standard_EXPORT Standard_Boolean Export (const Standard_CString theFileName,
|
||||
const Graphic3d_ExportFormat theFormat,
|
||||
const Graphic3d_SortType theSortType = Graphic3d_ST_BSP_Tree);
|
||||
|
||||
//! Dumps the full contents of the view to a pixmap with specified parameters.
|
||||
Standard_EXPORT Standard_Boolean ToPixMap (Image_PixMap& theImage,
|
||||
const V3d_ImageDumpOptions& theParams);
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
#include <Draw_ProgressIndicator.hxx>
|
||||
#include <Graphic3d_ArrayOfPolylines.hxx>
|
||||
#include <Graphic3d_AspectMarker3d.hxx>
|
||||
#include <Graphic3d_ExportFormat.hxx>
|
||||
#include <Graphic3d_NameOfTextureEnv.hxx>
|
||||
#include <Graphic3d_GraduatedTrihedron.hxx>
|
||||
#include <Graphic3d_TextureEnv.hxx>
|
||||
@ -3682,93 +3681,6 @@ static int VPlace (Draw_Interpretor& /*theDi*/, Standard_Integer theArgNb, const
|
||||
return 0;
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
//function : VExport
|
||||
//purpose : Export the view to a vector graphic format (PS, EMF, PDF)
|
||||
//==============================================================================
|
||||
|
||||
static int VExport(Draw_Interpretor& di, Standard_Integer argc, const char** argv)
|
||||
{
|
||||
Handle(V3d_View) V3dView = ViewerTest::CurrentView();
|
||||
if (V3dView.IsNull())
|
||||
return 1;
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
std::cout << "Usage: " << argv[0] << " Filename [Format]\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
Graphic3d_ExportFormat anExpFormat = Graphic3d_EF_PDF;
|
||||
TCollection_AsciiString aFormatStr;
|
||||
|
||||
TCollection_AsciiString aFileName (argv[1]);
|
||||
Standard_Integer aLen = aFileName.Length();
|
||||
|
||||
if (argc > 2)
|
||||
{
|
||||
aFormatStr = TCollection_AsciiString (argv[2]);
|
||||
}
|
||||
else if (aLen >= 4)
|
||||
{
|
||||
if (aFileName.Value (aLen - 2) == '.')
|
||||
{
|
||||
aFormatStr = aFileName.ToCString() + aLen - 2;
|
||||
}
|
||||
else if (aFileName.Value (aLen - 3) == '.')
|
||||
{
|
||||
aFormatStr = aFileName.ToCString() + aLen - 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Export format couln't be detected from filename '" << argv[1] << "'\n";
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cout << "Export format couln't be detected from filename '" << argv[1] << "'\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
aFormatStr.UpperCase();
|
||||
if (aFormatStr == "PS")
|
||||
anExpFormat = Graphic3d_EF_PostScript;
|
||||
else if (aFormatStr == "EPS")
|
||||
anExpFormat = Graphic3d_EF_EnhPostScript;
|
||||
else if (aFormatStr == "TEX")
|
||||
anExpFormat = Graphic3d_EF_TEX;
|
||||
else if (aFormatStr == "PDF")
|
||||
anExpFormat = Graphic3d_EF_PDF;
|
||||
else if (aFormatStr == "SVG")
|
||||
anExpFormat = Graphic3d_EF_SVG;
|
||||
else if (aFormatStr == "PGF")
|
||||
anExpFormat = Graphic3d_EF_PGF;
|
||||
else if (aFormatStr == "EMF")
|
||||
anExpFormat = Graphic3d_EF_EMF;
|
||||
else
|
||||
{
|
||||
std::cout << "Invalid export format '" << aFormatStr << "'\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
Standard_DISABLE_DEPRECATION_WARNINGS
|
||||
try
|
||||
{
|
||||
if (!V3dView->Export (argv[1], anExpFormat))
|
||||
{
|
||||
di << "Error: export of image to " << aFormatStr << " failed!\n";
|
||||
}
|
||||
}
|
||||
catch (Standard_Failure const& anException)
|
||||
{
|
||||
di << "Error: export of image to " << aFormatStr << " failed";
|
||||
di << " (exception: " << anException.GetMessageString() << ")";
|
||||
}
|
||||
Standard_ENABLE_DEPRECATION_WARNINGS
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int VColorScale (Draw_Interpretor& theDI,
|
||||
Standard_Integer theArgNb,
|
||||
const char** theArgVec)
|
||||
@ -12012,11 +11924,6 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands)
|
||||
theCommands.Add("vpan",
|
||||
"vpan : vpan dx dy",
|
||||
__FILE__,VPan,group);
|
||||
theCommands.Add("vexport",
|
||||
"vexport : vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF | EMF }"
|
||||
" : exports the view to a vector file of a given format"
|
||||
" : notice that EMF format requires patched gl2ps",
|
||||
__FILE__,VExport,group);
|
||||
theCommands.Add("vcolorscale",
|
||||
"vcolorscale name [-noupdate|-update] [-demo]"
|
||||
"\n\t\t: [-range RangeMin=0 RangeMax=1 NbIntervals=10]"
|
||||
|
||||
25
tests/3rdparty/export/A1
vendored
25
tests/3rdparty/export/A1
vendored
@ -1,25 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
if { [array get Draw_Groups "XSTEP-STL/VRML"] == "" } {
|
||||
pload XSDRAW
|
||||
}
|
||||
|
||||
meshfromstl m [locate_data_file shape.stl]
|
||||
|
||||
meshtext m
|
||||
|
||||
vsetdispmode m 34
|
||||
|
||||
set aFile $imagedir/shape.pdf
|
||||
|
||||
set format PDF
|
||||
|
||||
if { [checkplatform -windows] } {
|
||||
set size 154489
|
||||
} else {
|
||||
set size 144401
|
||||
}
|
||||
46
tests/3rdparty/export/A2
vendored
46
tests/3rdparty/export/A2
vendored
@ -1,46 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/ExportToPDF.pdf
|
||||
|
||||
set format PDF
|
||||
|
||||
set size 9070
|
||||
|
||||
46
tests/3rdparty/export/A3
vendored
46
tests/3rdparty/export/A3
vendored
@ -1,46 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/ExportToPS.ps
|
||||
|
||||
set format PS
|
||||
|
||||
set size 9550
|
||||
|
||||
45
tests/3rdparty/export/A4
vendored
45
tests/3rdparty/export/A4
vendored
@ -1,45 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/ExportToEPS.eps
|
||||
|
||||
set format EPS
|
||||
|
||||
set size 9500
|
||||
45
tests/3rdparty/export/A5
vendored
45
tests/3rdparty/export/A5
vendored
@ -1,45 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/ExportToTEX.tex
|
||||
|
||||
set format TEX
|
||||
|
||||
set size 1400
|
||||
45
tests/3rdparty/export/A6
vendored
45
tests/3rdparty/export/A6
vendored
@ -1,45 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/ExportToSVG.svg
|
||||
|
||||
set format SVG
|
||||
|
||||
set size 12120
|
||||
45
tests/3rdparty/export/A7
vendored
45
tests/3rdparty/export/A7
vendored
@ -1,45 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/ExportToPGF.pgf
|
||||
|
||||
set format PGF
|
||||
|
||||
set size 17800
|
||||
6
tests/3rdparty/export/begin
vendored
6
tests/3rdparty/export/begin
vendored
@ -1,6 +0,0 @@
|
||||
# On Windows with VC, in typical configuration gl2ps is built with Release
|
||||
# mode only which will fail in Debug
|
||||
if { [regexp {Debug mode} [dversion]] } {
|
||||
puts "TODO ?#23540 windows: Error: export of image.*failed"
|
||||
puts "TODO ?#23540 windows: Error: The file has been exported.*different size \[(\]0 "
|
||||
}
|
||||
16
tests/3rdparty/export/end
vendored
16
tests/3rdparty/export/end
vendored
@ -1,16 +0,0 @@
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} ${format}
|
||||
vglinfo
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "The file has been exported to ${format}."
|
||||
set filesize [file size ${aFile}]
|
||||
|
||||
# Check if difference of size is more 5%
|
||||
if { $filesize < $size && [expr 1.*($size - $filesize)/$size] > 0.05 } {
|
||||
puts "Error: The file has been exported to ${format}, but the result has a different size ($filesize instead of $size)."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Impossible to export file to ${format}."
|
||||
}
|
||||
5
tests/3rdparty/grids.list
vendored
5
tests/3rdparty/grids.list
vendored
@ -1,3 +1,2 @@
|
||||
001 export
|
||||
002 fonts
|
||||
003 text3d
|
||||
001 fonts
|
||||
002 text3d
|
||||
|
||||
@ -11,14 +11,6 @@ cpulimit 1000
|
||||
set rel_tol 0
|
||||
set max_rel_tol_diff 0
|
||||
|
||||
# On Windows with VC, in typical configuration gl2ps is built with Release
|
||||
# mode only which will fail in Debug mode; add TODO for that case in order
|
||||
# to handle it once for all tests that can use vexport command
|
||||
if { [regexp {Debug mode} [dversion]] } {
|
||||
puts "TODO ?#23540 windows: Error: export of image.*failed"
|
||||
puts "TODO ?#23540 windows: Error: The file has been exported.*different size \[(\]0 "
|
||||
}
|
||||
|
||||
if { [info exists imagedir] == 0 } {
|
||||
set imagedir .
|
||||
}
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
puts "================"
|
||||
puts "OCC23172"
|
||||
puts "================"
|
||||
puts ""
|
||||
######################################
|
||||
# vexport failed on some Intel GPUs
|
||||
######################################
|
||||
|
||||
set BugNumber OCC23172
|
||||
|
||||
box b 1 2 3
|
||||
vinit
|
||||
vdisplay b
|
||||
vfit
|
||||
|
||||
set aFile $imagedir/${test_image}.svg
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
file delete ${aFile}
|
||||
}
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport $aFile SVG
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to SVG file was done"
|
||||
puts "OK : Export to SVG file was done"
|
||||
} else {
|
||||
puts "Faulty : Export to SVG file was not done"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vinit View1
|
||||
vcolorscale cs -range 10 20 100 -font 16 -textpos right -xy 0 0
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
@ -1,38 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
pload XSDRAW
|
||||
vinit
|
||||
|
||||
meshfromstl m [locate_data_file shape.stl]
|
||||
|
||||
meshtext m
|
||||
|
||||
vsetdispmode m 34
|
||||
|
||||
file delete -force ${imagedir}/${test_image}.pdf
|
||||
set aFile ${imagedir}/${test_image}.pdf
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} PDF
|
||||
|
||||
set refsize_min 144000
|
||||
set refsize_max 154000
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to PDF format successful"
|
||||
set filesize [file size ${aFile}]
|
||||
if { $filesize < $refsize_min || $filesize > $refsize_max } {
|
||||
puts "Error: Export to PDF file was done but size of file is incorrect"
|
||||
puts " (current = $filesize, expected to be in range \[$refsize_min, $refsize_max\])."
|
||||
puts "Error: Update refsize limits if necessary."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Export to PDF format has failed"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
puts "MKV============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vinit
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
file delete -force ${imagedir}/${test_image}.pdf
|
||||
set aFile ${imagedir}/${test_image}.pdf
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} PDF
|
||||
|
||||
set refsize_min 9060
|
||||
set refsize_max 9090
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to PDF format successful"
|
||||
set filesize [file size ${aFile}]
|
||||
if { $filesize < $refsize_min || $filesize > $refsize_max } {
|
||||
puts "Error: Export to PDF file was done but size of file is incorrect"
|
||||
puts " (current = $filesize, expected to be in range \[$refsize_min, $refsize_max\])."
|
||||
puts "Error: Update refsize limits if necessary."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Export to PDF format has failed"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
@ -1,63 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vinit
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
file delete -force ${imagedir}/${test_image}.ps
|
||||
set aFile ${imagedir}/${test_image}.ps
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} PS
|
||||
|
||||
set refsize_min 9540
|
||||
set refsize_max 9570
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to PS format successful"
|
||||
set filesize [file size ${aFile}]
|
||||
if { $filesize < $refsize_min || $filesize > $refsize_max } {
|
||||
puts "Error: Export to PS file was done but size of file is incorrect"
|
||||
puts " (current = $filesize, expected to be in range \[$refsize_min, $refsize_max\])."
|
||||
puts "Error: Update refsize limits if necessary."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Export to PS format has failed"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
@ -1,62 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vinit
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
file delete -force ${imagedir}/${test_image}.eps
|
||||
set aFile ${imagedir}/${test_image}.eps
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} EPS
|
||||
|
||||
set refsize_min 9480
|
||||
set refsize_max 9520
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to EPS format successful"
|
||||
set filesize [file size ${aFile}]
|
||||
if { $filesize < $refsize_min || $filesize > $refsize_max } {
|
||||
puts "Error: Export to EPS file was done but size of file is incorrect"
|
||||
puts " (current = $filesize, expected to be in range \[$refsize_min, $refsize_max\])."
|
||||
puts "Error: Update refsize limits if necessary."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Export to EPS format has failed"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
@ -1,58 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vinit
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
set aFile $imagedir/${test_image}.tex
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} TEX
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to TEX file successful"
|
||||
set filesize [file size ${aFile}]
|
||||
puts "Size of TEX file = $filesize"
|
||||
if { $filesize > 1500 } {
|
||||
puts "Error : Export to TEX file succeeded but size of file is incorrect"
|
||||
}
|
||||
} else {
|
||||
puts "Error : Export to TEX file has failed"
|
||||
}
|
||||
@ -1,63 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vinit
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
file delete -force ${imagedir}/${test_image}.svg
|
||||
set aFile ${imagedir}/${test_image}.svg
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} SVG
|
||||
|
||||
set refsize_min 12110
|
||||
set refsize_max 12130
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to SVG format successful"
|
||||
set filesize [file size ${aFile}]
|
||||
if { $filesize < $refsize_min || $filesize > $refsize_max } {
|
||||
puts "Error: Export to SVG file was done but size of file is incorrect"
|
||||
puts " (current = $filesize, expected to be in range \[$refsize_min, $refsize_max\])."
|
||||
puts "Error: Update refsize limits if necessary."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Export to SVG format has failed"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
@ -1,63 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC21091"
|
||||
puts "OCC21450"
|
||||
puts "============"
|
||||
puts ""
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
vinit
|
||||
vtrihedron trihedron
|
||||
|
||||
vpoint p1 -300 -300 -300
|
||||
vdrawtext OC0 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p2 -300 -300 -100
|
||||
vdrawtext OC1 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p3 -100 -100 -300
|
||||
vdrawtext OC2 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p4 -100 -100 -100
|
||||
vdrawtext OC3 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
|
||||
vpoint p5 -300 -100 -300
|
||||
vdrawtext OC4 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p6 -100 -300 -300
|
||||
vdrawtext OC5 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p7 -300 -100 -100
|
||||
vdrawtext OC6 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vpoint p8 -100 -300 -100
|
||||
vdrawtext OC7 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SansFont
|
||||
|
||||
vaxis ax1 100 100 100 100 100 0
|
||||
|
||||
box a 110 110 110 200 200 200
|
||||
vdisplay a
|
||||
|
||||
file delete -force ${imagedir}/${test_image}.pgf
|
||||
set aFile ${imagedir}/${test_image}.pgf
|
||||
|
||||
vcaps -ffp 1
|
||||
vexport ${aFile} PGF
|
||||
|
||||
set refsize_min 17790
|
||||
set refsize_max 17920
|
||||
|
||||
if { [file exists ${aFile}] } {
|
||||
puts "Export to PGF format successful"
|
||||
set filesize [file size ${aFile}]
|
||||
if { $filesize < $refsize_min || $filesize > $refsize_max } {
|
||||
puts "Error: Export to PGF file was done but size of file is incorrect"
|
||||
puts " (current = $filesize, expected to be in range \[$refsize_min, $refsize_max\])."
|
||||
puts "Error: Update refsize limits if necessary."
|
||||
}
|
||||
} else {
|
||||
puts "Error: Export to PGF format has failed"
|
||||
}
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
@ -1,22 +0,0 @@
|
||||
puts "============"
|
||||
puts "OCC22796"
|
||||
puts "============"
|
||||
puts ""
|
||||
#######################################################################
|
||||
# Possibility to display multi-line text in 3D
|
||||
#######################################################################
|
||||
|
||||
vfont add [locate_data_file DejaVuSans.ttf] SansFont
|
||||
|
||||
set BugNumber OCC22796
|
||||
|
||||
vcaps -ffp 1
|
||||
vinit
|
||||
vdrawtext text0 "TestString\nHello,\tWorld!" -pos 0 0 0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont
|
||||
vexport $imagedir/${test_image}.pdf PDF
|
||||
|
||||
checkview -screenshot -3d -path ${imagedir}/${test_image}.png
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user