1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00

0023095: Porting demo and samples on OCCT 6.5.3

This commit is contained in:
dbv
2012-04-21 13:47:03 +04:00
parent 6076110592
commit cc5ac00dd5
76 changed files with 1824 additions and 2684 deletions

View File

@@ -1,35 +0,0 @@
@ECHO OFF
call "%~dp0env.bat"
IF NOT EXIST win32\vc8\obj goto QTSET
IF NOT EXIST "%QTDIR%" goto QTSET
goto QT
:QTSET
SET QTDIR=%ROOT%\3rdparty\win32\qt
SET PATH=%QTDIR%;%PATH%
:QT
if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE
echo %QTDIR%
echo Starting IESample .....
start /D "%BIN_DIR%" Tutorial.exe
GOTO END
:ERR_EXE
ECHO Executable %BIN_DIR%\Tutorial.exe not found."
ECHO Probably you didn't compile the application.
pause
GOTO END
:END

View File

@@ -1,23 +0,0 @@
@echo off
rem Launch MS VC with environment prepared for building OCCT qt tutorial
rem Set build environment
call %~dp0env.bat
call %~dp0..\..\..\ros\env_build.bat vc8 win32
rem Define path to project file
set PRJFILE=%~dp0Tutorial-vc8.sln
rem Launch Visual Studio - either professional (devenv) or Express, as available
if exist "%DevEnvDir%\devenv.exe" (
start devenv.exe "%PRJFILE%" /useenv
) else if exist "%DevEnvDir%\VCExpress.exe" (
start VCExpress.exe "%PRJFILE%" /useenv
) else (
echo Error: Could not find MS Visual Studio ^(%VCVER%^)
echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)
)

View File

@@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
EndProject
Global

View File

@@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
EndProject
Global

View File

@@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tutorial", "Tutorial.vcproj", "{59DEDC8A-A5ED-31E8-8F2B-8D996E3A41D6}"
EndProject
Global

View File

@@ -6,8 +6,9 @@ TARGET = Tutorial
HEADERS = src/*.h
SOURCES = src/*.cxx
INCLUDEPATH = $(CASROOT) $(CASROOT)/inc $(CASROOT)/src/WOKTclLib $(QTDIR)/include/QtCore \
$(QTDIR)/include/QtGui $(QTDIR)/include
INCLUDES = $$(CSF_OPT_INC)
PATHS = $$split(INCLUDES,";")
for(path, PATHS):INCLUDEPATH += $${path}
TS_FILES = ./src/Common-icon.ts \
./src/Common-string.ts \
@@ -43,110 +44,99 @@ win32 {
CONFIG(debug, debug|release) {
DEFINES += _DEBUG
!contains(QMAKE_HOST.arch, x86_64) {
LIBS = -L$(CSF_OPT_LIB32D)
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
DESTDIR = ./win32/vc7/bind
OBJECTS_DIR = ./win32/vc7/objd
MOC_DIR = ./win32/vc7/srcd
LIBS = -L$(CASROOT)/win32/vc7/libd
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
DESTDIR = ./win32/vc8/bind
OBJECTS_DIR = ./win32/vc8/objd
MOC_DIR = ./win32/vc8/srcd
LIBS = -L$(CASROOT)/win32/vc8/libd
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
DESTDIR = ./win32/vc9/bind
OBJECTS_DIR = ./win32/vc9/objd
MOC_DIR = ./win32/vc9/srcd
LIBS = -L$(CASROOT)/win32/vc9/libd
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
DESTDIR = ./win32/vc10/bind
OBJECTS_DIR = ./win32/vc10/objd
MOC_DIR = ./win32/vc10/srcd
LIBS = -L$(CASROOT)/win32/vc10/libd
}
} else {
LIBS = -L$(CSF_OPT_LIB64D)
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
DESTDIR = ./win64/vc8/bind
OBJECTS_DIR = ./win64/vc8/objd
MOC_DIR = ./win64/vc8/srcd
LIBS = -L$(CASROOT)/win64/vc8/libd
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
DESTDIR = ./win64/vc9/bind
OBJECTS_DIR = ./win64/vc9/objd
MOC_DIR = ./win64/vc9/srcd
LIBS = -L$(CASROOT)/win64/vc9/libd
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
DESTDIR = ./win64/vc10/bind
OBJECTS_DIR = ./win64/vc10/objd
MOC_DIR = ./win64/vc10/srcd
LIBS = -L$(CASROOT)/win64/vc10/libd
}
}
} else {
DEFINES += NDEBUG
!contains(QMAKE_HOST.arch, x86_64) {
LIBS = -L$(CSF_OPT_LIB32)
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1310) {
DESTDIR = ./win32/vc7/bin
OBJECTS_DIR = ./win32/vc7/obj
MOC_DIR = ./win32/vc7/src
LIBS = -L$(CASROOT)/win32/vc7/lib
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
DESTDIR = ./win32/vc8/bin
OBJECTS_DIR = ./win32/vc8/obj
MOC_DIR = ./win32/vc8/src
LIBS = -L$(CASROOT)/win32/vc8/lib
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
DESTDIR = ./win32/vc9/bin
OBJECTS_DIR = ./win32/vc9/obj
MOC_DIR = ./win32/vc9/src
LIBS = -L$(CASROOT)/win32/vc9/lib
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
DESTDIR = ./win32/vc10/bin
OBJECTS_DIR = ./win32/vc10/obj
MOC_DIR = ./win32/vc10/src
LIBS = -L$(CASROOT)/win32/vc10/lib
}
} else {
LIBS = -L$(CSF_OPT_LIB64)
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1400) {
DESTDIR = ./win64/vc8/bin
OBJECTS_DIR = ./win64/vc8/obj
MOC_DIR = ./win64/vc8/src
LIBS = -L$(CASROOT)/win64/vc8/lib
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1500) {
DESTDIR = ./win64/vc9/bin
OBJECTS_DIR = ./win64/vc9/obj
MOC_DIR = ./win64/vc9/src
LIBS = -L$(CASROOT)/win64/vc9/lib
}
contains(QMAKE_COMPILER_DEFINES, _MSC_VER=1600) {
DESTDIR = ./win64/vc10/bin
OBJECTS_DIR = ./win64/vc10/obj
MOC_DIR = ./win64/vc10/src
LIBS = -L$(CASROOT)/win64/vc10/lib
}
}
}
DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}
LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
-lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
-lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
-lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
-lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
-L$(QTDIR)/lib -lQtCore -lQtGui
LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
lrelease.name = LRELASE ${QMAKE_FILE_IN}
lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
lrelease.input = TS_FILES
lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm

View File

@@ -1,33 +1,3 @@
@ECHO OFF
call "%~dp0..\..\..\ros\env.bat"
IF NOT DEFINED CASROOT GOTO ERR_CASROOT
IF NOT EXIST "%CASROOT%\win32\vc8\bin\TKernel.dll" GOTO ERR_CASCADE
SET CASLIBS=%CASROOT%\win32\vc8\bin
SET ROOT=%CASROOT%\..
set RES_DIR=%~dp0res
set BIN_DIR=%~dp0win32\vc8\bin
SET RES_DIR=%~dp0res
SET CSF_ResourcesDefaults=%RES_DIR%
SET CSF_TuturialResourcesDefaults=%RES_DIR%
SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
GOTO END
:ERR_CASROOT
ECHO Environment variable "CASROOT" has not been defined. Abort.
pause
exit /B
:ERR_CASCADE
ECHO Environment variable "CASROOT" defined incorrectly. Abort.
pause
exit /B
:END
SET CSF_IEResourcesDefaults=%RES_DIR%

View File

@@ -3,17 +3,8 @@ REM Variable QTDIR and PATH to qmake executable must be defined without fail
REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10),
REM second argument specifies architecture) (win32 or win64)
REM third argument specifies Debug or Release mode
call "%~dp0..\..\..\ros\env_build.bat" %1 %2
IF NOT DEFINED QTDIR GOTO ERR_QTDIR
SET PATH=%QTDIR%\bin;%PATH%
call ..\..\..\env.bat %1 %2 %3
qmake -tp vc -r Tutorial.pro
GOTO END
:ERR_QTDIR
ECHO Environment variable "QTDIR" has not been defined. Abort.
:END

View File

@@ -0,0 +1,4 @@
call ../../../env.bat %1 %2 %3
call %~dp0env.bat
if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% Tutorial-%VCVER%.sln
if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" Tutorial-%VCVER%.sln

View File

@@ -0,0 +1,23 @@
call ../../../env.bat %1 %2 %3
call %~dp0env.bat
IF not "%CASDEB%" EQU "" (
SET BIN_DIR=win%ARCH%\%VCVER%\bind
) ELSE (
SET BIN_DIR=win%ARCH%\%VCVER%\bin
)
if not exist "%BIN_DIR%\Tutorial.exe" goto ERR_EXE
echo Starting Tutorial .....
start /D "%BIN_DIR%" Tutorial.exe
goto END
:ERR_EXE
echo Executable %BIN_DIR%\Tutorial.exe not found."
echo Probably you didn't compile the application.
pause
goto END
:END

View File

@@ -166,21 +166,21 @@ MakeBottle(const Standard_Real myWidth , const Standard_Real myHeight ,
Handle(Geom_CylindricalSurface) aCyl2 = new Geom_CylindricalSurface(neckAx2 , myNeckRadius * 1.05);
//Threading : Define 2D Curves
gp_Pnt2d aPnt(2. * PI , myNeckHeight / 2.);
gp_Dir2d aDir(2. * PI , myNeckHeight / 4.);
gp_Pnt2d aPnt(2. * M_PI , myNeckHeight / 2.);
gp_Dir2d aDir(2. * M_PI , myNeckHeight / 4.);
gp_Ax2d aAx2d(aPnt , aDir);
Standard_Real aMajor = 2. * PI;
Standard_Real aMajor = 2. * M_PI;
Standard_Real aMinor = myNeckHeight / 10;
Handle(Geom2d_Ellipse) anEllipse1 = new Geom2d_Ellipse(aAx2d , aMajor , aMinor);
Handle(Geom2d_Ellipse) anEllipse2 = new Geom2d_Ellipse(aAx2d , aMajor , aMinor / 4);
Handle(Geom2d_TrimmedCurve) aArc1 = new Geom2d_TrimmedCurve(anEllipse1 , 0 , PI);
Handle(Geom2d_TrimmedCurve) aArc2 = new Geom2d_TrimmedCurve(anEllipse2 , 0 , PI);
Handle(Geom2d_TrimmedCurve) aArc1 = new Geom2d_TrimmedCurve(anEllipse1 , 0 , M_PI);
Handle(Geom2d_TrimmedCurve) aArc2 = new Geom2d_TrimmedCurve(anEllipse2 , 0 , M_PI);
gp_Pnt2d anEllipsePnt1 = anEllipse1->Value(0);
gp_Pnt2d anEllipsePnt2 = anEllipse1->Value(PI);
gp_Pnt2d anEllipsePnt2 = anEllipse1->Value(M_PI);
Handle(Geom2d_TrimmedCurve) aSegment = GCE2d_MakeSegment(anEllipsePnt1 , anEllipsePnt2);