1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00

0023776: Redesign of MFC samples after V2d viewer removing

This commit is contained in:
aba 2013-03-12 09:19:35 +04:00
parent fad8962a72
commit 5c1f974e17
212 changed files with 9053 additions and 19513 deletions

7
.gitignore vendored
View File

@ -15,6 +15,12 @@
win32
win64
# standard names of directories for objects and binaries for samples
bin
obj
Debug
Release
# project files and artifacts
/adm/msvc
/adm/wnt
@ -23,6 +29,7 @@ win64
/adm/make
/adm/cmake
*.vcproj*user
*.csproj*user
*.ncb
*.suo
*.sdf

View File

@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bin/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -155,7 +155,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bin/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -198,7 +198,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bind/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -242,7 +242,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../..\win64\vc10\bind/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -457,24 +457,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -599,14 +581,13 @@
<ItemGroup>
<ClInclude Include="..\..\..\src\ChildFrm.h" />
<ClInclude Include="..\..\..\src\ChildFrm2d.h" />
<ClInclude Include="src\GeoAlgo_Sol.hxx" />
<ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx" />
<ClInclude Include="..\..\..\src\GeometryApp.h" />
<ClInclude Include="..\..\..\src\GeometryDoc.h" />
<ClInclude Include="..\..\..\src\GeometryView.h" />
<ClInclude Include="..\..\..\src\GeometryView2D.h" />
<ClInclude Include="..\..\..\src\GeomSources.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession_Curve.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
@ -614,7 +595,7 @@
<ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
<ClInclude Include="..\..\..\src\MainFrm.h" />
<ClInclude Include="res\resource.h" />
<ClInclude Include="..\..\..\res\resource.h" />
<ClInclude Include="..\..\..\src\StdAfx.h" />
</ItemGroup>
<ItemGroup>

View File

@ -54,9 +54,6 @@
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_Curve.cpp">
<Filter>Source Files\ISession2d</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
<Filter>Source Files\ISession2d</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
<Filter>Source Files\ISession2d</Filter>
</ClCompile>
@ -88,7 +85,7 @@
<ClInclude Include="..\..\..\src\ChildFrm2d.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GeoAlgo_Sol.hxx">
<ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\GeometryApp.h">
@ -109,9 +106,6 @@
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -133,7 +127,7 @@
<ClInclude Include="..\..\..\src\MainFrm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="res\resource.h">
<ClInclude Include="..\..\..\res\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\StdAfx.h">

View File

@ -116,7 +116,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bin/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -159,7 +159,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bin/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -202,7 +202,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bind/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -246,7 +246,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../..\win64\vc11\bind/Geometry.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -461,24 +461,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -603,14 +585,13 @@
<ItemGroup>
<ClInclude Include="..\..\..\src\ChildFrm.h" />
<ClInclude Include="..\..\..\src\ChildFrm2d.h" />
<ClInclude Include="src\GeoAlgo_Sol.hxx" />
<ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx" />
<ClInclude Include="..\..\..\src\GeometryApp.h" />
<ClInclude Include="..\..\..\src\GeometryDoc.h" />
<ClInclude Include="..\..\..\src\GeometryView.h" />
<ClInclude Include="..\..\..\src\GeometryView2D.h" />
<ClInclude Include="..\..\..\src\GeomSources.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession_Curve.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
@ -618,7 +599,7 @@
<ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
<ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
<ClInclude Include="..\..\..\src\MainFrm.h" />
<ClInclude Include="res\resource.h" />
<ClInclude Include="..\..\..\res\resource.h" />
<ClInclude Include="..\..\..\src\StdAfx.h" />
</ItemGroup>
<ItemGroup>

View File

@ -54,9 +54,6 @@
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_Curve.cpp">
<Filter>Source Files\ISession2d</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
<Filter>Source Files\ISession2d</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
<Filter>Source Files\ISession2d</Filter>
</ClCompile>
@ -88,7 +85,7 @@
<ClInclude Include="..\..\..\src\ChildFrm2d.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\GeoAlgo_Sol.hxx">
<ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\GeometryApp.h">
@ -109,9 +106,6 @@
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -133,7 +127,7 @@
<ClInclude Include="..\..\..\src\MainFrm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="res\resource.h">
<ClInclude Include="..\..\..\res\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\StdAfx.h">

View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\win32\vc8\bin/Geometry.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -179,7 +179,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\win64\vc8\bin/Geometry.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -277,7 +277,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\win32\vc8\bind/Geometry.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -376,7 +376,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\\win64\vc8\bind/Geometry.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -999,54 +999,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp"
>
@ -1350,7 +1302,7 @@
>
</File>
<File
RelativePath=".\src\GeoAlgo_Sol.hxx"
RelativePath="..\..\..\src\GeoAlgo_Sol.hxx"
>
</File>
<File
@ -1377,10 +1329,6 @@
RelativePath="..\..\..\src\ISession2D\ISession2D_Curve.h"
>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h"
>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h"
>
@ -1410,7 +1358,7 @@
>
</File>
<File
RelativePath="res\resource.h"
RelativePath="..\..\..\res\resource.h"
>
</File>
<File

View File

@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\win32\vc9\bin/Geometry.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -179,7 +179,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\win64\vc9\bin/Geometry.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -276,7 +276,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\win32\vc9\bind/Geometry.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -374,7 +374,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
OutputFile="../../../..\\win64\vc9\bind/Geometry.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -996,54 +996,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
BrowseInformation="1"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp"
>
@ -1347,7 +1299,7 @@
>
</File>
<File
RelativePath=".\src\GeoAlgo_Sol.hxx"
RelativePath="..\..\..\src\GeoAlgo_Sol.hxx"
>
</File>
<File
@ -1374,10 +1326,6 @@
RelativePath="..\..\..\src\ISession2D\ISession2D_Curve.h"
>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h"
>
</File>
<File
RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h"
>
@ -1407,7 +1355,7 @@
>
</File>
<File
RelativePath="res\resource.h"
RelativePath="..\..\..\res\resource.h"
>
</File>
<File

View File

@ -12,9 +12,9 @@
IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWnd)
BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd)
//{{AFX_MSG_MAP(CChildFrame)
ON_WM_CREATE()
//}}AFX_MSG_MAP
//{{AFX_MSG_MAP(CChildFrame)
ON_WM_CREATE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@ -22,8 +22,8 @@ END_MESSAGE_MAP()
CChildFrame::CChildFrame()
{
// TODO: add member initialization code here
// TODO: add member initialization code here
}
CChildFrame::~CChildFrame()
@ -36,61 +36,59 @@ CChildFrame::~CChildFrame()
#ifdef _DEBUG
void CChildFrame::AssertValid() const
{
CMDIChildWnd::AssertValid();
CMDIChildWnd::AssertValid();
}
void CChildFrame::Dump(CDumpContext& dc) const
{
CMDIChildWnd::Dump(dc);
CMDIChildWnd::Dump(dc);
}
#endif //_DEBUG
void CChildFrame::ActivateFrame(int nCmdShow)
{
// TODO: Add your specialized code here and/or call the base class
static BOOL first=true;
if(first){
first=false;
CMDIChildWnd::ActivateFrame(SW_SHOWMAXIMIZED);
return;
}
/*
POSITION pos=AfxGetApp()->GetFirstDocTemplatePosition();
CDocTemplate* DocT=AfxGetApp()->GetNextDocTemplate(pos);
POSITION p=DocT->GetFirstDocPosition();
DocT->GetNextDoc(p);
if(p==NULL)
nCmdShow = SW_SHOWMAXIMIZED;
*/
CMDIChildWnd::ActivateFrame(nCmdShow);
// TODO: Add your specialized code here and/or call the base class
static BOOL first=true;
if(first){
first=false;
CMDIChildWnd::ActivateFrame(SW_SHOWMAXIMIZED);
return;
}
/*
POSITION pos=AfxGetApp()->GetFirstDocTemplatePosition();
CDocTemplate* DocT=AfxGetApp()->GetNextDocTemplate(pos);
POSITION p=DocT->GetFirstDocPosition();
DocT->GetNextDoc(p);
if(p==NULL)
nCmdShow = SW_SHOWMAXIMIZED;
*/
CMDIChildWnd::ActivateFrame(nCmdShow);
}
int CChildFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
return -1;
if (!m_wndToolBar.Create(this) || !m_wndToolBar.LoadToolBar(IDR_3dCHILDFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
return -1;
m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
if (!m_wndToolBar.Create(this) || !m_wndToolBar.LoadToolBar(IDR_3dCHILDFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
return 0;
m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
return 0;
}
BOOL CChildFrame::DestroyWindow()
{
// TODO: Add your specialized code here and/or call the base class
return CMDIChildWnd::DestroyWindow();
// TODO: Add your specialized code here and/or call the base class
return CMDIChildWnd::DestroyWindow();
}

View File

@ -8,32 +8,32 @@
class CChildFrame : public OCC_BaseChildFrame
{
DECLARE_DYNCREATE(CChildFrame)
DECLARE_DYNCREATE(CChildFrame)
public:
CChildFrame();
CChildFrame();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CChildFrame)
public:
virtual void ActivateFrame(int nCmdShow = -1);
virtual BOOL DestroyWindow();
//}}AFX_VIRTUAL
// Implementation
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CChildFrame)
public:
virtual ~CChildFrame();
virtual void ActivateFrame(int nCmdShow = -1);
virtual BOOL DestroyWindow();
//}}AFX_VIRTUAL
// Implementation
public:
virtual ~CChildFrame();
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
#endif
// Generated message map functions
// Generated message map functions
protected:
//{{AFX_MSG(CChildFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//{{AFX_MSG(CChildFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////

View File

@ -1,25 +1,23 @@
// ChildFrm2D.cpp : implementation of the CChildFrame2D class/
#include "stdafx.h"
#include "ChildFrm2d.h"
#include "GeometryApp.h"
IMPLEMENT_DYNCREATE(CChildFrame2D, CMDIChildWnd)
BEGIN_MESSAGE_MAP(CChildFrame2D, CMDIChildWnd)
//{{AFX_MSG_MAP(CChildFrame2D)
ON_WM_CREATE()
//}}AFX_MSG_MAP
//{{AFX_MSG_MAP(CChildFrame2D)
ON_WM_CREATE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
static UINT indicators[] =
{
ID_SEPARATOR, // status line indicator
ID_INDICATOR_CAPS,
ID_INDICATOR_NUM,
ID_INDICATOR_SCRL,
ID_SEPARATOR, // status line indicator
ID_INDICATOR_CAPS,
ID_INDICATOR_NUM,
ID_INDICATOR_SCRL,
};
@ -28,8 +26,8 @@ static UINT indicators[] =
CChildFrame2D::CChildFrame2D()
{
// TODO: add member initialization code here
// TODO: add member initialization code here
}
CChildFrame2D::~CChildFrame2D()
@ -42,12 +40,12 @@ CChildFrame2D::~CChildFrame2D()
#ifdef _DEBUG
void CChildFrame2D::AssertValid() const
{
CMDIChildWnd::AssertValid();
CMDIChildWnd::AssertValid();
}
void CChildFrame2D::Dump(CDumpContext& dc) const
{
CMDIChildWnd::Dump(dc);
CMDIChildWnd::Dump(dc);
}
#endif //_DEBUG
@ -57,35 +55,35 @@ void CChildFrame2D::Dump(CDumpContext& dc) const
int CChildFrame2D::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
return -1;
if (!m_wndToolBar.Create(this) ||
!m_wndToolBar.LoadToolBar(IDR_2dCHILDFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
// TODO: Remove this if you don't want tool tips or a resizeable toolbar
m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
return -1;
// TODO: Delete these three lines if you don't want the toolbar to
// be dockable
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
return 0;
if (!m_wndToolBar.Create(this) ||
!m_wndToolBar.LoadToolBar(IDR_2dCHILDFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
// TODO: Remove this if you don't want tool tips or a resizeable toolbar
m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
// TODO: Delete these three lines if you don't want the toolbar to
// be dockable
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
return 0;
}
void CChildFrame2D::ActivateFrame(int nCmdShow)
{
// TODO: Add your specialized code here and/or call the base class
CMDIChildWnd::ActivateFrame(nCmdShow);
// TODO: Add your specialized code here and/or call the base class
CMDIChildWnd::ActivateFrame(nCmdShow);
}

View File

@ -8,38 +8,38 @@
class CChildFrame2D : public OCC_BaseChildFrame
{
DECLARE_DYNCREATE(CChildFrame2D)
DECLARE_DYNCREATE(CChildFrame2D)
public:
CChildFrame2D();
CChildFrame2D();
// Attributes
// Attributes
public:
// Operations
// Operations
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CChildFrame2D)
public:
virtual void ActivateFrame(int nCmdShow = -1);
//}}AFX_VIRTUAL
// Implementation
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CChildFrame2D)
public:
virtual ~CChildFrame2D();
virtual void ActivateFrame(int nCmdShow = -1);
//}}AFX_VIRTUAL
// Implementation
public:
virtual ~CChildFrame2D();
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
#endif
// Generated message map functions
// Generated message map functions
protected:
//CToolBar m_wndToolBar;
//{{AFX_MSG(CChildFrame2D)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//CToolBar m_wndToolBar;
//{{AFX_MSG(CChildFrame2D)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////

View File

@ -34,7 +34,7 @@
//=============================================================================
GeoAlgo_Sol::GeoAlgo_Sol():myIsDone(Standard_False)
{
}
@ -115,7 +115,6 @@ void GeoAlgo_Sol::Build(const TColgp_SequenceOfXYZ& seqOfXYZ)
//=============================================================================
Handle(Geom_BSplineSurface) GeoAlgo_Sol::Surface() const
{
return myGround;
}
@ -139,15 +138,15 @@ Standard_Boolean GeoAlgo_Sol::IsDone() const
//=============================================================================
Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName)
{
// This methods read a file of points ans build a surface using plate algorithm
// This methods read a file of points ans build a surface using plate algorithm
myIsDone = Standard_True;
Standard_Integer nbPnt=0;
// Read points from the file
// Read points from the file
filebuf fic;
istream in(&fic);
if (!fic.open(aGroundName,ios::in)){
cout << " impossible to open a file : "<<aGroundName<<endl;
myIsDone = Standard_False;
@ -159,9 +158,9 @@ Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName
Standard_Real x,y,z;
while (!in.fail()|| !in.eof()){
if (in >> x && in >> y && in >> z){
pntXYZ.SetX(x);
pntXYZ.SetY(y);
pntXYZ.SetZ(z);
pntXYZ.SetX(x);
pntXYZ.SetY(y);
pntXYZ.SetZ(z);
nbPnt++;
seqOfXYZ.Append(pntXYZ);
}
@ -169,12 +168,4 @@ Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName
fic.close();
Build(seqOfXYZ);
return myGround;
}

View File

@ -33,32 +33,19 @@ class Geom_BSplineSurface;
#include <Standard_Macro.hxx>
#endif
class GeoAlgo_Sol {
class GeoAlgo_Sol
{
public:
// Methods PUBLIC
//
Standard_EXPORT GeoAlgo_Sol();
Standard_EXPORT GeoAlgo_Sol(const Standard_CString aGroundName);
Standard_EXPORT void Build(const Standard_CString aGroundName) ;
Standard_EXPORT void Build(const TColgp_SequenceOfXYZ& aSeqofPoints) ;
Standard_EXPORT Handle_Geom_BSplineSurface Surface() const;
Standard_EXPORT Standard_Boolean IsDone() const;
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
Standard_EXPORT GeoAlgo_Sol();
Standard_EXPORT GeoAlgo_Sol(const Standard_CString aGroundName);
Standard_EXPORT void Build(const Standard_CString aGroundName) ;
Standard_EXPORT void Build(const TColgp_SequenceOfXYZ& aSeqofPoints) ;
Standard_EXPORT Handle_Geom_BSplineSurface Surface() const;
Standard_EXPORT Standard_Boolean IsDone() const;
private:
@ -66,14 +53,11 @@ private:
//
Standard_EXPORT Handle_Geom_BSplineSurface Read(const Standard_CString aGroundName) ;
// Fields PRIVATE
//
Handle_Geom_BSplineSurface myGround;
Standard_Boolean myIsDone;
};

File diff suppressed because it is too large Load Diff

View File

@ -16,110 +16,110 @@
class GeomSources
{
public:
Standard_EXPORT static void gpTest1(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest2(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest3(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest4(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest5(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest6(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest7(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest8(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest9(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest10(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest11(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest12(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest13(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest14(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest15(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest16(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest17(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest18(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest19(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest20(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest21(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest22(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest23(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest24(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest25(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest26(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest27(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest28(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest29(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest30(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest31(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest32(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest33(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest34(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest35(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest36(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest37(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest38(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest39(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest40(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest41(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest42(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest43(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest44(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest45(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest46(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest47(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest48(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest49(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest50(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest51(CGeometryDoc* aDoc);
GeomSources();
virtual ~GeomSources();
Standard_EXPORT static void gpTest1(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest2(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest3(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest4(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest5(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest6(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest7(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest8(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest9(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest10(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest11(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest12(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest13(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest14(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest15(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest16(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest17(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest18(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest19(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest20(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest21(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest22(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest23(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest24(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest25(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest26(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest27(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest28(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest29(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest30(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest31(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest32(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest33(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest34(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest35(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest36(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest37(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest38(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest39(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest40(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest41(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest42(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest43(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest44(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest45(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest46(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest47(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest48(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest49(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest50(CGeometryDoc* aDoc);
Standard_EXPORT static void gpTest51(CGeometryDoc* aDoc);
GeomSources();
virtual ~GeomSources();
private:
enum DisplayType{No2DNo3D, // 0 0 0
No2D3D , // 0 0 1
a2DNo3D , // 0 1 0
a2D3D }; // 1 1 1
No2D3D , // 0 0 1
a2DNo3D , // 0 1 0
a2D3D }; // 1 1 1
static void PreProcess (CGeometryDoc* aDoc,DisplayType aDisplayType);
static void PostProcess(CGeometryDoc* aDoc,UINT anID,DisplayType aDisplayType,const char* aString="",Quantity_Coefficient Coef = -1/*double zoom =-1*/);
static void DisplayPoint(CGeometryDoc* aDoc,
gp_Pnt2d& aPoint,
const char* aText,
Standard_Boolean UpdateViewer = Standard_False,
Standard_Real anXoffset =0,
Standard_Real anYoffset =0,
Standard_Real TextScale = 0.05);
gp_Pnt2d& aPoint,
const char* aText,
Standard_Boolean UpdateViewer = Standard_False,
Standard_Real anXoffset =0,
Standard_Real anYoffset =0,
Standard_Real TextScale = 0.05);
static void DisplayPoint(CGeometryDoc* aDoc,
gp_Pnt& aPoint,
const char* aText,
Standard_Boolean UpdateViewer = Standard_False,
Standard_Real anXoffset = 0,
Standard_Real anYoffset = 0,
Standard_Real aZoffset = 0,
Standard_Real TextScale = 0.05);
gp_Pnt& aPoint,
const char* aText,
Standard_Boolean UpdateViewer = Standard_False,
Standard_Real anXoffset = 0,
Standard_Real anYoffset = 0,
Standard_Real aZoffset = 0,
Standard_Real TextScale = 0.05);
static void DisplayCurve(CGeometryDoc* aDoc,
Handle(Geom2d_Curve) aCurve,
Standard_Integer aColorIndex = 4,
Standard_Boolean UpdateViewer = false);
static void DisplayCurveAndCurvature(CGeometryDoc* aDoc,
Handle(Geom2d_Curve) aCurve,
Standard_Integer aColorIndex = 4,
Standard_Boolean UpdateViewer = false);
static void DisplayCurve(CGeometryDoc* aDoc,
Handle(Geom2d_Curve) aCurve,
Standard_Integer aColorIndex = 4,
Standard_Boolean UpdateViewer = false);
static void DisplayCurveAndCurvature(CGeometryDoc* aDoc,
Handle(Geom2d_Curve) aCurve,
Standard_Integer aColorIndex = 4,
Standard_Boolean UpdateViewer = false);
static void DisplayCurve(CGeometryDoc* aDoc,
Handle(Geom_Curve) aCurve,
Quantity_NameOfColor aNameOfColor,
Standard_Boolean UpdateViewer = false);
static void DisplayCurve(CGeometryDoc* aDoc,
Handle(Geom_Curve) aCurve,
Quantity_NameOfColor aNameOfColor,
Standard_Boolean UpdateViewer = false);
static void DisplayCurve(CGeometryDoc* aDoc,
Handle(Geom_Curve) aCurve,
Standard_Boolean UpdateViewer = false);
static void DisplayCurve(CGeometryDoc* aDoc,
Handle(Geom_Curve) aCurve,
Standard_Boolean UpdateViewer = false);
static void DisplaySurface (CGeometryDoc* aDoc,
Handle(Geom_Surface) aSurface,
Quantity_NameOfColor aNameOfColor,
Standard_Boolean UpdateViewer = false);
static void DisplaySurface (CGeometryDoc* aDoc,
Handle(Geom_Surface) aSurface,
Quantity_NameOfColor aNameOfColor,
Standard_Boolean UpdateViewer = false);
static void DisplaySurface (CGeometryDoc* aDoc,
Handle(Geom_Surface) aSurface,
Standard_Boolean UpdateViewer = false);
static void DisplaySurface (CGeometryDoc* aDoc,
Handle(Geom_Surface) aSurface,
Standard_Boolean UpdateViewer = false);

View File

@ -15,15 +15,14 @@
/////////////////////////////////////////////////////////////////////////////
// CGeometryApp construction
CGeometryApp::CGeometryApp()
CGeometryApp::CGeometryApp() : OCC_App()
{
SampleName = "Geometry"; //for about dialog
SampleName = "Geometry"; //for about dialog
}
CGeometryApp::~CGeometryApp()
{
delete pDocTemplateForView2d;
delete pDocTemplateForView2d;
}
/////////////////////////////////////////////////////////////////////////////
// The one and only CGeometryApp object
@ -35,58 +34,57 @@ CGeometryApp theApp;
BOOL CGeometryApp::InitInstance()
{
AfxInitRichEdit();
AfxEnableControlContainer();
AfxInitRichEdit();
AfxEnableControlContainer();
// Standard initialization
// If you are not using these features and wish to reduce the size
// of your final executable, you should remove from the following
// the specific initialization routines you do not need.
// Standard initialization
// If you are not using these features and wish to reduce the size
// of your final executable, you should remove from the following
// the specific initialization routines you do not need.
// Change the registry key under which our settings are stored.
// You should modify this string to be something appropriate
// such as the name of your company or organization.
SetRegistryKey(_T("Local AppWizard-Generated Applications"));
// Change the registry key under which our settings are stored.
// You should modify this string to be something appropriate
// such as the name of your company or organization.
SetRegistryKey(_T("Local AppWizard-Generated Applications"));
LoadStdProfileSettings(); // Load standard INI file options (including MRU)
LoadStdProfileSettings(); // Load standard INI file options (including MRU)
// Register the application's document templates. Document templates
// serve as the connection between documents, frame windows and views.
// Register the application's document templates. Document templates
// serve as the connection between documents, frame windows and views.
pDocTemplateForView3d = new CMultiDocTemplate(
IDR_3DTYPE,
RUNTIME_CLASS(CGeometryDoc),
RUNTIME_CLASS(CChildFrame), // custom MDI child frame
RUNTIME_CLASS(CGeometryView));
AddDocTemplate(pDocTemplateForView3d);
pDocTemplateForView2d = new CMultiDocTemplate(
IDR_2DTYPE,
RUNTIME_CLASS(CGeometryDoc),
RUNTIME_CLASS(CChildFrame2D), // custom MDI child frame
RUNTIME_CLASS(CGeometryView2D));
//AddDocTemplate(pDocTemplateForView2d);
pDocTemplateForView3d = new CMultiDocTemplate(
IDR_3DTYPE,
RUNTIME_CLASS(CGeometryDoc),
RUNTIME_CLASS(CChildFrame), // custom MDI child frame
RUNTIME_CLASS(CGeometryView));
AddDocTemplate(pDocTemplateForView3d);
// create main MDI Frame window
CMainFrame* pMainFrame = new CMainFrame;
if (!pMainFrame->LoadFrame(IDR_MAINFRAME))
return FALSE;
m_pMainWnd = pMainFrame;
pDocTemplateForView2d = new CMultiDocTemplate(
IDR_2DTYPE,
RUNTIME_CLASS(CGeometryDoc),
RUNTIME_CLASS(CChildFrame2D), // custom MDI child frame
RUNTIME_CLASS(CGeometryView2D));
//AddDocTemplate(pDocTemplateForView2d);
// Parse command line for standard shell commands, DDE, file open
CCommandLineInfo cmdInfo;
ParseCommandLine(cmdInfo);
// create main MDI Frame window
CMainFrame* pMainFrame = new CMainFrame;
if (!pMainFrame->LoadFrame(IDR_MAINFRAME))
return FALSE;
m_pMainWnd = pMainFrame;
// Dispatch commands specified on the command line
if (!ProcessShellCommand(cmdInfo))
return FALSE;
// Parse command line for standard shell commands, DDE, file open
CCommandLineInfo cmdInfo;
ParseCommandLine(cmdInfo);
// The main window has been initialized, so show and update it.
pMainFrame->ShowWindow(m_nCmdShow);
pMainFrame->UpdateWindow();
// Dispatch commands specified on the command line
if (!ProcessShellCommand(cmdInfo))
return FALSE;
// The main window has been initialized, so show and update it.
pMainFrame->ShowWindow(m_nCmdShow);
pMainFrame->UpdateWindow();
return TRUE;
return TRUE;
}
/////////////////////////////////////////////////////////////////////////////
@ -117,10 +115,10 @@ BOOL CGeometryApp::IsViewExisting(CDocument * pDoc, CRuntimeClass * pViewClass,
CView* pCurrentView = pDoc->GetNextView(position);
ASSERT_VALID(pCurrentView);
if (pCurrentView->IsKindOf(pViewClass))
{
{
pView = pCurrentView;
return TRUE;
}
return TRUE;
}
}
return FALSE;
}

View File

@ -8,29 +8,29 @@
#pragma once
#endif // _MSC_VER >= 1000
#include <OCC_3dApp.h>
#include <OCC_App.h>
#include <GeometryDoc.h>
class CGeometryApp : public OCC_3dApp
class CGeometryApp : public OCC_App
{
public:
CGeometryApp();
~CGeometryApp();
// =========================================
CFrameWnd* CreateView2D(CGeometryDoc* pDoc);
// =========================================
// =========================================
CGeometryApp();
~CGeometryApp();
// =========================================
CFrameWnd* CreateView2D(CGeometryDoc* pDoc);
// =========================================
// =========================================
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGeometryApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGeometryApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
private :
BOOL IsViewExisting(CDocument* pDoc,CRuntimeClass* pViewClass,CView*& pView);
CMultiDocTemplate* pDocTemplateForView3d;
CMultiDocTemplate* pDocTemplateForView2d;
BOOL IsViewExisting(CDocument* pDoc,CRuntimeClass* pViewClass,CView*& pView);
CMultiDocTemplate* pDocTemplateForView3d;
CMultiDocTemplate* pDocTemplateForView2d;
};

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,6 @@
#pragma once
#endif // _MSC_VER >= 1000
#include "ISession2D_InteractiveContext.h"
#include "ResultDialog.h"
class Handle_AIS_Point;
@ -17,225 +16,224 @@ class Handle_AIS_Point;
class CGeometryDoc : public CDocument
{
public:
void Put2DOnTop(bool isMax = true);
void Put3DOnTop(bool isMax = true);
void Fit2DViews();
void Set3DViewsZoom(const Quantity_Factor& Coef );
void Fit3DViews(Quantity_Coefficient Coef);
void simplify(const TopoDS_Shape& aShape);
void Put2DOnTop(bool isMax = true);
void Put3DOnTop(bool isMax = true);
void Fit2DViews();
void Set3DViewsZoom(const Quantity_Factor& Coef );
void Fit3DViews(Quantity_Coefficient Coef);
void simplify(const TopoDS_Shape& aShape);
static void Fit();
static void Fit();
// 2D
// 2D
void DragEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState,
const Handle_V3d_View& aView );
void InputEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V3d_View& aView );
void MoveEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V3d_View& aView );
void ShiftMoveEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V3d_View& aView );
void ShiftDragEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState,
const Handle_V3d_View& aView );
void ShiftInputEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V3d_View& aView );
void Popup2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V3d_View& aView );
void DragEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState,
const Handle_V2d_View& aView );
void InputEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V2d_View& aView );
void MoveEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V2d_View& aView );
void ShiftMoveEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V2d_View& aView );
void ShiftDragEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState,
const Handle_V2d_View& aView );
void ShiftInputEvent2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V2d_View& aView );
void Popup2D (const Standard_Integer x ,
const Standard_Integer y ,
const Handle_V2d_View& aView );
Handle_AIS_InteractiveObject drawSurface
(const Handle_Geom_Surface& theSurface,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay);
Handle_AIS_InteractiveObject drawSurface
(const Handle_Geom_Surface& theSurface,
const Quantity_Color& theColor,
const Standard_Boolean toDisplay);
Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
// Waits for a user input or a period of time has been elapsed
Standard_Boolean WaitForInput (unsigned long aMilliSeconds);
// Waits for a user input or a period of time has been elapsed
Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given point
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_Point drawPoint (const gp_Pnt& thePnt,
const Quantity_Color& theColor = Quantity_Color(Quantity_NOC_GREEN),
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given point
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given shape with the given material
// (color is default for a given material)
// and displays it in the viewer if toDisplay = Standard_True
Handle_AIS_Shape drawShape (const TopoDS_Shape& theShape,
const Graphic3d_NameOfMaterial theMaterial = Graphic3d_NOM_BRASS,
const Standard_Boolean toDisplay = Standard_True);
// creates a presentation of the given shape with the given material
// (color is default for a given material)
// and displays it in the viewer if toDisplay = Standard_True
protected: // create from serialization only
CGeometryDoc();
DECLARE_DYNCREATE(CGeometryDoc)
CGeometryDoc();
DECLARE_DYNCREATE(CGeometryDoc)
// Attributes
// Attributes
public:
// Operations
// Operations
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGeometryDoc)
public:
virtual BOOL OnNewDocument();
virtual void Serialize(CArchive& ar);
virtual void OnCloseDocument();
//}}AFX_VIRTUAL
// Implementation
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGeometryDoc)
public:
virtual ~CGeometryDoc();
virtual BOOL OnNewDocument();
virtual void Serialize(CArchive& ar);
virtual void OnCloseDocument();
//}}AFX_VIRTUAL
// Implementation
public:
virtual ~CGeometryDoc();
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
#endif
protected:
// Generated message map functions
// Generated message map functions
protected:
//{{AFX_MSG(CGeometryDoc)
afx_msg void OnWindowNew2d();
afx_msg void OnBUTTONTest1();
afx_msg void OnBUTTONTest2();
afx_msg void OnBUTTONTest3();
afx_msg void OnBUTTONTest4();
afx_msg void OnBUTTONTest5();
afx_msg void OnBUTTONTest6();
afx_msg void OnBUTTONTest7();
afx_msg void OnBUTTONTest8();
afx_msg void OnBUTTONTest9();
afx_msg void OnBUTTONTest10();
afx_msg void OnBUTTONTest11();
afx_msg void OnBUTTONTest12();
afx_msg void OnBUTTONTest13();
afx_msg void OnBUTTONTest14();
afx_msg void OnBUTTONTest15();
afx_msg void OnBUTTONTest16();
afx_msg void OnBUTTONTest17();
afx_msg void OnBUTTONTest18();
afx_msg void OnBUTTONTest19();
afx_msg void OnBUTTONTest20();
afx_msg void OnBUTTONTest21();
afx_msg void OnBUTTONTest22();
afx_msg void OnBUTTONTest23();
afx_msg void OnBUTTONTest24();
afx_msg void OnBUTTONTest25();
afx_msg void OnBUTTONTest26();
afx_msg void OnBUTTONTest27();
afx_msg void OnBUTTONTest28();
afx_msg void OnBUTTONTest29();
afx_msg void OnBUTTONTest30();
afx_msg void OnBUTTONTest31();
afx_msg void OnBUTTONTest32();
afx_msg void OnBUTTONTest33();
afx_msg void OnBUTTONTest34();
afx_msg void OnBUTTONTest35();
afx_msg void OnBUTTONTest36();
afx_msg void OnBUTTONTest37();
afx_msg void OnBUTTONTest38();
afx_msg void OnBUTTONTest39();
afx_msg void OnBUTTONTest40();
afx_msg void OnBUTTONTest41();
afx_msg void OnBUTTONTest42();
afx_msg void OnBUTTONTest43();
afx_msg void OnBUTTONTest44();
afx_msg void OnBUTTONTest45();
afx_msg void OnBUTTONTest46();
afx_msg void OnBUTTONTest47();
afx_msg void OnBUTTONTest48();
afx_msg void OnBUTTONTest49();
afx_msg void OnBUTTONTest50();
afx_msg void OnUpdateBUTTONTest1(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest2(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest3(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest4(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest5(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest6(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest7(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest8(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest9(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest10(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest11(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest12(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest13(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest14(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest15(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest16(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest17(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest18(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest19(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest20(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest21(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest22(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest23(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest24(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest25(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest26(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest27(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest28(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest29(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest30(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest31(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest32(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest33(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest34(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest35(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest36(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest37(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest38(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest39(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest40(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest41(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest42(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest43(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest44(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest45(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest46(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest47(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest48(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest49(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest50(CCmdUI* pCmdUI);
afx_msg void OnCreateSol();
afx_msg void OnSimplify();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//{{AFX_MSG(CGeometryDoc)
afx_msg void OnWindowNew2d();
afx_msg void OnBUTTONTest1();
afx_msg void OnBUTTONTest2();
afx_msg void OnBUTTONTest3();
afx_msg void OnBUTTONTest4();
afx_msg void OnBUTTONTest5();
afx_msg void OnBUTTONTest6();
afx_msg void OnBUTTONTest7();
afx_msg void OnBUTTONTest8();
afx_msg void OnBUTTONTest9();
afx_msg void OnBUTTONTest10();
afx_msg void OnBUTTONTest11();
afx_msg void OnBUTTONTest12();
afx_msg void OnBUTTONTest13();
afx_msg void OnBUTTONTest14();
afx_msg void OnBUTTONTest15();
afx_msg void OnBUTTONTest16();
afx_msg void OnBUTTONTest17();
afx_msg void OnBUTTONTest18();
afx_msg void OnBUTTONTest19();
afx_msg void OnBUTTONTest20();
afx_msg void OnBUTTONTest21();
afx_msg void OnBUTTONTest22();
afx_msg void OnBUTTONTest23();
afx_msg void OnBUTTONTest24();
afx_msg void OnBUTTONTest25();
afx_msg void OnBUTTONTest26();
afx_msg void OnBUTTONTest27();
afx_msg void OnBUTTONTest28();
afx_msg void OnBUTTONTest29();
afx_msg void OnBUTTONTest30();
afx_msg void OnBUTTONTest31();
afx_msg void OnBUTTONTest32();
afx_msg void OnBUTTONTest33();
afx_msg void OnBUTTONTest34();
afx_msg void OnBUTTONTest35();
afx_msg void OnBUTTONTest36();
afx_msg void OnBUTTONTest37();
afx_msg void OnBUTTONTest38();
afx_msg void OnBUTTONTest39();
afx_msg void OnBUTTONTest40();
afx_msg void OnBUTTONTest41();
afx_msg void OnBUTTONTest42();
afx_msg void OnBUTTONTest43();
afx_msg void OnBUTTONTest44();
afx_msg void OnBUTTONTest45();
afx_msg void OnBUTTONTest46();
afx_msg void OnBUTTONTest47();
afx_msg void OnBUTTONTest48();
afx_msg void OnBUTTONTest49();
afx_msg void OnBUTTONTest50();
afx_msg void OnUpdateBUTTONTest1(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest2(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest3(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest4(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest5(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest6(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest7(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest8(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest9(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest10(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest11(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest12(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest13(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest14(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest15(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest16(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest17(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest18(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest19(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest20(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest21(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest22(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest23(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest24(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest25(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest26(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest27(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest28(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest29(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest30(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest31(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest32(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest33(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest34(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest35(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest36(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest37(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest38(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest39(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest40(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest41(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest42(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest43(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest44(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest45(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest46(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest47(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest48(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest49(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONTest50(CCmdUI* pCmdUI);
afx_msg void OnCreateSol();
afx_msg void OnSimplify();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
Handle_V3d_Viewer myViewer;
Handle_V3d_Viewer myViewerCollector;
Handle_AIS_InteractiveContext myAISContext;
Handle_V3d_Viewer myViewer;
Handle_V3d_Viewer myViewerCollector;
Handle_AIS_InteractiveContext myAISContext;
public :
Handle_AIS_InteractiveContext& GetAISContext(){ return myAISContext; };
Handle_V3d_Viewer GetViewer() { return myViewer; };
Handle_V3d_Viewer GetViewerCollector() { return myViewerCollector; };
Handle_AIS_InteractiveContext& GetAISContext(){ return myAISContext; };
Handle_V3d_Viewer GetViewer() { return myViewer; };
Handle_V3d_Viewer GetViewerCollector() { return myViewerCollector; };
private:
Handle_V2d_Viewer myViewer2D;
Handle_ISession2D_InteractiveContext myISessionContext;
Handle_V3d_Viewer myViewer2D;
Handle_AIS_InteractiveContext myAISContext2D;
public :
int Current;
void Minimize3D();
void Minimize2D();
Handle_V2d_Viewer GetViewer2D() { return myViewer2D; };
Handle_ISession2D_InteractiveContext& GetISessionContext(){ return myISessionContext; };
BOOL FitMode;
int Current;
void Minimize3D();
void Minimize2D();
Handle_V3d_Viewer GetViewer2D() { return myViewer2D; };
Handle_AIS_InteractiveContext& GetISessionContext(){ return myAISContext2D; };
BOOL FitMode;
public :
CResultDialog myCResultDialog;
CResultDialog myCResultDialog;
};

View File

@ -21,24 +21,24 @@ static char THIS_FILE[] = __FILE__;
IMPLEMENT_DYNCREATE(CGeometryView, OCC_3dView)
BEGIN_MESSAGE_MAP(CGeometryView, OCC_3dView)
//{{AFX_MSG_MAP(CGeometryView)
ON_COMMAND(ID_FILE_EXPORT_IMAGE, OnFileExportImage)
ON_WM_SIZE()
ON_WM_LBUTTONDOWN()
ON_WM_LBUTTONUP()
ON_WM_MBUTTONDOWN()
ON_WM_MBUTTONUP()
ON_WM_MOUSEMOVE()
ON_WM_RBUTTONDOWN()
ON_WM_RBUTTONUP()
ON_UPDATE_COMMAND_UI(ID_BUTTONHlrOff, OnUpdateBUTTONHlrOff)
ON_UPDATE_COMMAND_UI(ID_BUTTONHlrOn, OnUpdateBUTTONHlrOn)
ON_UPDATE_COMMAND_UI(ID_BUTTONPanGlo, OnUpdateBUTTONPanGlo)
ON_UPDATE_COMMAND_UI(ID_BUTTONPan, OnUpdateBUTTONPan)
ON_UPDATE_COMMAND_UI(ID_BUTTONZoomProg, OnUpdateBUTTONZoomProg)
ON_UPDATE_COMMAND_UI(ID_BUTTONZoomWin, OnUpdateBUTTONZoomWin)
ON_UPDATE_COMMAND_UI(ID_BUTTONRot, OnUpdateBUTTONRot)
//}}AFX_MSG_MAP
//{{AFX_MSG_MAP(CGeometryView)
ON_COMMAND(ID_FILE_EXPORT_IMAGE, OnFileExportImage)
ON_WM_SIZE()
ON_WM_LBUTTONDOWN()
ON_WM_LBUTTONUP()
ON_WM_MBUTTONDOWN()
ON_WM_MBUTTONUP()
ON_WM_MOUSEMOVE()
ON_WM_RBUTTONDOWN()
ON_WM_RBUTTONUP()
ON_UPDATE_COMMAND_UI(ID_BUTTONHlrOff, OnUpdateBUTTONHlrOff)
ON_UPDATE_COMMAND_UI(ID_BUTTONHlrOn, OnUpdateBUTTONHlrOn)
ON_UPDATE_COMMAND_UI(ID_BUTTONPanGlo, OnUpdateBUTTONPanGlo)
ON_UPDATE_COMMAND_UI(ID_BUTTONPan, OnUpdateBUTTONPan)
ON_UPDATE_COMMAND_UI(ID_BUTTONZoomProg, OnUpdateBUTTONZoomProg)
ON_UPDATE_COMMAND_UI(ID_BUTTONZoomWin, OnUpdateBUTTONZoomWin)
ON_UPDATE_COMMAND_UI(ID_BUTTONRot, OnUpdateBUTTONRot)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@ -58,18 +58,18 @@ CGeometryView::~CGeometryView()
#ifdef _DEBUG
void CGeometryView::AssertValid() const
{
CView::AssertValid();
CView::AssertValid();
}
void CGeometryView::Dump(CDumpContext& dc) const
{
CView::Dump(dc);
CView::Dump(dc);
}
CGeometryDoc* CGeometryView::GetDocument() // non-debug version is inline
{
ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CGeometryDoc)));
return (CGeometryDoc*)m_pDocument;
ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CGeometryDoc)));
return (CGeometryDoc*)m_pDocument;
}
#endif //_DEBUG
@ -79,25 +79,29 @@ CGeometryDoc* CGeometryView::GetDocument() // non-debug version is inline
void CGeometryView::OnFileExportImage()
{
CFileDialog dlg(FALSE,_T("*.BMP"),NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
_T("BMP Files (*.BMP)|*.bmp |GIF Files (*.GIF)|*.gif | PNG Files (*.PNG)|*.png"
"|JPEG Files (*.JPEG)|*.jpeg | PPM Files (*.PPM)|*.ppm | TIFF Files (*.TIFF)"
"|*.tiff | TGA Files (*.TGA)|*.tga | EXR Files (*.EXR)|*.exr||"),
NULL );
if (dlg.DoModal() == IDOK)
CFileDialog aDlg (FALSE, "*.BMP", NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
"BMP Files (*.BMP)|*.bmp|"
"GIF Files (*.GIF)|*.gif|"
"PNG Files (*.PNG)|*.png|"
"JPEG Files (*.JPG)|*.jpg|"
"PPM Files (*.PPM)|*.ppm|"
"TIFF Files (*.TIFF)|*.tiff|"
"TGA Files (*.TGA)|*.tga|"
"EXR Files (*.EXR)|*.exr||", NULL);
if (aDlg.DoModal() != IDOK)
{
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
CString aFileName = dlg.GetPathName();
myView->Dump(aFileName);
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
return;
}
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
myView->Dump (aDlg.GetPathName());
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
}
void CGeometryView::OnSize(UINT nType, int cx, int cy)
{
if (!myView.IsNull())
myView->MustBeResized();
myView->MustBeResized();
}
void CGeometryView::OnLButtonDown(UINT nFlags, CPoint point)
@ -107,277 +111,277 @@ void CGeometryView::OnLButtonDown(UINT nFlags, CPoint point)
myXmax=point.x; myYmax=point.y;
if ( nFlags & MK_CONTROL )
{
// Button MB1 down Control :start zomming
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction3d_Nothing : // start a drag
if (nFlags & MK_SHIFT)
ShiftDragEvent(myXmax,myYmax,-1);
else
DragEvent(myXmax,myYmax,-1);
break;
break;
case CurAction3d_DynamicZooming : // noting
// SetCursor(AfxGetApp()->LoadStandardCursor());
break;
case CurAction3d_WindowZooming :
break;
case CurAction3d_DynamicPanning :// noting
// SetCursor(AfxGetApp()->LoadStandardCursor());
break;
case CurAction3d_GlobalPanning :// noting
// SetCursor(AfxGetApp()->LoadStandardCursor());
break;
case CurAction3d_DynamicRotation :
// SetCursor(AfxGetApp()->LoadStandardCursor());
if (!myDegenerateModeIsOn)
myView->SetDegenerateModeOn();
myView->StartRotation(point.x,point.y);
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
}
{
// Button MB1 down Control :start zomming
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction3d_Nothing : // start a drag
if (nFlags & MK_SHIFT)
ShiftDragEvent(myXmax,myYmax,-1);
else
DragEvent(myXmax,myYmax,-1);
break;
break;
case CurAction3d_DynamicZooming : // noting
// SetCursor(AfxGetApp()->LoadStandardCursor());
break;
case CurAction3d_WindowZooming :
break;
case CurAction3d_DynamicPanning :// noting
// SetCursor(AfxGetApp()->LoadStandardCursor());
break;
case CurAction3d_GlobalPanning :// noting
// SetCursor(AfxGetApp()->LoadStandardCursor());
break;
case CurAction3d_DynamicRotation :
// SetCursor(AfxGetApp()->LoadStandardCursor());
if (!myDegenerateModeIsOn)
myView->SetDegenerateModeOn();
myView->StartRotation(point.x,point.y);
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
}
}
}
void CGeometryView::OnLButtonUp(UINT nFlags, CPoint point)
{
if ( nFlags & MK_CONTROL )
{
return;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction3d_Nothing :
if (point.x == myXmin && point.y == myYmin)
{ // no offset between down and up --> selectEvent
myXmax=point.x;
myYmax=point.y;
if (nFlags & MK_SHIFT )
ShiftInputEvent(point.x,point.y);
else
InputEvent (point.x,point.y);
} else
{
myXmax=point.x; myYmax=point.y;
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False);
if (nFlags & MK_SHIFT)
ShiftDragEvent(point.x,point.y,1);
else
DragEvent(point.x,point.y,1);
}
break;
case CurAction3d_DynamicZooming :
// SetCursor(AfxGetApp()->LoadStandardCursor());
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_WindowZooming :
myXmax=point.x; myYmax=point.y;
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
if ((abs(myXmin-myXmax)>ValZWMin) || (abs(myYmin-myYmax)>ValZWMin))
// Test if the zoom window is greater than a minimale window.
{
// Do the zoom window between Pmin and Pmax
myView->WindowFitAll(myXmin,myYmin,myXmax,myYmax);
}
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_DynamicPanning :
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_GlobalPanning :
myView->Place(point.x,point.y,myCurZoom);
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_DynamicRotation :
myCurrentMode = CurAction3d_Nothing;
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
} //switch (myCurrentMode)
} // else // if ( Ctrl )
if ( nFlags & MK_CONTROL )
{
return;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction3d_Nothing :
if (point.x == myXmin && point.y == myYmin)
{ // no offset between down and up --> selectEvent
myXmax=point.x;
myYmax=point.y;
if (nFlags & MK_SHIFT )
ShiftInputEvent(point.x,point.y);
else
InputEvent (point.x,point.y);
} else
{
myXmax=point.x; myYmax=point.y;
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False);
if (nFlags & MK_SHIFT)
ShiftDragEvent(point.x,point.y,1);
else
DragEvent(point.x,point.y,1);
}
break;
case CurAction3d_DynamicZooming :
// SetCursor(AfxGetApp()->LoadStandardCursor());
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_WindowZooming :
myXmax=point.x; myYmax=point.y;
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
if ((abs(myXmin-myXmax)>ValZWMin) || (abs(myYmin-myYmax)>ValZWMin))
// Test if the zoom window is greater than a minimale window.
{
// Do the zoom window between Pmin and Pmax
myView->WindowFitAll(myXmin,myYmin,myXmax,myYmax);
}
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_DynamicPanning :
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_GlobalPanning :
myView->Place(point.x,point.y,myCurZoom);
myCurrentMode = CurAction3d_Nothing;
break;
case CurAction3d_DynamicRotation :
myCurrentMode = CurAction3d_Nothing;
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
} //switch (myCurrentMode)
} // else // if ( Ctrl )
}
void CGeometryView::OnMButtonDown(UINT nFlags, CPoint point)
{
if ( nFlags & MK_CONTROL )
{
// Button MB2 down Control : panning init
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
if ( nFlags & MK_CONTROL )
{
// Button MB2 down Control : panning init
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
}
void CGeometryView::OnMButtonUp(UINT nFlags, CPoint point)
{
if ( nFlags & MK_CONTROL )
{
// Button MB2 down Control : panning init
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
if ( nFlags & MK_CONTROL )
{
// Button MB2 down Control : panning init
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
}
void CGeometryView::OnRButtonDown(UINT nFlags, CPoint point)
{
if ( nFlags & MK_CONTROL )
{
// SetCursor(AfxGetApp()->LoadStandardCursor());
if (!myDegenerateModeIsOn)
myView->SetDegenerateModeOn();
myView->StartRotation(point.x,point.y);
}
else // if ( Ctrl )
{
Popup(point.x,point.y);
}
if ( nFlags & MK_CONTROL )
{
// SetCursor(AfxGetApp()->LoadStandardCursor());
if (!myDegenerateModeIsOn)
myView->SetDegenerateModeOn();
myView->StartRotation(point.x,point.y);
}
else // if ( Ctrl )
{
Popup(point.x,point.y);
}
}
void CGeometryView::OnRButtonUp(UINT nFlags, CPoint point)
{
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
if (!myDegenerateModeIsOn)
{
myView->SetDegenerateModeOff();
myDegenerateModeIsOn = Standard_False;
} else
{
myView->SetDegenerateModeOn();
myDegenerateModeIsOn = Standard_True;
}
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
if (!myDegenerateModeIsOn)
{
myView->SetDegenerateModeOff();
myDegenerateModeIsOn = Standard_False;
} else
{
myView->SetDegenerateModeOn();
myDegenerateModeIsOn = Standard_True;
}
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
}
void CGeometryView::OnMouseMove(UINT nFlags, CPoint point)
{
// ============================ LEFT BUTTON =======================
// ============================ LEFT BUTTON =======================
if ( nFlags & MK_LBUTTON)
{
if ( nFlags & MK_CONTROL )
{
if ( nFlags & MK_CONTROL )
{
// move with MB1 and Control : on the dynamic zooming
// Do the zoom in function of mouse's coordinates
myView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min
myXmax = point.x;
myYmax = point.y;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction3d_Nothing :
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False);
myXmax = point.x;
myYmax = point.y;
if (nFlags & MK_SHIFT)
ShiftDragEvent(myXmax,myYmax,0);
else
DragEvent(myXmax,myYmax,0);
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_True);
break;
case CurAction3d_DynamicZooming :
myView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min \n";
myXmax=point.x; myYmax=point.y;
break;
case CurAction3d_WindowZooming :
myXmax = point.x; myYmax = point.y;
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_True,LongDash);
break;
case CurAction3d_DynamicPanning :
myView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
break;
case CurAction3d_GlobalPanning : // nothing
// move with MB1 and Control : on the dynamic zooming
// Do the zoom in function of mouse's coordinates
myView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min
myXmax = point.x;
myYmax = point.y;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction3d_Nothing :
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False);
myXmax = point.x;
myYmax = point.y;
if (nFlags & MK_SHIFT)
ShiftDragEvent(myXmax,myYmax,0);
else
DragEvent(myXmax,myYmax,0);
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_True);
break;
case CurAction3d_DynamicRotation :
myView->Rotation(point.x,point.y);
myView->Redraw();
case CurAction3d_DynamicZooming :
myView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min \n";
myXmax=point.x; myYmax=point.y;
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
case CurAction3d_WindowZooming :
myXmax = point.x; myYmax = point.y;
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
DrawRectangle(myXmin,myYmin,myXmax,myYmax,Standard_True,LongDash);
break;
}// switch (myCurrentMode)
}// if ( nFlags & MK_CONTROL ) else
} else // if ( nFlags & MK_LBUTTON)
case CurAction3d_DynamicPanning :
myView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
break;
case CurAction3d_GlobalPanning : // nothing
break;
case CurAction3d_DynamicRotation :
myView->Rotation(point.x,point.y);
myView->Redraw();
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
}// switch (myCurrentMode)
}// if ( nFlags & MK_CONTROL ) else
} else // if ( nFlags & MK_LBUTTON)
// ============================ MIDDLE BUTTON =======================
if ( nFlags & MK_MBUTTON)
{
if ( nFlags & MK_CONTROL )
{
myView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
if ( nFlags & MK_CONTROL )
{
myView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
}
}
} else // if ( nFlags & MK_MBUTTON)
// ============================ RIGHT BUTTON =======================
if ( nFlags & MK_RBUTTON)
{
if ( nFlags & MK_CONTROL )
{
myView->Rotation(point.x,point.y);
}
}else //if ( nFlags & MK_RBUTTON)
// ============================ NO BUTTON =======================
{ // No buttons
myXmax = point.x; myYmax = point.y;
if (nFlags & MK_SHIFT)
ShiftMoveEvent(point.x,point.y);
else
MoveEvent(point.x,point.y);
}
// ============================ RIGHT BUTTON =======================
if ( nFlags & MK_RBUTTON)
{
if ( nFlags & MK_CONTROL )
{
myView->Rotation(point.x,point.y);
}
}else //if ( nFlags & MK_RBUTTON)
// ============================ NO BUTTON =======================
{ // No buttons
myXmax = point.x; myYmax = point.y;
if (nFlags & MK_SHIFT)
ShiftMoveEvent(point.x,point.y);
else
MoveEvent(point.x,point.y);
}
}
void CGeometryView::OnUpdateBUTTONHlrOff(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (myDegenerateModeIsOn);
pCmdUI->Enable (!myDegenerateModeIsOn);
pCmdUI->SetCheck (myDegenerateModeIsOn);
pCmdUI->Enable (!myDegenerateModeIsOn);
}
void CGeometryView::OnUpdateBUTTONHlrOn(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (!myDegenerateModeIsOn);
pCmdUI->Enable (myDegenerateModeIsOn);
pCmdUI->SetCheck (!myDegenerateModeIsOn);
pCmdUI->Enable (myDegenerateModeIsOn);
}
void CGeometryView::OnUpdateBUTTONPanGlo(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (myCurrentMode == CurAction3d_GlobalPanning);
pCmdUI->Enable (myCurrentMode != CurAction3d_GlobalPanning);
pCmdUI->SetCheck (myCurrentMode == CurAction3d_GlobalPanning);
pCmdUI->Enable (myCurrentMode != CurAction3d_GlobalPanning);
}
void CGeometryView::OnUpdateBUTTONPan(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (myCurrentMode == CurAction3d_DynamicPanning);
pCmdUI->Enable (myCurrentMode != CurAction3d_DynamicPanning );
pCmdUI->SetCheck (myCurrentMode == CurAction3d_DynamicPanning);
pCmdUI->Enable (myCurrentMode != CurAction3d_DynamicPanning );
}
void CGeometryView::OnUpdateBUTTONZoomProg(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (myCurrentMode == CurAction3d_DynamicZooming );
pCmdUI->Enable (myCurrentMode != CurAction3d_DynamicZooming);
pCmdUI->SetCheck (myCurrentMode == CurAction3d_DynamicZooming );
pCmdUI->Enable (myCurrentMode != CurAction3d_DynamicZooming);
}
void CGeometryView::OnUpdateBUTTONZoomWin(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (myCurrentMode == CurAction3d_WindowZooming);
pCmdUI->Enable (myCurrentMode != CurAction3d_WindowZooming);
pCmdUI->SetCheck (myCurrentMode == CurAction3d_WindowZooming);
pCmdUI->Enable (myCurrentMode != CurAction3d_WindowZooming);
}
void CGeometryView::OnUpdateBUTTONRot(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck (myCurrentMode == CurAction3d_DynamicRotation);
pCmdUI->Enable (myCurrentMode != CurAction3d_DynamicRotation);
pCmdUI->SetCheck (myCurrentMode == CurAction3d_DynamicRotation);
pCmdUI->Enable (myCurrentMode != CurAction3d_DynamicRotation);
}
//==========================================================================================
@ -388,72 +392,72 @@ void CGeometryView::OnUpdateBUTTONRot(CCmdUI* pCmdUI)
//
//-----------------------------------------------------------------------------------------
void CGeometryView::DragEvent(const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState )
const Standard_Integer y ,
const Standard_Integer TheState )
{
// TheState == -1 button down
// TheState == 0 move
// TheState == 1 button up
// TheState == -1 button down
// TheState == 0 move
// TheState == 1 button up
static Standard_Integer theButtonDownX=0;
static Standard_Integer theButtonDownY=0;
static Standard_Integer theButtonDownX=0;
static Standard_Integer theButtonDownY=0;
if (TheState == -1)
{
theButtonDownX=x;
theButtonDownY=y;
}
if (TheState == -1)
{
theButtonDownX=x;
theButtonDownY=y;
}
if (TheState == 0)
GetDocument()->GetAISContext()->Select(theButtonDownX,theButtonDownY,x,y,myView);
if (TheState == 0)
GetDocument()->GetAISContext()->Select(theButtonDownX,theButtonDownY,x,y,myView);
}
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
void CGeometryView::InputEvent(const Standard_Integer x ,
const Standard_Integer y )
const Standard_Integer y )
{
GetDocument()->GetAISContext()->Select();
GetDocument()->GetAISContext()->Select();
}
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
void CGeometryView::MoveEvent(const Standard_Integer x ,
const Standard_Integer y )
const Standard_Integer y )
{
GetDocument()->GetAISContext()->MoveTo(x,y,myView);
GetDocument()->GetAISContext()->MoveTo(x,y,myView);
}
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
void CGeometryView::ShiftMoveEvent(const Standard_Integer x ,
const Standard_Integer y )
const Standard_Integer y )
{
GetDocument()->GetAISContext()->MoveTo(x,y,myView);
GetDocument()->GetAISContext()->MoveTo(x,y,myView);
}
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
void CGeometryView::ShiftDragEvent(const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState )
const Standard_Integer y ,
const Standard_Integer TheState )
{
static Standard_Integer theButtonDownX=0;
static Standard_Integer theButtonDownY=0;
static Standard_Integer theButtonDownX=0;
static Standard_Integer theButtonDownY=0;
if (TheState == -1)
{
theButtonDownX=x;
theButtonDownY=y;
}
if (TheState == -1)
{
theButtonDownX=x;
theButtonDownY=y;
}
if (TheState == 0)
GetDocument()->GetAISContext()->ShiftSelect(theButtonDownX,theButtonDownY,x,y,myView);
if (TheState == 0)
GetDocument()->GetAISContext()->ShiftSelect(theButtonDownX,theButtonDownY,x,y,myView);
}
@ -461,16 +465,16 @@ void CGeometryView::ShiftDragEvent(const Standard_Integer x ,
//
//-----------------------------------------------------------------------------------------
void CGeometryView::ShiftInputEvent(const Standard_Integer x ,
const Standard_Integer y )
const Standard_Integer y )
{
GetDocument()->GetAISContext()->ShiftSelect();
GetDocument()->GetAISContext()->ShiftSelect();
}
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
void CGeometryView::Popup(const Standard_Integer x,
const Standard_Integer y )
const Standard_Integer y )
{
Standard_Integer PopupMenuNumber=0;
GetDocument()->GetAISContext()->InitCurrent();
@ -481,13 +485,13 @@ void CGeometryView::Popup(const Standard_Integer x,
VERIFY(menu.LoadMenu(IDR_Popup3D));
CMenu* pPopup = menu.GetSubMenu(PopupMenuNumber);
ASSERT(pPopup != NULL);
POINT winCoord = { x , y };
Handle(WNT_Window) aWNTWindow=
Handle(WNT_Window)::DownCast(myView->Window());
Handle(WNT_Window)::DownCast(myView->Window());
ClientToScreen ( &winCoord);
pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON , winCoord.x, winCoord.y ,
AfxGetMainWnd());
AfxGetMainWnd());
}

View File

@ -15,72 +15,77 @@ class CGeometryView : public OCC_3dView
{
protected: // create from serialization only
public:
CGeometryView();
DECLARE_DYNCREATE(CGeometryView)
CGeometryView();
DECLARE_DYNCREATE(CGeometryView)
// Attributes
// Attributes
public:
CGeometryDoc* GetDocument();
CGeometryDoc* GetDocument();
// Operations
// Operations
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGeometryView)
public:
//}}AFX_VIRTUAL
// Implementation
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGeometryView)
public:
virtual ~CGeometryView();
void FitAll(Quantity_Coefficient Coef) { if (Coef != -1) myView->FitAll(Coef);
else myView->FitAll();
myView->ZFitAll(); };
//}}AFX_VIRTUAL
// Implementation
public:
virtual ~CGeometryView();
void FitAll(Quantity_Coefficient Coef)
{
if (Coef != -1)
myView->FitAll(Coef);
else myView->FitAll();
myView->ZFitAll();
};
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
#endif
// Generated message map functions
protected:
//{{AFX_MSG(CGeometryView)
afx_msg void OnFileExportImage();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
afx_msg void OnMButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMouseMove(UINT nFlags, CPoint point);
afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
afx_msg void OnUpdateBUTTONHlrOff(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONHlrOn(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONPanGlo(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONPan(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONZoomProg(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONZoomWin(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONRot(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//{{AFX_MSG(CGeometryView)
afx_msg void OnFileExportImage();
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
afx_msg void OnMButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMouseMove(UINT nFlags, CPoint point);
afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
afx_msg void OnUpdateBUTTONHlrOff(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONHlrOn(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONPanGlo(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONPan(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONZoomProg(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONZoomWin(CCmdUI* pCmdUI);
afx_msg void OnUpdateBUTTONRot(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
void DragEvent (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState);
void InputEvent (const Standard_Integer x ,
const Standard_Integer y );
void MoveEvent (const Standard_Integer x ,
const Standard_Integer y );
void ShiftMoveEvent (const Standard_Integer x ,
const Standard_Integer y );
void ShiftDragEvent (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState);
void ShiftInputEvent(const Standard_Integer x ,
const Standard_Integer y );
void Popup (const Standard_Integer x ,
const Standard_Integer y );
void DragEvent (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState);
void InputEvent (const Standard_Integer x ,
const Standard_Integer y );
void MoveEvent (const Standard_Integer x ,
const Standard_Integer y );
void ShiftMoveEvent (const Standard_Integer x ,
const Standard_Integer y );
void ShiftDragEvent (const Standard_Integer x ,
const Standard_Integer y ,
const Standard_Integer TheState);
void ShiftInputEvent(const Standard_Integer x ,
const Standard_Integer y );
void Popup (const Standard_Integer x ,
const Standard_Integer y );
};

View File

@ -14,16 +14,16 @@
IMPLEMENT_DYNCREATE(CGeometryView2D, CView)
BEGIN_MESSAGE_MAP(CGeometryView2D, OCC_2dView)
//{{AFX_MSG_MAP(CGeometryView2D)
ON_WM_LBUTTONDOWN()
ON_WM_LBUTTONUP()
ON_WM_MBUTTONDOWN()
ON_WM_MBUTTONUP()
ON_WM_RBUTTONDOWN()
ON_WM_RBUTTONUP()
ON_WM_MOUSEMOVE()
ON_WM_SIZE()
//}}AFX_MSG_MAP
//{{AFX_MSG_MAP(CGeometryView2D)
ON_WM_LBUTTONDOWN()
ON_WM_LBUTTONUP()
ON_WM_MBUTTONDOWN()
ON_WM_MBUTTONUP()
ON_WM_RBUTTONDOWN()
ON_WM_RBUTTONUP()
ON_WM_MOUSEMOVE()
ON_WM_SIZE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@ -41,11 +41,11 @@ CGeometryView2D::~CGeometryView2D()
void CGeometryView2D::OnDraw(CDC* pDC)
{
CGeometryDoc* pDoc = GetDocument();
ASSERT_VALID(pDoc);
CGeometryDoc* pDoc = GetDocument();
ASSERT_VALID(pDoc);
if (!myV2dView.IsNull())
myV2dView->Update();
if (!myV2dView.IsNull())
myV2dView->Update();
}
/////////////////////////////////////////////////////////////////////////////
@ -54,18 +54,18 @@ void CGeometryView2D::OnDraw(CDC* pDC)
#ifdef _DEBUG
void CGeometryView2D::AssertValid() const
{
CView::AssertValid();
CView::AssertValid();
}
void CGeometryView2D::Dump(CDumpContext& dc) const
{
CView::Dump(dc);
CView::Dump(dc);
}
CGeometryDoc* CGeometryView2D::GetDocument() // non-debug version is inline
{
ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CGeometryDoc)));
return (CGeometryDoc*)m_pDocument;
ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CGeometryDoc)));
return (CGeometryDoc*)m_pDocument;
}
#endif //_DEBUG
@ -83,233 +83,227 @@ void CGeometryView2D::OnLButtonDown(UINT nFlags, CPoint point)
myXmax=point.x; myYmax=point.y;
if ( nFlags & MK_CONTROL )
{
// Button MB1 down Control :start zomming
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction2d_Nothing : // start a drag
GetDocument()->DragEvent2D(point.x,point.y,-1,myV2dView);
break;
case CurAction2d_DynamicZooming : // noting
break;
case CurAction2d_WindowZooming :
break;
case CurAction2d_DynamicPanning :// noting
break;
case CurAction2d_GlobalPanning :// noting
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
}
{
// Button MB1 down Control :start zomming
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction2d_Nothing : // start a drag
GetDocument()->DragEvent2D(point.x,point.y,-1,myV2dView);
break;
case CurAction2d_DynamicZooming : // noting
break;
case CurAction2d_WindowZooming :
break;
case CurAction2d_DynamicPanning :// noting
break;
case CurAction2d_GlobalPanning :// noting
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
}
}
}
void CGeometryView2D::OnLButtonUp(UINT nFlags, CPoint point)
{
// TODO: Add your message handler code here and/or call default
if ( nFlags & MK_CONTROL )
{
return;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction2d_Nothing :
if (point.x == myXmin && point.y == myYmin)
{ // no offset between down and up --> selectEvent
myXmax=point.x;
myYmax=point.y;
if (nFlags & MK_SHIFT )
GetDocument()->ShiftInputEvent2D(point.x,point.y,myV2dView);
else
GetDocument()->InputEvent2D (point.x,point.y,myV2dView);
} else
{
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False);
myXmax=point.x;
myYmax=point.y;
if (nFlags & MK_SHIFT)
GetDocument()->ShiftDragEvent2D(point.x,point.y,1,myV2dView);
else
GetDocument()->DragEvent2D(point.x,point.y,1,myV2dView);
}
break;
case CurAction2d_DynamicZooming :
// SetCursor(AfxGetApp()->LoadStandardCursor());
myCurrentMode = CurAction2d_Nothing;
break;
case CurAction2d_WindowZooming :
myXmax=point.x; myYmax=point.y;
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
if ((abs(myXmin-myXmax)>ValZWMin) || (abs(myYmin-myYmax)>ValZWMin))
// Test if the zoom window is greater than a minimale window.
{
// Do the zoom window between Pmin and Pmax
myV2dView->WindowFit(myXmin,myYmin,myXmax,myYmax);
}
myCurrentMode = CurAction2d_Nothing;
break;
case CurAction2d_DynamicPanning :
myCurrentMode = CurAction2d_Nothing;
break;
case CurAction2d_GlobalPanning :
myV2dView->Place(point.x,point.y,myCurZoom);
myCurrentMode = CurAction2d_Nothing;
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
} //switch (myCurrentMode)
} // else // if ( Ctrl )
// TODO: Add your message handler code here and/or call default
if ( nFlags & MK_CONTROL )
{
return;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction2d_Nothing :
if (point.x == myXmin && point.y == myYmin)
{ // no offset between down and up --> selectEvent
myXmax=point.x;
myYmax=point.y;
if (nFlags & MK_SHIFT )
GetDocument()->ShiftInputEvent2D(point.x,point.y,myV2dView);
else
GetDocument()->InputEvent2D (point.x,point.y,myV2dView);
} else
{
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False);
myXmax=point.x;
myYmax=point.y;
if (nFlags & MK_SHIFT)
GetDocument()->ShiftDragEvent2D(point.x,point.y,1,myV2dView);
else
GetDocument()->DragEvent2D(point.x,point.y,1,myV2dView);
}
break;
case CurAction2d_DynamicZooming :
// SetCursor(AfxGetApp()->LoadStandardCursor());
myCurrentMode = CurAction2d_Nothing;
break;
case CurAction2d_WindowZooming :
myXmax=point.x; myYmax=point.y;
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
if ((abs(myXmin-myXmax)>ValZWMin) || (abs(myYmin-myYmax)>ValZWMin))
// Test if the zoom window is greater than a minimale window.
{
// Do the zoom window between Pmin and Pmax
myV2dView->WindowFit(myXmin,myYmin,myXmax,myYmax);
}
myCurrentMode = CurAction2d_Nothing;
break;
case CurAction2d_DynamicPanning :
myCurrentMode = CurAction2d_Nothing;
break;
case CurAction2d_GlobalPanning :
myV2dView->Place(point.x,point.y,myCurZoom);
myCurrentMode = CurAction2d_Nothing;
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
} //switch (myCurrentMode)
} // else // if ( Ctrl )
}
void CGeometryView2D::OnMButtonDown(UINT nFlags, CPoint point)
{
if ( nFlags & MK_CONTROL )
{
// Button MB2 down Control : panning init
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
if ( nFlags & MK_CONTROL )
{
// Button MB2 down Control : panning init
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
}
void CGeometryView2D::OnMButtonUp(UINT nFlags, CPoint point)
{
if ( nFlags & MK_CONTROL )
{
// Button MB2 up Control : panning stop
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
if ( nFlags & MK_CONTROL )
{
// Button MB2 up Control : panning stop
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
}
void CGeometryView2D::OnRButtonDown(UINT nFlags, CPoint point)
{
// TODO: Add your message handler code here and/or call default
if ( nFlags & MK_CONTROL )
{
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
else // if ( Ctrl )
{
GetDocument()->Popup2D(point.x,point.y,myV2dView);
}
// TODO: Add your message handler code here and/or call default
if ( nFlags & MK_CONTROL )
{
// SetCursor(AfxGetApp()->LoadStandardCursor());
}
else // if ( Ctrl )
{
GetDocument()->Popup2D(point.x,point.y,myV2dView);
}
}
void CGeometryView2D::OnRButtonUp(UINT nFlags, CPoint point)
{
OCC_2dView::Popup2D(point.x,point.y);
OCC_2dView::Popup2D(point.x,point.y);
}
void CGeometryView2D::OnMouseMove(UINT nFlags, CPoint point)
{
// ============================ LEFT BUTTON =======================
// ============================ LEFT BUTTON =======================
if ( nFlags & MK_LBUTTON)
{
if ( nFlags & MK_CONTROL )
{
if ( nFlags & MK_CONTROL )
{
// move with MB1 and Control : on the dynamic zooming
// Do the zoom in function of mouse's coordinates
myV2dView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min
myXmax = point.x;
// move with MB1 and Control : on the dynamic zooming
// Do the zoom in function of mouse's coordinates
myV2dView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min
myXmax = point.x;
myYmax = point.y;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction2d_Nothing :
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False);
myXmax = point.x;
myYmax = point.y;
}
else // if ( Ctrl )
{
switch (myCurrentMode)
{
case CurAction2d_Nothing :
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False);
myXmax = point.x;
myYmax = point.y;
GetDocument()->DragEvent2D(myXmax,myYmax,0,myV2dView);
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_True);
break;
case CurAction2d_DynamicZooming :
myV2dView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min \n";
myXmax=point.x; myYmax=point.y;
break;
case CurAction2d_WindowZooming :
myXmax = point.x; myYmax = point.y;
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_True,LongDash);
break;
case CurAction2d_DynamicPanning :
myV2dView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
break;
case CurAction2d_GlobalPanning : // nothing
GetDocument()->DragEvent2D(myXmax,myYmax,0,myV2dView);
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_True);
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
case CurAction2d_DynamicZooming :
myV2dView->Zoom(myXmax,myYmax,point.x,point.y);
// save the current mouse coordinate in min \n";
myXmax=point.x; myYmax=point.y;
break;
}// switch (myCurrentMode)
}// if ( nFlags & MK_CONTROL ) else
} else // if ( nFlags & MK_LBUTTON)
case CurAction2d_WindowZooming :
myXmax = point.x; myYmax = point.y;
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_False,LongDash);
DrawRectangle2D(myXmin,myYmin,myXmax,myYmax,Standard_True,LongDash);
break;
case CurAction2d_DynamicPanning :
myV2dView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
break;
case CurAction2d_GlobalPanning : // nothing
break;
default :
Standard_Failure::Raise(" incompatible Current Mode ");
break;
}// switch (myCurrentMode)
}// if ( nFlags & MK_CONTROL ) else
} else // if ( nFlags & MK_LBUTTON)
// ============================ MIDDLE BUTTON =======================
if ( nFlags & MK_MBUTTON)
{
if ( nFlags & MK_CONTROL )
{
myV2dView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
if ( nFlags & MK_CONTROL )
{
myV2dView->Pan(point.x-myXmax,myYmax-point.y); // Realize the panning
myXmax = point.x; myYmax = point.y;
}
}
} else // if ( nFlags & MK_MBUTTON)
// ============================ RIGHT BUTTON =======================
if ( nFlags & MK_RBUTTON)
{
}else //if ( nFlags & MK_RBUTTON)
// ============================ NO BUTTON =======================
{ // No buttons
myXmax = point.x; myYmax = point.y;
if (nFlags & MK_SHIFT)
GetDocument()->ShiftMoveEvent2D(point.x,point.y,myV2dView);
else
GetDocument()->MoveEvent2D(point.x,point.y,myV2dView);
}
// ============================ RIGHT BUTTON =======================
if ( nFlags & MK_RBUTTON)
{
}else //if ( nFlags & MK_RBUTTON)
// ============================ NO BUTTON =======================
{ // No buttons
myXmax = point.x; myYmax = point.y;
if (nFlags & MK_SHIFT)
GetDocument()->ShiftMoveEvent2D(point.x,point.y,myV2dView);
else
GetDocument()->MoveEvent2D(point.x,point.y,myV2dView);
}
}
void CGeometryView2D::OnSize(UINT nType, int cx, int cy)
{
if (!myV2dView.IsNull())
{
myV2dView->MustBeResized(V2d_TOWRE_ENLARGE_SPACE); // added sro
}
if (!myV2dView.IsNull())
{
myV2dView->MustBeResized(); // added sro
}
}
void CGeometryView2D::OnInitialUpdate()
{
Handle(WNT_Window) aWNTWindow;
aWNTWindow = new WNT_Window(((CGeometryApp*)AfxGetApp())->GetGraphicDevice(),GetSafeHwnd());
aWNTWindow->SetBackground(Quantity_NOC_BLACK);
Handle(WNT_Window) aWNTWindow;
aWNTWindow = new WNT_Window(GetSafeHwnd());
Handle(WNT_WDriver) aDriver= new WNT_WDriver(aWNTWindow);
myV2dView = new V2d_View(aDriver, GetDocument()->GetViewer2D(),0,0,50);
myV2dView = GetDocument()->GetViewer2D()->CreateView();
myV2dView->SetWindow(aWNTWindow);
myV2dView->SetBackgroundColor(Quantity_NOC_BLACK);
// initialyse the grids dialogs
TheRectangularGridDialog.Create(CRectangularGrid::IDD, NULL);
TheCircularGridDialog.Create(CCircularGrid::IDD, NULL);
TheRectangularGridDialog.SetViewer (GetDocument()->GetViewer2D());
TheCircularGridDialog.SetViewer (GetDocument()->GetViewer2D());
Standard_Integer w=100 , h=100 ; /* Debug Matrox */
aWNTWindow->Size (w,h) ; /* Keeps me unsatisfied (rlb)..... */
/* Resize is not supposed to be done on */
/* Matrox */
/* I suspect another problem elsewhere */
::PostMessage ( GetSafeHwnd () , WM_SIZE , SIZE_RESTORED , w + h*65536 ) ;
// initialyse the grids dialogs
TheRectangularGridDialog.Create(CRectangularGrid::IDD, NULL);
TheCircularGridDialog.Create(CCircularGrid::IDD, NULL);
TheRectangularGridDialog.SetViewer (GetDocument()->GetViewer2D());
TheCircularGridDialog.SetViewer (GetDocument()->GetViewer2D());
Standard_Integer w=100 , h=100 ; /* Debug Matrox */
aWNTWindow->Size (w,h) ; /* Keeps me unsatisfied (rlb)..... */
/* Resize is not supposed to be done on */
/* Matrox */
/* I suspect another problem elsewhere */
::PostMessage ( GetSafeHwnd () , WM_SIZE , SIZE_RESTORED , w + h*65536 ) ;
}

View File

@ -12,62 +12,46 @@
#include <OCC_2dView.h>
/////////////////////////////////////////////////////////////////////////////
/*
enum CurrentAction2d {
CurAction_Nothing,
CurAction_DynamicZooming,
CurAction_WindowZooming,
CurAction_DynamicPanning,
CurAction_GlobalPanning,
};
*/
#define ValZWMin 1
class CGeometryView2D : public OCC_2dView
{
protected: // create from serialization only
CGeometryView2D();
DECLARE_DYNCREATE(CGeometryView2D)
CGeometryView2D();
DECLARE_DYNCREATE(CGeometryView2D)
// Attributes
// Attributes
public:
CGeometryDoc* GetDocument();
CGeometryDoc* GetDocument();
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CNSGViewBib)
public:
virtual void OnDraw(CDC* pDC); // overridden to draw this view
virtual void OnInitialUpdate(); // called first time after construct
//}}AFX_VIRTUAL
// Implementation
// Overrides
// ClassWizard generated virtual function overrides
public:
virtual ~CGeometryView2D();
virtual void OnDraw(CDC* pDC); // overridden to draw this view
virtual void OnInitialUpdate(); // called first time after construct
// Implementation
public:
virtual ~CGeometryView2D();
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
#endif
// Generated message map functions
// Generated message map functions
protected:
//{{AFX_MSG(CGeometryView2D)
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
afx_msg void OnMButtonUp(UINT nFlags, CPoint point);
afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMouseMove(UINT nFlags, CPoint point);
afx_msg void OnSize(UINT nType, int cx, int cy);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//{{AFX_MSG(CGeometryView2D)
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMButtonDown(UINT nFlags, CPoint point);
afx_msg void OnMButtonUp(UINT nFlags, CPoint point);
afx_msg void OnRButtonDown(UINT nFlags, CPoint point);
afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
afx_msg void OnMouseMove(UINT nFlags, CPoint point);
afx_msg void OnSize(UINT nType, int cx, int cy);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
#ifndef _DEBUG // debug version in NSGViewBibliotheque.cpp

View File

@ -6,37 +6,12 @@
IMPLEMENT_STANDARD_HANDLE(ISession2D_Curve,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
#include <Graphic2d_SetOfCurves.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Bnd_Box2d.hxx>
#include <BndLib_Add2dCurve.hxx>
#include <Precision.hxx>
#include <Select2D_SensitiveBox.hxx>
#include <Select2D_SensitiveSegment.hxx>
#include <gp_Circ2d.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Ax2d.hxx>
#include <Select2D_SensitiveArc.hxx>
#include <Geom2d_Curve.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <gp_Pnt2d.hxx>
#include <GCE2d_MakeSegment.hxx>
#include <gp_Vec2d.hxx>
#include <OSD_Environment.hxx>
#include <Graphic2d_Array1OfVertex.hxx>
#include <Graphic2d_PolyLine.hxx>
#include <SelectMgr_Selection.hxx>
#include <Graphic2d_Segment.hxx>
#include <GeomAbs_CurveType.hxx>
#include <Graphic2d_Vertex.hxx>
#include <Geom2d_BezierCurve.hxx>
ISession2D_Curve::ISession2D_Curve(const Handle_Geom2d_Curve aGeom2dCurve,
const Aspect_TypeOfLine aTypeOfLine,
const Aspect_WidthOfLine aWidthOfLine,
const Standard_Integer aColorIndex)
:AIS_InteractiveObject()
ISession2D_Curve::ISession2D_Curve(const Handle_Geom2d_Curve aGeom2dCurve,
const Aspect_TypeOfLine aTypeOfLine,
const Aspect_WidthOfLine aWidthOfLine,
const Standard_Integer aColorIndex)
:AIS_InteractiveObject()
{
myGeom2dCurve = aGeom2dCurve;
myTypeOfLine = aTypeOfLine ;
@ -49,51 +24,52 @@ IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
myradiusratio = 1;
}
void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer aMode)
void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode)
{
Handle(Graphic2d_SetOfCurves) segment;
segment = new Graphic2d_SetOfCurves(aGrObj);
segment->Add(myGeom2dCurve);
segment->SetColorIndex (myColorIndex);
segment->SetWidthIndex (myWidthOfLine + 1);
segment->SetTypeIndex (myTypeOfLine + 1);
Geom2dAdaptor_Curve anAdaptor(myGeom2dCurve);
GCPnts_QuasiUniformDeflection anEdgeDistrib(anAdaptor,1.e-2);
if(anEdgeDistrib.IsDone())
{
Handle(Graphic3d_ArrayOfPolylines) aCurve =
new Graphic3d_ArrayOfPolylines(anEdgeDistrib.NbPoints());
for(Standard_Integer i=1;i<=anEdgeDistrib.NbPoints();++i)
aCurve->AddVertex(anEdgeDistrib.Value(i));
Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(aCurve);
}
if (myDisplayPole)
{
{
if (anAdaptor.GetType() == GeomAbs_BezierCurve )
{
Handle(Geom2d_BezierCurve) aBezier = anAdaptor.Bezier();
Graphic2d_Array1OfVertex anArrayOfVertex(1,aBezier->NbPoles());
Handle(Graphic3d_ArrayOfPolylines) anArrayOfVertex = new Graphic3d_ArrayOfPolylines(aBezier->NbPoles());
for(int i=1;i<=aBezier->NbPoles();i++)
{
gp_Pnt2d CurrentPoint = aBezier->Pole(i);
Graphic2d_Vertex aVertex(CurrentPoint.X(),CurrentPoint.Y());
anArrayOfVertex(i)=aVertex;
}
Handle(Graphic2d_Polyline) aPolyline = new Graphic2d_Polyline(aGrObj,anArrayOfVertex);
{
gp_Pnt2d CurrentPoint = aBezier->Pole(i);
anArrayOfVertex->AddVertex(CurrentPoint.X(),CurrentPoint.Y(),0.);
}
Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(anArrayOfVertex);
}
if (anAdaptor.GetType() == GeomAbs_BSplineCurve )
{
Handle(Geom2d_BSplineCurve) aBSpline = anAdaptor.BSpline();
Graphic2d_Array1OfVertex anArrayOfVertex(1,aBSpline->NbPoles());
Handle(Graphic3d_ArrayOfPolylines) anArrayOfVertex =
new Graphic3d_ArrayOfPolylines(aBSpline->NbPoles());
for(int i=1;i<=aBSpline->NbPoles();i++)
{
gp_Pnt2d CurrentPoint = aBSpline->Pole(i);
Graphic2d_Vertex aVertex(CurrentPoint.X(),CurrentPoint.Y());
anArrayOfVertex(i)=aVertex;
}
Handle(Graphic2d_Polyline) aPolyline = new Graphic2d_Polyline(aGrObj,anArrayOfVertex);
{
gp_Pnt2d CurrentPoint = aBSpline->Pole(i);
anArrayOfVertex->AddVertex(CurrentPoint.X(),CurrentPoint.Y(),0.);
}
Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(anArrayOfVertex);
}
}
if (myDisplayCurbure && (anAdaptor.GetType() != GeomAbs_Line))
{
@ -106,37 +82,39 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager2d)& aPres
gp_Pnt2d P1, P2;
for (intrv = 1; intrv <= nbintv; intrv++)
{
Standard_Real t = TI(intrv);
Standard_Real step = (TI(intrv+1) - t) / GetDiscretisation();
Standard_Real LRad, ratio;
for (ii = 1; ii <= myDiscretisation; ii++)
{
LProp.SetParameter(t);
{
Standard_Real t = TI(intrv);
Standard_Real step = (TI(intrv+1) - t) / GetDiscretisation();
Standard_Real LRad, ratio;
for (ii = 1; ii <= myDiscretisation; ii++)
{
LProp.SetParameter(t);
if (LProp.IsTangentDefined())
{
Curvature = Abs(LProp.Curvature());
if ( Curvature > Resolution)
{
myGeom2dCurve->D0(t, P1);
LRad = 1./Curvature;
ratio = ( ( LRad > myradiusmax) ? myradiusmax/LRad : 1 );
ratio *= myradiusratio;
LProp.CentreOfCurvature(P2);
gp_Vec2d V(P1, P2);
gp_Pnt2d P3 = P1.Translated(ratio*V);
Handle(Graphic2d_Segment) aSegment = new Graphic2d_Segment(aGrObj,P1.X(),P1.Y(),P3.X(),P3.Y());
}
}
t += step;
}
{
Curvature = Abs(LProp.Curvature());
if ( Curvature > Resolution)
{
myGeom2dCurve->D0(t, P1);
LRad = 1./Curvature;
ratio = ( ( LRad > myradiusmax) ? myradiusmax/LRad : 1 );
ratio *= myradiusratio;
LProp.CentreOfCurvature(P2);
gp_Vec2d V(P1, P2);
gp_Pnt2d P3 = P1.Translated(ratio*V);
Handle(Graphic3d_ArrayOfPolylines) aSegment = new Graphic3d_ArrayOfPolylines(2);
aSegment->AddVertex(P1.X(),P1.Y(),0.);
aSegment->AddVertex(P3.X(),P3.Y(),0.);
Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(aSegment);
}
}
t += step;
}
}
}
}
void ISession2D_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer aMode)
const Standard_Integer aMode)
{
}

View File

@ -10,9 +10,7 @@
#include <Aspect_WidthOfline.hxx>
#include <Standard_Integer.hxx>
#include <SelectMgr_SelectableObject.hxx>
#include <Handle_PrsMgr_PresentationManager2d.hxx>
#include <Handle_Graphic2d_GraphicObject.hxx>
#include <Handle_SelectMgr_Selection.hxx>
#include <SelectMgr_Selection.hxx>
#include <Standard_OStream.hxx>
#include <Standard_IStream.hxx>
#include <Standard_CString.hxx>
@ -21,7 +19,6 @@ class TColGeom2d_HSequenceOfCurve;
class PrsMgr_PresentationManager2d;
class Graphic2d_GraphicObject;
class SelectMgr_Selection;
class ISession2D_ObjectOwner;
#include "Geom2d_Curve.hxx"
@ -32,81 +29,56 @@ class ISession2D_Curve : public AIS_InteractiveObject {
public:
// Methods PUBLIC
//
// Methods PUBLIC
//
ISession2D_Curve
(const Handle_Geom2d_Curve aGeom2dCurve,
const Aspect_TypeOfLine aTypeOfline = Aspect_TOL_SOLID,
const Aspect_WidthOfLine aWidthOfLine = Aspect_WOL_MEDIUM,
const Standard_Integer aColorIndex = 4);
ISession2D_Curve
(const Handle_Geom2d_Curve aGeom2dCurve,
const Aspect_TypeOfLine aTypeOfline = Aspect_TOL_SOLID,
const Aspect_WidthOfLine aWidthOfLine = Aspect_WOL_MEDIUM,
const Standard_Integer aColorIndex = 4);
inline Standard_Integer NbPossibleSelection() const;
inline Standard_Integer NbPossibleSelection() const;
inline Aspect_TypeOfLine GetTypeOfLine
() const;
inline void SetTypeOfLine
(const Aspect_TypeOfLine aNewTypeOfLine) ;
inline Aspect_WidthOfLine GetWidthOfLine
() const;
inline void SetWidthOfLine
(const Aspect_WidthOfLine aNewWidthOfLine) ;
inline Standard_Integer GetColorIndex
() const;
inline void SetColorIndex
(const Standard_Integer aNewColorIndex) ;
inline Aspect_TypeOfLine GetTypeOfLine() const;
inline void SetTypeOfLine(const Aspect_TypeOfLine aNewTypeOfLine);
inline Standard_Boolean GetDisplayPole
() const;
inline void SetDisplayPole
(const Standard_Boolean aNewDisplayPole) ;
inline Aspect_WidthOfLine GetWidthOfLine() const;
inline void SetWidthOfLine(const Aspect_WidthOfLine aNewWidthOfLine);
inline Standard_Boolean ISession2D_Curve::GetDisplayCurbure
() const;
inline void ISession2D_Curve::SetDisplayCurbure
(const Standard_Boolean aNewDisplayCurbure);
inline Standard_Integer GetColorIndex() const;
inline void SetColorIndex(const Standard_Integer aNewColorIndex) ;
inline Standard_Boolean GetDisplayPole() const;
inline void SetDisplayPole(const Standard_Boolean aNewDisplayPole) ;
inline Standard_Real GetDiscretisation
() const;
inline void SetDiscretisation
(const Standard_Real aNewDiscretisation) ;
inline Standard_Boolean ISession2D_Curve::GetDisplayCurbure() const;
inline void ISession2D_Curve::SetDisplayCurbure
(const Standard_Boolean aNewDisplayCurbure);
inline Standard_Real GetDiscretisation() const;
inline void SetDiscretisation(const Standard_Real aNewDiscretisation) ;
DEFINE_STANDARD_RTTI(ISession2D_Curve)
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
DEFINE_STANDARD_RTTI(ISession2D_Curve)
private:
// Methods PRIVATE
//
virtual void Compute(const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,const Handle(Graphic2d_GraphicObject)& aGrObj,const Standard_Integer aMode = 0) ;
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
// Fields PRIVATE
//
Handle_Geom2d_Curve myGeom2dCurve;
Aspect_TypeOfLine myTypeOfLine;
Aspect_WidthOfLine myWidthOfLine;
Standard_Integer myColorIndex;
Standard_Boolean myDisplayPole;
Standard_Boolean myDisplayCurbure;
Standard_Real myDiscretisation;
Standard_Real myradiusmax ;
Standard_Real myradiusratio ;
// Methods PRIVATE
//
virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
// Fields PRIVATE
//
Handle_Geom2d_Curve myGeom2dCurve;
Aspect_TypeOfLine myTypeOfLine;
Aspect_WidthOfLine myWidthOfLine;
Standard_Integer myColorIndex;
Standard_Boolean myDisplayPole;
Standard_Boolean myDisplayCurbure;
Standard_Real myDiscretisation;
Standard_Real myradiusmax ;
Standard_Real myradiusratio ;
};
@ -116,14 +88,14 @@ Standard_Real myradiusratio ;
inline Standard_Integer ISession2D_Curve::NbPossibleSelection() const
{
return 1;
return 1;
}
inline Aspect_TypeOfLine ISession2D_Curve::GetTypeOfLine() const
{
return myTypeOfLine ;
}
inline void ISession2D_Curve::SetTypeOfLine(const Aspect_TypeOfLine aNewTypeOfLine)
{
myTypeOfLine = aNewTypeOfLine;
@ -150,37 +122,37 @@ inline void ISession2D_Curve::SetColorIndex(const Standard_Integer aNewColorInd
}
inline Standard_Boolean ISession2D_Curve::GetDisplayPole
() const
() const
{
return myDisplayPole;
return myDisplayPole;
}
inline void ISession2D_Curve::SetDisplayPole
(const Standard_Boolean aNewDisplayPole)
(const Standard_Boolean aNewDisplayPole)
{
myDisplayPole = aNewDisplayPole;
myDisplayPole = aNewDisplayPole;
}
inline Standard_Boolean ISession2D_Curve::GetDisplayCurbure
() const
() const
{
return myDisplayCurbure;
return myDisplayCurbure;
}
inline void ISession2D_Curve::SetDisplayCurbure
(const Standard_Boolean aNewDisplayCurbure)
(const Standard_Boolean aNewDisplayCurbure)
{
myDisplayCurbure = aNewDisplayCurbure;
myDisplayCurbure = aNewDisplayCurbure;
}
inline Standard_Real ISession2D_Curve::GetDiscretisation
() const
() const
{
return myDiscretisation;
return myDiscretisation;
}
inline void ISession2D_Curve::SetDiscretisation
(const Standard_Real aNewDiscretisation)
(const Standard_Real aNewDiscretisation)
{
myDiscretisation = aNewDiscretisation;
myDiscretisation = aNewDiscretisation;
}

View File

@ -1,166 +0,0 @@
#include "stdafx.h"
#include <ISession2D_InteractiveContext.h>
IMPLEMENT_STANDARD_HANDLE(ISession2D_InteractiveContext,MMgt_TShared)
IMPLEMENT_STANDARD_RTTIEXT(ISession2D_InteractiveContext,MMgt_TShared)
#include <Aspect_Window.hxx>
#include <Aspect_Background.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <SelectMgr_SelectionManager.hxx>
#include <V2d_Viewer.hxx>
#include <V2d_View.hxx>
#include <PrsMgr_PresentationManager2d.hxx>
#include <StdSelect_ViewerSelector2d.hxx>
#include <SelectMgr_SelectableObject.hxx>
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
ISession2D_InteractiveContext::ISession2D_InteractiveContext()
{
}
ISession2D_InteractiveContext::ISession2D_InteractiveContext(const Handle(V2d_Viewer)& aViewer)
{
Initialize(aViewer);
}
void ISession2D_InteractiveContext::Initialize(const Handle(V2d_Viewer)& aViewer)
{
myViewer = aViewer;
myPrsmgr = new PrsMgr_PresentationManager2d(myViewer->View());
mySelectionManager = new SelectMgr_SelectionManager();
mySelector = new StdSelect_ViewerSelector2d();
mySelector->Set(3);
// set Sensitivity very very important for SensitiveCurve !!
mySelector->SetSensitivity (0.5); // en mm
mySelectionManager->Add(mySelector);
}
void ISession2D_InteractiveContext::Display(const Handle(AIS_InteractiveObject)& anObject,
const Standard_Boolean Redraw)
{
myMapOfObject.Add(anObject);
myPrsmgr->Display(anObject);//,anObject->DisplayMode());
mySelectionManager->Load(anObject,mySelector);
mySelectionManager->Activate(anObject,0,mySelector);
if (Redraw) myViewer->Update();
}
void ISession2D_InteractiveContext::Erase(const Handle(AIS_InteractiveObject)& anObject,
const Standard_Boolean Redraw)
{
if (!anObject.IsNull())
{
myPrsmgr->Erase(anObject);//,anObject->DisplayMode());
mySelectionManager
->Deactivate(anObject,mySelector);
if (Redraw) myViewer->Update();
}
}
void ISession2D_InteractiveContext::Move(const Handle(V2d_View)& aView,
const Standard_Integer x1,
const Standard_Integer y1)
{
if (!aBuffer.IsNull())
{
aBuffer->UnPost();
aBuffer->Clear();
}
if (myViewer->IsActive()) // A propos de la grille !!!
{
aView->ShowHit(x1,y1);
}
aBuffer =new Graphic2d_Buffer(aView->View(),0,0,3,5);
mySelector->Pick(x1,y1,aView);
Handle(SelectMgr_SelectableObject) aSelectableObject;
mySelector->Init();
while (mySelector->More())
{
aSelectableObject = Handle(SelectMgr_SelectableObject)::DownCast(mySelector->Picked()->Selectable());
myPrsmgr->Dump(aBuffer,aSelectableObject) ;
aBuffer->Post();
mySelector->Next();
}
}
void ISession2D_InteractiveContext::Pick(const Handle(V2d_View)& aView,
const Standard_Integer x1,
const Standard_Integer y1)
{
if (myViewer->IsActive()) // A propos de la grille !!!
{
aView->ShowHit(x1,y1);
}
mySelector->Pick(x1,y1,aView);
Handle(SelectMgr_SelectableObject) aSelectableObject;
mySelector->Init();
while (mySelector->More())
{
Handle(SelectMgr_EntityOwner) aOwn= mySelector->Picked();
aSelectableObject = Handle(SelectMgr_SelectableObject)::DownCast(aOwn->Selectable());
myPrsmgr->ColorHighlight(aSelectableObject,5,0) ;
mySelector->Next();
}
if (myViewer->IsActive()) // A propos de la grille !!!
{
aView->ShowHit(x1,y1);
}
}
void ISession2D_InteractiveContext::DisplayAreas()
{
myViewer->InitActiveViews();
while(myViewer->MoreActiveViews())
{
Handle(V2d_View) aView = myViewer->ActiveView();
mySelector->DisplayAreas(aView);
myViewer->NextActiveViews();
}
myViewer->Update();
}
void ISession2D_InteractiveContext::ClearAreas()
{
mySelector->ClearAreas();
myViewer->Update();
}
void ISession2D_InteractiveContext::EraseAll()
{
TColStd_MapIteratorOfMapOfTransient anIterator(myMapOfObject);
for (;anIterator.More();anIterator.Next())
{
Handle(Standard_Transient) aTransient = anIterator.Key();
Handle(AIS_InteractiveObject) anObject = Handle(AIS_InteractiveObject)::DownCast(aTransient);
if (!anObject.IsNull())
{
myPrsmgr->Erase(anObject);
mySelectionManager
->Deactivate(Handle(AIS_InteractiveObject)::DownCast(anObject),mySelector);
}
else
{
Standard_CString ObjectTypeName = aTransient->DynamicType()->Name();
}
}
myViewer->Update();
}

View File

@ -1,98 +0,0 @@
// File generated by CPPExt (Transient)
//
// Copyright (C) 1991,1995 by
//
// MATRA DATAVISION, FRANCE
//
// This software is furnished in accordance with the terms and conditions
// of the contract and with the inclusion of the above copyright notice.
// This software or any other copy thereof may not be provided or otherwise
// be made available to any other person. No title to an ownership of the
// software is hereby transferred.
//
// At the termination of the contract, the software and all copies of this
// software must be deleted.
//
#ifndef _ISession2D_InteractiveContext_HeaderFile
#define _ISession2D_InteractiveContext_HeaderFile
#include <Standard_Macro.hxx>
#include <Standard_DefineHandle.hxx>
#include <Handle_V2d_Viewer.hxx>
#include <Handle_PrsMgr_PresentationManager2d.hxx>
#include <Handle_SelectMgr_SelectionManager.hxx>
#include <Handle_StdSelect_ViewerSelector2d.hxx>
#include <MMgt_TShared.hxx>
#include <Handle_SelectMgr_SelectableObject.hxx>
#include <Standard_Boolean.hxx>
#include <Handle_V2d_View.hxx>
#include <Graphic2d_Buffer.hxx>
class V2d_Viewer;
class PrsMgr_PresentationManager2d;
class SelectMgr_SelectionManager;
#include <StdSelect_ViewerSelector2d.hxx>
class SelectMgr_SelectableObject;
class V2d_View;
#include "TColStd_MapOfTransient.hxx"
DEFINE_STANDARD_HANDLE(ISession2D_InteractiveContext,MMgt_TShared)
class ISession2D_InteractiveContext : public MMgt_TShared {
public:
void EraseAll();
// Methods PUBLIC
//
ISession2D_InteractiveContext();
ISession2D_InteractiveContext(const Handle(V2d_Viewer)& aViewer);
void Initialize(const Handle(V2d_Viewer)& aViewer) ;
void Display(const Handle(AIS_InteractiveObject)& anObject,const Standard_Boolean Redraw = Standard_True) ;
void Erase(const Handle(AIS_InteractiveObject)& anObject,const Standard_Boolean Redraw = Standard_True) ;
virtual void Move(const Handle(V2d_View)& aView,const Standard_Integer x1,const Standard_Integer y1) ;
void Pick(const Handle(V2d_View)& aView,
const Standard_Integer x1,
const Standard_Integer y1);
void DisplayAreas() ;
void ClearAreas() ;
DEFINE_STANDARD_RTTI(ISession2D_InteractiveContext)
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private:
TColStd_MapOfTransient myMapOfObject;
// Methods PRIVATE
//
// Fields PRIVATE
//
Handle(V2d_Viewer) myViewer;
Handle_PrsMgr_PresentationManager2d myPrsmgr;
Handle_SelectMgr_SelectionManager mySelectionManager;
Handle_StdSelect_ViewerSelector2d mySelector;
// for dynamic selection
Handle(Graphic2d_Buffer) aBuffer;
};
// other inline functions and methods (like "C++: function call" methods)
//
#endif

View File

@ -4,17 +4,8 @@
#include <ISession2D_SensitiveCurve.h>
IMPLEMENT_STANDARD_HANDLE(ISession2D_SensitiveCurve,Select2D_SensitiveEntity)
IMPLEMENT_STANDARD_RTTIEXT(ISession2D_SensitiveCurve,Select2D_SensitiveEntity)
#include <Bnd_Box2d.hxx>
#include <gp_Lin2d.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Vec2d.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <SelectBasics_BasicTool.hxx>
#include "GCPnts_TangentialDeflection.hxx"
#include "Geom2dAdaptor_Curve.hxx"
IMPLEMENT_STANDARD_HANDLE(ISession2D_SensitiveCurve,Select3D_SensitiveEntity)
IMPLEMENT_STANDARD_RTTIEXT(ISession2D_SensitiveCurve,Select3D_SensitiveEntity)
//=====================================================
// Function : Create
@ -27,7 +18,7 @@ ISession2D_SensitiveCurve(const Handle(SelectBasics_EntityOwner)& OwnerId,
const Handle(Geom2d_Curve)& C,
const Standard_Real CDeflect,
const Standard_Integer MaxRect):
Select2D_SensitiveEntity(OwnerId),
Select3D_SensitiveEntity(OwnerId),
myMaxRect(MaxRect),
myCurve(C),
myCDeflect(CDeflect)

View File

@ -21,8 +21,8 @@
#include <Standard_Integer.hxx>
#include <gp_Pnt2d.hxx>
#include <Select2D_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Select3D_SensitiveEntity.hxx>
#include <SelectBasics_EntityOwner.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
class SelectBasics_EntityOwner;
@ -32,57 +32,38 @@ class gp_Pnt2d;
#include <Geom2d_Curve.hxx>
DEFINE_STANDARD_HANDLE(ISession2D_SensitiveCurve,Select2D_SensitiveEntity)
class ISession2D_SensitiveCurve : public Select2D_SensitiveEntity {
DEFINE_STANDARD_HANDLE(ISession2D_SensitiveCurve,Select3D_SensitiveEntity)
class ISession2D_SensitiveCurve : public Select3D_SensitiveEntity {
public:
// Methods PUBLIC
//
Standard_EXPORT ISession2D_SensitiveCurve(const Handle(SelectBasics_EntityOwner)& OwnerId,
const Handle(Geom2d_Curve)& C,
const Standard_Real CDeflect,
const Standard_Integer MaxRect = 3);
inline void SetMaxBoxes(const Standard_Integer MaxRect) ;
inline virtual Standard_Integer MaxBoxes() const;
Standard_EXPORT ISession2D_SensitiveCurve(const Handle(SelectBasics_EntityOwner)& OwnerId,
const Handle(Geom2d_Curve)& C,
const Standard_Real CDeflect,
const Standard_Integer MaxRect = 3);
inline void SetMaxBoxes(const Standard_Integer MaxRect) ;
inline virtual Standard_Integer MaxBoxes() const;
inline void SetCurve(const Handle(Geom2d_Curve) aCurve) ;
inline Handle(Geom2d_Curve) GetCurve() ;
inline void SetCurve(const Handle(Geom2d_Curve) aCurve) ;
inline Handle(Geom2d_Curve) GetCurve() ;
void Compute();
void Compute();
Standard_EXPORT void Areas(SelectBasics_ListOfBox2d& aSeq) ;
Standard_EXPORT Standard_Boolean Matches(const Standard_Real XMin,const Standard_Real YMin,const Standard_Real XMax,const Standard_Real YMax,const Standard_Real aTol) ;
Standard_EXPORT Standard_Boolean Matches(const Standard_Real X,const Standard_Real Y,const Standard_Real aTol,Standard_Real& DMin) ;
Handle(TColgp_HArray1OfPnt2d) SensitivePolygon();
Standard_EXPORT void Areas(SelectBasics_ListOfBox2d& aSeq) ;
Standard_EXPORT Standard_Boolean Matches(const Standard_Real XMin,const Standard_Real YMin,const Standard_Real XMax,const Standard_Real YMax,const Standard_Real aTol) ;
Standard_EXPORT Standard_Boolean Matches(const Standard_Real X,const Standard_Real Y,const Standard_Real aTol,Standard_Real& DMin) ;
Handle(TColgp_HArray1OfPnt2d) SensitivePolygon();
DEFINE_STANDARD_RTTI(ISession2D_SensitiveCurve)
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
DEFINE_STANDARD_RTTI(ISession2D_SensitiveCurve)
private:
// Methods PRIVATE
//
// Fields PRIVATE
//
Standard_Real myCDeflect;
Standard_Integer myMaxRect;
Handle(Geom2d_Curve) myCurve;
Standard_Real myCDeflect;
Standard_Integer myMaxRect;
Handle(Geom2d_Curve) myCurve;
Handle(TColgp_HArray1OfPnt2d) myPolyP2d;
};
@ -102,8 +83,4 @@ inline Handle(Geom2d_Curve) ISession2D_SensitiveCurve::
GetCurve()
{return myCurve;}
// other inline functions and methods (like "C++: function call" methods)
//
#endif

View File

@ -9,9 +9,6 @@
IMPLEMENT_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
#include "StdPrs_Curve.hxx"
#include "GeomAdaptor_Curve.hxx"
#include "StdPrs_PoleCurve.hxx"
#ifdef _DEBUG
#undef THIS_FILE
static char THIS_FILE[]=__FILE__;

View File

@ -16,16 +16,18 @@ DEFINE_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
class ISession_Curve : public AIS_InteractiveObject
{
public:
ISession_Curve(Handle(Geom_Curve)& aCurve);
virtual ~ISession_Curve();
DEFINE_STANDARD_RTTI(ISession_Curve)
ISession_Curve(Handle(Geom_Curve)& aCurve);
virtual ~ISession_Curve();
DEFINE_STANDARD_RTTI(ISession_Curve)
private:
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
Standard_EXPORT virtual void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
Standard_EXPORT virtual void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
Handle(Geom_Curve) myCurve;
Handle(Geom_Curve) myCurve;
};
#endif // !defined(AFX_ISESSION_CURVE_H__F981CB93_A3CC_11D1_8DA3_0800369C8A03__INCLUDED_)

View File

@ -14,11 +14,6 @@ static char THIS_FILE[]=__FILE__;
IMPLEMENT_STANDARD_HANDLE(ISession_Direction,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
#include "Graphic2d_SetOfSegments.hxx"
#include "gp_Vec2d.hxx"
#include "DsgPrs_LengthPresentation.hxx"
#include "Prs3d_ArrowAspect.hxx"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
@ -84,31 +79,6 @@ void ISession_Direction::Compute(const Handle(Prs3d_Projector)& aProjector,
{
}
void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer aMode)
{
Handle(Graphic2d_SetOfSegments) segment;
segment = new Graphic2d_SetOfSegments(aGrObj);
segment->Add(myPnt.X(),
myPnt.Y(),
myPnt.X()+myLength*myDir.X(),
myPnt.Y()+myLength*myDir.Y());
gp_Dir2d aFirstDir = gp_Dir2d(myDir.X(),myDir.Y()).Rotated (200*M_PI/180) ;
segment->Add(myPnt.X()+myLength*myDir.X(),
myPnt.Y()+myLength*myDir.Y(),
myPnt.X()+myLength*myDir.X()+ myLength*aFirstDir.X()/5 ,
myPnt.Y()+myLength*myDir.Y()+ myLength*aFirstDir.Y()/5 );
gp_Dir2d aSecondDir = gp_Dir2d(myDir.X(),myDir.Y()).Rotated (-200*M_PI/180) ;
segment->Add(myPnt.X()+myLength*myDir.X(),
myPnt.Y()+myLength*myDir.Y(),
myPnt.X()+myLength*myDir.X()+ myLength*aSecondDir.X()/5 ,
myPnt.Y()+myLength*myDir.Y()+ myLength*aSecondDir.Y()/5 );
}
void ISession_Direction::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer aMode)
{

View File

@ -14,17 +14,17 @@ DEFINE_STANDARD_HANDLE(ISession_Direction,AIS_InteractiveObject)
class ISession_Direction : public AIS_InteractiveObject
{
public:
TCollection_ExtendedString myText;
void SetText(TCollection_ExtendedString& aText);
ISession_Direction();
ISession_Direction(gp_Pnt& aPnt,gp_Dir& aDir,Standard_Real aLength=1,Standard_Real anArrowLength=1);
ISession_Direction(gp_Pnt& aPnt,gp_Vec& aVec,Standard_Real anArrowLength=1);
TCollection_ExtendedString myText;
void SetText(TCollection_ExtendedString& aText);
ISession_Direction();
ISession_Direction(gp_Pnt& aPnt,gp_Dir& aDir,Standard_Real aLength=1,Standard_Real anArrowLength=1);
ISession_Direction(gp_Pnt& aPnt,gp_Vec& aVec,Standard_Real anArrowLength=1);
ISession_Direction(gp_Pnt2d& aPnt2d,gp_Dir2d& aDir2d,Standard_Real aLength=1);
ISession_Direction(gp_Pnt2d& aPnt2d,gp_Vec2d& aVec2d);
ISession_Direction(gp_Pnt2d& aPnt2d,gp_Dir2d& aDir2d,Standard_Real aLength=1);
ISession_Direction(gp_Pnt2d& aPnt2d,gp_Vec2d& aVec2d);
virtual ~ISession_Direction();
DEFINE_STANDARD_RTTI(ISession_Direction)
virtual ~ISession_Direction();
DEFINE_STANDARD_RTTI(ISession_Direction)
private:
@ -33,9 +33,6 @@ private:
const Standard_Integer aMode);
void Compute (const Handle(Prs3d_Projector)& aProjector,
const Handle(Prs3d_Presentation)& aPresentation) ;
virtual void Compute(const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer aMode = 0) ;
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
gp_Pnt myPnt;

View File

@ -14,9 +14,6 @@ static char THIS_FILE[]=__FILE__;
IMPLEMENT_STANDARD_HANDLE(ISession_Point,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession_Point,AIS_InteractiveObject)
#include "Graphic2d_CircleMarker.hxx"
#include "StdPrs_Point.hxx"
#include "Geom_CartesianPoint.hxx"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
@ -58,14 +55,6 @@ void ISession_Point::Compute(const Handle(Prs3d_Projector)& aProjector,
{
}
void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer unMode)
{
Handle(Graphic2d_CircleMarker) aCircleMarker;
aCircleMarker = new Graphic2d_CircleMarker(aGrObj,myPoint.X(),myPoint.Y(),0,0,1);
}
void ISession_Point::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer unMode)
{

View File

@ -17,28 +17,25 @@ DEFINE_STANDARD_HANDLE(ISession_Point,AIS_InteractiveObject)
class ISession_Point : public AIS_InteractiveObject
{
public:
ISession_Point();
ISession_Point(Standard_Real X,Standard_Real Y ,Standard_Real Z);
ISession_Point(gp_Pnt2d& aPoint,Standard_Real Elevation = 0);
ISession_Point(gp_Pnt& aPoint);
virtual ~ISession_Point();
DEFINE_STANDARD_RTTI(ISession_Point)
ISession_Point();
ISession_Point(Standard_Real X,Standard_Real Y ,Standard_Real Z);
ISession_Point(gp_Pnt2d& aPoint,Standard_Real Elevation = 0);
ISession_Point(gp_Pnt& aPoint);
virtual ~ISession_Point();
DEFINE_STANDARD_RTTI(ISession_Point)
private :
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode);
void Compute (const Handle(Prs3d_Projector)& aProjector,
const Handle(Prs3d_Presentation)& aPresentation) ;
void Compute (const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer unMode = 0) ;
void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer unMode) ;
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode);
void Compute (const Handle(Prs3d_Projector)& aProjector,
const Handle(Prs3d_Presentation)& aPresentation);
gp_Pnt myPoint;
void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer unMode);
gp_Pnt myPoint;
};

View File

@ -14,15 +14,6 @@ static char THIS_FILE[]=__FILE__;
IMPLEMENT_STANDARD_HANDLE(ISession_Surface,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
#include "GeomAdaptor_Surface.hxx"
#include "StdPrs_WFSurface.hxx"
#include "StdPrs_WFPoleSurface.hxx"
#include "GeomAdaptor_HSurface.hxx"
#include "AIS_Drawer.hxx"
#include "Prs3d_IsoAspect.hxx"
#include "StdPrs_WFDeflectionShape.hxx"
#include "StdPrs_ShadedSurface.hxx"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////

View File

@ -23,9 +23,9 @@ public:
DEFINE_STANDARD_RTTI(ISession_Surface)
private:
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
Standard_EXPORT virtual void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
Standard_EXPORT virtual void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation);
void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode);
Handle(Geom_Surface) mySurface;

View File

@ -14,20 +14,6 @@ static char THIS_FILE[]=__FILE__;
IMPLEMENT_STANDARD_HANDLE(ISession_Text,AIS_InteractiveObject)
IMPLEMENT_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
#include <Graphic2d_Text.hxx>
#include <Select2D_SensitiveBox.hxx>
#include <Graphic2d_Segment.hxx>
#include <OSD_Environment.hxx>
#include <Graphic2d_View.hxx>
#include <Graphic2d_Drawer.hxx>
#include "PrsMgr_PresentationManager2d.hxx"
#include "SelectMgr_Selection.hxx"
#include "Graphic2d_Array1OfVertex.hxx"
#include "Graphic2d_Polyline.hxx"
#include "Graphic2d_Vertex.hxx"
#include "Graphic2d_DisplayList.hxx"
#include "Prs3d_Text.hxx"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
@ -37,7 +23,6 @@ ISession_Text::ISession_Text()
}
ISession_Text::ISession_Text
(const TCollection_AsciiString& aText,
const Standard_Real anX , // = 0
@ -52,7 +37,9 @@ ISession_Text::ISession_Text
:AIS_InteractiveObject(),MyText(aText),MyX(anX),MyY(anY),MyZ(aZ),
MyTypeOfText(aType),MyAngle(anAngle),MySlant(aslant),MyFontIndex(aFontIndex),
MyColorIndex(aColorIndex),MyScale(aScale),MyWidth(0),MyHeight(0)
{}
{
}
ISession_Text::ISession_Text
(const TCollection_AsciiString& aText,
@ -66,9 +53,9 @@ ISession_Text::ISession_Text
:AIS_InteractiveObject(),MyText(aText),MyX(aPoint.X()),MyY(aPoint.Y()),MyZ(aPoint.Z()),
MyTypeOfText(aType),MyAngle(anAngle),MySlant(aslant),MyFontIndex(aFontIndex),
MyColorIndex(aColorIndex),MyScale(aScale),MyWidth(0),MyHeight(0)
{}
{
}
ISession_Text::~ISession_Text()
{
@ -87,25 +74,6 @@ void ISession_Text::Compute(const Handle(Prs3d_Projector)& aProjector,
{
}
void ISession_Text::Compute(const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer unMode)
{
Handle(Graphic2d_Text) text;
text = new Graphic2d_Text(aGrObj, MyText, MyX, MyY, MyAngle,MyTypeOfText,MyScale);
text->SetFontIndex(MyFontIndex);
text->SetColorIndex(MyColorIndex);
text->SetSlant(MySlant);
text->SetUnderline(Standard_False);
text->SetZoomable(Standard_True);
aGrObj->Display();
Quantity_Length anXoffset,anYoffset;
text->TextSize(MyWidth, MyHeight,anXoffset,anYoffset);
}
void ISession_Text::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer unMode)
{

View File

@ -11,24 +11,20 @@
#include <Standard_Macro.hxx>
#include <Standard_DefineHandle.hxx>
#include <TCollection_AsciiString.hxx>
#include <Aspect_TypeOfText.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <Quantity_Factor.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Handle_PrsMgr_PresentationManager2d.hxx>
#include <Handle_Graphic2d_GraphicObject.hxx>
#include <Handle_SelectMgr_Selection.hxx>
#include <PrsMgr_PresentationManager3d.hxx>
#include <SelectMgr_Selection.hxx>
#include <Standard_OStream.hxx>
#include <Standard_IStream.hxx>
#include <Standard_CString.hxx>
#include <SelectMgr_SelectableObject.hxx>
class TCollection_AsciiString;
class PrsMgr_PresentationManager2d;
class Graphic2d_GraphicObject;
class SelectMgr_Selection;
DEFINE_STANDARD_HANDLE(ISession_Text,AIS_InteractiveObject)
@ -80,32 +76,15 @@ inline void SetScale (const Quantity_Factor aNewScale) ;
DEFINE_STANDARD_RTTI(ISession_Text)
protected:
// Methods PROTECTED
//
// Fields PROTECTED
//
private:
// Methods PRIVATE
//
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode);
void Compute (const Handle(Prs3d_Projector)& aProjector,
const Handle(Prs3d_Presentation)& aPresentation);
void Compute (const Handle(PrsMgr_PresentationManager2d)& aPresentationManager,
const Handle(Graphic2d_GraphicObject)& aGrObj,
const Standard_Integer unMode = 0) ;
void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer unMode) ;
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode);
void Compute (const Handle(Prs3d_Projector)& aProjector,
const Handle(Prs3d_Presentation)& aPresentation);
void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection,
const Standard_Integer unMode) ;
// Fields PRIVATE

View File

@ -18,17 +18,17 @@ static char THIS_FILE[] = __FILE__;
IMPLEMENT_DYNAMIC(CMainFrame, CMDIFrameWnd)
BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
//{{AFX_MSG_MAP(CMainFrame)
ON_WM_CREATE()
//}}AFX_MSG_MAP
//{{AFX_MSG_MAP(CMainFrame)
ON_WM_CREATE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
static UINT indicators[] =
{
ID_SEPARATOR, // status line indicator
ID_INDICATOR_CAPS,
ID_INDICATOR_NUM,
ID_INDICATOR_SCRL,
ID_SEPARATOR, // status line indicator
ID_INDICATOR_CAPS,
ID_INDICATOR_NUM,
ID_INDICATOR_SCRL,
};
/////////////////////////////////////////////////////////////////////////////
@ -36,8 +36,6 @@ static UINT indicators[] =
CMainFrame::CMainFrame()
{
// TODO: add member initialization code here
}
CMainFrame::~CMainFrame()
@ -46,58 +44,57 @@ CMainFrame::~CMainFrame()
int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
return -1;
if (!m_wndToolBar.Create(this) ||
!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
if (!m_wndToolBar2.Create(this) ||
!m_wndToolBar2.LoadToolBar(IDR_MAINFRAME2))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
return -1;
if (!m_wndStatusBar.Create(this) ||
!m_wndStatusBar.SetIndicators(indicators,
sizeof(indicators)/sizeof(UINT)))
{
TRACE0("Failed to create status bar\n");
return -1; // fail to create
}
if (!m_wndToolBar.Create(this) ||
!m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
if (!m_wndToolBar2.Create(this) ||
!m_wndToolBar2.LoadToolBar(IDR_MAINFRAME2))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
// TODO: Remove this if you don't want tool tips or a resizeable toolbar
m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
if (!m_wndStatusBar.Create(this) ||
!m_wndStatusBar.SetIndicators(indicators,
sizeof(indicators)/sizeof(UINT)))
{
TRACE0("Failed to create status bar\n");
return -1; // fail to create
}
// TODO: Delete these three lines if you don't want the toolbar to
// be dockable
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
// TODO: Remove this if you don't want tool tips or a resizeable toolbar
m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
// TODO: Remove this if you don't want tool tips or a resizeable toolbar
m_wndToolBar2.SetBarStyle(m_wndToolBar2.GetBarStyle() |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
// TODO: Delete these three lines if you don't want the toolbar to
// be dockable
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
// TODO: Delete these three lines if you don't want the toolbar to
// be dockable
m_wndToolBar2.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar2);
return 0;
// TODO: Remove this if you don't want tool tips or a resizeable toolbar
m_wndToolBar2.SetBarStyle(m_wndToolBar2.GetBarStyle() |
CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
// TODO: Delete these three lines if you don't want the toolbar to
// be dockable
m_wndToolBar2.EnableDocking(CBRS_ALIGN_ANY);
EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar2);
return 0;
}
BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
{
// TODO: Modify the Window class or styles here by modifying
// the CREATESTRUCT cs
return CMDIFrameWnd::PreCreateWindow(cs);
// TODO: Modify the Window class or styles here by modifying
// the CREATESTRUCT cs
return CMDIFrameWnd::PreCreateWindow(cs);
}
/////////////////////////////////////////////////////////////////////////////
@ -106,12 +103,12 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
#ifdef _DEBUG
void CMainFrame::AssertValid() const
{
CMDIFrameWnd::AssertValid();
CMDIFrameWnd::AssertValid();
}
void CMainFrame::Dump(CDumpContext& dc) const
{
CMDIFrameWnd::Dump(dc);
CMDIFrameWnd::Dump(dc);
}
#endif //_DEBUG

View File

@ -11,41 +11,39 @@
class CMainFrame : public CMDIFrameWnd
{
DECLARE_DYNAMIC(CMainFrame)
DECLARE_DYNAMIC(CMainFrame)
public:
CMainFrame();
CMainFrame();
// Attributes
// Attributes
public:
// Operations
// Operations
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMainFrame)
virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
//}}AFX_VIRTUAL
// Overrides
// ClassWizard generated virtual function overrides
virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
// Implementation
// Implementation
public:
virtual ~CMainFrame();
virtual ~CMainFrame();
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
#endif
protected: // control bar embedded members
CStatusBar m_wndStatusBar;
CToolBar m_wndToolBar;
CToolBar m_wndToolBar2;
CStatusBar m_wndStatusBar;
CToolBar m_wndToolBar;
CToolBar m_wndToolBar2;
// Generated message map functions
// Generated message map functions
protected:
//{{AFX_MSG(CMainFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//{{AFX_MSG(CMainFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////

View File

@ -83,181 +83,193 @@
#include <AIS_InteractiveContext.hxx>
#include <AIS_Shape.hxx>
//#include <AIS_Trihedron.hxx>
#include <AIS_Point.hxx>
#include <AIS_Drawer.hxx>
#include <Aspect_Grid.hxx>
#include <Aspect_Window.hxx>
#include <Aspect_Background.hxx>
#include <BRepAlgo.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepTools.hxx>
#include <Graphic3d_WNTGraphicDevice.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Compound.hxx>
#include <Bnd_Box2d.hxx>
#include <BndLib.hxx>
#include <BndLib_Add2dCurve.hxx>
#include <BndLib_Add3dCurve.hxx>
#include <BndLib_AddSurface.hxx>
#include <BRep_Tool.hxx>
#include <BRepMesh.hxx>
#include <DsgPrs_LengthPresentation.hxx>
#include <FairCurve_Batten.hxx>
#include <FairCurve_MinimalVariation.hxx>
#include <GC_MakeCircle.hxx>
#include <GC_MakeTranslation.hxx>
#include <GC_MakeSegment.hxx>
#include <GC_MakeConicalSurface.hxx>
#include <GC_MakePlane.hxx>
#include <GC_MakeEllipse.hxx>
#include <GccAna_Circ2d2TanRad.hxx>
#include <GccAna_Lin2d2Tan.hxx>
#include <GccAna_Pnt2dBisec.hxx>
#include <GccEnt.hxx>
#include <GccEnt_QualifiedCirc.hxx>
#include <GccEnt_QualifiedLin.hxx>
#include <gce_MakeCirc2d.hxx>
#include <gce_MakeLin2d.hxx>
#include <GCE2d_MakeSegment.hxx>
#include <GCE2d_MakeParabola.hxx>
#include <GCE2d_MakeEllipse.hxx>
#include <GCE2d_MakeArcOfCircle.hxx>
#include <GCE2d_MakeArcOfEllipse.hxx>
#include <GCPnts_AbscissaPoint.hxx>
#include <GCPnts_QuasiUniformDeflection.hxx>
#include <GCPnts_TangentialDeflection.hxx>
#include <GCPnts_UniformAbscissa.hxx>
#include <Geom_BezierSurface.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_BSplineSurface.hxx>
#include <Geom_CartesianPoint.hxx>
#include <Geom_Circle.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Line.hxx>
#include <Geom_Plane.hxx>
#include <Geom_RectangularTrimmedSurface.hxx>
#include <Geom_Surface.hxx>
#include <Geom_SphericalSurface.hxx>
#include <Geom_Transformation.hxx>
#include <Geom_TrimmedCurve.hxx>
#include <Geom_OffsetSurface.hxx>
#include <Geom_SurfaceOfLinearExtrusion.hxx>
#include <Geom_SurfaceOfRevolution.hxx>
#include <Geom2dAPI_ExtremaCurveCurve.hxx>
#include <Geom2dAPI_InterCurveCurve.hxx>
#include <Geom2dAPI_Interpolate.hxx>
#include <Geom2dAPI_PointsToBSpline.hxx>
#include <Geom2d_OffsetCurve.hxx>
#include <Geom2d_Circle.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom2d_Ellipse.hxx>
#include <Geom2d_Line.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <Geom2d_BSplineCurve.hxx>
#include <Geom2d_Parabola.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Geom2dConvert.hxx>
#include <Geom2dLProp_Curve2dTool.hxx>
#include <Geom2dLProp_CLProps2d.hxx>
#include <GeomAbs_CurveType.hxx>
#include <GeomAdaptor_Curve.hxx>
#include <GeomAdaptor_HCurve.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <GeomAdaptor_HSurface.hxx>
#include <GeomAPI.hxx>
#include <GeomAPI_ExtremaSurfaceSurface.hxx>
#include <GeomAPI_IntCS.hxx>
#include <GeomAPI_PointsToBSplineSurface.hxx>
#include <GeomAPI_PointsToBSpline.hxx>
#include <GeomAPI_ProjectPointOnSurf.hxx>
#include <GeomAPI_ProjectPointOnCurve.hxx>
#include <GeomAPI_Interpolate.hxx>
#include <GeomConvert.hxx>
#include <GeomConvert_CompBezierSurfacesToBSplineSurface.hxx>
#include <GeomFill_ConstrainedFilling.hxx>
#include <GeomFill_SimpleBound.hxx>
#include <GeomFill_FillingStyle.hxx>
#include <GeomFill_BSplineCurves.hxx>
#include <GeomFill_Pipe.hxx>
#include <GeomLib.hxx>
#include <GeomPlate_BuildPlateSurface.hxx>
#include <GeomPlate_PointConstraint.hxx>
#include <GeomPlate_MakeApprox.hxx>
#include <GeomTools.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <Graphic3d_Group.hxx>
#include <Graphic3d_Array1OfVertex.hxx>
#include <Graphic3d_ArrayOfPolylines.hxx>
#include <GProp_PEquation.hxx>
#include <gp.hxx>
#include <gp_Ax2d.hxx>
#include <gp_Circ2d.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Dir.hxx>
#include <gp_Elips.hxx>
#include <gp_Lin.hxx>
#include <gp_Lin2d.hxx>
#include <gp_Mat.hxx>
#include <gp_Parab2d.hxx>
#include <gp_Pln.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Trsf.hxx>
#include <gp_Vec2d.hxx>
#include <IntAna_IntConicQuad.hxx>
#include <OSD_Environment.hxx>
#include <Poly_Triangulation.hxx>
#include <Precision.hxx>
#include <Prs3d_Root.hxx>
#include <Prs3d_Text.hxx>
#include <Prs3d_ArrowAspect.hxx>
#include <Prs3d_IsoAspect.hxx>
#include <PrsMgr_PresentationManager3d.hxx>
#include <Prs3d_IsoAspect.hxx>
#include <Prs3d_TextAspect.hxx>
#include <Prs3d_PointAspect.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <SelectMgr_SelectableObject.hxx>
#include <SelectMgr_Selection.hxx>
#include <SelectMgr_SelectionManager.hxx>
#include <SelectBasics_BasicTool.hxx>
#include <ShapeAnalysis_FreeBounds.hxx>
#include <ShapeFix_Shape.hxx>
#include <StdSelect_ViewerSelector3d.hxx>
#include <StdPrs_WFDeflectionShape.hxx>
#include <StdPrs_ShadedSurface.hxx>
#include <StdPrs_Point.hxx>
#include <StdPrs_WFSurface.hxx>
#include <StdPrs_WFPoleSurface.hxx>
#include <StdPrs_Curve.hxx>
#include <StdPrs_PoleCurve.hxx>
#include <Standard_ErrorHandler.hxx>
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
#include <TColgp_Array1OfPnt.hxx>
#include <TColgp_Array2OfPnt.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColgp_Array2OfPnt2d.hxx>
#include <TColgp_HArray1OfPnt.hxx>
#include <TColgp_HArray1OfPnt2d.hxx>
#include <TColgp_SequenceOfPnt.hxx>
#include <TColgp_SequenceOfPnt2d.hxx>
#include <TColGeom_Array2OfBezierSurface.hxx>
#include <TColStd_HArray1OfInteger.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Solid.hxx>
#include <TopoDS.hxx>
#include <TopoDS_ListIteratorOfListOfShape.hxx>
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Compound.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Builder.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Face.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <V3d_Viewer.hxx>
#include <V3d_View.hxx>
#include <WNT_Window.hxx>
#include <Standard_ErrorHandler.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS_Solid.hxx>
#include <TopoDS.hxx>
#include <TopExp_Explorer.hxx>
//#include <ShapeTool_Face.hxx>
//#include <ShapeTool_PCurves.hxx>
//#include <ShapeTool_Reshape.hxx>
//#include <ShapeTool_ShellSolid.hxx>
#include <TopoDS_ListIteratorOfListOfShape.hxx>
#include "WNT_WDriver.hxx"
#include "V2d_View.hxx"
#include "V2d_Viewer.hxx"
//#include "UnitsAPI.hxx"
#include "GProp_PEquation.hxx"
#include "gp.hxx"
#include "TColgp_Array1OfPnt.hxx"
#include "Geom2d_Circle.hxx"
#include "gp_Vec2d.hxx"
#include "Geom2d_Circle.hxx"
#include "Geom2dLProp_Curve2dTool.hxx"
#include "Geom2dLProp_CLProps2d.hxx"
#include "gp_Dir.hxx"
#include "Precision.hxx"
#include "GCPnts_AbscissaPoint.hxx"
#include "Geom2dAdaptor_Curve.hxx"
#include "GCPnts_UniformAbscissa.hxx"
#include "Geom_SphericalSurface.hxx"
#include "Geom_Circle.hxx"
#include "GC_MakeTranslation.hxx"
#include "Geom_Transformation.hxx"
#include "GC_MakeCircle.hxx"
#include "gp_Mat.hxx"
#include "GeomAPI_IntCS.hxx"
#include "GC_MakeSegment.hxx"
#include "GC_MakeConicalSurface.hxx"
#include "gp_Lin.hxx"
#include "Geom2d_Ellipse.hxx"
#include "GCE2d_MakeEllipse.hxx"
#include "GCE2d_MakeArcOfEllipse.hxx"
#include "TColgp_HArray1OfPnt.hxx"
#include "Geom_BSplineCurve.hxx"
#include "GeomAPI_PointsToBSpline.hxx"
#include "GeomAPI_Interpolate.hxx"
#include "GccEnt_QualifiedLin.hxx"
#include "GccAna_Circ2d2TanRad.hxx"
#include "gce_MakeCirc2d.hxx"
#include "GccEnt.hxx"
#include "GccAna_Lin2d2Tan.hxx"
#include "GccEnt_QualifiedCirc.hxx"
#include "gce_MakeLin2d.hxx"
#include "Geom2d_OffsetCurve.hxx"
#include "Geom2dAPI_InterCurveCurve.hxx"
#include "Geom2dAPI_ExtremaCurveCurve.hxx"
#include "GeomAPI.hxx"
#include "Geom2d_TrimmedCurve.hxx"
#include "GCE2d_MakeSegment.hxx"
#include "Geom2dConvert.hxx"
#include "TColgp_Array1OfPnt2d.hxx"
#include "TColgp_HArray1OfPnt2d.hxx"
#include "gp_Parab2d.hxx"
#include "gp_Trsf.hxx"
#include "gp_Pln.hxx"
#include "gp_Elips.hxx"
#include "IntAna_IntConicQuad.hxx"
#include "GeomAPI_ProjectPointOnSurf.hxx"
#include "GeomAPI_ProjectPointOnCurve.hxx"
#include "Geom2dAPI_PointsToBSpline.hxx"
#include "Geom2dAPI_Interpolate.hxx"
#include "GccAna_Pnt2dBisec.hxx"
#include "BRepBuilderAPI_MakeVertex.hxx"
#include "BRepBuilderAPI_MakeFace.hxx"
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
#include "GeomTools.hxx"
#include "TColgp_SequenceOfPnt2d.hxx"
#include "GC_MakePlane.hxx"
#include "GC_MakeEllipse.hxx"
#include "Geom_Plane.hxx"
#include "Geom2d_Line.hxx"
#include "Geom_Circle.hxx"
#include "AIS_Drawer.hxx"
#include "Prs3d_IsoAspect.hxx"
#include "GCE2d_MakeArcOfCircle.hxx"
#include "Geom_Line.hxx"
#include "Geom2d_BSplineCurve.hxx"
#include "TColgp_Array2OfPnt2d.hxx"
#include "Geom_RectangularTrimmedSurface.hxx"
#include "GeomFill_FillingStyle.hxx"
#include "GeomFill_BSplineCurves.hxx"
#include "TopoDS_Vertex.hxx"
#include "TopoDS_Shape.hxx"
#include "TopoDS_Face.hxx"
#include "GeomAdaptor_HCurve.hxx"
#include "GeomFill_SimpleBound.hxx"
#include "GeomFill_Pipe.hxx"
#include "GeomConvert.hxx"
#include "TColgp_Array2OfPnt.hxx"
#include "Geom_BezierSurface.hxx"
#include "TColGeom_Array2OfBezierSurface.hxx"
#include "GeomConvert_CompBezierSurfacesToBSplineSurface.hxx"
#include "TColStd_HArray1OfInteger.hxx"
#include "Geom_OffsetSurface.hxx"
#include "Geom_SurfaceOfLinearExtrusion.hxx"
#include "Geom_SurfaceOfRevolution.hxx"
#include "GeomLib.hxx"
#include "Geom_BSplineSurface.hxx"
#include "Geom2d_Parabola.hxx"
#include "GCE2d_MakeParabola.hxx"
#include "Geom_TrimmedCurve.hxx"
#include "GeomFill_ConstrainedFilling.hxx"
#include "Geom_Curve.hxx"
#include "Geom_Surface.hxx"
#include "BndLib_Add2dCurve.hxx"
#include "BndLib.hxx"
#include "FairCurve_Batten.hxx"
#include "FairCurve_MinimalVariation.hxx"
#include "Geom2d_Parabola.hxx"
#include "GCE2d_MakeParabola.hxx"
#include "Geom_TrimmedCurve.hxx"
#include "GeomFill_ConstrainedFilling.hxx"
#include <GeomAPI_ExtremaSurfaceSurface.hxx>
#include <TColgp_Array2OfPnt.hxx>
#include <GeomAPI_PointsToBSplineSurface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <BndLib_AddSurface.hxx>
#include <BndLib_Add3dCurve.hxx>
#include "Prs3d_TextAspect.hxx"
#include "Prs3d_ArrowAspect.hxx"
#include "Prs3d_PointAspect.hxx"
#include <BRepMesh.hxx>
#include <TColgp_SequenceOfPnt.hxx>
#include <BRep_Tool.hxx>
#include <Poly_Triangulation.hxx>
#include <GeomPlate_BuildPlateSurface.hxx>
#include <GeomPlate_PointConstraint.hxx>
#include <GeomPlate_MakeApprox.hxx>
#include <ShapeAnalysis_FreeBounds.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopExp.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Builder.hxx>
#include <ShapeFix_Shape.hxx>
#include <AIS_Point.hxx>
#include <Geom_CartesianPoint.hxx>
#include "ISession2D_Curve.h"
#include "ISession_Direction.h"
#include "ISession2D_InteractiveContext.h"
#include "ISession_Curve.h"
#include "ISession_Surface.h"
#include "ISession_Text.h"

View File

@ -111,7 +111,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bind/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -153,7 +153,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bind/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -196,7 +196,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bin/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -238,7 +238,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bin/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -115,7 +115,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bind/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -157,7 +157,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bind/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -200,7 +200,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bin/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -242,7 +242,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bin/Modeling.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -80,7 +80,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win32\vc8\bind/Modeling.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win64\vc8\bind/Modeling.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win32\vc8\bin/Modeling.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -372,7 +372,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win64\vc8\bin/Modeling.exe"
LinkIncremental="1"
SuppressStartupBanner="true"

View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win32\vc9\bind/Modeling.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win64\vc9\bind/Modeling.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win32\vc9\bin/Modeling.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -370,7 +370,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKBO.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBRep.lib TKIGES.lib TKShHealing.lib TKSTEP.lib TKSTEP209.lib TKSTEPAttr.lib TKSTEPBase.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKBO.lib"
OutputFile="../../../..\win64\vc9\bin/Modeling.exe"
LinkIncremental="1"
SuppressStartupBanner="true"

View File

@ -15,9 +15,9 @@
/////////////////////////////////////////////////////////////////////////////
// CModelingApp construction
CModelingApp::CModelingApp()
CModelingApp::CModelingApp() : OCC_App()
{
SampleName = "Modeling"; //for about dialog
SampleName = "Modeling"; //for about dialog
}
/////////////////////////////////////////////////////////////////////////////

View File

@ -8,22 +8,25 @@
#pragma once
#endif // _MSC_VER >= 1000
#include <OCC_3dApp.h>
#include <OCC_App.h>
class CModelingApp : public OCC_3dApp
class CModelingApp : public OCC_App
{
public:
CModelingApp();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CModelingApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
private:
CToolBar *m_pToolBar2;
};
CModelingApp();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CModelingApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
private:
CToolBar *m_pToolBar2;
};
/////////////////////////////////////////////////////////////////////////////

View File

@ -4936,7 +4936,7 @@ void CModelingDoc::InputEvent(const Standard_Integer x ,
"Points Files (*.pass)|*.pass; |All Files (*.*)|*.*||",
NULL );
CString initdir(((OCC_BaseApp*) AfxGetApp())->GetInitDataDir());
CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir());
initdir += "\\Data\\TangentSurface";
dlg.m_ofn.lpstrInitialDir = initdir;

View File

@ -0,0 +1,16 @@
Viewer2d sample demonstrates how the functionality of TKV3d package can be used
for 2D visualization. It provides samples of 2D objects visualization,
dynamic selection and highlighting.
It illustratea how to:
1) implement 2D view behavior with V3d_View class, with interactive zooming and
panning of the 2D scene;
2) draw 2D primitives like rectangles, lines, curves;
3) draw different types of markers;
4) draw text defined by its font, height, style, angle;
5) display 2D curves of a face' edges and group them using orientation
criterion;
6) display zoomable images;
6) display circular and rectangular grids .
Viewer2d support zooming ,panning of displayed objects and
circular and rectangular grids.

View File

@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bin/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -154,7 +154,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bin/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -195,7 +195,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bind/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -237,7 +237,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bind/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -248,102 +248,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorRampColorMapDialog.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\FontPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\MarkPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\PropertiesSheet.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\StdAfx.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -364,22 +268,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\TypePropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Viewer2dApp.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -412,22 +300,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\WidthPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -458,18 +330,10 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.h" />
<ClInclude Include="..\..\..\src\Properties\colornewcolorrampcolormapDialog.h" />
<ClInclude Include="..\..\..\src\Properties\ColorPropertyPage.h" />
<ClInclude Include="..\..\..\src\Properties\FontPropertyPage.h" />
<ClInclude Include="..\..\..\src\Properties\MarkPropertyPage.h" />
<ClInclude Include="..\..\..\src\Properties\PropertiesSheet.h" />
<ClInclude Include="..\..\..\res\resource.h" />
<ClInclude Include="..\..\..\src\StdAfx.h" />
<ClInclude Include="..\..\..\src\Properties\TypePropertyPage.h" />
<ClInclude Include="..\..\..\src\Viewer2dApp.h" />
<ClInclude Include="..\..\..\src\Viewer2dDoc.h" />
<ClInclude Include="..\..\..\src\Properties\WidthPropertyPage.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\res\Toolbar.bmp" />

View File

@ -15,39 +15,15 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorRampColorMapDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\FontPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\MarkPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\PropertiesSheet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\StdAfx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\TypePropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Viewer2dApp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Viewer2dDoc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\WidthPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
<Filter>Source Files</Filter>
</ClCompile>
@ -58,42 +34,18 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\colornewcolorrampcolormapDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\ColorPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\FontPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\MarkPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\PropertiesSheet.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\res\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\StdAfx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\TypePropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Viewer2dApp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Viewer2dDoc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\WidthPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\res\Toolbar.bmp">

View File

@ -116,7 +116,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bin/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bin/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -199,7 +199,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bind/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -241,7 +241,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bind/Viewer2d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -252,102 +252,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorRampColorMapDialog.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\FontPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\MarkPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\PropertiesSheet.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\StdAfx.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -368,22 +272,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\TypePropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Viewer2dApp.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -416,22 +304,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\WidthPropertyPage.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -462,18 +334,10 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.h" />
<ClInclude Include="..\..\..\src\Properties\colornewcolorrampcolormapDialog.h" />
<ClInclude Include="..\..\..\src\Properties\ColorPropertyPage.h" />
<ClInclude Include="..\..\..\src\Properties\FontPropertyPage.h" />
<ClInclude Include="..\..\..\src\Properties\MarkPropertyPage.h" />
<ClInclude Include="..\..\..\src\Properties\PropertiesSheet.h" />
<ClInclude Include="..\..\..\res\resource.h" />
<ClInclude Include="..\..\..\src\StdAfx.h" />
<ClInclude Include="..\..\..\src\Properties\TypePropertyPage.h" />
<ClInclude Include="..\..\..\src\Viewer2dApp.h" />
<ClInclude Include="..\..\..\src\Viewer2dDoc.h" />
<ClInclude Include="..\..\..\src\Properties\WidthPropertyPage.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\res\Toolbar.bmp" />

View File

@ -15,39 +15,15 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorNewColorRampColorMapDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\ColorPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\FontPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\MarkPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\PropertiesSheet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\StdAfx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\TypePropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Viewer2dApp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Viewer2dDoc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\Properties\WidthPropertyPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\WINMAIN.CPP">
<Filter>Source Files</Filter>
</ClCompile>
@ -58,42 +34,18 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\colornewcolorrampcolormapDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\ColorPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\FontPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\MarkPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\PropertiesSheet.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\res\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\StdAfx.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\TypePropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Viewer2dApp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Viewer2dDoc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\Properties\WidthPropertyPage.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\res\Toolbar.bmp">

View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc8\bin/Viewer2d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc8\bin/Viewer2d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc8\bind/Viewer2d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -371,7 +371,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc8\bind/Viewer2d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -414,282 +414,6 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\ColorNewColorRampColorMapDialog.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\ColorPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\FontPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\MarkPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\PropertiesSheet.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\StdAfx.cpp"
>
@ -740,52 +464,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\TypePropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\res\Viewer2d.rc"
>
@ -918,52 +596,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\WidthPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Common\WINMAIN.CPP"
>
@ -1015,30 +647,6 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\colornewcolorrampcolormapDialog.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\ColorPropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\FontPropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\MarkPropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\PropertiesSheet.h"
>
</File>
<File
RelativePath="..\..\..\res\resource.h"
>
@ -1047,10 +655,6 @@
RelativePath="..\..\..\src\StdAfx.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\TypePropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Viewer2dApp.h"
>
@ -1059,10 +663,6 @@
RelativePath="..\..\..\src\Viewer2dDoc.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\WidthPropertyPage.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"

View File

@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc9\bin/Viewer2d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc9\bin/Viewer2d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -273,7 +273,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc9\bind/Viewer2d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc9\bind/Viewer2d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -411,282 +411,6 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\ColorNewColorRampColorMapDialog.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\ColorPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\FontPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\MarkPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\PropertiesSheet.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\StdAfx.cpp"
>
@ -737,52 +461,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\TypePropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\res\Viewer2d.rc"
>
@ -915,52 +593,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\src\Properties\WidthPropertyPage.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Common\WINMAIN.CPP"
>
@ -1012,30 +644,6 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\..\..\src\Properties\ColorNewColorCubeColorMapDialog.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\colornewcolorrampcolormapDialog.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\ColorPropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\FontPropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\MarkPropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\PropertiesSheet.h"
>
</File>
<File
RelativePath="..\..\..\res\resource.h"
>
@ -1044,10 +652,6 @@
RelativePath="..\..\..\src\StdAfx.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\TypePropertyPage.h"
>
</File>
<File
RelativePath="..\..\..\src\Viewer2dApp.h"
>
@ -1056,10 +660,6 @@
RelativePath="..\..\..\src\Viewer2dDoc.h"
>
</File>
<File
RelativePath="..\..\..\src\Properties\WidthPropertyPage.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"

View File

@ -276,8 +276,6 @@ BEGIN
MENUITEM "&New\tCtrl+N", ID_FILE_NEW
MENUITEM "&Close", ID_FILE_CLOSE
MENUITEM SEPARATOR
MENUITEM "CasCade Properties...", ID_MENU_CASCADE_PROPERTIES
MENUITEM SEPARATOR
MENUITEM "Export Image...", ID_FILE_EXPORT_IMAGE
MENUITEM SEPARATOR
MENUITEM "E&xit", ID_APP_EXIT
@ -296,7 +294,7 @@ BEGIN
END
POPUP "&Help"
BEGIN
MENUITEM "&About Viewer2d...", ID_APP_ABOUT
MENUITEM "&About Viewer2d...", ID_APP_ABOUT
END
END
@ -315,7 +313,7 @@ BEGIN
END
POPUP "&Help"
BEGIN
MENUITEM "&About Viewer2d...", ID_APP_ABOUT
MENUITEM "&About Viewer2d...", ID_APP_ABOUT
END
END

View File

@ -1,63 +0,0 @@
// ColorNewColorCubeColorMapDialog.cpp : implementation file
//
#include "stdafx.h"
#include "ColorNewColorCubeColorMapDialog.h"
#include "Aspect_ColorCubeColorMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CColorNewColorCubeColorMapDialog dialog
CColorNewColorCubeColorMapDialog::CColorNewColorCubeColorMapDialog(CWnd* pParent /*=NULL*/)
: CDialog(CColorNewColorCubeColorMapDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(CColorNewColorCubeColorMapDialog)
m_base_pixel = 0;
m_redmax = 7;
m_redmult = 1;
m_greenmax = 7;
m_greenmult = 8;
m_bluemax = 3;
m_bluemult = 64;
//}}AFX_DATA_INIT
}
void CColorNewColorCubeColorMapDialog::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CColorNewColorCubeColorMapDialog)
DDX_Text(pDX, IDC_NewColorCube_EDIT_base_pixel, m_base_pixel);
DDX_Text(pDX, IDC_NewColorCube_EDIT_redmax, m_redmax);
DDX_Text(pDX, IDC_NewColorCube_EDIT_redmult, m_redmult);
DDX_Text(pDX, IDC_NewColorCube_EDIT_greenmax, m_greenmax);
DDX_Text(pDX, IDC_NewColorCube_EDIT_grennmult, m_greenmult);
DDX_Text(pDX, IDC_NewColorCube_EDIT_bluemax, m_bluemax);
DDX_Text(pDX, IDC_NewColorCube_EDIT_bluemult, m_bluemult);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CColorNewColorCubeColorMapDialog, CDialog)
//{{AFX_MSG_MAP(CColorNewColorCubeColorMapDialog)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CColorNewColorCubeColorMapDialog message handlers
void CColorNewColorCubeColorMapDialog::OnOK()
{
UpdateData(true);
myColorMap =
new Aspect_ColorCubeColorMap(m_base_pixel,
m_redmax ,
m_redmult ,
m_greenmax ,
m_greenmult ,
m_bluemax ,
m_bluemult );
CDialog::OnOK();
}

View File

@ -1,57 +0,0 @@
// ColorNewColorCubeColorMapDialog.h : header file
//
#if !defined(AFX_COLORNEWCOLORCUBECOLORMAPDIALOG_H__67E9AE93_D9F9_11D1_8DE3_0800369C8A03__INCLUDED_)
#define AFX_COLORNEWCOLORCUBECOLORMAPDIALOG_H__67E9AE93_D9F9_11D1_8DE3_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
#include "Aspect_ColorMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CColorNewColorCubeColorMapDialog dialog
class CColorNewColorCubeColorMapDialog : public CDialog
{
private :
Handle(Aspect_ColorMap) myColorMap;
// Construction
public:
CColorNewColorCubeColorMapDialog(CWnd* pParent = NULL); // standard constructor
Handle(Aspect_ColorMap) ColorMap() {return myColorMap;};
// Dialog Data
//{{AFX_DATA(CColorNewColorCubeColorMapDialog)
enum { IDD = IDD_DIALOG_NewColorCube };
int m_base_pixel;
int m_redmax;
int m_redmult;
int m_greenmax;
int m_greenmult;
int m_bluemax;
int m_bluemult;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CColorNewColorCubeColorMapDialog)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CColorNewColorCubeColorMapDialog)
virtual void OnOK();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_COLORNEWCOLORCUBECOLORMAPDIALOG_H__67E9AE93_D9F9_11D1_8DE3_0800369C8A03__INCLUDED_)

View File

@ -1,144 +0,0 @@
// ColorNewColorRampColorMapDialog.cpp : implementation file
//
#include "stdafx.h"
#include "ColorNewColorRampColorMapDialog.h"
#include "Quantity_Color.hxx"
#include "Aspect_ColorRampColorMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CColorNewColorRampColorMapDialog dialog
CColorNewColorRampColorMapDialog::CColorNewColorRampColorMapDialog(CWnd* pParent /*=NULL*/)
: CDialog(CColorNewColorRampColorMapDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(CColorNewColorRampColorMapDialog)
m_base_pixel = 0;
m_dimension = 16;
m_Red = 1.0;
m_Green = 0.0;
m_Blue = 0.0;
//}}AFX_DATA_INIT
}
void CColorNewColorRampColorMapDialog::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CColorNewColorRampColorMapDialog)
DDX_Control(pDX, IDC_NewColorMap_COMBO_NewEntryColorName, m_ColorList);
DDX_Text(pDX, IDC_NewColorRamp_EDIT_base_pixel, m_base_pixel);
DDX_Text(pDX, IDC_NewColorramp_EDIT_dimension, m_dimension);
DDX_Text(pDX, IDC_NewColorMapRamp_EDIT_ColorRed, m_Red);
DDX_Text(pDX, IDC_NewColorMapRamp_EDIT_ColorGreen, m_Green);
DDX_Text(pDX, IDC_NewColorMapRamp_EDIT_ColorBlue, m_Blue);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CColorNewColorRampColorMapDialog, CDialog)
//{{AFX_MSG_MAP(CColorNewColorRampColorMapDialog)
ON_BN_CLICKED(IDC_NewColorMapRamp_BUTTON_EditColor, OnColorMapRampBUTTONEditColor)
ON_EN_CHANGE(IDC_NewColorMapRamp_EDIT_ColorRed, OnChangeColorMapRampEDITColorRed)
ON_EN_CHANGE(IDC_NewColorMapRamp_EDIT_ColorGreen, OnChangeColorMapRampEDITColorGreen)
ON_EN_CHANGE(IDC_NewColorMapRamp_EDIT_ColorBlue, OnChangeColorMapRampEDITColorBlue)
ON_CBN_SELCHANGE(IDC_NewColorMap_COMBO_NewEntryColorName, OnSelchangeColorMapCOMBONewEntryColorName)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CColorNewColorRampColorMapDialog message handlers
BOOL CColorNewColorRampColorMapDialog::OnInitDialog()
{
CDialog::OnInitDialog();
for (int i = 0 ;i< 517 ; i++)
{
Standard_CString TheColorName = Quantity_Color::StringName((Quantity_NameOfColor)i);
// update the CComboBox to add the enumeration possibilities.
m_ColorList.AddString( TheColorName );
}
Quantity_Color aColor(m_Red,m_Green,m_Blue,Quantity_TOC_RGB);
m_ColorList.SetCurSel(aColor.Name());
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
void CColorNewColorRampColorMapDialog::OnColorMapRampBUTTONEditColor()
{
UpdateData(true);
COLORREF m_clr ;
m_clr = RGB(m_Red*255,m_Green*255,m_Blue*255);
CColorDialog dlgColor(m_clr);
if (dlgColor.DoModal() == IDOK)
{
m_clr = dlgColor.GetColor();
m_Red = GetRValue(m_clr)/255.;
m_Green = GetGValue(m_clr)/255.;
m_Blue = GetBValue(m_clr)/255.;
}
Quantity_Color aColor(m_Red,m_Green,m_Blue,Quantity_TOC_RGB);
m_ColorList.SetCurSel(aColor.Name());
UpdateData(false);
}
void CColorNewColorRampColorMapDialog::OnChangeColorMapRampEDITColorRed()
{
UpdateData(true);
if (m_Red<0) m_Red=0;
if (m_Red>1) m_Red=1;
Quantity_Color aColor(m_Red,m_Green,m_Blue,Quantity_TOC_RGB);
m_ColorList.SetCurSel(aColor.Name());
UpdateData(false);
}
void CColorNewColorRampColorMapDialog::OnChangeColorMapRampEDITColorGreen()
{
UpdateData(true);
if (m_Green<0) m_Green=0;
if (m_Green>1) m_Green=1;
Quantity_Color aColor(m_Red,m_Green,m_Blue,Quantity_TOC_RGB);
m_ColorList.SetCurSel(aColor.Name());
UpdateData(false);
}
void CColorNewColorRampColorMapDialog::OnChangeColorMapRampEDITColorBlue()
{
UpdateData(true);
if (m_Blue<0) m_Blue=0;
if (m_Blue>1) m_Blue=1;
Quantity_Color aColor(m_Red,m_Green,m_Blue,Quantity_TOC_RGB);
m_ColorList.SetCurSel(aColor.Name());
UpdateData(false);
}
void CColorNewColorRampColorMapDialog::OnSelchangeColorMapCOMBONewEntryColorName()
{
// TODO: Add your control notification handler code here
UpdateData(true);
int CurSel = m_ColorList.GetCurSel();
Quantity_NameOfColor SelectedNameOfColor = (Quantity_NameOfColor)CurSel;
Quantity_Color TheSelectedEquivalentColor(SelectedNameOfColor);
Quantity_Parameter Red,Green,Blue;
TheSelectedEquivalentColor.Values(Red,Green,Blue,Quantity_TOC_RGB);
m_Red = Red;
m_Green = Green;
m_Blue = Blue;
UpdateData(false);
}
void CColorNewColorRampColorMapDialog::OnOK()
{
UpdateData(true);
Quantity_Color TheColor(m_Red,m_Green,m_Blue,Quantity_TOC_RGB);
myColorMap =
new Aspect_ColorRampColorMap(m_base_pixel,
m_dimension,
TheColor );
CDialog::OnOK();
}

View File

@ -1,286 +0,0 @@
// ColorPropertyPage.cpp : implementation file
//
#include "stdafx.h"
#include "ColorPropertyPage.h"
#include "ColorNewColorCubeColorMapDialog.h"
#include "ColorNewColorRampColorMapDialog.h"
#include "Aspect_ColorMapEntry.hxx"
#include "V2d_DefaultMap.hxx"
#include "Aspect_GenericColorMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CColorPropertyPage property page
IMPLEMENT_DYNCREATE(CColorPropertyPage, CPropertyPage)
CColorPropertyPage::CColorPropertyPage()
: CPropertyPage(CColorPropertyPage::IDD)
{
//{{AFX_DATA_INIT(CColorPropertyPage)
m_ColorMapSize = _T("Computing...");
m_ColorMapType = _T("Computing...");
m_CurrentEntryRed = _T("9.999");
m_CurrentEntryGreen = _T("9.999");
m_CurrentEntryBlue = _T("9.999");
m_NearsetColorName = _T("Computing...");
m_NewEntryRed = 9.999;
m_NewEntryBlue = 9.999;
m_NewEntryGreen = 9.999;
//}}AFX_DATA_INIT
}
BOOL CColorPropertyPage::OnInitDialog()
{
CPropertyPage::OnInitDialog();
for (int i = 0 ;i< 517 ; i++)
{
Standard_CString TheColorName = Quantity_Color::StringName((Quantity_NameOfColor)i);
// update the CComboBox to add the enumeration possibilities.
m_NewEntryColorNameCtrl.AddString( TheColorName );
}
m_NewEntryColorNameCtrl.SetCurSel(1);
// TODO: Add extra initialization here
UpdateDisplay(1);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
CColorPropertyPage::~CColorPropertyPage()
{
}
void CColorPropertyPage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CColorPropertyPage)
DDX_Control(pDX, IDC_ColorMap_COMBO_NewEntryColorName , m_NewEntryColorNameCtrl );
DDX_Control(pDX, IDC_ColorMap_TAB , m_TabCtrl );
DDX_Text (pDX, IDC_ColorMap_STATIC_Size , m_ColorMapSize );
DDX_Text (pDX, IDC_ColorMap_STATIC_Type , m_ColorMapType );
DDX_Text (pDX, IDC_ColorMap_STATIC_EntryColorRed , m_CurrentEntryRed );
DDX_Text (pDX, IDC_ColorMap_STATIC_EntryColorGreen , m_CurrentEntryGreen );
DDX_Text (pDX, IDC_ColorMap_STATIC_EntryColorBlue , m_CurrentEntryBlue );
DDX_Text (pDX, IDC_ColorMap_STATIC_EntryColorName , m_NearsetColorName );
DDX_Text (pDX, IDC_ColorMap_EDIT_NewEntryColorRed , m_NewEntryRed );
DDX_Text (pDX, IDC_ColorMap_EDIT_NewEntryColorBlue , m_NewEntryBlue );
DDX_Text (pDX, IDC_ColorMap_EDIT_NewEntryColorGreen , m_NewEntryGreen );
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CColorPropertyPage, CPropertyPage)
//{{AFX_MSG_MAP(CColorPropertyPage)
ON_NOTIFY(TCN_SELCHANGE, IDC_ColorMap_TAB, OnSelchangeColorMapTAB)
ON_CBN_SELCHANGE(IDC_ColorMap_COMBO_NewEntryColorName, OnSelchangeColorMapCOMBONewEntryColorName)
ON_BN_CLICKED(IDC_ColorMap_BUTTON_UpdateCurrentEntry, OnColorMapBUTTONUpdateCurrentEntry)
ON_BN_CLICKED(IDC_ColorMap_BUTTON_NewColorCubeColorMap, OnColorMapBUTTONNewColorCubeColorMap)
ON_BN_CLICKED(IDC_ColorMap_BUTTON_NewGenericColorMap, OnColorMapBUTTONNewGenericColorMap)
ON_BN_CLICKED(IDC_ColorMap_BUTTON_NewColorRampColorMap, OnColorMapBUTTONNewColorRampColorMap)
ON_BN_CLICKED(IDC_ColorMap_BUTTON_NewEntry_EditColor, OnColorMapBUTTONNewEntryEditColor)
ON_BN_CLICKED(IDC_ColorMap_BUTTON_AddNewEntry, OnColorMapBUTTONAddNewEntry)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
void CColorPropertyPage::UpdateDisplay(int CurrentSelectionIndex)
{
Aspect_TypeOfColorMap aColorMapType = myColorMap->Type();
switch (aColorMapType) {
case Aspect_TOC_Generic : m_ColorMapType = _T("Generic"); ; break;
case Aspect_TOC_ColorCube : m_ColorMapType = _T("ColorCube"); break;
case Aspect_TOC_ColorRamp : m_ColorMapType = _T("ColorRamp"); break;
default : cout<<" Underknown";
}
int ShowOrHide;
if (aColorMapType == Aspect_TOC_Generic)
{
ShowOrHide = SW_SHOW;
GetDlgItem(IDC_ColorMap_STATIC_NewEntryNotavailable)->ShowWindow(SW_HIDE);
}
else
{
ShowOrHide = SW_HIDE;
GetDlgItem(IDC_ColorMap_STATIC_NewEntryNotavailable)->ShowWindow(SW_SHOW);
}
GetDlgItem(IDC_ColorMap_EDIT_NewEntryColorRed)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_EDIT_NewEntryColorGreen)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_EDIT_NewEntryColorBlue)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_COMBO_NewEntryColorName)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_BUTTON_NewEntry_EditColor)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_BUTTON_UpdateCurrentEntry)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_BUTTON_AddNewEntry)->ShowWindow(ShowOrHide);
GetDlgItem(IDC_ColorMap_STATIC_NewEntryColorNameStatic)->ShowWindow(ShowOrHide);
TCollection_AsciiString SizeMessage(myColorMap->Size());
m_ColorMapSize = _T(SizeMessage.ToCString());
// clear the Tab Ctrl
m_TabCtrl.DeleteAllItems();
TC_ITEM TabCtrlItem;
TabCtrlItem.mask = TCIF_TEXT;
for(int i =0;i<myColorMap->Size();i++) // not <=ColorMapSize, I've enter a CSR
{
Aspect_ColorMapEntry aColorMapEntry = myColorMap->FindEntry(i);
TCollection_AsciiString EntryNumerMessage(aColorMapEntry.Index());
TabCtrlItem.pszText = (LPSTR)EntryNumerMessage.ToCString();
m_TabCtrl.InsertItem( aColorMapEntry.Index(), &TabCtrlItem );
}
m_TabCtrl.SetCurSel(CurrentSelectionIndex);
// update The Current Selected entry
Aspect_ColorMapEntry aColorMapEntry = myColorMap->FindEntry(CurrentSelectionIndex);
if (aColorMapEntry. IsAllocated () )
{
Quantity_Color TheColor = aColorMapEntry.Color();
Quantity_Parameter Red,Green,Blue;
TheColor.Values(Red,Green,Blue,Quantity_TOC_RGB);
TCollection_AsciiString Message;
Message = Red;
m_CurrentEntryRed = _T(Message.ToCString());
m_NewEntryRed = Red;
Message = Green;
m_CurrentEntryGreen = _T(Message.ToCString());
m_NewEntryGreen = Green;
Message = Blue;
m_CurrentEntryBlue = _T(Message.ToCString());
m_NewEntryBlue = Blue;
Standard_CString StringName = Quantity_Color::StringName(TheColor.Name());
m_NearsetColorName = StringName;
m_NewEntryColorNameCtrl.SetCurSel(TheColor.Name());
if (aColorMapType == Aspect_TOC_Generic)
if (m_TabCtrl.GetCurSel() == 0)
GetDlgItem(IDC_ColorMap_BUTTON_UpdateCurrentEntry)->ShowWindow(SW_HIDE);
else
GetDlgItem(IDC_ColorMap_BUTTON_UpdateCurrentEntry)->ShowWindow(SW_SHOW);
}
else
{
m_NearsetColorName = _T("Not Allocated");
m_CurrentEntryRed = _T("9.999");
m_NewEntryRed = 9.999;
m_CurrentEntryGreen = _T("9.999");
m_NewEntryGreen = 9.999;
m_CurrentEntryBlue = _T("9.999");
m_NewEntryBlue = 9.999;
GetDlgItem(IDC_ColorMap_BUTTON_UpdateCurrentEntry)->ShowWindow(SW_HIDE);
}
UpdateData(false);
}
void CColorPropertyPage::OnColorMapBUTTONNewGenericColorMap()
{
// TODO: Add your control notification handler code here
myColorMap = V2d_DefaultMap::ColorMap();
SetModified(true);
UpdateDisplay(1);
}
void CColorPropertyPage::OnColorMapBUTTONNewColorCubeColorMap()
{
CColorNewColorCubeColorMapDialog aDlg(NULL);
if (aDlg.DoModal() == IDOK)
{
myColorMap = aDlg.ColorMap();
SetModified(true);
UpdateDisplay(1);
}
}
void CColorPropertyPage::OnColorMapBUTTONNewColorRampColorMap()
{
CColorNewColorRampColorMapDialog aDlg(NULL);
if (aDlg.DoModal() == IDOK)
{
myColorMap = aDlg.ColorMap();
SetModified(true);
UpdateDisplay(1);
}
}
/////////////////////////////////////////////////////////////////////////////
// CColorPropertyPage message handlers
void CColorPropertyPage::OnSelchangeColorMapTAB(NMHDR* pNMHDR, LRESULT* pResult)
{
UpdateDisplay(m_TabCtrl.GetCurSel());
*pResult = 0;
}
void CColorPropertyPage::OnSelchangeColorMapCOMBONewEntryColorName()
{
UpdateData(true);
int CurSel = m_NewEntryColorNameCtrl.GetCurSel();
Quantity_NameOfColor SelectedNameOfColor = (Quantity_NameOfColor)CurSel;
Quantity_Color TheSelectedEquivalentColor(SelectedNameOfColor);
Quantity_Parameter Red,Green,Blue;
TheSelectedEquivalentColor.Values(Red,Green,Blue,Quantity_TOC_RGB);
m_NewEntryRed = Red;
m_NewEntryGreen = Green;
m_NewEntryBlue = Blue;
UpdateData(false);
}
void CColorPropertyPage::OnColorMapBUTTONNewEntryEditColor()
{
int CurrentSelectedItem = m_TabCtrl.GetCurSel();
COLORREF m_clr ;
m_clr = RGB(m_NewEntryRed*255,m_NewEntryGreen*255,m_NewEntryBlue*255);
CColorDialog dlgColor(m_clr);
if (dlgColor.DoModal() == IDOK)
{
SetModified(TRUE);
m_clr = dlgColor.GetColor();
m_NewEntryRed = GetRValue(m_clr)/255.;
m_NewEntryGreen = GetGValue(m_clr)/255.;
m_NewEntryBlue = GetBValue(m_clr)/255.;
}
Quantity_Color aColor(m_NewEntryRed,m_NewEntryGreen,m_NewEntryBlue,Quantity_TOC_RGB);
m_NewEntryColorNameCtrl.SetCurSel(aColor.Name());
UpdateData(false);
}
void CColorPropertyPage::OnColorMapBUTTONUpdateCurrentEntry()
{
UpdateData(true);
Handle(Aspect_GenericColorMap) aGenericColorMap = Handle(Aspect_GenericColorMap)::DownCast(myColorMap);
if (aGenericColorMap.IsNull())
Standard_Failure::Raise(" couldn't update a none Generic Color Map");
Aspect_ColorMapEntry aColorMapEntry = myColorMap->FindEntry( m_TabCtrl.GetCurSel());
Quantity_Color aColor(m_NewEntryRed,m_NewEntryGreen,m_NewEntryBlue,Quantity_TOC_RGB);
aColorMapEntry.SetColor(aColor);
aGenericColorMap->AddEntry(aColorMapEntry); // in fact just update
SetModified(true);
UpdateData(true);
UpdateDisplay(m_TabCtrl.GetCurSel());
}
void CColorPropertyPage::OnColorMapBUTTONAddNewEntry()
{
UpdateData(true);
Quantity_Color aColor(m_NewEntryRed,m_NewEntryGreen,m_NewEntryBlue,Quantity_TOC_RGB);
Handle(Aspect_GenericColorMap) aGenericColorMap = Handle(Aspect_GenericColorMap)::DownCast(myColorMap);
if (aGenericColorMap.IsNull())
Standard_Failure::Raise(" couldn't update a none Generic Color Map");
int NewEntry = aGenericColorMap->AddEntry(aColor);
SetModified(true);
UpdateDisplay(NewEntry);
UpdateData(false);
}
BOOL CColorPropertyPage::OnApply()
{
myViewer->SetColorMap(myColorMap);
myViewer->Update();
return CPropertyPage::OnApply();
}

View File

@ -1,83 +0,0 @@
#if !defined(AFX_ColorPropertyPage_H__A815F7A3_D51B_11D1_8DDE_0800369C8A03__INCLUDED_)
#define AFX_ColorPropertyPage_H__A815F7A3_D51B_11D1_8DDE_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// ColorPropertyPage.h : header file
//
#include "Aspect_ColorMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CColorPropertyPage dialog
class CColorPropertyPage : public CPropertyPage
{
DECLARE_DYNCREATE(CColorPropertyPage)
private :
Handle(Aspect_ColorMap) myColorMap;
private :
Handle(V2d_Viewer) myViewer;
public:
void SetViewer(Handle(V2d_Viewer) aViewer) {
myViewer = aViewer;
myColorMap = aViewer->ColorMap();
};
// Construction
public:
CColorPropertyPage();
~CColorPropertyPage();
// Dialog Data
//{{AFX_DATA(CColorPropertyPage)
enum { IDD = IDD_DIALOG_Color };
CComboBox m_NewEntryColorNameCtrl;
CTabCtrl m_TabCtrl;
CString m_ColorMapSize ;
CString m_ColorMapType ;
CString m_CurrentEntryRed;
CString m_CurrentEntryGreen;
CString m_CurrentEntryBlue;
CString m_NearsetColorName;
double m_NewEntryRed;
double m_NewEntryBlue;
double m_NewEntryGreen;
//}}AFX_DATA
// Overrides
// ClassWizard generate virtual function overrides
//{{AFX_VIRTUAL(CColorPropertyPage)
public:
virtual BOOL OnApply();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CColorPropertyPage)
virtual BOOL OnInitDialog();
afx_msg void OnSelchangeColorMapTAB(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnSelchangeColorMapCOMBONewEntryColorName();
afx_msg void OnColorMapBUTTONUpdateCurrentEntry();
afx_msg void OnColorMapBUTTONNewColorCubeColorMap();
afx_msg void OnColorMapBUTTONNewGenericColorMap();
afx_msg void OnColorMapBUTTONNewColorRampColorMap();
afx_msg void OnColorMapBUTTONNewEntryEditColor();
afx_msg void OnColorMapBUTTONAddNewEntry();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
void UpdateDisplay(int CurrentSelectionIndex);
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_ColorPropertyPage_H__A815F7A3_D51B_11D1_8DDE_0800369C8A03__INCLUDED_)

View File

@ -1,267 +0,0 @@
// FontPropertyPage.cpp : implementation file
//
#include "stdafx.h"
#include "FontPropertyPage.h"
#include "Aspect_FontMapEntry.hxx"
/////////////////////////////////////////////////////////////////////////////
// CFontPropertyPage property page
IMPLEMENT_DYNCREATE(CFontPropertyPage, CPropertyPage)
CFontPropertyPage::CFontPropertyPage() : CPropertyPage(CFontPropertyPage::IDD)
{
//{{AFX_DATA_INIT(CFontPropertyPage)
m_FontMapSize = _T("Computing...");
m_CurrentEntryValue = _T("Computing...");
m_CurrentEntryStyle = _T("Computing...");
m_CurrentEntrySize = _T("Computing...");
m_CurrentEntrySlant = _T("Computing...");
m_NewEntryValue = _T("");
m_NewEntrySize = 1.0;
m_NewEntrySlant = 0.0;
//}}AFX_DATA_INIT
}
CFontPropertyPage::~CFontPropertyPage()
{
}
BOOL CFontPropertyPage::OnInitDialog()
{
CPropertyPage::OnInitDialog();
m_NewEntry_Type.AddString("DEFAULT");
m_NewEntry_Type.AddString("COURIER");
m_NewEntry_Type.AddString("HELVETICA");
m_NewEntry_Type.AddString("TIMES");
m_NewEntry_Type.AddString("USERDEFINED");
m_NewEntry_Type.SetCurSel(1);
// TODO: Add extra initialization here
UpdateDisplay(1);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
void CFontPropertyPage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CFontPropertyPage)
DDX_Text (pDX, IDC_FontMap_STATIC_Size , m_FontMapSize );
DDX_Control(pDX, IDC_FontMap_TAB , m_TabCtrl );
DDX_Text (pDX, IDC_FontMap_STATIC_CurrentEntryValue , m_CurrentEntryValue );
DDX_Text (pDX, IDC_FontMap_STATIC_CurrentEntryType , m_CurrentEntryStyle );
DDX_Text (pDX, IDC_FontMap_STATIC_CurrentEntrySize , m_CurrentEntrySize );
DDX_Text (pDX, IDC_FontMap_STATIC_CurrentEntrySlant , m_CurrentEntrySlant );
DDX_Control(pDX, IDC_FontMap_COMBO_NewEntryType , m_NewEntry_Type );
DDX_Text(pDX, IDC_FontMap_EDIT_NewEntryValue, m_NewEntryValue);
DDX_Text(pDX, IDC_FontMap_EDIT_NewEntrySize, m_NewEntrySize);
DDX_Text(pDX, IDC_FontMap_EDIT_NewEntrySlant, m_NewEntrySlant);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CFontPropertyPage, CPropertyPage)
//{{AFX_MSG_MAP(CFontPropertyPage)
ON_NOTIFY(TCN_SELCHANGE, IDC_FontMap_TAB, OnSelchangeFontMapTAB)
ON_BN_CLICKED(IDC_FontMap_BUTTON_NewEntry_EditFont, OnFontMapBUTTONNewEntryEditFont)
ON_BN_CLICKED(IDC_FontMap_BUTTON_UpdateCurrent, OnFontMapBUTTONUpdateCurrent)
ON_CBN_SELCHANGE(IDC_FontMap_COMBO_NewEntryType, OnSelchangeFontMapCOMBONewEntryType)
ON_BN_CLICKED(IDC_FontMap_BUTTON_NewEntry, OnFontMapBUTTONNewEntry)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CFontPropertyPage message handlers
void CFontPropertyPage::UpdateDisplay(int CurrentSelectionIndex)
{
// Update the size of the Width map
TCollection_AsciiString SizeMessage(myFontMap->Size());
m_FontMapSize = _T(SizeMessage.ToCString());
// clear the Tab Ctrl
m_TabCtrl.DeleteAllItems();
TC_ITEM TabCtrlItem;
TabCtrlItem.mask = TCIF_TEXT;
for(int i =1;i<=myFontMap->Size();i++)
{
Aspect_FontMapEntry aFontMapEntry = myFontMap->Entry(i);
TCollection_AsciiString EntryNumerMessage(aFontMapEntry.Index());
TabCtrlItem.pszText = (LPSTR) EntryNumerMessage.ToCString();
m_TabCtrl.InsertItem( aFontMapEntry.Index(), &TabCtrlItem );
}
m_TabCtrl.SetCurSel(CurrentSelectionIndex-1);
// update the current Entry informations
Aspect_FontMapEntry aFontMapEntry = myFontMap->Entry(CurrentSelectionIndex);
Aspect_FontStyle TheType = aFontMapEntry.Type();
m_CurrentEntryValue = (TheType.Value() == NULL?" ":TheType.Value());
TCollection_AsciiString Message;
switch (TheType.Style())
{
case Aspect_TOF_DEFAULT : Message = "Aspect_TOF_DEFAULT"; break;
case Aspect_TOF_COURIER : Message = "Aspect_TOF_COURIER"; break;
case Aspect_TOF_HELVETICA : Message = "Aspect_TOF_HELVETICA"; break;
case Aspect_TOF_TIMES : Message = "Aspect_TOF_TIMES"; break;
case Aspect_TOF_USERDEFINED : Message = "Aspect_TOF_USERDEFINED"; break;
default: Message = "Underknown";
}
m_CurrentEntryStyle = _T(Message.ToCString());
Message = TheType.Size ();
m_CurrentEntrySize = _T(Message.ToCString());
Message = TheType.Slant ();
m_CurrentEntrySlant = _T(Message.ToCString());
// update The New Entry :
switch (TheType.Style())
{
case Aspect_TOF_DEFAULT : m_NewEntry_Type.SetCurSel(0); break;
case Aspect_TOF_COURIER : m_NewEntry_Type.SetCurSel(1); break;
case Aspect_TOF_HELVETICA : m_NewEntry_Type.SetCurSel(2); break;
case Aspect_TOF_TIMES : m_NewEntry_Type.SetCurSel(3); break;
case Aspect_TOF_USERDEFINED : m_NewEntry_Type.SetCurSel(4); break;
default: ;
}
m_NewEntryValue = (TheType.Value() == NULL?" ":TheType.Value());
m_NewEntrySize = TheType.Size ();
m_NewEntrySlant = TheType.Slant ();
if (TheType.Style()==Aspect_TOF_USERDEFINED)
{
GetDlgItem(IDC_FontMap_EDIT_NewEntrySize)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_EDIT_NewEntrySlant)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry_EditFont)->ShowWindow(SW_SHOW);
}
else
{
GetDlgItem(IDC_FontMap_EDIT_NewEntrySize)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_EDIT_NewEntrySlant)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry_EditFont)->ShowWindow(SW_HIDE);
}
UpdateData(false);
}
void CFontPropertyPage::OnSelchangeFontMapTAB(NMHDR* pNMHDR, LRESULT* pResult)
{
// TODO: Add your control notification handler code here
UpdateDisplay( m_TabCtrl.GetCurSel()+1);
*pResult = 0;
}
void CFontPropertyPage::OnSelchangeFontMapCOMBONewEntryType()
{
UpdateData(true);
// update the New Entry Value message
if (m_NewEntry_Type.GetCurSel() == Aspect_TOF_USERDEFINED)
{
// allow the user to select a font from the common CFontDialog
GetDlgItem(IDC_FontMap_BUTTON_NewEntry_EditFont)->ShowWindow(SW_SHOW);
m_NewEntryValue = "Please Select a Font";
// remove the posiblility to update while a font was selected
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_EDIT_NewEntrySize)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_EDIT_NewEntrySlant)->ShowWindow(SW_HIDE);
}
else
{
GetDlgItem(IDC_FontMap_EDIT_NewEntrySize)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_EDIT_NewEntrySlant)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry_EditFont)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry)->ShowWindow(SW_SHOW);
Aspect_FontStyle TheType((Aspect_TypeOfFont)m_NewEntry_Type.GetCurSel(),m_NewEntrySize);
m_NewEntryValue = (TheType.Value() == NULL?" ":TheType.Value());
}
UpdateData(false);
}
#include "WNT_FontMapEntry.hxx"
void CFontPropertyPage::OnFontMapBUTTONNewEntryEditFont()
{
Handle(WNT_FontMapEntry) anEntry = new WNT_FontMapEntry((char* const)(LPCTSTR )m_NewEntryValue);
Standard_Address anAddress = anEntry->LogFont();
LOGFONT* lf = (LOGFONT*)(anAddress );
CFontDialog dlg(lf);
if (dlg.DoModal() == IDOK)
{
TCHAR buff[ 255 ];
wsprintf ( buff, "%d-%d-%d-%d-%d-%d-%d-%d-%d-%d-%d-%d-%d-%s",
lf->lfHeight, lf->lfWidth, lf->lfEscapement, lf->lfOrientation, lf->lfWeight, lf->lfItalic,
lf->lfUnderline, lf->lfStrikeOut, lf->lfCharSet, lf->lfOutPrecision, lf->lfClipPrecision, lf->lfQuality,
lf->lfPitchAndFamily, lf->lfFaceName);
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry)->ShowWindow(SW_SHOW);
Aspect_FontStyle TheType(buff);
m_NewEntryValue = (TheType.Value() == NULL?" ":TheType.Value());
}
UpdateData(false);
}
void CFontPropertyPage::OnFontMapBUTTONUpdateCurrent()
{
// The Entry to modify :
Aspect_FontMapEntry aFontMapEntry = myFontMap->Entry( m_TabCtrl.GetCurSel()+1);
UpdateData(true);
Aspect_TypeOfFont aTypeOfFont = (Aspect_TypeOfFont)m_NewEntry_Type.GetCurSel();
if (aTypeOfFont == Aspect_TOF_USERDEFINED)
{
Aspect_FontStyle TheType((Standard_CString)(LPCTSTR )m_NewEntryValue);
aFontMapEntry.SetType(TheType);
}
else
{
Aspect_FontStyle TheType((Aspect_TypeOfFont)m_NewEntry_Type.GetCurSel(),m_NewEntrySize,m_NewEntrySlant);
aFontMapEntry.SetType(TheType);
}
myFontMap->AddEntry(aFontMapEntry); // in fact just update
SetModified(true);
UpdateDisplay(m_TabCtrl.GetCurSel()+1);
UpdateData(false);
}
void CFontPropertyPage::OnFontMapBUTTONNewEntry()
{
// The Entry to modify :
Aspect_FontMapEntry aFontMapEntry;
UpdateData(true);
Aspect_TypeOfFont aTypeOfFont = (Aspect_TypeOfFont)m_NewEntry_Type.GetCurSel();
if (aTypeOfFont == Aspect_TOF_USERDEFINED)
{
Aspect_FontStyle TheType((Standard_CString)(LPCTSTR )m_NewEntryValue);
aFontMapEntry.SetType(TheType);
}
else
{
Aspect_FontStyle TheType((Aspect_TypeOfFont)m_NewEntry_Type.GetCurSel(),m_NewEntrySize,m_NewEntrySlant);
aFontMapEntry.SetType(TheType);
}
myFontMap->AddEntry(aFontMapEntry); // in fact just update
SetModified(true);
UpdateDisplay(m_TabCtrl.GetCurSel()+1);
UpdateData(false);
}
BOOL CFontPropertyPage::OnApply()
{
myViewer->SetFontMap(myFontMap);
myViewer->Update();
return CPropertyPage::OnApply();
}

View File

@ -1,76 +0,0 @@
#if !defined(AFX_FontPropertyPage_H__A815F7A5_D51B_11D1_8DDE_0800369C8A03__INCLUDED_)
#define AFX_FontPropertyPage_H__A815F7A5_D51B_11D1_8DDE_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// FontPropertyPage.h : header file
//
#include "Aspect_FontMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CFontPropertyPage dialog
class CFontPropertyPage : public CPropertyPage
{
DECLARE_DYNCREATE(CFontPropertyPage)
private :
Handle(Aspect_FontMap) myFontMap;
private :
Handle(V2d_Viewer) myViewer;
public:
void SetViewer(Handle(V2d_Viewer) aViewer) {
myViewer = aViewer;
myFontMap = aViewer->FontMap();
};
// Construction
public:
CFontPropertyPage();
~CFontPropertyPage();
// Dialog Data
//{{AFX_DATA(CFontPropertyPage)
enum { IDD = IDD_DIALOG_Font };
CString m_FontMapSize;
CTabCtrl m_TabCtrl;
CString m_CurrentEntryValue;
CString m_CurrentEntryStyle;
CString m_CurrentEntrySize;
CString m_CurrentEntrySlant;
CComboBox m_NewEntry_Type;
double m_NewEntrySize;
double m_NewEntrySlant;
CString m_NewEntryValue;
//}}AFX_DATA
// Overrides
// ClassWizard generate virtual function overrides
//{{AFX_VIRTUAL(CFontPropertyPage)
public:
virtual BOOL OnApply();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CFontPropertyPage)
virtual BOOL OnInitDialog();
afx_msg void OnSelchangeFontMapTAB(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnFontMapBUTTONNewEntryEditFont();
afx_msg void OnFontMapBUTTONUpdateCurrent();
afx_msg void OnSelchangeFontMapCOMBONewEntryType();
afx_msg void OnFontMapBUTTONNewEntry();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
void UpdateDisplay(int CurrentSelectionIndex);
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_FontPropertyPage_H__A815F7A5_D51B_11D1_8DDE_0800369C8A03__INCLUDED_)

View File

@ -1,172 +0,0 @@
// MarkPropertyPage.cpp : implementation file
//
#include "stdafx.h"
#include "MarkPropertyPage.h"
#include "Aspect_MarkMap.hxx"
#include "Aspect_MarkMapEntry.hxx"
#include "TColQuantity_Array1OfLength.hxx"
#include "TColStd_SequenceOfReal.hxx"
#include "TShort_Array1OfShortReal.hxx"
#include "TColStd_Array1OfBoolean.hxx"
/////////////////////////////////////////////////////////////////////////////
// CMarkPropertyPage property page
IMPLEMENT_DYNCREATE(CMarkPropertyPage, CPropertyPage)
CMarkPropertyPage::CMarkPropertyPage() : CPropertyPage(CMarkPropertyPage::IDD)
{
//{{AFX_DATA_INIT(CMarkPropertyPage)
m_MarkMapSize = _T("Computing...");
m_CurrentEntryStyle = _T("Computing...");
m_CurrentEntryXValue = _T("Computing...");
m_CurrentEntryYValue = _T("Computing...");
m_CurrentEntrySValue = _T("Computing...");
//}}AFX_DATA_INIT
}
BOOL CMarkPropertyPage::OnInitDialog()
{
CPropertyPage::OnInitDialog();
UpdateDisplay(1);
UpdateData(false);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
CMarkPropertyPage::~CMarkPropertyPage()
{
}
void CMarkPropertyPage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CMarkPropertyPage)
DDX_Control(pDX, IDC_MarkMap_TAB, m_TabCtrl);
DDX_Text(pDX, IDC_MarkMap_STATIC_Size, m_MarkMapSize);
DDX_Text(pDX, IDC_MarkMap_STATIC_CurrentEntryStyle, m_CurrentEntryStyle);
DDX_Text(pDX, IDC_MarkMap_STATIC_CurrentEntryXValue, m_CurrentEntryXValue);
DDX_Text(pDX, IDC_MarkMap_STATIC_CurrentEntryYValue, m_CurrentEntryYValue);
DDX_Text(pDX, IDC_MarkMap_STATIC_CurrentEntrySValue, m_CurrentEntrySValue);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CMarkPropertyPage, CPropertyPage)
//{{AFX_MSG_MAP(CMarkPropertyPage)
ON_NOTIFY(TCN_SELCHANGE, IDC_MarkMap_TAB, OnSelchangeMarkMapTAB)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CMarkPropertyPage message handlers
void CMarkPropertyPage::UpdateDisplay(int CurrentSelectionIndex)
{
TCollection_AsciiString SizeMessage(myMarkMap->Size());
m_MarkMapSize = _T(SizeMessage.ToCString());
m_TabCtrl.DeleteAllItems();
TC_ITEM TabCtrlItem;
TabCtrlItem.mask = TCIF_TEXT;
for(int i =1;i<=myMarkMap->Size();i++)
{
Aspect_MarkMapEntry aMarkMapEntry = myMarkMap->Entry(i);
TCollection_AsciiString EntryNumerMessage(aMarkMapEntry.Index());
TabCtrlItem.pszText = (LPSTR) EntryNumerMessage.ToCString();
m_TabCtrl.InsertItem( aMarkMapEntry.Index(), &TabCtrlItem );
}
m_TabCtrl.SetCurSel(CurrentSelectionIndex-1);
// update The Current Selected entry
Aspect_MarkMapEntry aMarkMapEntry = myMarkMap->Entry(CurrentSelectionIndex);
if (aMarkMapEntry. IsAllocated () )
{
Aspect_MarkerStyle aMarkerStyle = aMarkMapEntry.Style() ;
switch (aMarkerStyle.Type()) {
case Aspect_TOM_POINT : m_CurrentEntryStyle = _T("Aspect_TOM_POINT"); break;
case Aspect_TOM_PLUS : m_CurrentEntryStyle = _T("Aspect_TOM_PLUS"); break;
case Aspect_TOM_STAR : m_CurrentEntryStyle = _T("Aspect_TOM_STAR"); break;
case Aspect_TOM_O : m_CurrentEntryStyle = _T("Aspect_TOM_O"); break;
case Aspect_TOM_X : m_CurrentEntryStyle = _T("Aspect_TOM_X"); break;
case Aspect_TOM_O_POINT : m_CurrentEntryStyle = _T("Aspect_TOM_O_POINT"); break;
case Aspect_TOM_O_PLUS : m_CurrentEntryStyle = _T("Aspect_TOM_O_PLUS"); break;
case Aspect_TOM_O_STAR : m_CurrentEntryStyle = _T("Aspect_TOM_O_STAR"); break;
case Aspect_TOM_O_X : m_CurrentEntryStyle = _T("Aspect_TOM_O_X"); break;
case Aspect_TOM_BALL : m_CurrentEntryStyle = _T("Aspect_TOM_BALL"); break;
case Aspect_TOM_RING1 : m_CurrentEntryStyle = _T("Aspect_TOM_RING1"); break;
case Aspect_TOM_RING2 : m_CurrentEntryStyle = _T("Aspect_TOM_RING2"); break;
case Aspect_TOM_RING3 : m_CurrentEntryStyle = _T("Aspect_TOM_RING3"); break;
case Aspect_TOM_USERDEFINED : m_CurrentEntryStyle = _T("Aspect_TOM_USERDEFINED"); break;
default : m_CurrentEntryStyle = _T("Underknown");
}
cout<<" aMarkerStyle Length: "<<aMarkerStyle.Length()<<endl;
const TShort_Array1OfShortReal& aMarkerStyleXValues = aMarkerStyle.XValues() ;
const TShort_Array1OfShortReal& aMarkerStyleYValues= aMarkerStyle.YValues() ;
const TColStd_Array1OfBoolean& aMarkerStyleSValues= aMarkerStyle.SValues() ;
TCollection_AsciiString MessageX =BuildValuesAscii(aMarkerStyleXValues);
TCollection_AsciiString MessageY =BuildValuesAscii(aMarkerStyleYValues);
TCollection_AsciiString MessageS =BuildValuesAscii(aMarkerStyleSValues);
m_CurrentEntryXValue = _T(MessageX.ToCString());
m_CurrentEntryYValue = _T(MessageY.ToCString());
m_CurrentEntrySValue = _T(MessageS.ToCString());
}
else
{
m_CurrentEntryStyle = _T("Not Allocated");
m_CurrentEntryXValue = _T("");
m_CurrentEntryYValue = _T("");
m_CurrentEntrySValue = _T("");
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_HIDE);
}
}
void CMarkPropertyPage::OnSelchangeMarkMapTAB(NMHDR* pNMHDR, LRESULT* pResult)
{
UpdateDisplay(m_TabCtrl.GetCurSel()+1);
UpdateData(false);
*pResult = 0;
}
BOOL CMarkPropertyPage::OnApply()
{
// myViewer->SetMarkMap(myMarkMap);
// myViewer->Update();
return CPropertyPage::OnApply();
}
TCollection_AsciiString CMarkPropertyPage::BuildValuesAscii(const TShort_Array1OfShortReal& anArray)
{
TCollection_AsciiString Message;
for(int i=1;i<=anArray.Length();i++)
{
Message += anArray.Value(i);
Message += "\t";
}
return Message;
}
TCollection_AsciiString CMarkPropertyPage::BuildValuesAscii(const TColStd_Array1OfBoolean& anArray)
{
TCollection_AsciiString Message;
for(int i=1;i<=anArray.Length();i++)
{
if (anArray(i)) Message += "True"; else Message += "False";
Message += "\t";
}
return Message;
}

View File

@ -1,78 +0,0 @@
#if !defined(AFX_MarkPropertyPage_H__B6E7AAD3_DB72_11D1_8DE5_0800369C8A03__INCLUDED_)
#define AFX_MarkPropertyPage_H__B6E7AAD3_DB72_11D1_8DE5_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// MarkPropertyPage.h : header file
//
#include "V2d_Viewer.hxx"
#include "TColQuantity_Array1OfLength.hxx"
#include "TColQuantity_HArray1OfLength.hxx"
#include "TColStd_Array1OfBoolean.hxx"
/////////////////////////////////////////////////////////////////////////////
// CMarkPropertyPage dialog
class CMarkPropertyPage : public CPropertyPage
{
private :
Handle(Aspect_MarkMap) myMarkMap;
private :
Handle(V2d_Viewer) myViewer;
public:
void SetViewer(Handle(V2d_Viewer) aViewer) {
myViewer = aViewer;
myMarkMap = aViewer->MarkMap();
};
DECLARE_DYNCREATE(CMarkPropertyPage)
// Construction
public:
CMarkPropertyPage();
~CMarkPropertyPage();
// Dialog Data
//{{AFX_DATA(CMarkPropertyPage)
enum { IDD = IDD_DIALOG_Mark };
CTabCtrl m_TabCtrl;
CComboBox m_NewEntryControl;
CString m_MarkMapSize;
CString m_CurrentEntryStyle;
CString m_CurrentEntryXValue;
CString m_CurrentEntryYValue;
CString m_CurrentEntrySValue;
//}}AFX_DATA
// Overrides
// ClassWizard generate virtual function overrides
//{{AFX_VIRTUAL(CMarkPropertyPage)
public:
virtual BOOL OnApply();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CMarkPropertyPage)
virtual BOOL OnInitDialog();
afx_msg void OnSelchangeMarkMapTAB(NMHDR* pNMHDR, LRESULT* pResult);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
void UpdateDisplay(int CurrentSelectionIndex);
TCollection_AsciiString BuildValuesAscii(const TShort_Array1OfShortReal& anArray);
TCollection_AsciiString BuildValuesAscii(const TColStd_Array1OfBoolean& anArray);
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_MarkPropertyPage_H__B6E7AAD3_DB72_11D1_8DE5_0800369C8A03__INCLUDED_)

View File

@ -1,236 +0,0 @@
//
// resources Microsoft Visual C++
//
/////////////////////////////////////////////////////////////////////////////
// Add manually edited resources here...
/////////////////////////////////////////////////////////////////////////////
IDD_DIALOG_Color DIALOG DISCARDABLE 0, 0, 281, 186
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Color Map "
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Type Of The Color Map :",IDC_STATIC,20,10,87,10
LTEXT "To be updated ...",IDC_ColorMap_STATIC_Type,110,10,69,
10
LTEXT "Size Of The Color Map :",IDC_STATIC,20,20,79,10
CONTROL "Tab1",IDC_ColorMap_TAB,"SysTabControl32",TCS_BUTTONS,19,
53,242,15
LTEXT "To be updated ...",IDC_ColorMap_STATIC_Size,110,20,69,
10
GROUPBOX "Entries :",IDC_STATIC,10,40,264,50
LTEXT "Color Name :",IDC_STATIC,20,75,50,10
LTEXT "To be updated ...",IDC_ColorMap_STATIC_EntryColorName,
204,75,69,10
PUSHBUTTON "Add",IDC_ColorMap_BUTTON_AddNewEntry,110,145,55,15
GROUPBOX "New Entry",IDC_STATIC,10,100,267,79
PUSHBUTTON "Update Current",IDC_ColorMap_BUTTON_UpdateCurrentEntry,
20,145,55,15
LTEXT "Color Name :",
IDC_ColorMap_STATIC_NewEntryColorNameStatic,20,120,55,10
PUSHBUTTON "Edit...",IDC_ColorMap_BUTTON_NewEntry_EditColor,204,145,
55,15
LTEXT "999",IDC_ColorMap_STATIC_EntryColorRed,75,75,35,10
LTEXT "999",IDC_ColorMap_STATIC_EntryColorGreen,120,75,35,10
LTEXT "999",IDC_ColorMap_STATIC_EntryColorBlue,165,75,35,10
EDITTEXT IDC_ColorMap_EDIT_NewEntryColorRed,75,120,35,12,
ES_AUTOHSCROLL
EDITTEXT IDC_ColorMap_EDIT_NewEntryColorGreen,120,120,30,12,
ES_AUTOHSCROLL
EDITTEXT IDC_ColorMap_EDIT_NewEntryColorBlue,165,120,35,12,
ES_AUTOHSCROLL
COMBOBOX IDC_ColorMap_COMBO_NewEntryColorName,204,120,70,193,
CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "New Generic Color Map",
IDC_ColorMap_BUTTON_NewGenericColorMap,179,4,95,13
LTEXT "Not available for this type of Color map",
IDC_ColorMap_STATIC_NewEntryNotavailable,70,130,160,10
PUSHBUTTON "New Color Cube Color Map ",
IDC_ColorMap_BUTTON_NewColorCubeColorMap,179,18,95,13
PUSHBUTTON "New Color Ramp Color Map",
IDC_ColorMap_BUTTON_NewColorRampColorMap,179,31,95,13
END
IDD_DIALOG_Font DIALOGEX 0, 0, 287, 210
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Font Map"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Size Of The Font Map :",IDC_STATIC,20,10,80,10
LTEXT "To be updated ...",IDC_FontMap_STATIC_Size,110,10,80,10
GROUPBOX "Entries :",IDC_STATIC,10,28,270,97,0,WS_EX_TRANSPARENT
CONTROL "Tab1",IDC_FontMap_TAB,"SysTabControl32",TCS_BUTTONS,20,
40,242,15
GROUPBOX "New Entry",IDC_STATIC,10,130,270,73
PUSHBUTTON "Update Current",IDC_FontMap_BUTTON_UpdateCurrent,158,
181,55,15
PUSHBUTTON "Add",IDC_FontMap_BUTTON_NewEntry,221,179,55,16
LTEXT "To be updated...",IDC_FontMap_STATIC_CurrentEntryValue,
63,75,217,10
LTEXT "Type :",IDC_STATIC,21,155,23,10
LTEXT "Type :",IDC_STATIC,21,60,40,10
LTEXT "To be updated ...",IDC_FontMap_STATIC_CurrentEntryType,
63,60,80,10
LTEXT "Size :",IDC_STATIC,21,174,42,10
LTEXT "Slant :",IDC_STATIC,21,189,28,10
EDITTEXT IDC_FontMap_EDIT_NewEntrySize,63,172,62,12,
ES_AUTOHSCROLL | ES_WANTRETURN
EDITTEXT IDC_FontMap_EDIT_NewEntrySlant,63,187,62,12,
ES_AUTOHSCROLL | ES_WANTRETURN
LTEXT "Size :",IDC_STATIC,21,90,30,10
LTEXT "Slant :",IDC_STATIC,21,106,36,10
LTEXT "Value :",IDC_STATIC,21,75,40,10
LTEXT "Type :",IDC_STATIC,21,140,42,10
COMBOBOX IDC_FontMap_COMBO_NewEntryType,63,138,113,77,
CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_FontMap_EDIT_NewEntryValue,63,153,209,12,
ES_AUTOHSCROLL | ES_READONLY
LTEXT "To be updated...",IDC_FontMap_STATIC_CurrentEntrySize,
63,90,70,10
LTEXT "To be updated...",IDC_FontMap_STATIC_CurrentEntrySlant,
63,106,80,10
PUSHBUTTON "Edit...",IDC_FontMap_BUTTON_NewEntry_EditFont,191,138,
55,12
END
IDD_DIALOG_Width DIALOG DISCARDABLE 0, 0, 281, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Width Map "
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Size Of The Width Map :",IDC_STATIC,15,10,80,10
CONTROL "Tab1",IDC_WidthMap_TAB,"SysTabControl32",TCS_BUTTONS,21,
40,242,15
LTEXT "To be updated ...",IDC_WidthMap_STATIC_Size,107,10,80,
10
GROUPBOX "Entries :",IDC_STATIC,10,30,264,57
LTEXT "Type :",IDC_STATIC,15,60,80,10
LTEXT "Width :",IDC_STATIC,15,75,80,10
LTEXT "Type :",IDC_STATIC,15,115,49,10
LTEXT "Width :",IDC_STATIC,15,130,49,10
COMBOBOX IDC_WidthMap_COMBO_NewEntryType,70,113,113,77,
CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_WidthMap_EDIT_NewEntryWidth,70,128,62,12,
ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN
LTEXT "To be updated ...",IDC_WidthMap_STATIC_EntryType,107,60,
80,10
LTEXT "To be updated ...",IDC_WidthMap_STATIC_EntryWidth,107,
75,80,10
PUSHBUTTON "Add",IDC_WidthMap_BUTTON_AddNewEntry,200,130,55,15
GROUPBOX "New Entry",IDC_STATIC,7,101,267,51
PUSHBUTTON "Update Current",IDC_WidthMap_BUTTON_UpdateCurrentEntry,
200,110,55,15
END
IDD_DIALOG_NewColorCube DIALOG DISCARDABLE 0, 0, 207, 156
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "New Color Cube"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,150,10,50,13
PUSHBUTTON "Cancel",IDCANCEL,150,30,50,14
LTEXT "base_pixel",IDC_STATIC,20,10,50,10
LTEXT "greenmax",IDC_STATIC,20,70,50,10
LTEXT "greenmult",IDC_STATIC,20,90,50,10
LTEXT "bluemax",IDC_STATIC,20,110,50,10
LTEXT "bluemult",IDC_STATIC,20,130,50,10
EDITTEXT IDC_NewColorCube_EDIT_bluemult,80,130,50,12,
ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_NewColorCube_EDIT_bluemax,80,110,50,12,
ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_NewColorCube_EDIT_grennmult,80,90,50,12,
ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_NewColorCube_EDIT_greenmax,80,70,50,12,
ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_NewColorCube_EDIT_base_pixel,80,10,50,12,
ES_AUTOHSCROLL | ES_NUMBER
LTEXT "redmax",IDC_STATIC,20,30,50,10
EDITTEXT IDC_NewColorCube_EDIT_redmax,80,30,50,12,ES_AUTOHSCROLL |
ES_NUMBER
LTEXT "redmult",IDC_STATIC,20,50,50,10
EDITTEXT IDC_NewColorCube_EDIT_redmult,80,50,50,12,ES_AUTOHSCROLL |
ES_NUMBER
END
IDD_DIALOG_NewColorRamp DIALOG DISCARDABLE 0, 0, 252, 121
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "New Color ramp"
FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,150,10,50,13
PUSHBUTTON "Cancel",IDCANCEL,150,30,50,14
LTEXT "base_pixel",-1,20,10,49,10
EDITTEXT IDC_NewColorRamp_EDIT_base_pixel,80,10,40,12,
ES_AUTOHSCROLL | ES_NUMBER
LTEXT "dimension",-1,20,30,49,10
EDITTEXT IDC_NewColorramp_EDIT_dimension,80,30,40,12,
ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Color Name :",
IDC_ColorMap_STATIC_NewEntryColorNameStatic,20,50,49,10
PUSHBUTTON "Edit...",IDC_NewColorMapRamp_BUTTON_EditColor,145,70,55,10
EDITTEXT IDC_NewColorMapRamp_EDIT_ColorRed,28,70,35,12,
ES_AUTOHSCROLL
EDITTEXT IDC_NewColorMapRamp_EDIT_ColorGreen,65,70,35,12,
ES_AUTOHSCROLL
EDITTEXT IDC_NewColorMapRamp_EDIT_ColorBlue,103,70,35,12,
ES_AUTOHSCROLL
COMBOBOX IDC_NewColorMap_COMBO_NewEntryColorName,80,50,70,193,
CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
END
IDD_DIALOG_Type DIALOGEX 0, 0, 287, 170
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Type Map"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Size Of The Typet Map :",-1,20,10,80,10
LTEXT "To be updated ...",IDC_TypeMap_STATIC_Size,110,10,80,10
GROUPBOX "Entries :",-1,10,28,270,62,0,WS_EX_TRANSPARENT
CONTROL "Tab1",IDC_TypeMap_TAB,"SysTabControl32",TCS_BUTTONS,20,
40,242,15
GROUPBOX "New Entry",-1,10,100,270,60
PUSHBUTTON "Update Current",IDC_FontMap_BUTTON_UpdateCurrent,160,
140,55,15
PUSHBUTTON "Add",IDC_FontMap_BUTTON_NewEntry,220,140,55,15
LTEXT "To be updated...",IDC_TypeMap_STATIC_CurrentEntryValue,
63,75,217,10
LTEXT "Value :",-1,21,126,42,10
LTEXT "Style :",-1,21,60,40,10
LTEXT "To be updated ...",IDC_TypeMap_STATIC_CurrentEntryStyle,
63,60,80,10
LTEXT "Value :",-1,21,75,40,10
LTEXT "Style :",-1,21,111,42,10
COMBOBOX IDC_TypeMap_COMBO_NewEntryStyle,63,108,113,77,
CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_TypeMap_EDIT_NewEntryValue,63,124,194,12,
ES_AUTOHSCROLL | ES_READONLY
END
IDD_DIALOG_Mark DIALOGEX 0, 0, 287, 201
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Mark Map"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Size Of The Mark Map :",AFX_ID_PREVIEW_CLOSE,20,10,80,
10
LTEXT "To be updated ...",IDC_MarkMap_STATIC_Size,110,10,80,10
GROUPBOX "Entries :",-1,10,28,270,92,0,WS_EX_TRANSPARENT
CONTROL "Tab1",IDC_MarkMap_TAB,"SysTabControl32",TCS_BUTTONS,20,
40,242,15
LTEXT "To be updated...",IDC_MarkMap_STATIC_CurrentEntryXValue,
63,75,217,9
LTEXT "Style :",-1,21,60,40,10
LTEXT "To be updated ...",IDC_MarkMap_STATIC_CurrentEntryStyle,
63,60,80,10
LTEXT "XValue :",-1,21,75,40,9
LTEXT "To be updated...",IDC_MarkMap_STATIC_CurrentEntryYValue,
63,90,217,10
LTEXT "YValue :",-1,21,90,40,10
LTEXT "To be updated...",IDC_MarkMap_STATIC_CurrentEntrySValue,
63,105,217,10
LTEXT "SValue :",-1,21,105,40,10
LTEXT "To be updated...",IDC_MarkMap_STATIC_CurrentEntryValue,
62,90,217,10
END

View File

@ -1,55 +0,0 @@
// MapProperties.cpp : implementation file
//
#include "stdafx.h"
#include "PropertiesSheet.h"
/////////////////////////////////////////////////////////////////////////////
// CPropertiesSheet
IMPLEMENT_DYNAMIC(CPropertiesSheet, CPropertySheet)
CPropertiesSheet::CPropertiesSheet(CWnd* pParentWnd, UINT iSelectPage)
:CPropertySheet("View Map Properties", pParentWnd, iSelectPage)
{
}
void CPropertiesSheet::SetViewer (Handle(V2d_Viewer) aViewer)
{
AddPage(& m_pageWidthProperty);
m_pageWidthProperty.SetViewer(aViewer);
AddPage(& m_pageColorProperty);
m_pageColorProperty.SetViewer(aViewer);
AddPage(& m_pageFontProperty);
m_pageFontProperty.SetViewer(aViewer);
AddPage(& m_pageTypeProperty);
m_pageTypeProperty.SetViewer(aViewer);
AddPage(& m_pageMarkProperty);
m_pageMarkProperty.SetViewer(aViewer);
}
CPropertiesSheet::~CPropertiesSheet()
{
}
BEGIN_MESSAGE_MAP(CPropertiesSheet, CPropertySheet)
//{{AFX_MSG_MAP(CPropertiesSheet)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CPropertiesSheet message handlers
BOOL CPropertiesSheet::OnInitDialog()
{
BOOL bResult = CPropertySheet::OnInitDialog();
return bResult;
}

View File

@ -1,68 +0,0 @@
#if !defined(AFX_PropertiesSheet_H__A815F7A6_D51B_11D1_8DDE_0800369C8A03__INCLUDED_)
#define AFX_PropertiesSheet_H__A815F7A6_D51B_11D1_8DDE_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// PropertiesSheet.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// CPropertiesSheet
#include "ColorPropertyPage.h"
#include "FontPropertyPage.h"
#include "WidthPropertyPage.h"
#include "TypePropertyPage.h"
#include "MarkPropertyPage.h"
class CPropertiesSheet : public CPropertySheet
{
DECLARE_DYNAMIC(CPropertiesSheet)
private :
CColorPropertyPage m_pageColorProperty;
CFontPropertyPage m_pageFontProperty;
CWidthPropertyPage m_pageWidthProperty;
CTypePropertyPage m_pageTypeProperty;
CMarkPropertyPage m_pageMarkProperty;
// Construction
public:
CPropertiesSheet(CWnd* pParentWnd = NULL, UINT iSelectPage = 0);
void SetViewer (Handle(V2d_Viewer) aViewer);
// Attributes
public:
// Operations
public:
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CPropertiesSheet)
public:
virtual BOOL OnInitDialog();
//}}AFX_VIRTUAL
// Implementation
public:
virtual ~CPropertiesSheet();
// Generated message map functions
protected:
//{{AFX_MSG(CPropertiesSheet)
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_PropertiesSheet_H__A815F7A6_D51B_11D1_8DDE_0800369C8A03__INCLUDED_)

View File

@ -1,287 +0,0 @@
// TypePropertyPage.cpp : implementation file
//
#include "stdafx.h"
#include "TypePropertyPage.h"
#include "Aspect_TypeMap.hxx"
#include "Aspect_TypeMapEntry.hxx"
#include "TColQuantity_Array1OfLength.hxx"
#include "TColStd_SequenceOfReal.hxx"
/////////////////////////////////////////////////////////////////////////////
// CTypePropertyPage property page
IMPLEMENT_DYNCREATE(CTypePropertyPage, CPropertyPage)
CTypePropertyPage::CTypePropertyPage() : CPropertyPage(CTypePropertyPage::IDD)
{
//{{AFX_DATA_INIT(CTypePropertyPage)
m_TypeMapSize = _T("Computing...");
m_CurrentEntryStyle = _T("Computing...");
m_CurrentEntryValue = _T("Computing...");
m_NewEntryValue = _T("");
//}}AFX_DATA_INIT
}
BOOL CTypePropertyPage::OnInitDialog()
{
CPropertyPage::OnInitDialog();
// TODO: Add extra initialization here
m_NewEntryControl.AddString("SOLID");
m_NewEntryControl.AddString("DASH");
m_NewEntryControl.AddString("DOT");
m_NewEntryControl.AddString("DOTDASH");
m_NewEntryControl.AddString("USERDEFINED");
m_NewEntryControl.SetCurSel(1);
UpdateDisplay(1);
UpdateData(false);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
CTypePropertyPage::~CTypePropertyPage()
{
}
void CTypePropertyPage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CTypePropertyPage)
DDX_Control(pDX, IDC_TypeMap_TAB, m_TabCtrl);
DDX_Control(pDX, IDC_TypeMap_COMBO_NewEntryStyle, m_NewEntryControl);
DDX_Control(pDX, IDC_TypeMap_EDIT_NewEntryValue, m_NewEntryValueControl);
DDX_Text(pDX, IDC_TypeMap_STATIC_Size, m_TypeMapSize);
DDX_Text(pDX, IDC_TypeMap_STATIC_CurrentEntryStyle, m_CurrentEntryStyle);
DDX_Text(pDX, IDC_TypeMap_STATIC_CurrentEntryValue, m_CurrentEntryValue);
DDX_Text(pDX, IDC_TypeMap_EDIT_NewEntryValue, m_NewEntryValue);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CTypePropertyPage, CPropertyPage)
//{{AFX_MSG_MAP(CTypePropertyPage)
ON_BN_CLICKED(IDC_FontMap_BUTTON_NewEntry, OnFontMapBUTTONNewEntry)
ON_BN_CLICKED(IDC_FontMap_BUTTON_UpdateCurrent, OnFontMapBUTTONUpdateCurrent)
ON_EN_CHANGE(IDC_TypeMap_EDIT_NewEntryValue, OnChangeTypeMapEDITNewEntryValue)
ON_NOTIFY(TCN_SELCHANGE, IDC_TypeMap_TAB, OnSelchangeTypeMapTAB)
ON_CBN_SELCHANGE(IDC_TypeMap_COMBO_NewEntryStyle, OnSelchangeTypeMapCOMBONewEntryStyle)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CTypePropertyPage message handlers
void CTypePropertyPage::UpdateDisplay(int CurrentSelectionIndex)
{
TCollection_AsciiString SizeMessage(myTypeMap->Size());
m_TypeMapSize = _T(SizeMessage.ToCString());
m_TabCtrl.DeleteAllItems();
TC_ITEM TabCtrlItem;
TabCtrlItem.mask = TCIF_TEXT;
for(int i =1;i<=myTypeMap->Size();i++)
{
Aspect_TypeMapEntry aTypeMapEntry = myTypeMap->Entry(i);
TCollection_AsciiString EntryNumerMessage(aTypeMapEntry.Index());
TabCtrlItem.pszText = (LPSTR) EntryNumerMessage.ToCString();
m_TabCtrl.InsertItem( aTypeMapEntry.Index(), &TabCtrlItem );
}
m_TabCtrl.SetCurSel(CurrentSelectionIndex-1);
// update The Current Selected entry
Aspect_TypeMapEntry aTypeMapEntry = myTypeMap->Entry(CurrentSelectionIndex);
if (aTypeMapEntry. IsAllocated () )
{
Aspect_LineStyle TypeMapEntryType = aTypeMapEntry.Type() ;
switch (TypeMapEntryType.Style()) {
case Aspect_TOL_SOLID : m_CurrentEntryStyle = _T("SOLID"); break;
case Aspect_TOL_DASH : m_CurrentEntryStyle = _T("DASH"); break;
case Aspect_TOL_DOT : m_CurrentEntryStyle = _T("DOT"); break;
case Aspect_TOL_DOTDASH : m_CurrentEntryStyle = _T("DOTDASH"); break;
case Aspect_TOL_USERDEFINED : m_CurrentEntryStyle = _T("USERDEFINED"); break;
default : m_CurrentEntryStyle = _T("Underknown");
}
int NbValue = TypeMapEntryType.Length();
TCollection_AsciiString Message = BuildValuesAscii(TypeMapEntryType.Values());
m_CurrentEntryValue = _T(Message.ToCString());
m_NewEntryControl.SetCurSel(TypeMapEntryType.Style());
m_NewEntryValue = _T(Message.ToCString());
if (TypeMapEntryType.Style() == Aspect_TOL_USERDEFINED)
m_NewEntryValueControl.SetReadOnly( false );
else
m_NewEntryValueControl.SetReadOnly( true );
}
else
{
m_CurrentEntryStyle = _T("Not Allocated");
m_CurrentEntryValue = _T("");
m_NewEntryValue = _T("No value");
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_HIDE);
}
}
void CTypePropertyPage::OnSelchangeTypeMapTAB(NMHDR* pNMHDR, LRESULT* pResult)
{
UpdateDisplay(m_TabCtrl.GetCurSel()+1);
UpdateData(false);
*pResult = 0;
}
void CTypePropertyPage::OnSelchangeTypeMapCOMBONewEntryStyle()
{
UpdateData(true);
// the Type Map entry change in the edit part
if (m_NewEntryControl.GetCurSel() == Aspect_TOL_USERDEFINED)
m_NewEntryValueControl.SetReadOnly( false );
else
{
m_NewEntryValueControl.SetReadOnly( true );
// create a dummy map to extract the default values
Aspect_TypeMapEntry aTypeMapEntry(99,(Aspect_TypeOfLine)m_NewEntryControl.GetCurSel());
Aspect_LineStyle TypeMapEntryType = aTypeMapEntry.Type() ;
TCollection_AsciiString Message = BuildValuesAscii(TypeMapEntryType.Values());
m_NewEntryValue = _T(Message.ToCString());
}
UpdateData(false);
}
void CTypePropertyPage::OnChangeTypeMapEDITNewEntryValue()
{
UpdateData(true);
Handle(TColQuantity_HArray1OfLength) anArray;
Standard_Boolean IsDone = ExtractValues(TCollection_AsciiString((char *)(LPCSTR)m_NewEntryValue),anArray);
if (IsDone)
{
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry)->ShowWindow(SW_SHOW);
}
else
{
GetDlgItem(IDC_FontMap_BUTTON_UpdateCurrent)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_FontMap_BUTTON_NewEntry)->ShowWindow(SW_HIDE);
}
}
void CTypePropertyPage::OnFontMapBUTTONNewEntry()
{
UpdateData(true);
int NewEntry;
if (m_NewEntryControl.GetCurSel() == Aspect_TOL_USERDEFINED)
{
Handle(TColQuantity_HArray1OfLength) anArray;
if (ExtractValues(TCollection_AsciiString((char *)(LPCSTR)m_NewEntryValue),anArray))
{
Aspect_LineStyle aLineStyle(anArray->Array1());
NewEntry = myTypeMap->AddEntry( aLineStyle );
}
else Standard_Failure::Raise(" The String is not Valid ");
}
else
{
Aspect_LineStyle aLineStyle((Aspect_TypeOfLine)m_NewEntryControl.GetCurSel());
NewEntry = myTypeMap->AddEntry( aLineStyle );
}
SetModified(true);
UpdateDisplay(NewEntry);
UpdateData(false);
}
void CTypePropertyPage::OnFontMapBUTTONUpdateCurrent()
{
UpdateData(true);
Aspect_TypeMapEntry aTypeMapEntry = myTypeMap->Entry( m_TabCtrl.GetCurSel()+1);
if (m_NewEntryControl.GetCurSel() == Aspect_TOL_USERDEFINED)
{
Handle(TColQuantity_HArray1OfLength) anArray;
if (ExtractValues(TCollection_AsciiString((char *)(LPCSTR)m_NewEntryValue),anArray))
{
Aspect_LineStyle aLineStyle(anArray->Array1());
aTypeMapEntry.SetType( aLineStyle );
}
else Standard_Failure::Raise(" The String is not Valid ");
}
else
{
Aspect_LineStyle aLineStyle((Aspect_TypeOfLine)m_NewEntryControl.GetCurSel());
aTypeMapEntry.SetType( aLineStyle );
}
myTypeMap->AddEntry(aTypeMapEntry); // in fact just update
SetModified(true);
UpdateDisplay(m_TabCtrl.GetCurSel()+1);
UpdateData(false);
}
BOOL CTypePropertyPage::OnApply()
{
myViewer->SetTypeMap(myTypeMap);
myViewer->Update();
return CPropertyPage::OnApply();
}
Standard_Boolean CTypePropertyPage::ExtractValues(TCollection_AsciiString aMessage,
Handle(TColQuantity_HArray1OfLength)& anArray) // out
{
TColStd_SequenceOfReal aSequenceOfReal;
Standard_Integer CurrentStartValue=1;
bool NotFinish = true;
while (NotFinish)
{
CurrentStartValue = aMessage.SearchFromEnd(";");
if ( CurrentStartValue == aMessage.Length()) return Standard_False;
if (CurrentStartValue != -1)
{
TCollection_AsciiString aNewMessage = aMessage.Split(CurrentStartValue);
aMessage.Remove(aMessage.Length());
if (aNewMessage.IsRealValue())
aSequenceOfReal.Append(aNewMessage.RealValue());
else return Standard_False;
}
else
{
if (aMessage.IsRealValue())
aSequenceOfReal.Append(aMessage.RealValue());
else return Standard_False;
NotFinish = false;
}
}
anArray = new TColQuantity_HArray1OfLength(1,aSequenceOfReal.Length());
for (int i=1;i<=aSequenceOfReal.Length();i++)
anArray->SetValue(i,aSequenceOfReal(aSequenceOfReal.Length()-i+1));
return Standard_True;
}
TCollection_AsciiString CTypePropertyPage::BuildValuesAscii(const TColQuantity_Array1OfLength& anArray)
{
TCollection_AsciiString Message;
int NbValue = anArray.Length();
for (int j=1;j<NbValue;j++)
{
Message += anArray(j);
Message += " ; ";
}
Quantity_Length Length = anArray(NbValue);
if (Length > Precision::Confusion()) Message += Length;
else Message += "No value";
return Message;
}

View File

@ -1,81 +0,0 @@
#if !defined(AFX_TypePropertyPage_H__B6E7AAD3_DB72_11D1_8DE5_0800369C8A03__INCLUDED_)
#define AFX_TypePropertyPage_H__B6E7AAD3_DB72_11D1_8DE5_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// TypePropertyPage.h : header file
//
#include "V2d_Viewer.hxx"
#include "TColQuantity_HArray1OfLength.hxx"
/////////////////////////////////////////////////////////////////////////////
// CTypePropertyPage dialog
class CTypePropertyPage : public CPropertyPage
{
private :
Handle(Aspect_TypeMap) myTypeMap;
private :
Handle(V2d_Viewer) myViewer;
public:
void SetViewer(Handle(V2d_Viewer) aViewer) {
myViewer = aViewer;
myTypeMap = aViewer->TypeMap();
};
DECLARE_DYNCREATE(CTypePropertyPage)
// Construction
public:
CTypePropertyPage();
~CTypePropertyPage();
// Dialog Data
//{{AFX_DATA(CTypePropertyPage)
enum { IDD = IDD_DIALOG_Type };
CTabCtrl m_TabCtrl;
CComboBox m_NewEntryControl;
CString m_TypeMapSize;
CString m_CurrentEntryStyle;
CString m_CurrentEntryValue;
CEdit m_NewEntryValueControl;
CString m_NewEntryValue;
//}}AFX_DATA
// Overrides
// ClassWizard generate virtual function overrides
//{{AFX_VIRTUAL(CTypePropertyPage)
public:
virtual BOOL OnApply();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CTypePropertyPage)
virtual BOOL OnInitDialog();
afx_msg void OnFontMapBUTTONNewEntry();
afx_msg void OnFontMapBUTTONUpdateCurrent();
afx_msg void OnChangeTypeMapEDITNewEntryValue();
afx_msg void OnSelchangeTypeMapTAB(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnSelchangeTypeMapCOMBONewEntryStyle();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
void UpdateDisplay(int CurrentSelectionIndex);
TCollection_AsciiString BuildValuesAscii(const TColQuantity_Array1OfLength& anArray);
Standard_Boolean ExtractValues(TCollection_AsciiString aMessage,Handle(TColQuantity_HArray1OfLength)& anArray);
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_TypePropertyPage_H__B6E7AAD3_DB72_11D1_8DE5_0800369C8A03__INCLUDED_)

View File

@ -1,184 +0,0 @@
// WidthProperty.cpp : implementation file
//
#include "stdafx.h"
#include "WidthPropertyPage.h"
#include "Aspect_WidthMapEntry.hxx"
#include "Aspect_LineStyle.hxx"
/////////////////////////////////////////////////////////////////////////////
// CWidthPropertyPage property page
IMPLEMENT_DYNCREATE(CWidthPropertyPage, CPropertyPage)
CWidthPropertyPage::CWidthPropertyPage() : CPropertyPage(CWidthPropertyPage::IDD)
{
//{{AFX_DATA_INIT(CWidthPropertyPage)
m_WidthMapSize = _T("Computing...");
m_EntryType = _T("Computing...");
m_EntryWidth = _T("Computing...");
m_NewEntryWidth = 1;
//}}AFX_DATA_INIT
}
CWidthPropertyPage::~CWidthPropertyPage()
{
}
void CWidthPropertyPage::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CWidthPropertyPage)
DDX_Text (pDX, IDC_WidthMap_STATIC_Size, m_WidthMapSize);
DDX_Control (pDX, IDC_WidthMap_TAB, m_TabCtrl);
DDX_Text (pDX, IDC_WidthMap_STATIC_EntryType, m_EntryType);
DDX_Text (pDX, IDC_WidthMap_STATIC_EntryWidth, m_EntryWidth);
DDX_Control (pDX, IDC_WidthMap_COMBO_NewEntryType, m_NewEntryType);
DDX_Control (pDX, IDC_WidthMap_EDIT_NewEntryWidth, m_NewEntryWidthControl);
DDX_Text (pDX, IDC_WidthMap_EDIT_NewEntryWidth, m_NewEntryWidth);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CWidthPropertyPage, CPropertyPage)
//{{AFX_MSG_MAP(CWidthPropertyPage)
ON_NOTIFY(TCN_SELCHANGE, IDC_WidthMap_TAB, OnSelchangeDialogWidthTAB)
ON_BN_CLICKED(IDC_WidthMap_BUTTON_AddNewEntry, OnWidthMapBUTTONAddNewEntry)
ON_CBN_SELCHANGE(IDC_WidthMap_COMBO_NewEntryType, OnSelchangeWidthMapCOMBONewEntryType)
ON_BN_CLICKED(IDC_WidthMap_BUTTON_UpdateCurrentEntry, OnWidthMapBUTTONUpdateCurrentEntry)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CWidthPropertyPage message handlers
BOOL CWidthPropertyPage::OnInitDialog()
{
CPropertyPage::OnInitDialog();
// update the CComboBox to add the enumeration possibilities.
m_NewEntryType.AddString( "THIN" );
m_NewEntryType.AddString( "MEDIUM" );
m_NewEntryType.AddString( "THICK" );
m_NewEntryType.AddString( "VERYTHICK" );
m_NewEntryType.AddString( "USERDEFINED" );
m_NewEntryType.SetCurSel(0);
UpdateDisplay(1);
UpdateData(false);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
void CWidthPropertyPage::UpdateDisplay(int CurrentSelectionIndex)
{
// Update the size of the Width map
TCollection_AsciiString SizeMessage(myWidthMap->Size());
m_WidthMapSize = _T(SizeMessage.ToCString());
// clear the Tab Ctrl
m_TabCtrl.DeleteAllItems();
TC_ITEM TabCtrlItem;
TabCtrlItem.mask = TCIF_TEXT;
for(int i =1;i<=myWidthMap->Size();i++)
{
Aspect_WidthMapEntry aWidthMapEntry = myWidthMap->Entry(i);
TCollection_AsciiString EntryNumerMessage(aWidthMapEntry.Index());
TabCtrlItem.pszText = (LPSTR) EntryNumerMessage.ToCString();
m_TabCtrl.InsertItem( aWidthMapEntry.Index(), &TabCtrlItem );
}
m_TabCtrl.SetCurSel(CurrentSelectionIndex-1);
// update the current Entry informations
Aspect_WidthMapEntry aWidthMapEntry = myWidthMap->Entry(CurrentSelectionIndex);
// update the current entry
switch (aWidthMapEntry.Type()) {
case Aspect_WOL_THIN : m_EntryType = _T("Aspect_WOL_THIN") ; break;
case Aspect_WOL_MEDIUM : m_EntryType = _T("Aspect_WOL_MEDIUM") ; break;
case Aspect_WOL_THICK : m_EntryType = _T("Aspect_WOL_THICK") ; break;
case Aspect_WOL_VERYTHICK : m_EntryType = _T("Aspect_WOL_VERYTHICK") ; break;
case Aspect_WOL_USERDEFINED : m_EntryType = _T("Aspect_WOL_USERDEFINED") ; break;
default : cout<<" Underknown";
}
TCollection_AsciiString WidthMessage(aWidthMapEntry.Width());
m_EntryWidth = _T(WidthMessage.ToCString());
// update the edit / new part of the
// also update the edit part
m_NewEntryType.SetCurSel(aWidthMapEntry.Type());
m_NewEntryWidth = aWidthMapEntry.Width();
if (aWidthMapEntry.Type() == Aspect_WOL_USERDEFINED)
m_NewEntryWidthControl.SetReadOnly( false);
else
m_NewEntryWidthControl.SetReadOnly( true);
// if (CurrentSelectionIndex == 1) // the item 1 is not editable ( in the map by default )
// GetDlgItem(IDC_WidthMap_BUTTON_UpdateCurrentEntry)->ShowWindow(SW_HIDE);
// else
GetDlgItem(IDC_WidthMap_BUTTON_UpdateCurrentEntry)->ShowWindow(SW_SHOW);
}
void CWidthPropertyPage::OnSelchangeDialogWidthTAB(NMHDR* pNMHDR, LRESULT* pResult)
{
UpdateDisplay( m_TabCtrl.GetCurSel()+1);
UpdateData(false);
*pResult = 0;
}
void CWidthPropertyPage::OnSelchangeWidthMapCOMBONewEntryType()
{
UpdateData(true);
// the Width Map entry change in the edit part
if (m_NewEntryType.GetCurSel() == Aspect_WOL_USERDEFINED)
m_NewEntryWidthControl.SetReadOnly( false);
else
{
m_NewEntryWidthControl.SetReadOnly( true);
Aspect_WidthMapEntry aTmpWidthMapEntry (99,(Aspect_WidthOfLine)m_NewEntryType.GetCurSel());
m_NewEntryWidth = aTmpWidthMapEntry.Width();
}
UpdateData(false);
}
void CWidthPropertyPage::OnWidthMapBUTTONAddNewEntry()
{
UpdateData(true);
int NewEntry;
if (m_NewEntryType.GetCurSel() == Aspect_WOL_USERDEFINED)
NewEntry =myWidthMap->AddEntry(m_NewEntryWidth);
else
NewEntry =myWidthMap->AddEntry( (Aspect_WidthOfLine)m_NewEntryType.GetCurSel());
SetModified(true);
UpdateDisplay(NewEntry);
UpdateData(false);
}
void CWidthPropertyPage::OnWidthMapBUTTONUpdateCurrentEntry()
{
UpdateData(true);
Aspect_WidthMapEntry aWidthMapEntry = myWidthMap->Entry( m_TabCtrl.GetCurSel()+1);
if (m_NewEntryType.GetCurSel() == Aspect_WOL_USERDEFINED)
aWidthMapEntry.SetWidth(m_NewEntryWidth );
else
aWidthMapEntry.SetType((Aspect_WidthOfLine)m_NewEntryType.GetCurSel());
myWidthMap->AddEntry(aWidthMapEntry); // in fact just update
SetModified(true);
UpdateDisplay(m_TabCtrl.GetCurSel()+1);
UpdateData(false);
}
BOOL CWidthPropertyPage::OnApply()
{
//AfxGetMainWnd()->SendMessage(WM_USERAPPLY_InMapProperties);
myViewer->SetWidthMap(myWidthMap);
myViewer->Update();
return CPropertyPage::OnApply();
}

View File

@ -1,73 +0,0 @@
#if !defined(AFX_WIDTHPROPERTY_H__0F6C04B3_D5DB_11D1_8DDF_0800369C8A03__INCLUDED_)
#define AFX_WIDTHPROPERTY_H__0F6C04B3_D5DB_11D1_8DDF_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// WidthProperty.h : header file
//
#include "Aspect_WidthMap.hxx"
/////////////////////////////////////////////////////////////////////////////
// CWidthPropertyPage dialog
class CWidthPropertyPage : public CPropertyPage
{
DECLARE_DYNCREATE(CWidthPropertyPage)
private :
Handle(Aspect_WidthMap) myWidthMap;
private :
Handle(V2d_Viewer) myViewer;
public:
void SetViewer(Handle(V2d_Viewer) aViewer) {
myViewer = aViewer;
myWidthMap = aViewer->WidthMap();
};
// Construction
public:
CWidthPropertyPage();
~CWidthPropertyPage();
// Dialog Data
//{{AFX_DATA(CWidthPropertyPage)
enum { IDD = IDD_DIALOG_Width };
CString m_WidthMapSize;
CTabCtrl m_TabCtrl;
CString m_EntryType;
CString m_EntryWidth;
CComboBox m_NewEntryType;
CEdit m_NewEntryWidthControl;
double m_NewEntryWidth;
//}}AFX_DATA
// Overrides
// ClassWizard generate virtual function overrides
//{{AFX_VIRTUAL(CWidthPropertyPage)
public:
virtual BOOL OnApply();
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CWidthPropertyPage)
afx_msg void OnSelchangeDialogWidthTAB(NMHDR* pNMHDR, LRESULT* pResult);
virtual BOOL OnInitDialog();
afx_msg void OnWidthMapBUTTONAddNewEntry();
afx_msg void OnSelchangeWidthMapCOMBONewEntryType();
afx_msg void OnWidthMapBUTTONUpdateCurrentEntry();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
void UpdateDisplay(int CurrentSelectionIndex);
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_WIDTHPROPERTY_H__0F6C04B3_D5DB_11D1_8DDF_0800369C8A03__INCLUDED_)

View File

@ -1,61 +0,0 @@
#if !defined(AFX_ColorNewColorRampColorMapDialog_H__A45F6973_DB41_11D1_8DE5_0800369C8A03__INCLUDED_)
#define AFX_ColorNewColorRampColorMapDialog_H__A45F6973_DB41_11D1_8DE5_0800369C8A03__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
// ColorNewColorRampColorMapDialog.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// CColorNewColorRampColorMapDialog dialog
class CColorNewColorRampColorMapDialog : public CDialog
{
private :
Handle(Aspect_ColorMap) myColorMap;
// Construction
public:
CColorNewColorRampColorMapDialog(CWnd* pParent = NULL); // standard constructor
Handle(Aspect_ColorMap) ColorMap() {return myColorMap;};
// Dialog Data
//{{AFX_DATA(CColorNewColorRampColorMapDialog)
enum { IDD = IDD_DIALOG_NewColorRamp };
CComboBox m_ColorList;
int m_base_pixel;
int m_dimension;
double m_Red;
double m_Green;
double m_Blue;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CColorNewColorRampColorMapDialog)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CColorNewColorRampColorMapDialog)
virtual void OnOK();
afx_msg void OnColorMapRampBUTTONEditColor();
virtual BOOL OnInitDialog();
afx_msg void OnChangeColorMapRampEDITColorRed();
afx_msg void OnChangeColorMapRampEDITColorGreen();
afx_msg void OnChangeColorMapRampEDITColorBlue();
afx_msg void OnSelchangeColorMapCOMBONewEntryColorName();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_ColorNewColorRampColorMapDialog_H__A45F6973_DB41_11D1_8DE5_0800369C8A03__INCLUDED_)

View File

@ -72,170 +72,110 @@
# pragma comment (lib,"TKernel.lib")
*/
#include <Standard_ErrorHandler.hxx>
#include <AIS_Drawer.hxx>
#include <AIS_Circle.hxx>
#include <AIS_Line.hxx>
#include <AIS_InteractiveContext.hxx>
#include <AIS_InteractiveObject.hxx>
#include <AIS_LocalContext.hxx>
#include <AIS_TexturedShape.hxx>
#include <WNT_Window.hxx>
#include <V2d_Viewer.hxx>
#include <V2d_View.hxx>
#include <WNT_GraphicDevice.hxx>
#include <Aspect_WindowDriver.hxx>
#include "gp_Pnt2d.hxx"
#include "Geom2d_Curve.hxx"
#include "GCE2d_MakeSegment.hxx"
#include "gp_Pnt2d.hxx"
#include <Graphic2d_SetOfCurves.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Bnd_Box2d.hxx>
#include <BndLib_Add2dCurve.hxx>
#include <Precision.hxx>
#include <Select2D_SensitiveBox.hxx>
#include <Select2D_SensitiveSegment.hxx>
#include <gp_Circ2d.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Ax2d.hxx>
#include <Select2D_SensitiveArc.hxx>
#include <Geom2d_Curve.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <gp_Pnt2d.hxx>
#include <GCE2d_MakeSegment.hxx>
#include <gp_Vec2d.hxx>
#include <OSD_Environment.hxx>
#include <Graphic2d_Array1OfVertex.hxx>
#include <Graphic2d_PolyLine.hxx>
#include "SelectMgr_Selection.hxx"
#include <Quantity_Length.hxx>
#include <Aspect_MarkMapEntry.hxx>
#include <Aspect_ColorMapEntry.hxx>
#include <Aspect_ColorScale.hxx>
#include <Aspect_GenericColorMap.hxx>
#include <Aspect_ColorMap.hxx>
#include <Aspect_FontMap.hxx>
#include <Aspect_MarkMap.hxx>
#include <Aspect_TypeMap.hxx>
#include <Aspect_WidthMap.hxx>
#include <Aspect_TypeOfline.hxx>
#include <Aspect_WidthOfline.hxx>
#include <Standard_Integer.hxx>
#include <SelectMgr_SelectableObject.hxx>
#include <Handle_PrsMgr_PresentationManager2d.hxx>
#include <Handle_Graphic2d_GraphicObject.hxx>
#include <Handle_SelectMgr_Selection.hxx>
#include <Standard_OStream.hxx>
#include <Standard_IStream.hxx>
#include <Standard_CString.hxx>
#include "Geom2d_Curve.hxx"
#include <Aspect_Window.hxx>
#include <Aspect_Background.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <SelectMgr_SelectionManager.hxx>
#include <V2d_Viewer.hxx>
#include <V2d_View.hxx>
#include <PrsMgr_PresentationManager2d.hxx>
#include <StdSelect_ViewerSelector2d.hxx>
#include "SelectMgr_SelectableObject.hxx"
#include <Handle_V2d_Viewer.hxx>
#include <Handle_PrsMgr_PresentationManager2d.hxx>
#include <Handle_SelectMgr_SelectionManager.hxx>
#include <Handle_StdSelect_ViewerSelector2d.hxx>
#include <MMgt_TShared.hxx>
#include <Handle_SelectMgr_SelectableObject.hxx>
#include <Standard_Boolean.hxx>
#include <Handle_V2d_View.hxx>
#include <Graphic2d_Buffer.hxx>
class V2d_Viewer;
class PrsMgr_PresentationManager2d;
class SelectMgr_SelectionManager;
#include <StdSelect_ViewerSelector2d.hxx>
class SelectMgr_SelectableObject;
class V2d_View;
#include <SelectMgr_SelectableObject.hxx>
class ISession2D_InteractiveObject;
#include <SelectMgr_EntityOwner.hxx>
#include <Aspect_TypeOfText.hxx>
#include <BRepPrimAPI_MakeBox.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <BRepTools.hxx>
#include <Bnd_Box2d.hxx>
#include <gp_Lin2d.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Vec2d.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <SelectBasics_BasicTool.hxx>
#include <BndLib_Add2dCurve.hxx>
#include <GCE2d_MakeSegment.hxx>
#include <GCPnts_TangentialDeflection.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <Standard_Integer.hxx>
#include <gp_Pnt2d.hxx>
#include <Select2D_SensitiveEntity.hxx>
#include <Handle_SelectBasics_EntityOwner.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
class SelectBasics_EntityOwner;
class gp_Pnt2d;
#include <SelectBasics_ListOfBox2d.hxx>
#include "TColgp_HArray1OfPnt2d.hxx"
#include <Geom2d_Curve.hxx>
#include <Graphic2d_Text.hxx>
#include <Select2D_SensitiveBox.hxx>
#include <Graphic2d_Segment.hxx>
#include <Geom_CartesianPoint.hxx>
#include <Geom_Circle.hxx>
#include <Geom_Curve.hxx>
#include <Geom_Line.hxx>
#include <Geom2d_Curve.hxx>
#include <Geom2d_TrimmedCurve.hxx>
#include <Geom2dAdaptor_Curve.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <Graphic3d_AspectText3d.hxx>
#include <Graphic3d_Group.hxx>
#include <Graphic3d_AspectMarker3d.hxx>
#include <Graphic3d_StructureManager.hxx>
#include <Graphic3d_Texture1Dsegment.hxx>
#include <gp_Ax2d.hxx>
#include <gp_Circ.hxx>
#include <gp_Circ2d.hxx>
#include <gp_Dir2d.hxx>
#include <gp_Lin2d.hxx>
#include <gp_Pln.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_Vec2d.hxx>
#include <HLRAlgo_Projector.hxx>
#include <MMgt_TShared.hxx>
#include <OSD_Environment.hxx>
#include <Graphic2d_View.hxx>
#include <Graphic2d_Drawer.hxx>
#include "PrsMgr_PresentationManager2d.hxx"
#include "SelectMgr_Selection.hxx"
#include "Graphic2d_Array1OfVertex.hxx"
#include "Graphic2d_Polyline.hxx"
#include "Graphic2d_Vertex.hxx"
#include "Graphic2d_DisplayList.hxx"
#include <Precision.hxx>
#include <Prs3d_LineAspect.hxx>
#include <Prs3d_PlaneAspect.hxx>
#include <Prs3d_Presentation.hxx>
#include <Quantity_Factor.hxx>
#include <Quantity_Length.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <SelectBasics_ListOfBox2d.hxx>
#include <SelectBasics_BasicTool.hxx>
#include <SelectMgr_EntityOwner.hxx>
#include <SelectMgr_Selection.hxx>
#include <SelectMgr_SelectableObject.hxx>
#include <SelectMgr_SelectionManager.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <SelectMgr_Selection.hxx>
#include <Standard_OStream.hxx>
#include <Standard_IStream.hxx>
#include <Standard_CString.hxx>
#include <SelectMgr_SelectableObject.hxx>
#include <TCollection_AsciiString.hxx>
#include <Aspect_TypeOfText.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
#include <Quantity_Factor.hxx>
#include <Quantity_PlaneAngle.hxx>
#include <Handle_PrsMgr_PresentationManager2d.hxx>
#include <Handle_Graphic2d_GraphicObject.hxx>
#include <Handle_SelectMgr_Selection.hxx>
class TCollection_AsciiString;
class Graphic2d_GraphicObject;
#include <SelectMgr_EntityOwner.hxx>
#include "Aspect_MarkMap.hxx"
#include "V2d_View.hxx"
#include "Aspect_ColorMap.hxx"
#include "Aspect_FontMap.hxx"
#include "Aspect_MarkMap.hxx"
#include "Aspect_TypeMap.hxx"
#include "Aspect_WidthMap.hxx"
#include "Aspect_MarkMap.hxx"
#include "StdSelect_TextProjector2d.hxx"
#include "StdSelect_SensitiveText2d.hxx"
#include "WNT_FontMapEntry.hxx"
#include "WNT_WDriver.hxx"
#include "HLRAlgo_Projector.hxx"
#include "AIS2D_InteractiveContext.hxx"
#include "AIS2D_InteractiveObject.hxx"
#include "Graphic2d_TypeOfPolygonFilling.hxx"
#include "Prs2d_AspectLine.hxx"
#include <Standard_OStream.hxx>
#include <Standard_IStream.hxx>
#include <Standard_CString.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColgp_HArray1OfPnt2d.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>
#include <Visual3d_ViewManager.hxx>
#include <V3d_View.hxx>
#include <V3d_Viewer.hxx>
#include <WNT_Window.hxx>
#include <..\res\resource.h>
class ISession2D_InteractiveObject;
class V3d_Viewer;
class SelectMgr_SelectableObject;
class TCollection_AsciiString;
class SelectBasics_EntityOwner;
class gp_Pnt2d;
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.

View File

@ -19,12 +19,11 @@ static char THIS_FILE[] = __FILE__;
/////////////////////////////////////////////////////////////////////////////
// CViewer2dApp construction
CViewer2dApp::CViewer2dApp()
CViewer2dApp::CViewer2dApp() : OCC_App()
{
SampleName = "Viewer2d"; //for about dialog
SampleName = "Viewer2d"; //for about dialog
}
/////////////////////////////////////////////////////////////////////////////
// The one and only CViewer2dApp object

View File

@ -8,18 +8,20 @@
#pragma once
#endif // _MSC_VER > 1000
#include <OCC_2dApp.h>
#include <OCC_App.h>
class CViewer2dApp : public OCC_2dApp
class CViewer2dApp : public OCC_App
{
public:
CViewer2dApp();
CViewer2dApp();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CViewer2dApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CViewer2dApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
};

File diff suppressed because it is too large Load Diff

View File

@ -2,6 +2,9 @@
//
/////////////////////////////////////////////////////////////////////////////
#include <AIS_Shape.hxx>
#include <AIS_LocalContext.hxx>
#include <TopoDS_Face.hxx>
#include "OCC_2dDoc.h"
@ -24,12 +27,11 @@ protected:
// Generated message map functions
protected:
//{{AFX_MSG(CViewer2dDoc)
afx_msg void OnBUTTONTest2DProperties();
afx_msg void OnBUTTONTestText();
afx_msg void OnBUTTONTestMarkers();
afx_msg void OnBUTTONTestLine();
afx_msg void OnBUTTONErase();
afx_msg void OnBUTTONTestFase();
afx_msg void OnBUTTONTestFace();
afx_msg void OnBUTTONTestRect();
afx_msg void OnBUTTONTestCurve();
afx_msg void OnBUTTONTestImage();

View File

@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bin/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -154,7 +154,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bin/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -196,7 +196,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bind/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -239,7 +239,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bind/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -116,7 +116,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bin/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bin/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -200,7 +200,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bind/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -243,7 +243,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKBRep.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bind/Viewer3d.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc8\bin/Viewer3d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc8\bin/Viewer3d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -275,7 +275,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc8\bind/Viewer3d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -373,7 +373,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc8\bind/Viewer3d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

View File

@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc9\bin/Viewer3d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc9\bin/Viewer3d.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc9\bind/Viewer3d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -371,7 +371,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKBRep.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc9\bin/Viewer3d.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

View File

@ -145,7 +145,7 @@ Handle_AIS_TexturedShape TexturesExt_Presentation::Texturize(const TopoDS_Shape&
TCollection_AsciiString TFileName;
// load texture from file if it is not an integer value
// integer value indicates a number of texture in predefined TexturesExt enumeration
CString initfile(((OCC_BaseApp*) AfxGetApp())->GetInitDataDir());
CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir());
initfile += "\\Data\\";
if (!aTFileName.IsIntegerValue())
{
@ -174,7 +174,7 @@ Standard_Boolean TexturesExt_Presentation::loadShape(TopoDS_Shape& aShape,
TCollection_AsciiString aFileName)
{
// create a TopoDS_Shape -> read from a brep file
CString initfile(((OCC_BaseApp*) AfxGetApp())->GetInitDataDir());
CString initfile(((OCC_App*) AfxGetApp())->GetInitDataDir());
initfile += "\\Data\\";
initfile += aFileName.ToCString();

View File

@ -26,9 +26,9 @@ END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CViewer3dApp construction
CViewer3dApp::CViewer3dApp()
CViewer3dApp::CViewer3dApp() : OCC_App()
{
SampleName = "Viewer3d"; //for about dialog
SampleName = "Viewer3d"; //for about dialog
}
/////////////////////////////////////////////////////////////////////////////

View File

@ -8,24 +8,24 @@
#pragma once
#endif // _MSC_VER >= 1000
#include <OCC_3dApp.h>
#include <OCC_App.h>
class CViewer3dApp : public OCC_3dApp
class CViewer3dApp : public OCC_App
{
public:
CViewer3dApp();
CViewer3dApp();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CViewer3dApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CViewer3dApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
DECLARE_MESSAGE_MAP()
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////
//{{AFX_INSERT_LOCATION}}

View File

@ -460,7 +460,6 @@ void CViewer3dDoc::OnObjectErase()
OCC_3dBaseDoc::OnObjectErase();
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
}
void CViewer3dDoc::OnObjectDisplayall()
@ -469,7 +468,6 @@ void CViewer3dDoc::OnObjectDisplayall()
OCC_3dBaseDoc::OnObjectDisplayall();
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
}
Handle_User_Cylinder CViewer3dDoc::GetCylinder()
@ -521,77 +519,85 @@ void CViewer3dDoc::InputEvent(const Standard_Integer x ,
const Standard_Integer y ,
const Handle(V3d_View)& aView )
{
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
if (myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
Quantity_Color CSFColor ;
COLORREF MSColor ;
myAISContext->Select();
// Change the color of a selected face in a user cylinder
if (myState == FACE_COLOR) {
myAISContext->InitSelected();
if (myAISContext->MoreSelected()) {
//Handle_AIS_InteractiveObject Current = myAISContext->Current() ;
Handle_AIS_InteractiveObject Current = myAISContext->SelectedInteractive() ;
if ( Current->HasColor () ) {
CSFColor = myAISContext->Color(Current);
MSColor = RGB (CSFColor.Red()*255.,CSFColor.Green()*255.,CSFColor.Blue()*255.);
}
else {
MSColor = RGB ( 255,255,255 ) ;
}
CColorDialog dlgColor(MSColor);
if (dlgColor.DoModal() == IDOK) {
MSColor = dlgColor.GetColor();
CSFColor = Quantity_Color (GetRValue(MSColor)/255.,
GetGValue(MSColor)/255.,
GetBValue(MSColor)/255.,Quantity_TOC_RGB);
TopoDS_Shape S = myAISContext->SelectedShape();
Handle(Geom_Surface) Surface = BRep_Tool::Surface(TopoDS::Face(S));
if (Surface->IsKind(STANDARD_TYPE(Geom_Plane)))
//Handle(User_Cylinder)::DownCast(myAISContext->Current())->SetPlanarFaceColor(CSFColor.Name());
Handle(User_Cylinder)::DownCast(myAISContext->SelectedInteractive())->SetPlanarFaceColor(CSFColor.Name());
else
//Handle(User_Cylinder)::DownCast(myAISContext->Current())->SetCylindricalFaceColor(CSFColor.Name());
Handle(User_Cylinder)::DownCast(myAISContext->SelectedInteractive())->SetCylindricalFaceColor(CSFColor.Name());
//myAISContext->Redisplay(myAISContext->Current());
myAISContext->Redisplay(myAISContext->SelectedInteractive());
myState = -1;
myAISContext->CloseLocalContext();
}
}
TCollection_AsciiString Message ("\
TopoDS_Shape S = myAISContext->SelectedShape(); \n\
\n\
Handle(Geom_Surface) Surface = BRep_Tool::Surface(TopoDS::Face(S)); \n\
\n\
if (Surface->IsKind(STANDARD_TYPE(Geom_Plane))) \n\
Handle(User_Cylinder)::DownCast(myAISContext->Current())->SetPlanarFaceColor(CSFColor.Name()); \n\
else \n\
Handle(User_Cylinder)::DownCast(myAISContext->Current())->SetCylindricalFaceColor(CSFColor.Name()); \n\
\n\
myAISContext->Redisplay(myAISContext->Current()); \n\
\n\
myAISContext->CloseLocalContext(); \n\
\n\
\n\
NOTE: a User_Cylinder is an object defined by the user. \n\
The User_Cylinder class inherit from the AIS_InteractiveObject \n\
Cascade class, it's use is the same as an AIS_InteractiveObject. \n\
Methods SetPlanarFaceColor and SetCylindricalFaceColor are also \n\
defined in the User_Cylinder class. \n\
\n");
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Change face color"));
myCResultDialog.SetText(text);
SetTitle(CString("Change face color"));
}
Quantity_Color CSFColor;
COLORREF MSColor;
myAISContext->Select();
// Change the color of a selected face in a user cylinder
if (myState == FACE_COLOR)
{
myAISContext->InitSelected();
if (myAISContext->MoreSelected())
{
Handle_AIS_InteractiveObject Current = myAISContext->SelectedInteractive();
if (Current->HasColor())
{
CSFColor = myAISContext->Color (Current);
MSColor = RGB (CSFColor.Red()*255.0, CSFColor.Green()*255.0, CSFColor.Blue()*255.0);
}
else
{
MSColor = RGB (255, 255, 255);
}
CColorDialog dlgColor(MSColor);
if (dlgColor.DoModal() == IDOK)
{
MSColor = dlgColor.GetColor();
CSFColor = Quantity_Color (GetRValue (MSColor)/255.0,
GetGValue (MSColor)/255.0,
GetBValue (MSColor)/255.0,
Quantity_TOC_RGB);
TopoDS_Shape S = myAISContext->SelectedShape();
Handle(Geom_Surface) Surface = BRep_Tool::Surface (TopoDS::Face(S));
if (Surface->IsKind (STANDARD_TYPE (Geom_Plane)))
{
Handle(User_Cylinder)::DownCast (myAISContext->SelectedInteractive())
->SetPlanarFaceColor (CSFColor.Name());
}
else
{
Handle(User_Cylinder)::DownCast (myAISContext->SelectedInteractive())
->SetCylindricalFaceColor (CSFColor.Name());
}
myAISContext->Redisplay (myAISContext->SelectedInteractive());
myState = -1;
myAISContext->CloseLocalContext();
}
}
TCollection_AsciiString aMessage (" TopoDS_Shape S = myAISContext->SelectedShape(); \n"
" \n"
" Handle(Geom_Surface) Surface = BRep_Tool::Surface(TopoDS::Face(S));"
" if (Surface->IsKind(STANDARD_TYPE(Geom_Plane))) \n"
" Handle(User_Cylinder)::DownCast(myAISContext->Current())->SetPlanarFaceColor(CSFColor.Name()); \n"
" else \n"
" Handle(User_Cylinder)::DownCast(myAISContext->Current())->SetCylindricalFaceColor(CSFColor.Name()); \n"
" \n"
" myAISContext->Redisplay(myAISContext->Current()); \n"
" \n"
" myAISContext->CloseLocalContext(); \n"
" \n"
" \n"
" NOTE: a User_Cylinder is an object defined by the user. \n"
" The User_Cylinder class inherit from the AIS_InteractiveObject \n"
" Cascade class, it's use is the same as an AIS_InteractiveObject. \n"
" Methods SetPlanarFaceColor and SetCylindricalFaceColor are also \n"
" defined in the User_Cylinder class. \n"
" \n");
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString ("Change face color"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Change face color"));
}
}
//-----------------------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------------------
@ -600,9 +606,9 @@ void CViewer3dDoc::ShiftDragEvent(const Standard_Integer x ,
const Standard_Integer TheState ,
const Handle(V3d_View)& aView )
{
OCC_3dBaseDoc::ShiftDragEvent(x,y,TheState,aView);
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
OCC_3dBaseDoc::ShiftDragEvent(x,y,TheState,aView);
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
}
@ -614,33 +620,29 @@ void CViewer3dDoc::ShiftInputEvent(const Standard_Integer x ,
const Standard_Integer y ,
const Handle(V3d_View)& aView )
{
OCC_3dBaseDoc::ShiftInputEvent(x,y,aView);
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
OCC_3dBaseDoc::ShiftInputEvent(x,y,aView);
if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues();
}
void CViewer3dDoc::OnObjectColoredMesh()
{
for(myAISContext->InitCurrent();myAISContext->MoreCurrent();myAISContext->NextCurrent())
if (myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder))){
myAISContext->ClearPrs(myAISContext->Current(),6,Standard_False);
myAISContext->RecomputePrsOnly(myAISContext->Current(),Standard_False);
myAISContext->SetDisplayMode(myAISContext->Current(),6);
}
if (myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder)))
{
myAISContext->ClearPrs(myAISContext->Current(),6,Standard_False);
myAISContext->RecomputePrsOnly(myAISContext->Current(),Standard_False);
myAISContext->SetDisplayMode(myAISContext->Current(),6);
}
}
void CViewer3dDoc::OnUpdateObjectColoredMesh(CCmdUI* pCmdUI)
{
bool CylinderIsCurrentAndDisplayed = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ())
//if ((myAISContext->IsDisplayed(myAISContext->Current(),1) || myAISContext->IsDisplayed(myAISContext->Current(),0))
// && myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder)))
if(myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder)))
CylinderIsCurrentAndDisplayed=true;
pCmdUI->Enable (CylinderIsCurrentAndDisplayed);
}
void CViewer3dDoc::OnUpdateObjectWireframe(CCmdUI* pCmdUI)
@ -700,19 +702,6 @@ void CViewer3dDoc::OnUpdateOptionsTrihedronStaticTrihedron(CCmdUI* pCmdUI)
}
/*
void CViewer3dDoc::OnUpdateObjectColor(CCmdUI* pCmdUI)
{
bool OneOrMoreInShadingOrWireframe = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)
|| myAISContext->IsDisplayed(myAISContext->Current(),0))
OneOrMoreInShadingOrWireframe = true;
pCmdUI->Enable (OneOrMoreInShadingOrWireframe);
}
*/
void CViewer3dDoc::Popup( const Standard_Integer x,
const Standard_Integer y ,
const Handle(V3d_View)& aView )
@ -747,85 +736,82 @@ void CViewer3dDoc::Popup( const Standard_Integer x,
pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON , winCoord.x, winCoord.y ,
AfxGetMainWnd());
}
//Set faces selection mode
void CViewer3dDoc::OnFaces()
{
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_FACE);
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_FACE);
TCollection_AsciiString Message ("\
myAISContext->OpenLocalContext(); \n\
\n\
myAISContext->ActivateStandardMode(TopAbs_FACE); \n\
\n");
TCollection_AsciiString aMessage (" myAISContext->OpenLocalContext(); \n"
" \n"
" myAISContext->ActivateStandardMode(TopAbs_FACE); \n"
" \n");
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Standard mode: TopAbs_FACE"));
myCResultDialog.SetText(text);
SetTitle(CString("Standard mode: TopAbs_FACE"));
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString("Standard mode: TopAbs_FACE"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Standard mode: TopAbs_FACE"));
}
//Set edges selection mode
void CViewer3dDoc::OnEdges()
{
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_EDGE);
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_EDGE);
TCollection_AsciiString Message ("\
myAISContext->OpenLocalContext(); \n\
\n\
myAISContext->ActivateStandardMode(TopAbs_EDGE); \n\
\n");
TCollection_AsciiString aMessage (" myAISContext->OpenLocalContext(); \n"
" \n"
" myAISContext->ActivateStandardMode(TopAbs_EDGE); \n"
" \n");
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Standard mode: TopAbs_EDGE"));
myCResultDialog.SetText(text);
SetTitle(CString("Standard mode: TopAbs_EDGE"));
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString ("Standard mode: TopAbs_EDGE"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Standard mode: TopAbs_EDGE"));
}
// Set vertices selection mode
void CViewer3dDoc::OnVertices()
{
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_VERTEX);
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_VERTEX);
TCollection_AsciiString Message ("\
myAISContext->OpenLocalContext(); \n\
\n\
myAISContext->ActivateStandardMode(TopAbs_VERTEX); \n\
\n");
TCollection_AsciiString aMessage (" myAISContext->OpenLocalContext(); \n"
" \n"
" myAISContext->ActivateStandardMode(TopAbs_VERTEX); \n"
" \n");
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Standard mode: TopAbs_VERTEX"));
myCResultDialog.SetText(text);
SetTitle(CString("Standard mode: TopAbs_VERTEX"));
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString ("Standard mode: TopAbs_VERTEX"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Standard mode: TopAbs_VERTEX"));
}
//Neutral selection mode
void CViewer3dDoc::OnNeutral()
{
myAISContext->CloseAllContexts();
myAISContext->CloseAllContexts();
TCollection_AsciiString Message ("\
myAISContext->CloseAllContexts(); \n\
\n");
TCollection_AsciiString aMessage (" myAISContext->CloseAllContexts(); \n"
" \n");
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Standard mode: Neutral"));
myCResultDialog.SetText(text);
SetTitle(CString("Standard mode: Neutral"));
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString ("Standard mode: Neutral"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Standard mode: Neutral"));
}
// Change the color of faces on a user cylinder
void CViewer3dDoc::OnUsercylinderChangefacecolor()
{
myAISContext->OpenLocalContext();
myAISContext->Activate(myAISContext->Current(),4);
myState = FACE_COLOR;
// see the following of treatment in inputevent
myAISContext->OpenLocalContext();
myAISContext->Activate(myAISContext->Current(),4);
myState = FACE_COLOR;
// see the following of treatment in inputevent
}
// Make 3d fillets on solids
@ -833,167 +819,170 @@ void CViewer3dDoc::OnUsercylinderChangefacecolor()
// before running this function
void CViewer3dDoc::OnFillet3d()
{
if( !myAISContext->HasOpenedContext())
if (!myAISContext->HasOpenedContext())
{
AfxMessageBox("It is necessary to activate the edges selection mode\n"
"and select edges on an object before \nrunning this function");
return;
}
myAISContext->InitSelected();
if (myAISContext->MoreSelected())
{
Handle(AIS_Shape) S = Handle(AIS_Shape)::DownCast (myAISContext->SelectedInteractive());
if (S.IsNull())
{
AfxMessageBox("It is necessary to activate the edges selection mode\n\
and select edges on an object before \nrunning this function");
return;
AfxMessageBox("It is necessary to activate the edges selection mode\n"
"and select edges on an object before \nrunning this function");
return;
}
myAISContext->InitSelected();
if (myAISContext->MoreSelected()) {
Handle(AIS_Shape) S = Handle(AIS_Shape)::DownCast(myAISContext->SelectedInteractive());
if (S.IsNull()){
AfxMessageBox("It is necessary to activate the edges selection mode\n\
and select edges on an object before \nrunning this function");
return;
}
TopoDS_Shape Sh=S->Shape();
BRepFilletAPI_MakeFillet aFillet(Sh);
for (myAISContext->InitSelected(); myAISContext->MoreSelected(); myAISContext->NextSelected())
{
TopoDS_Edge anEdge;
try {
anEdge=TopoDS::Edge(myAISContext->SelectedShape());
}
catch(Standard_Failure)
{
}
if (anEdge.IsNull())
{
AfxMessageBox("It is necessary to activate the edges selection mode\n\
and select edges on an object before \nrunning this function");
return;
}
}
BoxRadius dlg(NULL,10.);
if (dlg.DoModal() == IDOK){
for (myAISContext->InitSelected(); myAISContext->MoreSelected(); myAISContext->NextSelected()){
TopoDS_Edge anEdge = TopoDS::Edge(myAISContext->SelectedShape());
aFillet.Add(dlg.m_radius,anEdge);
}
}
else return;
TopoDS_Shape Sh=S->Shape();
TopoDS_Shape aNewShape;
// if(!aFillet.IsDone())
try{
aNewShape = aFillet.Shape();
}
catch(Standard_Failure)
{
AfxMessageBox("Error During Fillet computation");
return;
}
S ->Set(aNewShape);
myAISContext->Redisplay(S);
}
TCollection_AsciiString Message ("\
Handle(AIS_Shape) S = Handle(AIS_Shape)::DownCast(myAISContext->Interactive()); \n\
\n\
BRepAPI_MakeFillet aFillet(S->Shape()); \n\
\n\
TopoDS_Edge anEdge=TopoDS::Edge(myAISContext->SelectedShape()); \n\
\n\
aFillet.Add(dlg.m_radius,anEdge); \n\
\n\
TopoDS_Shape aNewShape = aFillet.Shape(); \n\
\n\
S ->Set(aNewShape); \n\
\n\
myAISContext->Redisplay(S); \n\
\n");
BRepFilletAPI_MakeFillet aFillet(Sh);
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Make a fillet"));
myCResultDialog.SetText(text);
SetTitle(CString("Make a fillet"));
for (myAISContext->InitSelected(); myAISContext->MoreSelected(); myAISContext->NextSelected())
{
TopoDS_Shape aSelShape = myAISContext->SelectedShape();
if (aSelShape.ShapeType() != TopAbs_EDGE)
{
AfxMessageBox("It is necessary to activate the edges selection mode\n\
and select edges on an object before \nrunning this function");
return;
}
}
BoxRadius dlg(NULL,10.);
if (dlg.DoModal() == IDOK)
{
for (myAISContext->InitSelected(); myAISContext->MoreSelected(); myAISContext->NextSelected())
{
TopoDS_Edge anEdge = TopoDS::Edge(myAISContext->SelectedShape());
aFillet.Add(dlg.m_radius,anEdge);
}
}
else
{
return;
}
TopoDS_Shape aNewShape;
try
{
aNewShape = aFillet.Shape();
}
catch (Standard_Failure)
{
AfxMessageBox("Error During Fillet computation");
return;
}
S ->Set (aNewShape);
myAISContext->Redisplay (S);
}
TCollection_AsciiString aMessage (" Handle(AIS_Shape) S = Handle(AIS_Shape)::DownCast(myAISContext->Interactive()); \n"
" \n"
" BRepAPI_MakeFillet aFillet(S->Shape()); \n"
" \n"
" TopoDS_Edge anEdge=TopoDS::Edge(myAISContext->SelectedShape()); \n"
" \n"
" aFillet.Add(dlg.m_radius,anEdge); \n"
" \n"
" TopoDS_Shape aNewShape = aFillet.Shape(); \n"
" \n"
" S->Set(aNewShape); \n"
" \n"
" myAISContext->Redisplay(S); \n"
" \n");
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString ("Make a fillet"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Make a fillet"));
}
// Create and display a circle with standard tools
void CViewer3dDoc::OnCircle()
{
gp_Ax2 ax2(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., -1.));
Handle(Geom_Circle) C = new Geom_Circle(ax2, 300);
// GC_MakeCircle C(gp_Pnt(-100.,-300.,0.),gp_Pnt(-50.,-200.,0.),gp_Pnt(-10.,-250.,0.));
// Handle(AIS_Circle) anAISCirc = new AIS_Circle(C.Value());
Handle(AIS_Circle) anAISCirc = new AIS_Circle(C);
myAISContext->Display(anAISCirc);
gp_Ax2 anAx2 (gp_Pnt (0., 0., 0.), gp_Dir(0., 0., -1.));
Handle(Geom_Circle) aGeomCircle = new Geom_Circle (anAx2, 300);
TCollection_AsciiString Message ("\
GC_MakeCircle C(gp_Pnt(-100.,-300.,0.),gp_Pnt(-50.,-200.,0.),gp_Pnt(-10.,-250.,0.)); \n\
\n\
Handle(AIS_Circle) anAISCirc = new AIS_Circle(C.Value()); \n\
\n\
myAISContext->Display(anAISCirc); \n\
\n");
// the lines above substitute
// GC_MakeCircle C(gp_Pnt(-100.,-300.,0.),gp_Pnt(-50.,-200.,0.),gp_Pnt(-10.,-250.,0.));
// Handle(AIS_Circle) anAISCirc = new AIS_Circle(C.Value());
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Create a circle"));
myCResultDialog.SetText(text);
SetTitle(CString("Create a circle"));
Handle(AIS_Circle) anAISCirc = new AIS_Circle(aGeomCircle);
myAISContext->Display (anAISCirc);
TCollection_AsciiString aMessage (" GC_MakeCircle C(gp_Pnt(-100.,-300.,0.),gp_Pnt(-50.,-200.,0.),gp_Pnt(-10.,-250.,0.)); \n"
" \n"
" Handle(AIS_Circle) anAISCirc = new AIS_Circle(C.Value()); \n"
" \n"
" myAISContext->Display(anAISCirc); \n"
" \n");
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString ("Create a circle"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Create a circle"));
}
void CViewer3dDoc::OnLine()
{
// TODO: Add your command handler code here
gp_Lin L(gp_Pnt(0.,0.,0.),gp_Dir(1.,0.,0.));
Handle(Geom_Line) aLine = new Geom_Line(L);
Handle(AIS_Line) anAISLine = new AIS_Line(aLine);
myAISContext->Display(anAISLine);
// TODO: Add your command handler code here
gp_Lin aGpLin (gp_Pnt (0., 0., 0.), gp_Dir(1., 0., 0.));
Handle(Geom_Line) aGeomLin = new Geom_Line (aGpLin);
Handle(AIS_Line) anAISLine = new AIS_Line (aGeomLin);
myAISContext->Display (anAISLine);
TCollection_AsciiString Message ("\
gp_Lin L(gp_Pnt(0.,0.,0.),gp_Dir(1.,0.,0.)); \n\
\n\
Handle(Geom_Line) aLine = new Geom_Line(L); \n\
\n\
Handle(AIS_Line) anAISLine = new AIS_Line(aLine); \n\
\n\
myAISContext->Display(anAISLine); \n\
\n");
TCollection_AsciiString aMessage (" gp_Lin L(gp_Pnt(0.,0.,0.),gp_Dir(1.,0.,0.)); \n"
" \n"
" Handle(Geom_Line) aLine = new Geom_Line(L); \n"
" \n"
" Handle(AIS_Line) anAISLine = new AIS_Line(aLine); \n"
" \n"
" myAISContext->Display(anAISLine); \n"
" \n");
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Create a line"));
myCResultDialog.SetText(text);
SetTitle(CString("Create a line"));
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString("Create a line"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Create a line"));
}
void CViewer3dDoc::OnNbisos()
{
int nu = myAISContext->DefaultDrawer()->UIsoAspect()->Number();
int nv = myAISContext->DefaultDrawer()->VIsoAspect()->Number();
DlgIsos dlg(NULL,nu,nv);
if (dlg.DoModal() == IDOK) {
myAISContext->DefaultDrawer()->UIsoAspect()->SetNumber(dlg.m_isou);
myAISContext->DefaultDrawer()->VIsoAspect()->SetNumber(dlg.m_isov);
int aNumU = myAISContext->DefaultDrawer()->UIsoAspect()->Number();
int aNumV = myAISContext->DefaultDrawer()->VIsoAspect()->Number();
TCollection_AsciiString Message ("\
myAISContext->DefaultDrawer()->UIsoAspect()->SetNumber(dlg.m_isou); \n\
\n\
myAISContext->DefaultDrawer()->VIsoAspect()->SetNumber(dlg.m_isov); \n\
\n");
DlgIsos aDlg (NULL, aNumU, aNumV);
CString text(Message.ToCString());
myCResultDialog.SetTitle(CString("Iso Aspect"));
myCResultDialog.SetText(text);
SetTitle(CString("Iso Aspect"));
if (aDlg.DoModal() == IDOK)
{
myAISContext->DefaultDrawer()->UIsoAspect()->SetNumber (aDlg.m_isou);
myAISContext->DefaultDrawer()->VIsoAspect()->SetNumber (aDlg.m_isov);
}
TCollection_AsciiString aMessage (" myAISContext->DefaultDrawer()->UIsoAspect()->SetNumber(dlg.m_isou); \n"
" \n"
" myAISContext->DefaultDrawer()->VIsoAspect()->SetNumber(dlg.m_isov); \n"
" \n");
CString aMsgStr (aMessage.ToCString());
myCResultDialog.SetTitle (CString("Iso Aspect"));
myCResultDialog.SetText (aMsgStr);
SetTitle (CString ("Iso Aspect"));
}
}
BOOL CViewer3dDoc::OnNewDocument()
{
if (!CDocument::OnNewDocument())
return FALSE;
if (!CDocument::OnNewDocument())
return FALSE;
// TODO: add reinitialization code here
// (SDI documents will reuse this document)
// TODO: add reinitialization code here
// (SDI documents will reuse this document)
SetTitle(myPresentation->GetName());
myAISContext->EraseAll(Standard_False);
@ -1006,7 +995,7 @@ BOOL CViewer3dDoc::OnNewDocument()
pView->Reset();
}
return TRUE;
return TRUE;
}
void CViewer3dDoc::OnFileNew()
@ -1048,7 +1037,7 @@ void CViewer3dDoc::DoSample()
Standard_SStream aSStream;
aSStream << "An exception was caught: " << Standard_Failure::Caught() << ends;
Standard_CString aMsg = aSStream.str().c_str();
// aSStream.rdbuf()->freeze(0); // allow deletion of dynamic array
// aSStream.rdbuf()->freeze(0); // allow deletion of dynamic array
AfxMessageBox (aMsg);
}
}
@ -1125,39 +1114,28 @@ void CViewer3dDoc::OnUpdateBUTTONEnd(CCmdUI* pCmdUI)
void CViewer3dDoc::OnDumpView()
{
// save current directory and restore it on exit
char aCurPath[MAX_PATH];
::GetCurrentDirectory(MAX_PATH, aCurPath);
::SetCurrentDirectory(myLastPath);
CFileDialog *aDlg = new CFileDialog(false, "gif", "OCCView.gif",
OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, "GIF Files (*.gif)|*.gif||", NULL);
int result = aDlg->DoModal();
if ( result == IDOK)
CFileDialog aDlg (false, "gif", "OCCView.gif", OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
"GIF Files (*.GIF)|*.gif|"
"BMP Files (*.BMP)|*.bmp|"
"PNG Files (*.PNG)|*.png|"
"JPEG Files (*.JPG)|*.jpg|"
"PPM Files (*.PPM)|*.ppm|"
"TIFF Files (*.TIFF)|*.tiff|"
"TGA Files (*.TGA)|*.tga|"
"EXR Files (*.EXR)|*.exr||", NULL);
if (aDlg.DoModal() != IDOK)
{
CString aFileName = aDlg->GetFileName();
delete aDlg;
POSITION pos = GetFirstViewPosition();
while (pos != NULL)
{
CViewer3dView* pView = (CViewer3dView*) GetNextView(pos);
pView->UpdateWindow();
}
myViewer->InitActiveViews();
Handle(V3d_View) aView = myViewer->ActiveView();
char aStrFileName[MAX_PATH];
strcpy_s(aStrFileName, aFileName);
aView->Dump(aStrFileName);
return;
}
else
delete aDlg;
::GetCurrentDirectory(MAX_PATH, myLastPath);
::SetCurrentDirectory(aCurPath);
for (POSITION aPos = GetFirstViewPosition(); aPos != NULL;)
{
CViewer3dView* pView = (CViewer3dView* )GetNextView (aPos);
pView->UpdateWindow();
}
myViewer->InitActiveViews();
Handle(V3d_View) aView = myViewer->ActiveView();
aView->Dump (aDlg.GetPathName());
}
void CViewer3dDoc::Start()

View File

@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bin/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -154,7 +154,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bin/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -195,7 +195,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bind/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -237,7 +237,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bind/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -116,7 +116,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bin/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bin/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -199,7 +199,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bind/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -241,7 +241,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bind/ImportExport.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win32\vc8\bin/ImportExport.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win64\vc8\bin/ImportExport.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win32\vc8\bind/ImportExport.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -371,7 +371,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win64\vc8\bind/ImportExport.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

View File

@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win32\vc9\bin/ImportExport.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win64\vc9\bin/ImportExport.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -273,7 +273,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win32\vc9\bind/ImportExport.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../../win64\vc9\bind/ImportExport.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

View File

@ -11,7 +11,7 @@
#include <OCC_3dView.h>
#include <res\resource.h>
BEGIN_MESSAGE_MAP(CImportExportApp, OCC_3dApp)
BEGIN_MESSAGE_MAP(CImportExportApp, OCC_App)
//{{AFX_MSG_MAP(CSerializeApp)
ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
//}}AFX_MSG_MAP
@ -20,16 +20,19 @@ END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CImportExportApp construction
CImportExportApp::CImportExportApp()
CImportExportApp::CImportExportApp() : OCC_App()
{
// Set the local system units
try
{ UnitsAPI::SetLocalSystem(UnitsAPI_MDTV); }
catch (Standard_Failure)
{
AfxMessageBox("Fatal Error in units initialisation");
}
SampleName = "ImportExport"; //for about dialog
// Set the local system units
try
{
UnitsAPI::SetLocalSystem (UnitsAPI_MDTV);
}
catch (Standard_Failure)
{
AfxMessageBox ("Fatal Error in units initialisation");
}
SampleName = "ImportExport"; //for about dialog
}
/////////////////////////////////////////////////////////////////////////////
@ -111,7 +114,7 @@ void CImportExportApp::OnFileOpen()
NULL );
CString initdir(((OCC_BaseApp*) AfxGetApp())->GetInitDataDir());
CString initdir(((OCC_App*) AfxGetApp())->GetInitDataDir());
initdir += "\\Data";
dlg.m_ofn.lpstrInitialDir = initdir;

View File

@ -8,25 +8,29 @@
#pragma once
#endif // _MSC_VER >= 1000
#include <OCC_3dApp.h>
#include <OCC_App.h>
class CImportExportApp : public OCC_3dApp
class CImportExportApp : public OCC_App
{
public:
CImportExportApp();
CImportExportApp();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CImportExportApp)
public:
virtual BOOL InitInstance();
virtual CDocument* OpenDocumentFile(LPCTSTR lpszFileName);
//}}AFX_VIRTUAL
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CImportExportApp)
public:
virtual BOOL InitInstance();
virtual CDocument* OpenDocumentFile(LPCTSTR lpszFileName);
//}}AFX_VIRTUAL
protected:
//{{AFX_MSG(CSerializeApp)
afx_msg void OnFileOpen();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
//{{AFX_MSG(CSerializeApp)
afx_msg void OnFileOpen();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////

View File

@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bin/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -154,7 +154,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bin/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -195,7 +195,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc10\bind/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -237,7 +237,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc10\bind/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -116,7 +116,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bin/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -158,7 +158,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bin/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -199,7 +199,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win32\vc11\bind/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -241,7 +241,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;TKBO.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../../../win64\vc11\bind/Ocaf.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

View File

@ -81,7 +81,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc8\bin/Ocaf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc8\bin/Ocaf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -274,7 +274,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc8\bind/Ocaf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -371,7 +371,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc8\bind/Ocaf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

View File

@ -82,7 +82,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc9\bin/Ocaf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -178,7 +178,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc9\bin/Ocaf.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -273,7 +273,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win32\vc9\bind/Ocaf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -369,7 +369,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib"
AdditionalDependencies="TKLCAF.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib TKBO.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib"
OutputFile="../../../..\win64\vc9\bind/Ocaf.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

View File

@ -33,26 +33,20 @@ END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// COcafApp construction
COcafApp::COcafApp()
COcafApp::COcafApp() : OCC_App()
{
// CasCade :
SetSamplePath("06_Ocaf");
myApp = new TOcaf_Application();
// End CasCade
SampleName = "OCAF"; //for about dialog
SetSamplePath("06_Ocaf");
myApp = new TOcaf_Application();
SampleName = "OCAF"; //for about dialog
try
{ UnitsAPI::SetLocalSystem(UnitsAPI_MDTV); }
catch (Standard_Failure)
{
try
{
UnitsAPI::SetLocalSystem(UnitsAPI_MDTV);
}
catch (Standard_Failure)
{
AfxMessageBox("Fatal Error in units initialisation");
}
}
COcafApp::~COcafApp()
{
// Warning : delete only template you don't declare by AddDocTemplate
// if( pDocTemplateForView3d) delete pDocTemplateForView3d;
}
}
/////////////////////////////////////////////////////////////////////////////
@ -138,7 +132,7 @@ BOOL COcafApp::IsViewExisting(CDocument * pDoc, CRuntimeClass * pViewClass, CVie
//================================================================
// Function : COcafApp::OnFileOpen()
///Purpose :
// Purpose :
//================================================================
void COcafApp::OnFileOpen()
{

View File

@ -8,39 +8,36 @@
#pragma once
#endif // _MSC_VER >= 1000
#include <OCC_3dApp.h>
#include <OCC_App.h>
#include "OcafDoc.h"
#include "TOCAF_Application.hxx"
class COcafApp : public OCC_3dApp
class COcafApp : public OCC_App
{
public:
COcafApp();
~COcafApp();
COcafApp();
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(COcafApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
void OnFileOpen();
// CasCade :
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(COcafApp)
public:
virtual BOOL InitInstance();
//}}AFX_VIRTUAL
void OnFileOpen();
public:
// =========================================
// =========================================
Handle_TOcaf_Application GetApp() {return myApp;}
Handle_TOcaf_Application GetApp() {return myApp;}
private :
Handle_TOcaf_Application myApp;
BOOL IsViewExisting(CDocument* pDoc,CRuntimeClass* pViewClass,CView*& pView);
CMultiDocTemplate* pDocTemplateForView3d;
BOOL IsViewExisting(CDocument* pDoc,CRuntimeClass* pViewClass,CView*& pView);
// End CasCade
DECLARE_MESSAGE_MAP()
private:
Handle_TOcaf_Application myApp;
CMultiDocTemplate* pDocTemplateForView3d;
DECLARE_MESSAGE_MAP()
};
/////////////////////////////////////////////////////////////////////////////

Some files were not shown because too many files have changed in this diff Show More