0024355: Compiler Warning level 4 for MFC samples
authoribs <ibs@opencascade.com>
Thu, 21 Nov 2013 09:44:27 +0000 (13:44 +0400)
committerbugmaster <bugmaster@opencascade.com>
Thu, 21 Nov 2013 09:45:42 +0000 (13:45 +0400)
Some warnings were removed from MFC samples
All warnings of sample projects with warning level 4 were fixed on VC9
Warnings level increased to -W4 in projects of MFC samples; sample ReadMe files added to documentation
Changes in Viewer2dDoc.cpp and OcafDoc.cpp were restored.
Minor corrections in documentation

102 files changed:
dox/FILES.txt
dox/dev_guides/building/cmake/cmake.md
dox/overview/Overview.md
samples/CSharp/ReadMe.md
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
samples/mfc/standard/01_Geometry/src/GeomSources.cpp
samples/mfc/standard/01_Geometry/src/GeomSources.h
samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
samples/mfc/standard/01_Geometry/src/GeometryView.cpp
samples/mfc/standard/01_Geometry/src/GeometryView2D.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp
samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
samples/mfc/standard/02_Modeling/src/ISession_Direction.cpp
samples/mfc/standard/02_Modeling/src/ISession_Direction.h
samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp
samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/src/ISession_Curve.cpp
samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/src/FSD_Archive.cxx
samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
samples/mfc/standard/06_Ocaf/src/TOcafFunction_BoxDriver.cxx
samples/mfc/standard/06_Ocaf/src/TOcafFunction_CutDriver.cxx
samples/mfc/standard/06_Ocaf/src/TOcafFunction_CylDriver.cxx
samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/src/ISession_Curve.cpp
samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp
samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
samples/mfc/standard/08_HLR/src/HLRView2D.cpp
samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
samples/mfc/standard/09_Animation/src/AnimationView3D.cpp
samples/mfc/standard/09_Animation/src/Fonc.cxx
samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
samples/mfc/standard/10_Convert/src/ISession/ISession_Curve.cpp
samples/mfc/standard/10_Convert/src/WNT/OCCDemoView.cpp
samples/mfc/standard/Common/DimensionDlg.cpp
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
samples/mfc/standard/Common/ImportExport/ImportExport.cpp
samples/mfc/standard/Common/OCC_2dView.cpp
samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
samples/mfc/standard/Common/OCC_3dDoc.cpp
samples/mfc/standard/Common/OCC_3dView.cpp
samples/mfc/standard/Common/OCC_BaseDoc.h
samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Markers.h
samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Text.h
samples/mfc/standard/Common/ResultDialog.cpp
samples/mfc/standard/Common/ResultDialog.h
samples/mfc/standard/Common/User_Cylinder.cxx
samples/mfc/standard/ReadMe.md [moved from samples/mfc/standard/readme.txt with 58% similarity, mode: 0644]
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
samples/mfc/standard/mfcsample/src/mfcsample.cpp

index 77dd56c..2b3d9cc 100644 (file)
@@ -6,7 +6,12 @@
 # in the generated documentation.
 
 overview/overview.md
+
+../samples/mfc/standard/ReadMe.md
+../samples/CSharp/ReadMe.md
+
 tutorial/tutorial.md
+
 technical_overview/technical_overview.md
 
 user_guides/user_guides.md
index dba6939..98fb625 100644 (file)
@@ -77,19 +77,26 @@ The error message which appears at the end of configuration process, informs you
 which need to be defined. This error will appear until all required variables are defined correctly.
 Note: In cmake-gui there is "grouped" option, which groups variables with a common prefix.
 
-###The variables with BUILD_ prefix:
+### Selection of components to be built
 
-* BUILD_TYPE - defines build configuration of the future project (Release by default)
-* BUILD_<MODULE> - allows including the toolkit set of the specified module to the future project or excluding it from the project.
-* BUILD_TOOLKITS - allows including specific OCCT toolkits (list of items separated by a space or a semicolon) to the common set of the future project.
-* BUILD_SAMPLES  - allows including MFC samples (for visual studio only) to the common set of the future project. 
-                   In install folder there will be samples.bat script to execute specific sample. 
-                   List of samples is being shown by sample.bat without arguments.
+The variables with "BUILD_" prefix allow specifying OCCT components and
+configuration to be built:
 
-###The variables with USE_ prefix (3rd-party libraries):
+* BUILD_CONFIGURATION - defines configuration to be built (Release by default).
+* BUILD_<MODULE> - specify whether corresponding OCCT module should be 
+                   built (all toolkits). Note that even if whole module is not 
+                   selected for build, its toolkits used by other toolkits 
+                   selected for build will be included automatically.
+* BUILD_TOOLKITS - allows including additional toolkits from non-selected 
+                   modules (should be list of toolkit names separated by a 
+                   space or a semicolon).
+* BUILD_SAMPLES - specify whether OCCT MFC samples should be built.
 
-Check USE_\<PRODUCT\> variable (USE_FREEIMAGE, USE_GL2PS, USE_TBB and USE_OPENCL) 
-if you want to use this 3rd-party product.
+Check variables with "USE_" prefix (USE_FREEIMAGE, USE_GL2PS, USE_TBB, and 
+USE_OPENCL) if you want to enable use of the corresponding optional 3rd-party 
+library.
+
+### 3rd-party configuration
 
 ### 3rd-party configuration (The variables with 3RDPARTY_ prefix)
 
@@ -100,9 +107,8 @@ At the next configuration 3rd-party product paths stored in 3RDPARTY_\<PRODUCT\>
 will be searched for in 3RDPARTY_DIR directory. If the structure of 3RDPARTY_DIR directory 
 is the same as adopted in the OCCT, the directory will contain product dir, lib and header files. 
 
- **Press "Configure" ("c" key for ccmake)**
+Press "Configure" ("c" key for ccmake).
 
-Important: The names of searched libraries and header files are hardcoded.
 The result of the 3rdparty product search will be recorded in the corresponding variables:
 
 * 3RDPARTY_\<PRODUCT\>_DIR - path to the product directory (with directory name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32)
@@ -112,20 +118,23 @@ The result of the 3rdparty product search will be recorded in the corresponding
 
 The search process is as follows:
 
- - 1 level:. 3RDPARTY_DIR
-   - 2 level: 3RDPARTY_\<PRODUCT\>_DIR\
-     - 3 level: 3RDPARTY_\<PRODUCT\>_LIBRARY
-     - 3 level: 3RDPARTY_\<PRODUCT\>_INCLUDE
-     - 3 level: 3RDPARTY_\<PRODUCT\>_DLL
+1. Common path: 3RDPARTY_DIR
+2. Path to particular 3rd-party library: 3RDPARTY_\<PRODUCT\>_DIR
+3. Paths to headers and binaries:
+   1. 3RDPARTY_\<PRODUCT\>_INCLUDE
+   2. 3RDPARTY_\<PRODUCT\>_LIBRARY
+   3. 3RDPARTY_\<PRODUCT\>_DLL
 
 If a variable of any level is not defined (empty or \<variable name\>-NOTFOUND) 
 and the upper level variable is defined, the content of the non-defined variable 
 will be searched for at the next configuration step. If search process in level 3 
 does not find the required files, it searches in default places also.
 
-*Note*: Freetype search process tries to find ft2build.h file in 3RDPARTY_FREETYPE INCLUDE dir 
+**Note**: the names of searched libraries and header files are hardcoded.
+Freetype search process tries to find ft2build.h file in 3RDPARTY_FREETYPE INCLUDE dir 
 and after that adds "3RDPARTY_FREETYPE_INCLUDE /freetype2" path to common includes if it exists. 
-Important: If BUILD_TYPE or BITNESS variable is changed - at the next configuration 
+
+Important: If BUILD_CONFIGURATION variable is changed - at the next configuration 
 3RDPARTY_ variables will be replaced by the search process result, except for the 3RDPARTY_DIR variable.
 
 *Note*: CMake will produce an error after the configuration step until all required variables are defined correctly.
@@ -133,6 +142,7 @@ If the search result (include path, or library path, or dll path) does not meet
 you can  change 3RDPARTY_\<PRODUCT\>_DIR variable, clear (if they are not empty) 
 3RDPARTY_\<PRODUCT\>_DLL, 3RDPARTY_\<PRODUCT\>_INCLUDE_DIR and 3RDPARTY_\<PRODUCT\>_LIBRARY variables 
 (or clear one of them) and run the configuration process again. 
+
 At this time the search will be performed in the new identified directory 
 and the result will be recorded to empty variables (non-empty variables will not be replaced).
 
index 02313c8..03299fb 100644 (file)
@@ -531,6 +531,8 @@ The list of MFC samples:
   * To start a sample use Open CASCADE Technology\\Samples\\Mfc\\ item of the Start\\Programs menu;
   * Read carefully readme.txt to learn about launching and compilation options.
 
+See \subpage samples_mfc_standard "Readme" for details.
+
 @subsubsection OCCT_OVW_SECTION_7_3_2 Qt
 
 OCCT contains three samples based on Qt application framework
@@ -592,3 +594,6 @@ Export:
   * Step
   * Stl
   * Vrml
+
+See \subpage samples_csharp "Readme" for details.
+
index 62f2963..4b4b427 100644 (file)
@@ -1,4 +1,5 @@
-#### OCCT CSharp sample
+OCCT CSharp sample {#samples_csharp}
+================== 
        
 This sample demonstrates simple way of using OCCT libraries in .Net application
 whitten using CSharp and Windows Forms or Windows Presentation Foundation (WPF).
index cc9b5a3..44211a6 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 278cff3..3c7a23c 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index e6c1f40..9cec6e1 100644 (file)
@@ -64,7 +64,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="../../../..\win64\vc8\bin"
-                       IntermediateDirectory=".\win64\obj"
+                       Name="Debug|Win32"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\win64\obj/Geometry.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\win32\objd/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win64\obj/Geometry.pch"
-                               AssemblerListingLocation=".\win64\obj/"
-                               ObjectFile=".\win64\obj/"
-                               ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               PrecompiledHeaderFile=".\win32\objd/Geometry.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\objd/"
+                               BrowseInformation="1"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\win64\vc8\bin/Geometry.exe"
-                               LinkIncremental="1"
+                               OutputFile="../../../..\win32\vc8\bind/Geometry.exe"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Geometry.pdb"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Geometry.pdb"
                                SubSystem="2"
-                               TargetMachine="17"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="../../../..\win32\vc8\bind"
-                       IntermediateDirectory=".\win32\objd"
+                       Name="Release|x64"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\win32\objd/Geometry.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\win64\obj/Geometry.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win32\objd/Geometry.pch"
-                               AssemblerListingLocation=".\win32\objd/"
-                               ObjectFile=".\win32\objd/"
-                               ProgramDataBaseFileName=".\win32\objd/"
-                               BrowseInformation="1"
+                               PrecompiledHeaderFile=".\win64\obj/Geometry.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
                        />
                        <Tool
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib TKMesh.lib"
-                               OutputFile="../../../..\win32\vc8\bind/Geometry.exe"
-                               LinkIncremental="2"
+                               OutputFile="../../../..\win64\vc8\bin/Geometry.exe"
+                               LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Geometry.pdb"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Geometry.pdb"
                                SubSystem="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Debug|Win32"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="2"
+                                                       Optimization="0"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
+                                                       BasicRuntimeChecks="3"
+                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCCLCompilerTool"
-                                                       Optimization="0"
+                                                       Optimization="2"
                                                        AdditionalIncludeDirectories=""
                                                        PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
index e93895d..b88b995 100644 (file)
@@ -65,7 +65,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                AssemblerListingLocation=".\win64\obj/"
                                ObjectFile=".\win64\obj/"
                                ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                ObjectFile=".\win32\objd/"
                                ProgramDataBaseFileName=".\win32\objd/"
                                BrowseInformation="1"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                                CompileAs="0"
                                ObjectFile=".\win64\objd/"
                                ProgramDataBaseFileName=".\win64\objd/"
                                BrowseInformation="1"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
index b5da460..a3f333b 100755 (executable)
@@ -99,12 +99,12 @@ void GeomSources::PostProcess(CGeometryDoc* aDoc,
   aDoc->SetTitle(Title);
 }
 
-void GeomSources::AddSeparator(CGeometryDoc* aDoc,TCollection_AsciiString& aMessage)
+void GeomSources::AddSeparator(CGeometryDoc* /*aDoc*/,TCollection_AsciiString& aMessage)
 {
   aMessage+= "------------------------------------------------------------------------\n";
 }
 void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
-                          gp_Pnt2d& aPoint,
+                          const gp_Pnt2d& aPoint,
                           const char* aText,
                           Standard_Boolean UpdateViewer,
                           Standard_Real anXoffset,
@@ -119,7 +119,7 @@ void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
 }
 
 void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
-                          gp_Pnt& aPoint,
+                          const gp_Pnt& aPoint,
                           const char* aText,
                           Standard_Boolean UpdateViewer,
                           Standard_Real anXoffset,
@@ -224,9 +224,10 @@ Standard_Real result = A.DotCross(B,C); \n\
                                         \n");
   AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
+
     DisplayPoint(aDoc,gp_Pnt(A),"A (1,2,3)",false,0.1);
     DisplayPoint(aDoc,gp_Pnt(B),"B (2,2,2)",false,0.1);
-    DisplayPoint(aDoc,gp_Pnt(C),"C (3,2,3)", false,0.1);
+    DisplayPoint(aDoc,gp_Pnt(C),"C (3,2,3)",false,0.1);
 
 // to add a numeric value in a TCollectionAsciiString  
   TCollection_AsciiString Message2 (result);
@@ -709,7 +710,7 @@ void GeomSources::gpTest10(CGeometryDoc* aDoc)
     for(;count<=N;count++)
     {                                                  
       C->D0(UA.Parameter(count),P);
-      Standard_Real Parameter = UA.Parameter(count);
+      //Standard_Real Parameter = UA.Parameter(count);
       // append P in a Sequence
       aSequence.Append(P);
     }                                                   
@@ -1308,10 +1309,10 @@ gp_Dir A2YDirection = A2.YDirection() ;     \n\
  aDoc->GetAISContext()->Display(aDirection, Standard_False);
 
  Handle(ISession_Direction) aDirection2 = new ISession_Direction(P1,AXDirection,2);
- aDirection2->SetText(TCollection_ExtendedString("A.XDirection"));
+ aDirection2->SetText("A.XDirection");
  aDoc->GetAISContext()->Display(aDirection2, Standard_False);
  Handle(ISession_Direction) aDirection3 = new ISession_Direction(P1,AYDirection,2);
- aDirection3->SetText(TCollection_ExtendedString("A.YDirection"));
+ aDirection3->SetText("A.YDirection");
  aDoc->GetAISContext()->Display(aDirection3, Standard_False);
 
  DisplayPoint(aDoc,P2,"P2",false,0.1);
@@ -1319,10 +1320,10 @@ gp_Dir A2YDirection = A2.YDirection() ;     \n\
  aDoc->GetAISContext()->Display(aDirection4, Standard_False);
 
  Handle(ISession_Direction) aDirection5 = new ISession_Direction(P2,A2XDirection,2);
- aDirection5->SetText(TCollection_ExtendedString("A2 XDirection"));
+ aDirection5->SetText("A2 XDirection");
  aDoc->GetAISContext()->Display(aDirection5, Standard_False);
  Handle(ISession_Direction) aDirection6 = new ISession_Direction(P2,A2YDirection,2);
- aDirection6->SetText(TCollection_ExtendedString("A2 YDirection"));
+ aDirection6->SetText("A2 YDirection");
  aDoc->GetAISContext()->Display(aDirection6, Standard_False);
 
  Message += "IsDirectA = ";
@@ -1703,19 +1704,13 @@ gp_Ax2d C2DCircleXAxis = C2DCircle->XAxis();            \n\
  DisplayCurve(aDoc,C3D,false);
  DisplayCurve(aDoc,C2D,5,false);
 
- Handle(ISession_Direction) aC3DCircleXAxisDirection = new ISession_Direction((gp_Pnt)C3DCircleXAxis.Location(),
-   (gp_Dir)C3DCircleXAxis.Direction(),
-   5.2);
+ Handle(ISession_Direction) aC3DCircleXAxisDirection = new ISession_Direction(C3DCircleXAxis.Location(),C3DCircleXAxis.Direction(),5.2);
  aDoc->GetAISContext()->Display(aC3DCircleXAxisDirection, Standard_False);
 
- Handle(ISession_Direction) acirc2dXAxisDirection = new ISession_Direction((gp_Pnt2d)circ2dXAxis.Location(),
-   (gp_Dir2d)circ2dXAxis.Direction(),
-   5.2);
+ Handle(ISession_Direction) acirc2dXAxisDirection = new ISession_Direction(circ2dXAxis.Location(),circ2dXAxis.Direction(),5.2);
  aDoc->GetISessionContext()->Display(acirc2dXAxisDirection, Standard_False);
 
- Handle(ISession_Direction) aC2DCircleXAxisDirection = new ISession_Direction((gp_Pnt2d)C2DCircleXAxis.Location(),
-   (gp_Dir2d)C2DCircleXAxis.Direction(),
-   5.2);
+ Handle(ISession_Direction) aC2DCircleXAxisDirection = new ISession_Direction(C2DCircleXAxis.Location(),C2DCircleXAxis.Direction(),5.2);
  aDoc->GetISessionContext()->Display(aC2DCircleXAxisDirection, Standard_False);
 
  PostProcess(aDoc,ID_BUTTON_Test_24,TheDisplayType,Message.ToCString());
@@ -2149,7 +2144,7 @@ void GeomSources::gpTest30(CGeometryDoc* aDoc)
   gp_Circ2d C = gce_MakeCirc2d (P1,P2,P3);
   GccEnt_QualifiedCirc QC = GccEnt::Outside(C);
   GccAna_Lin2d2Tan LT (QC,P4,Precision::Confusion());
-  Standard_Integer NbSol;
+  Standard_Integer NbSol = 0;
   if (LT.IsDone())
   {
     NbSol = LT.NbSolutions();
@@ -2601,8 +2596,8 @@ void GeomSources::gpTest35(CGeometryDoc* aDoc)
   GeomAPI_IntCS CS (aCurve,aSurface);
   Handle(Geom_Curve) segment;
 
-  Standard_Integer NbSeg;
-  Standard_Integer NbPoints;
+  Standard_Integer NbSeg = 0;
+  Standard_Integer NbPoints = 0;
   if(CS.IsDone())
   {
     NbSeg = CS.NbSegments();
@@ -3782,7 +3777,7 @@ void GeomSources::gpTest47(CGeometryDoc* aDoc)
     GeomAPI_PointsToBSplineSurface(array3).Surface();
 
   GeomAPI_ExtremaSurfaceSurface ESS(aSurf1,aSurf2);
-  Quantity_Length dist = ESS.LowerDistance();
+  //Quantity_Length dist = ESS.LowerDistance();
   gp_Pnt P1,P2;
   ESS.NearestPoints(P1,P2);
 
@@ -3952,10 +3947,10 @@ aSPL2Box.Get(  aSPL2Xmin, aSPL2Ymin, aSPL2Xmax,aSPL2Ymax);             \n\
   DisplayCurve(aDoc,GCE2d_MakeSegment(gp_Pnt2d(aSPL1Xmin,aSPL1Ymin),gp_Pnt2d(aSPL1Xmin,aSPL1Ymax)) ,4); // Xmin,Y
   DisplayCurve(aDoc,GCE2d_MakeSegment(gp_Pnt2d(aSPL1Xmax,aSPL1Ymin),gp_Pnt2d(aSPL1Xmax,aSPL1Ymax)) ,4); // Xmax,Y
 
-  DisplayPoint(aDoc,gp_Pnt2d(aSPL2Xmin,aSPL2Ymax),Standard_CString("aSPL2Xmin,aSPL2Ymax"));
-  DisplayPoint(aDoc,gp_Pnt2d(aSPL2Xmax,aSPL2Ymax),Standard_CString("aSPL2Xmax,aSPL2Ymax"));
-  DisplayPoint(aDoc,gp_Pnt2d(aSPL2Xmin,aSPL2Ymin),Standard_CString("aSPL2Xmin,aSPL2Ymin"));
-  DisplayPoint(aDoc,gp_Pnt2d(aSPL2Xmax,aSPL2Ymin),Standard_CString("aSPL2Xmax,aSPL2Ymin"));
+  DisplayPoint(aDoc,gp_Pnt2d(aSPL1Xmin,aSPL1Ymax),Standard_CString("aSPL2Xmin,aSPL2Ymax"));
+  DisplayPoint(aDoc,gp_Pnt2d(aSPL1Xmax,aSPL1Ymax),Standard_CString("aSPL2Xmax,aSPL2Ymax"));
+  DisplayPoint(aDoc,gp_Pnt2d(aSPL1Xmin,aSPL1Ymin),Standard_CString("aSPL2Xmin,aSPL2Ymin"));
+  DisplayPoint(aDoc,gp_Pnt2d(aSPL1Xmax,aSPL1Ymin),Standard_CString("aSPL2Xmax,aSPL2Ymin"));
 
   DisplayCurve(aDoc,GCE2d_MakeSegment(gp_Pnt2d(aSPL2Xmin,aSPL2Ymax),gp_Pnt2d(aSPL2Xmax,aSPL2Ymax)) ,4); // X,Ymax
   DisplayCurve(aDoc,GCE2d_MakeSegment(gp_Pnt2d(aSPL2Xmin,aSPL2Ymin),gp_Pnt2d(aSPL2Xmax,aSPL2Ymin)) ,4); // X,Ymin
index fd1fce1..cd32e28 100755 (executable)
@@ -79,14 +79,14 @@ private:
   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 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 gp_Pnt& aPoint,
     const char* aText,
     Standard_Boolean UpdateViewer = Standard_False,
     Standard_Real anXoffset = 0,
index a5c5e99..0376c6b 100755 (executable)
@@ -243,10 +243,10 @@ void CGeometryDoc::Dump(CDumpContext& dc) const
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryDoc::DragEvent2D(const Standard_Integer  x        ,
-              const Standard_Integer  y        ,
-              const Standard_Integer  TheState ,
-              const Handle(V3d_View)& aView    )
+void CGeometryDoc::DragEvent2D(const Standard_Integer /*x*/,
+                               const Standard_Integer /*y*/,
+                               const Standard_Integer /*TheState*/,
+                               const Handle(V3d_View)& /*aView*/)
 {
 }
 
@@ -254,9 +254,9 @@ void CGeometryDoc::DragEvent2D(const Standard_Integer  x        ,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryDoc::InputEvent2D(const Standard_Integer  x     ,
-               const Standard_Integer  y     ,
-               const Handle(V3d_View)& aView ) 
+void CGeometryDoc::InputEvent2D(const Standard_Integer /*x*/,
+                                const Standard_Integer /*y*/,
+                                const Handle(V3d_View)& /*aView*/)
 {
   myAISContext2D->Select(Standard_True);
 }
@@ -264,9 +264,9 @@ void CGeometryDoc::InputEvent2D(const Standard_Integer  x     ,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryDoc::MoveEvent2D(const Standard_Integer  x,
-              const Standard_Integer  y,
-              const Handle(V3d_View)& aView) 
+void CGeometryDoc::MoveEvent2D(const Standard_Integer x,
+                               const Standard_Integer y,
+                               const Handle(V3d_View)& aView)
 {
   if(aView->Viewer()->Grid()->IsActive())
   {
@@ -281,19 +281,19 @@ void CGeometryDoc::MoveEvent2D(const Standard_Integer  x,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryDoc::ShiftMoveEvent2D(const Standard_Integer  x,
-                                    const Standard_Integer  y  ,
-                                    const Handle(V3d_View)& aView) 
+void CGeometryDoc::ShiftMoveEvent2D(const Standard_Integer /*x*/,
+                                    const Standard_Integer /*y*/,
+                                    const Handle(V3d_View)& /*aView*/)
 {
 }
 
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryDoc::ShiftDragEvent2D(const Standard_Integer  x,
-                                    const Standard_Integer  y,
-                                    const Standard_Integer  TheState,
-                                    const Handle(V3d_View)& aView) 
+void CGeometryDoc::ShiftDragEvent2D(const Standard_Integer /*x*/,
+                                    const Standard_Integer /*y*/,
+                                    const Standard_Integer /*TheState*/,
+                                    const Handle(V3d_View)& /*aView*/)
 {
 }
 
@@ -301,18 +301,18 @@ void CGeometryDoc::ShiftDragEvent2D(const Standard_Integer  x,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryDoc::ShiftInputEvent2D(const Standard_Integer  x,
-                                    const Standard_Integer  y,
-                                    const Handle(V3d_View)& aView) 
+void CGeometryDoc::ShiftInputEvent2D(const Standard_Integer /*x*/,
+                                     const Standard_Integer /*y*/,
+                                     const Handle(V3d_View)& /*aView*/)
 {
 }
 
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void  CGeometryDoc::Popup2D(const Standard_Integer  x,
-                            const Standard_Integer  y ,
-                            const Handle(V3d_View)& aView) 
+void  CGeometryDoc::Popup2D(const Standard_Integer x,
+                            const Standard_Integer y,
+                            const Handle(V3d_View)& aView)
 {
   CMenu menu;
   VERIFY(menu.LoadMenu(IDR_Popup3D));
@@ -1129,7 +1129,7 @@ void CGeometryDoc::OnSimplify()
   if (!isRead)
   {
     Path += " was not found.  The sample can not be shown.";
-    myCResultDialog.SetText((CString)Path.ToCString());
+    myCResultDialog.SetText(Path.ToCString());
     return;
   }
   myAISContext->SetDisplayMode(AIS_Shaded);
@@ -1138,165 +1138,164 @@ void CGeometryDoc::OnSimplify()
 
 void CGeometryDoc::simplify(const TopoDS_Shape& aShape)
 {
-  myCResultDialog.SetTitle(CString("Simplify Face"));
-  myCResultDialog.SetText((CString)
-    "  TopoDS_Shape aShape;" EOL
-    "" EOL
-    "  // initialize aShape" EOL
-    "  //aShape = ..." EOL
-    "" EOL
-    "  // define parameter triangulation" EOL
-    "  Standard_Real aDeflection = 0.1;" EOL
-    "  " EOL
-    "  // removes all the triangulations of the faces ," EOL
-    "  //and all the polygons on the triangulations of the edges" EOL
-    "  BRepTools::Clean(aShape);" EOL
-    "  // adds a triangulation of the shape aShape with the deflection aDeflection" EOL
-    "  BRepMesh::Mesh(aShape,aDeflection);" EOL
-    "" EOL
-    "  Standard_Integer aIndex = 1, nbNodes = 0;" EOL
-    "  " EOL
-    "  // define two sequence of points" EOL
-    "  TColgp_SequenceOfPnt aPoints, aPoints1;" EOL
-    " " EOL
-    "  // triangulation" EOL
-    "  for(TopExp_Explorer aExpFace(aShape,TopAbs_FACE); aExpFace.More(); aExpFace.Next())" EOL
-    "  {  " EOL
-    "    TopoDS_Face aFace = TopoDS::Face(aExpFace.Current());" EOL
-    "    TopLoc_Location aLocation;" EOL
-    "" EOL
-    "    // takes the triangulation of the face aFace" EOL
-    "    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);" EOL
-    "" EOL
-    "    if(!aTr.IsNull())" EOL
-    "    { " EOL
-    "      // takes the array of nodes for this triangulation" EOL
-    "      const TColgp_Array1OfPnt& aNodes = aTr->Nodes();    " EOL
-    "      nbNodes = aNodes.Length();" EOL
-    "" EOL
-    "      for( Standard_Integer i = 1; i <= nbNodes; i++)" EOL
-    "      {" EOL
-    "        // create seguence of node points in absolute coordinate system" EOL
-    "        gp_Pnt aPnt = aNodes(i).Transformed(aLocation);" EOL
-    "        aPoints.Append(aPnt);" EOL
-    "        " EOL
-    "      }" EOL
-    "    }" EOL
-    "  }" EOL
-    " " EOL
-    "  // remove double points" EOL
-    "  nbNodes = aPoints.Length();" EOL
-    "  for( Standard_Integer i = 1; i <= nbNodes; i++)" EOL
-    "  {" EOL
-    "    gp_Pnt aPi = aPoints(i);" EOL
-    "    for( Standard_Integer j = i + 1; j < nbNodes; j++)" EOL
-    "    {" EOL
-    "      gp_Pnt aPj = aPoints(j);" EOL
-    "      if(!aPi.IsEqual(aPj,0.9))" EOL
-    "        aIndex++;" EOL
-    "    }" EOL
-    "    if(aIndex == j - 1)" EOL
-    "      aPoints1.Append(aPi);" EOL
-    "" EOL
-    "    aIndex = i + 1;" EOL
-    "  }" EOL
-    "" EOL
-    "  // find max point" EOL
-    "  aIndex = 0;" EOL
-    "  gp_Pnt aPntMax = aPoints1(1);" EOL
-    "  nbNodes = aPoints1.Length();" EOL
-    "  for(i = 2; i <= nbNodes; i++)" EOL
-    "  {" EOL
-    "    if(aPoints1(i).X() > aPntMax.X())" EOL
-    "    {" EOL
-    "      aIndex = i;" EOL
-    "      aPntMax = aPoints1(aIndex);      " EOL
-    "    } " EOL
-    "  }" EOL
-    "" EOL
-    "  // clear seguence" EOL
-    "  aPoints.Clear();" EOL
-    "" EOL
-    "  Standard_Integer nbLeftNodes = nbNodes;" EOL
-    "" EOL
-    "  // ascending sort - fill aPoints with ascending " EOL
-    "  // by X coordinate points from aPoints1" EOL
-    "  for(i = 1; i < nbNodes; i++)" EOL
-    "  {" EOL
-    "    Standard_Real aMin = aPntMax.X();" EOL
-    "    aIndex = 1;" EOL
-    "    for( Standard_Integer j = 1; j <= nbLeftNodes; j++)" EOL
-    "    {" EOL
-    "      if(aPoints1(j).X() < aMin)" EOL
-    "      {" EOL
-    "        aMin = aPoints1(j).X();" EOL
-    "        aIndex = j;" EOL
-    "      } " EOL
-    "    }" EOL
-    "    aPoints.Append(aPoints1(aIndex));" EOL
-    "    aPoints1.Remove(aIndex);" EOL
-    "    nbLeftNodes = aPoints1.Length();" EOL
-    "  }" EOL
-    "  aPoints.Append(aPntMax);" EOL
-    "" EOL
-    "  // define parameters GeomPlate_BuildPlateSurface" EOL
-    "  Standard_Integer Degree = 3;" EOL
-    "  Standard_Integer NbPtsOnCur = 10;" EOL
-    "  Standard_Integer NbIter = 3;" EOL
-    "  Standard_Integer Order = 0;" EOL
-    "  Standard_Integer MaxSeg = 9;" EOL
-    "  Standard_Integer MaxDegree = 5;" EOL
-    "  Standard_Real dmax, anApproxTol = 0.001;" EOL
-    "  Standard_Real aConstrTol = Precision::Confusion();" EOL
-    "  " EOL
-    "  // define object BuildPlateSurface" EOL
-    "  GeomPlate_BuildPlateSurface BPSurf(Degree,NbPtsOnCur,NbIter);" EOL
-    "  " EOL
-    "  // add point constraints to GeomPlate_BuildPlateSurface object" EOL
-    "  nbNodes = aPoints.Length();" EOL
-    "  for (i = 1; i <= nbNodes; i++)" EOL
-    "    BPSurf.Add(new GeomPlate_PointConstraint(aPoints(i), Order, aConstrTol));" EOL
-    "" EOL
-    "  BPSurf.Perform();" EOL
-    "" EOL
-    "  // make PlateSurface" EOL
-    "  Handle(GeomPlate_Surface) PSurf;" EOL
-    "  Handle(Geom_Surface) aSurf;" EOL
-    "  " EOL
-    "  if (BPSurf.IsDone())" EOL
-    "  {" EOL
-    "    PSurf = BPSurf.Surface();" EOL
-    "" EOL
-    "    // define parameter approximation" EOL
-    "    dmax = Max(0.01,10*BPSurf.G0Error());" EOL
-    "" EOL
-    "    // make approximation" EOL
-    "    GeomPlate_MakeApprox Mapp(PSurf,anApproxTol, MaxSeg,MaxDegree,dmax);" EOL
-    "    aSurf = Mapp.Surface();" EOL
-    "  }" EOL
-    "  else " EOL
-    "    return;" EOL
-    "" EOL
-    "  ShapeAnalysis_FreeBounds aFreeBounds(aShape, Standard_False, Standard_True);" EOL
-    "  TopoDS_Compound aClosedWires = aFreeBounds.GetClosedWires();" EOL
-    "  TopTools_IndexedMapOfShape aWires;" EOL
-    "  TopExp::MapShapes(aClosedWires, TopAbs_WIRE, aWires);" EOL
-    "  TopoDS_Wire aWire;" EOL
-    "  Standard_Integer nbWires = aWires.Extent();" EOL
-    "  if (nbWires) " EOL
-    "    aWire = TopoDS::Wire(aWires(1));" EOL
-    "  else " EOL
-    "    return;" EOL
-    "" EOL
-    "  BRep_Builder B;" EOL
-    "  TopoDS_Face aFace;" EOL
-    "  B.MakeFace(aFace, aSurf, Precision::Confusion());" EOL
-    "  B.Add(aFace, aWire);" EOL
-    "  Handle_ShapeFix_Shape sfs = new ShapeFix_Shape(aFace);" EOL
-    "  sfs->Perform();" EOL
-    "  TopoDS_Shape aFixedFace = sfs->Shape();" EOL
-    "  if (aFixedFace.IsNull()) " EOL
-    "    return;" EOL);
+    myCResultDialog.SetTitle("Simplify Face");
+    myCResultDialog.SetText("  TopoDS_Shape aShape;\n"
+    "\n"
+    "  // initialize aShape\n"
+    "  //aShape = ...\n"
+    "\n"
+    "  // define parameter triangulation\n"
+    "  Standard_Real aDeflection = 0.1;\n"
+    "  \n"
+    "  // removes all the triangulations of the faces ,\n"
+    "  //and all the polygons on the triangulations of the edges\n"
+    "  BRepTools::Clean(aShape);\n"
+    "  // adds a triangulation of the shape aShape with the deflection aDeflection\n"
+    "  BRepMesh::Mesh(aShape,aDeflection);\n"
+    "\n"
+    "  Standard_Integer aIndex = 1, nbNodes = 0;\n"
+    "  \n"
+    "  // define two sequence of points\n"
+    "  TColgp_SequenceOfPnt aPoints, aPoints1;\n"
+    " \n"
+    "  // triangulation\n"
+    "  for(TopExp_Explorer aExpFace(aShape,TopAbs_FACE); aExpFace.More(); aExpFace.Next())\n"
+    "  {  \n"
+    "    TopoDS_Face aFace = TopoDS::Face(aExpFace.Current());\n"
+    "    TopLoc_Location aLocation;\n"
+    "\n"
+    "    // takes the triangulation of the face aFace\n"
+    "    Handle_Poly_Triangulation aTr = BRep_Tool::Triangulation(aFace,aLocation);\n"
+    "\n"
+    "    if(!aTr.IsNull())\n"
+    "    { \n"
+    "      // takes the array of nodes for this triangulation\n"
+    "      const TColgp_Array1OfPnt& aNodes = aTr->Nodes();    \n"
+    "      nbNodes = aNodes.Length();\n"
+    "\n"
+    "      for( Standard_Integer i = 1; i <= nbNodes; i++)\n"
+    "      {\n"
+    "        // create seguence of node points in absolute coordinate system\n"
+    "        gp_Pnt aPnt = aNodes(i).Transformed(aLocation);\n"
+    "        aPoints.Append(aPnt);\n"
+    "        \n"
+    "      }\n"
+    "    }\n"
+    "  }\n"
+    " \n"
+    "  // remove double points\n"
+    "  nbNodes = aPoints.Length();\n"
+    "  for( Standard_Integer i = 1; i <= nbNodes; i++)\n"
+    "  {\n"
+    "    gp_Pnt aPi = aPoints(i);\n"
+    "    for( Standard_Integer j = i + 1; j < nbNodes; j++)\n"
+    "    {\n"
+    "      gp_Pnt aPj = aPoints(j);\n"
+    "      if(!aPi.IsEqual(aPj,0.9))\n"
+    "        aIndex++;\n"
+    "    }\n"
+    "    if(aIndex == j - 1)\n"
+    "      aPoints1.Append(aPi);\n"
+    "\n"
+    "    aIndex = i + 1;\n"
+    "  }\n"
+    "\n"
+    "  // find max point\n"
+    "  aIndex = 0;\n"
+    "  gp_Pnt aPntMax = aPoints1(1);\n"
+    "  nbNodes = aPoints1.Length();\n"
+    "  for(i = 2; i <= nbNodes; i++)\n"
+    "  {\n"
+    "    if(aPoints1(i).X() > aPntMax.X())\n"
+    "    {\n"
+    "      aIndex = i;\n"
+    "      aPntMax = aPoints1(aIndex);      \n"
+    "    } \n"
+    "  }\n"
+    "\n"
+    "  // clear seguence\n"
+    "  aPoints.Clear();\n"
+    "\n"
+    "  Standard_Integer nbLeftNodes = nbNodes;\n"
+    "\n"
+    "  // ascending sort - fill aPoints with ascending \n"
+    "  // by X coordinate points from aPoints1\n"
+    "  for(i = 1; i < nbNodes; i++)\n"
+    "  {\n"
+    "    Standard_Real aMin = aPntMax.X();\n"
+    "    aIndex = 1;\n"
+    "    for( Standard_Integer j = 1; j <= nbLeftNodes; j++)\n"
+    "    {\n"
+    "      if(aPoints1(j).X() < aMin)\n"
+    "      {\n"
+    "        aMin = aPoints1(j).X();\n"
+    "        aIndex = j;\n"
+    "      } \n"
+    "    }\n"
+    "    aPoints.Append(aPoints1(aIndex));\n"
+    "    aPoints1.Remove(aIndex);\n"
+    "    nbLeftNodes = aPoints1.Length();\n"
+    "  }\n"
+    "  aPoints.Append(aPntMax);\n"
+    "\n"
+    "  // define parameters GeomPlate_BuildPlateSurface\n"
+    "  Standard_Integer Degree = 3;\n"
+    "  Standard_Integer NbPtsOnCur = 10;\n"
+    "  Standard_Integer NbIter = 3;\n"
+    "  Standard_Integer Order = 0;\n"
+    "  Standard_Integer MaxSeg = 9;\n"
+    "  Standard_Integer MaxDegree = 5;\n"
+    "  Standard_Real dmax, anApproxTol = 0.001;\n"
+    "  Standard_Real aConstrTol = Precision::Confusion();\n"
+    "  \n"
+    "  // define object BuildPlateSurface\n"
+    "  GeomPlate_BuildPlateSurface BPSurf(Degree,NbPtsOnCur,NbIter);\n"
+    "  \n"
+    "  // add point constraints to GeomPlate_BuildPlateSurface object\n"
+    "  nbNodes = aPoints.Length();\n"
+    "  for (i = 1; i <= nbNodes; i++)\n"
+    "    BPSurf.Add(new GeomPlate_PointConstraint(aPoints(i), Order, aConstrTol));\n"
+    "\n"
+    "  BPSurf.Perform();\n"
+    "\n"
+    "  // make PlateSurface\n"
+    "  Handle(GeomPlate_Surface) PSurf;\n"
+    "  Handle(Geom_Surface) aSurf;\n"
+    "  \n"
+    "  if (BPSurf.IsDone())\n"
+    "  {\n"
+    "    PSurf = BPSurf.Surface();\n"
+    "\n"
+    "    // define parameter approximation\n"
+    "    dmax = Max(0.01,10*BPSurf.G0Error());\n"
+    "\n"
+    "    // make approximation\n"
+    "    GeomPlate_MakeApprox Mapp(PSurf,anApproxTol, MaxSeg,MaxDegree,dmax);\n"
+    "    aSurf = Mapp.Surface();\n"
+    "  }\n"
+    "  else \n"
+    "    return;\n"
+    "\n"
+    "  ShapeAnalysis_FreeBounds aFreeBounds(aShape, Standard_False, Standard_True);\n"
+    "  TopoDS_Compound aClosedWires = aFreeBounds.GetClosedWires();\n"
+    "  TopTools_IndexedMapOfShape aWires;\n"
+    "  TopExp::MapShapes(aClosedWires, TopAbs_WIRE, aWires);\n"
+    "  TopoDS_Wire aWire;\n"
+    "  Standard_Integer nbWires = aWires.Extent();\n"
+    "  if (nbWires) \n"
+    "    aWire = TopoDS::Wire(aWires(1));\n"
+    "  else \n"
+    "    return;\n"
+    "\n"
+    "  BRep_Builder B;\n"
+    "  TopoDS_Face aFace;\n"
+    "  B.MakeFace(aFace, aSurf, Precision::Confusion());\n"
+    "  B.Add(aFace, aWire);\n"
+    "  Handle_ShapeFix_Shape sfs = new ShapeFix_Shape(aFace);\n"
+    "  sfs->Perform();\n"
+    "  TopoDS_Shape aFixedFace = sfs->Shape();\n"
+    "  if (aFixedFace.IsNull()) \n"
+    "    return;\n");
 
     // define parameter triangulation
     Standard_Real aDeflection = 0.1;
index 3e8de8d..4232cef 100755 (executable)
@@ -98,7 +98,7 @@ void CGeometryView::OnFileExportImage()
   SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
 }
 
-void CGeometryView::OnSize(UINT nType, int cx, int cy) 
+void CGeometryView::OnSize(UINT /*nType*/, int /*cx*/, int /*cy*/)
 {
   if (!myView.IsNull())
     myView->MustBeResized();
@@ -213,7 +213,7 @@ void CGeometryView::OnLButtonUp(UINT nFlags, CPoint point)
   } // else // if ( Ctrl )
 }
 
-void CGeometryView::OnMButtonDown(UINT nFlags, CPoint point) 
+void CGeometryView::OnMButtonDown(UINT nFlags, CPoint /*point*/) 
 {
   if ( nFlags & MK_CONTROL ) 
   {
@@ -222,7 +222,7 @@ void CGeometryView::OnMButtonDown(UINT nFlags, CPoint point)
   }
 }
 
-void CGeometryView::OnMButtonUp(UINT nFlags, CPoint point) 
+void CGeometryView::OnMButtonUp(UINT nFlags, CPoint /*point*/)
 {
   if ( nFlags & MK_CONTROL ) 
   {
@@ -248,7 +248,7 @@ void CGeometryView::OnRButtonDown(UINT nFlags, CPoint point)
   }
 }
 
-void CGeometryView::OnRButtonUp(UINT nFlags, CPoint point) 
+void CGeometryView::OnRButtonUp(UINT /*nFlags*/, CPoint /*point*/) 
 {
   SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
   myView->SetComputedMode (myHlrModeIsOn);
@@ -412,8 +412,8 @@ void CGeometryView::DragEvent(const Standard_Integer  x        ,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryView::InputEvent(const Standard_Integer  x     ,
-                               const Standard_Integer  y     ) 
+void CGeometryView::InputEvent(const Standard_Integer /*x*/,
+                               const Standard_Integer /*y*/)
 {
   GetDocument()->GetAISContext()->Select(); 
 }
@@ -421,8 +421,8 @@ void CGeometryView::InputEvent(const Standard_Integer  x     ,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryView::MoveEvent(const Standard_Integer  x       ,
-                              const Standard_Integer  y       ) 
+void CGeometryView::MoveEvent(const Standard_Integer x,
+                              const Standard_Integer y)
 {
   GetDocument()->GetAISContext()->MoveTo(x,y,myView);
 }
@@ -460,8 +460,8 @@ void CGeometryView::ShiftDragEvent(const Standard_Integer  x        ,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CGeometryView::ShiftInputEvent(const Standard_Integer  x       ,
-                                    const Standard_Integer  y       ) 
+void CGeometryView::ShiftInputEvent(const Standard_Integer /*x*/,
+                                    const Standard_Integer /*y*/)
 {
   GetDocument()->GetAISContext()->ShiftSelect(); 
 }
index 5e49192..c4d0b50 100755 (executable)
@@ -39,7 +39,7 @@ CGeometryView2D::~CGeometryView2D()
 
 // CNSGView drawing
 
-void CGeometryView2D::OnDraw(CDC* pDC)
+void CGeometryView2D::OnDraw(CDC* /*pDC*/)
 {
   CGeometryDoc* pDoc = GetDocument();
   ASSERT_VALID(pDoc);
@@ -170,7 +170,7 @@ void CGeometryView2D::OnLButtonUp(UINT nFlags, CPoint point)
 
 }
 
-void CGeometryView2D::OnMButtonDown(UINT nFlags, CPoint point) 
+void CGeometryView2D::OnMButtonDown(UINT nFlags, CPoint /*point*/) 
 {
   if ( nFlags & MK_CONTROL ) 
   {
@@ -179,7 +179,7 @@ void CGeometryView2D::OnMButtonDown(UINT nFlags, CPoint point)
   }
 }
 
-void CGeometryView2D::OnMButtonUp(UINT nFlags, CPoint point) 
+void CGeometryView2D::OnMButtonUp(UINT nFlags, CPoint /*point*/) 
 {
   if ( nFlags & MK_CONTROL ) 
   {
@@ -201,7 +201,7 @@ void CGeometryView2D::OnRButtonDown(UINT nFlags, CPoint point)
   }    
 }
 
-void CGeometryView2D::OnRButtonUp(UINT nFlags, CPoint point) 
+void CGeometryView2D::OnRButtonUp(UINT /*nFlags*/, CPoint point) 
 {
   OCC_2dView::Popup2D(point.x,point.y);
 }
@@ -277,7 +277,7 @@ void CGeometryView2D::OnMouseMove(UINT nFlags, CPoint point)
       }
 }
 
-void CGeometryView2D::OnSize(UINT nType, int cx, int cy) 
+void CGeometryView2D::OnSize(UINT /*nType*/, int /*cx*/, int /*cy*/) 
 {
   if (!myV2dView.IsNull())
   {
index 71b5cd9..853f5cb 100755 (executable)
@@ -29,9 +29,9 @@ ISession2D_Curve::ISession2D_Curve(const Handle_Geom2d_Curve aGeom2dCurve,
   myradiusratio = 1;
 }
 
-void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
                                const Handle(Prs3d_Presentation)& aPresentation,
-                               const Standard_Integer aMode) 
+                               const Standard_Integer /*aMode*/) 
 {
 
   Geom2dAdaptor_Curve anAdaptor(myGeom2dCurve);
@@ -118,8 +118,8 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
   }
 }
 
-void ISession2D_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                        const Standard_Integer aMode) 
+void ISession2D_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
+                                        const Standard_Integer /*aMode*/) 
 { 
 }
 
index f3b463c..e649376 100755 (executable)
@@ -30,7 +30,7 @@ ISession_Curve::~ISession_Curve()
 {
 
 }
-void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer aMode)
 {
@@ -48,14 +48,14 @@ void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresen
     }
 }
 
-void ISession_Curve::Compute(const Handle(Prs3d_Projector)& aProjector,
-                             const Handle(Prs3d_Presentation)& aPresentation) 
+void ISession_Curve::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
  {
 
  }
 
-void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                     const Standard_Integer aMode) 
+void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
+                                     const Standard_Integer /*aMode*/) 
 { 
 }
 
index 64ad5dc..b01a86f 100755 (executable)
@@ -25,24 +25,24 @@ ISession_Direction::ISession_Direction()
 
 }
 
-ISession_Direction::ISession_Direction(gp_Pnt& aPnt,gp_Dir&   aDir,Standard_Real aLength,Standard_Real anArrowLength)
+ISession_Direction::ISession_Direction(const gp_Pnt& aPnt,const gp_Dir&   aDir,Standard_Real aLength,Standard_Real anArrowLength)
 :myPnt(aPnt),myDir(aDir),myLength(aLength),myArrowLength(anArrowLength)
 {}
 
-ISession_Direction::ISession_Direction(gp_Pnt& aPnt,gp_Vec&   aVec,Standard_Real anArrowLength)
+ISession_Direction::ISession_Direction(const gp_Pnt& aPnt,const gp_Vec&   aVec,Standard_Real anArrowLength)
 :myPnt(aPnt),myDir(aVec),myArrowLength(anArrowLength)
 {
   myLength = aVec.Magnitude();
 }
 
-ISession_Direction::ISession_Direction(gp_Pnt2d& aPnt2d,
-                                       gp_Dir2d& aDir2d,
+ISession_Direction::ISession_Direction(const gp_Pnt2d& aPnt2d,
+                                       const gp_Dir2d& aDir2d,
                                        Standard_Real aLength)
 :myPnt(gp_Pnt(aPnt2d.X(),aPnt2d.Y(),0)),myDir(gp_Dir(aDir2d.X(),aDir2d.Y(),0)),myLength(aLength)
 {}
 
-ISession_Direction::ISession_Direction(gp_Pnt2d& aPnt2d,
-                                       gp_Vec2d&   aVec2d)
+ISession_Direction::ISession_Direction(const gp_Pnt2d& aPnt2d,
+                                       const gp_Vec2d&   aVec2d)
 :myPnt(gp_Pnt(aPnt2d.X(),aPnt2d.Y(),0)),myDir(gp_Dir(aVec2d.X(),aVec2d.Y(),0))
 {
   myLength = aVec2d.Magnitude();
@@ -54,9 +54,9 @@ ISession_Direction::~ISession_Direction()
 
 }
 
-void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer aMode)
+                             const Standard_Integer /*aMode*/)
 {
     Handle(Prs3d_ArrowAspect) anArrowAspect = myDrawer->ArrowAspect();
     anArrowAspect->SetLength(myArrowLength);
@@ -76,13 +76,13 @@ void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& aPr
 }
 
 
-void ISession_Direction::Compute(const Handle(Prs3d_Projector)& aProjector,
-                             const Handle(Prs3d_Presentation)& aPresentation) 
+void ISession_Direction::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+                                 const Handle(Prs3d_Presentation)& /*aPresentation*/) 
  {
  }
 
-void ISession_Direction::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                     const Standard_Integer aMode) 
+void ISession_Direction::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
+                                         const Standard_Integer /*aMode*/) 
 { 
 }
 
@@ -90,3 +90,8 @@ void ISession_Direction::SetText(TCollection_ExtendedString & aText)
 {
     myText = aText;
 }
+
+void ISession_Direction::SetText(Standard_CString aText)
+{
+    myText = aText;
+}
index 5871c8d..20c391b 100755 (executable)
@@ -16,12 +16,13 @@ class ISession_Direction : public AIS_InteractiveObject
 public:
   TCollection_ExtendedString myText;
   void SetText(TCollection_ExtendedString& aText);
+  void SetText(Standard_CString 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(const gp_Pnt& aPnt,const gp_Dir&   aDir,Standard_Real aLength=1,Standard_Real anArrowLength=1);
+  ISession_Direction(const gp_Pnt& aPnt,const 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(const gp_Pnt2d& aPnt2d,const gp_Dir2d&   aDir2d,Standard_Real aLength=1);
+  ISession_Direction(const gp_Pnt2d& aPnt2d,const gp_Vec2d&   aVec2d);
 
   virtual ~ISession_Direction();
   DEFINE_STANDARD_RTTI(ISession_Direction)
index 2d957a4..d533b9c 100755 (executable)
@@ -24,13 +24,13 @@ ISession_Point::ISession_Point(Standard_Real X,Standard_Real Y ,Standard_Real Z)
 
 }
 
-ISession_Point::ISession_Point(gp_Pnt2d& aPoint,Standard_Real Elevation)
+ISession_Point::ISession_Point(const gp_Pnt2d& aPoint,Standard_Real Elevation)
 :myPoint(gp_Pnt(aPoint.X(),aPoint.Y(),Elevation))
 {
 
 }
 
-ISession_Point::ISession_Point(gp_Pnt& aPoint)
+ISession_Point::ISession_Point(const gp_Pnt& aPoint)
 :myPoint(aPoint)
 {
 
@@ -41,9 +41,9 @@ ISession_Point::~ISession_Point()
 
 }
 
-void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer aMode)
+                             const Standard_Integer /*aMode*/)
 {
     Handle(Geom_CartesianPoint) aGeomPoint = new Geom_CartesianPoint(myPoint);
 
@@ -51,13 +51,13 @@ void ISession_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresen
  }
 
 
-void ISession_Point::Compute(const Handle(Prs3d_Projector)& aProjector,
-                             const Handle(Prs3d_Presentation)& aPresentation) 
+void ISession_Point::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
  {
  }
 
-void ISession_Point::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, 
-                                     const Standard_Integer unMode)
+void ISession_Point::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/, 
+                                     const Standard_Integer /*unMode*/)
 {
 }
 
index d372fb1..3b1f589 100755 (executable)
@@ -19,8 +19,8 @@ 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);
+  ISession_Point(const gp_Pnt2d& aPoint,Standard_Real Elevation = 0);
+  ISession_Point(const gp_Pnt& aPoint);
   virtual ~ISession_Point();
   DEFINE_STANDARD_RTTI(ISession_Point)
 
index 2a370e1..dccb298 100755 (executable)
@@ -31,7 +31,7 @@ ISession_Surface::~ISession_Surface()
 {
 
 }
-void ISession_Surface::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void ISession_Surface::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer aMode)
 {
@@ -56,12 +56,12 @@ void ISession_Surface::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
 
 }
 
-void ISession_Surface::Compute(const Handle(Prs3d_Projector)& aProjector,
-                             const Handle(Prs3d_Presentation)& aPresentation) 
+void ISession_Surface::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+                               const Handle(Prs3d_Presentation)& /*aPresentation*/) 
 {
 }
 
-void ISession_Surface::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                     const Standard_Integer aMode) 
+void ISession_Surface::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
+                                       const Standard_Integer /*aMode*/) 
 { 
 }
\ No newline at end of file
index 5d010a5..b754248 100755 (executable)
@@ -62,20 +62,20 @@ ISession_Text::~ISession_Text()
 
 }
 
-void ISession_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
-                             const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer aMode)
+void ISession_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+                            const Handle(Prs3d_Presentation)& aPresentation,
+                            const Standard_Integer /*aMode*/)
 {
     Prs3d_Text::Draw(aPresentation,myDrawer,MyText,gp_Pnt(  MyX ,MyY,MyZ ));
 }
 
-void ISession_Text::Compute(const Handle(Prs3d_Projector)& aProjector,
-                             const Handle(Prs3d_Presentation)& aPresentation) 
+void ISession_Text::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+                            const Handle(Prs3d_Presentation)& /*aPresentation*/) 
  {
  }
 
-void ISession_Text::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, 
-                                     const Standard_Integer unMode)
+void ISession_Text::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/, 
+                                    const Standard_Integer /*unMode*/)
 {
 }
 
index bda7433..06c2279 100644 (file)
       <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
index 74f8cfb..851e0cb 100644 (file)
       <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
index 21a4deb..dc495fd 100644 (file)
@@ -62,7 +62,7 @@
                                AssemblerListingLocation=".\win32\objd/"
                                ObjectFile=".\win32\objd/"
                                ProgramDataBaseFileName=".\win32\objd/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                                CompileAs="0"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="../../../..\win64\vc8\bind"
-                       IntermediateDirectory=".\win64\objd"
+                       Name="Release|Win32"
+                       OutputDirectory="../../../..\win32\vc8\bin"
+                       IntermediateDirectory=".\win32\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\win64\objd/TopologyTransformations.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\win32\obj/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win64\objd/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win64\objd/"
-                               ObjectFile=".\win64\objd/"
-                               ProgramDataBaseFileName=".\win64\objd/"
-                               WarningLevel="3"
+                               PrecompiledHeaderFile=".\win32\obj/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win32\obj/"
+                               ObjectFile=".\win32\obj/"
+                               ProgramDataBaseFileName=".\win32\obj/"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
                        />
                        <Tool
                        />
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib TKBO.lib"
-                               OutputFile="../../../..\win64\vc8\bind/Modeling.exe"
-                               LinkIncremental="2"
+                               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 TKOpenGl.lib mfcsample.lib  TKBO.lib"
+                               OutputFile="../../../..\win32\vc8\bin/Modeling.exe"
+                               LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win64\vc8\bind/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Modeling.pdb"
                                SubSystem="2"
-                               TargetMachine="17"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="../../../..\win32\vc8\bin"
-                       IntermediateDirectory=".\win32\obj"
+                       Name="Debug|x64"
+                       OutputDirectory="../../../..\win64\vc8\bind"
+                       IntermediateDirectory=".\win64\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\win32\obj/TopologyTransformations.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\win64\objd/TopologyTransformations.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;WNT;WINVER=0x0500"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win32\obj/TopologyTransformations.pch"
-                               AssemblerListingLocation=".\win32\obj/"
-                               ObjectFile=".\win32\obj/"
-                               ProgramDataBaseFileName=".\win32\obj/"
+                               PrecompiledHeaderFile=".\win64\objd/TopologyTransformations.pch"
+                               AssemblerListingLocation=".\win64\objd/"
+                               ObjectFile=".\win64\objd/"
+                               ProgramDataBaseFileName=".\win64\objd/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
                        />
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib  TKBO.lib"
-                               OutputFile="../../../..\win32\vc8\bin/Modeling.exe"
-                               LinkIncremental="1"
+                               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 TKOpenGl.lib mfcsample.lib TKBO.lib"
+                               OutputFile="../../../..\win64\vc8\bind/Modeling.exe"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OPT_LIB32)"
-                               ProgramDatabaseFile="../../../..\win32\vc8\bin/Modeling.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OPT_LIB64D)"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bind/Modeling.pdb"
                                SubSystem="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="Release|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|Win32"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="Release|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|Win32"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
                                        />
                                </FileConfiguration>
index e476b55..bd01035 100644 (file)
@@ -63,7 +63,7 @@
                                AssemblerListingLocation=".\win32\objd/"
                                ObjectFile=".\win32\objd/"
                                ProgramDataBaseFileName=".\win32\objd/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                                CompileAs="0"
                                AssemblerListingLocation=".\win64\objd/"
                                ObjectFile=".\win64\objd/"
                                ProgramDataBaseFileName=".\win64\objd/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                AssemblerListingLocation=".\win64\obj/"
                                ObjectFile=".\win64\obj/"
                                ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
index 97d78b2..1dc7faa 100755 (executable)
@@ -21,20 +21,20 @@ IMPLEMENT_STANDARD_RTTIEXT(ISession_Direction,AIS_InteractiveObject)
 //////////////////////////////////////////////////////////////////////
 
 
-ISession_Direction::ISession_Direction(gp_Pnt& aPnt,gp_Pnt& aPnt2)
+ISession_Direction::ISession_Direction(const gp_Pnt& aPnt,const gp_Pnt& aPnt2)
 :myStartPnt(aPnt),myEndPnt(aPnt2)
 {}
 
-ISession_Direction::ISession_Direction(gp_Pnt& aPnt,gp_Vec& aVec)
+ISession_Direction::ISession_Direction(const gp_Pnt& aPnt,const gp_Vec& aVec)
 :myStartPnt(aPnt)
 {
   myEndPnt = myStartPnt.Translated(aVec);
 }
 
 
-void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
-                             const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer aMode)
+void ISession_Direction::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
+                                 const Handle(Prs3d_Presentation)& aPresentation,
+                                 const Standard_Integer /*aMode*/)
 {
     Handle(Prs3d_ArrowAspect) anArrowAspect = myDrawer->ArrowAspect();
     anArrowAspect->SetLength(myStartPnt.Distance(myEndPnt));
index e4c5d79..cfec6d2 100755 (executable)
@@ -21,8 +21,8 @@ class ISession_Direction : public AIS_InteractiveObject
 {
 public:
        ISession_Direction();
-    ISession_Direction(gp_Pnt& aPnt,gp_Pnt& aPnt2);
-    ISession_Direction(gp_Pnt& aPnt,gp_Vec& aVec);
+    ISession_Direction(const gp_Pnt& aPnt,const gp_Pnt& aPnt2);
+    ISession_Direction(const gp_Pnt& aPnt,const gp_Vec& aVec);
 
     DEFINE_STANDARD_RTTI(ISession_Direction)
 
index faab1a7..51005da 100755 (executable)
@@ -108,10 +108,10 @@ void CModelingDoc::OnMirror()
        for(aListIterator.Initialize(aList);aListIterator.More();aListIterator.Next()){
                myAISContext->Remove(aListIterator.Value());
        }
-       TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.); 
+       TopoDS_Shape S = BRepPrimAPI_MakeWedge(60.,100.,80.,20.);
        Handle(AIS_Shape) ais1 = new AIS_Shape(S);
-       myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); 
-       myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);   
+       myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False);
+       myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
        myAISContext->Display(ais1,Standard_False);
        gp_Trsf theTransformation;
        gp_Pnt PntCenterOfTheTransformation(110,60,60);
@@ -277,7 +277,7 @@ void CModelingDoc::OnTranslation()
        myAISContext->Display(ais1,Standard_False);
        gp_Trsf theTransformation;
        gp_Vec theVectorOfTranslation(-6,-6,6);
+
        Handle (ISession_Direction) aDirection1 = new ISession_Direction(gp_Pnt(0,0,0),theVectorOfTranslation);
        myAISContext->Display(aDirection1,Standard_False);
 
@@ -3651,7 +3651,7 @@ void CModelingDoc::OnBuilder()
 
        //Circular Edges
        Handle (Geom_Circle) C;
-       Standard_Real R = 100;
+       //Standard_Real R = 100;
 
        //Edge EX01
        C = new Geom_Circle(gp_Ax2(gp_Pnt(100,0,100),gp_Dir(0,1,0),gp_Dir(-1,0,0)),100);
@@ -4810,9 +4810,9 @@ Please, select a face to continue\nthe creation of a tangent surface.");
        }
 }
 
-void CModelingDoc::InputEvent(const Standard_Integer  x     ,
-                                                 const Standard_Integer  y     ,
-                              const Handle(V3d_View)& aView ) 
+void CModelingDoc::InputEvent(const Standard_Integer /*x*/,
+                              const Standard_Integer /*y*/,
+                              const Handle(V3d_View)& /*aView*/)
 {
     myAISContext->Select();
        if (myState == SELECT_EDGE_PLATE_TGTES_1) {
index e618b81..e1465b5 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 492a1b4..1553f60 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 7967220..c3e8bd8 100644 (file)
@@ -64,7 +64,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="../../../..\win64\vc8\bin"
-                       IntermediateDirectory=".\win64\obj"
+                       Name="Debug|Win32"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\win64\obj/Viewer2d.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\win32\objd/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win64\obj/Viewer2d.pch"
-                               AssemblerListingLocation=".\win64\obj/"
-                               ObjectFile=".\win64\obj/"
-                               ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               PrecompiledHeaderFile=".\win32\objd/Viewer2d.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\objd/"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib"
-                               OutputFile="../../../..\win64\vc8\bin/Viewer2d.exe"
-                               LinkIncremental="1"
+                               OutputFile="../../../..\win32\vc8\bind/Viewer2d.exe"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer2d.pdb"
                                SubSystem="2"
-                               TargetMachine="17"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="../../../..\win32\vc8\bind"
-                       IntermediateDirectory=".\win32\objd"
+                       Name="Release|x64"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\win32\objd/Viewer2d.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\win64\obj/Viewer2d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win32\objd/Viewer2d.pch"
-                               AssemblerListingLocation=".\win32\objd/"
-                               ObjectFile=".\win32\objd/"
-                               ProgramDataBaseFileName=".\win32\objd/"
+                               PrecompiledHeaderFile=".\win64\obj/Viewer2d.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
                        />
                        <Tool
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib"
-                               OutputFile="../../../..\win32\vc8\bind/Viewer2d.exe"
-                               LinkIncremental="2"
+                               OutputFile="../../../..\win64\vc8\bin/Viewer2d.exe"
+                               LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer2d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer2d.pdb"
                                SubSystem="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
                                        />
                                </FileConfiguration>
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
index e4d81c5..39115d4 100644 (file)
@@ -65,7 +65,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                AssemblerListingLocation=".\win64\obj/"
                                ObjectFile=".\win64\obj/"
                                ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                AssemblerListingLocation=".\win32\objd/"
                                ObjectFile=".\win32\objd/"
                                ProgramDataBaseFileName=".\win32\objd/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                                CompileAs="0"
                                AssemblerListingLocation=".\win64\objd/"
                                ObjectFile=".\win64\objd/"
                                ProgramDataBaseFileName=".\win64\objd/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
index 796ef34..3efcbe4 100755 (executable)
@@ -249,7 +249,8 @@ void CViewer2dDoc::OnBUTTONTestFace()
 
     TopoDS_Shape aFaceShape;
     BRep_Builder aBuilder;
-    Standard_Boolean result = BRepTools::Read(aFaceShape,aFileName,aBuilder);
+    //Standard_Boolean result = BRepTools::Read(aFaceShape,aFileName,aBuilder);
+    BRepTools::Read(aFaceShape,aFileName,aBuilder);
 
     if(aFaceShape.IsNull() || aFaceShape.ShapeType() != TopAbs_FACE) 
     {
index 8335006..fe0e4b3 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index af07785..de2328b 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 598febc..e81d5a9 100644 (file)
@@ -64,7 +64,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="../../../..\win64\vc8\bin"
-                       IntermediateDirectory=".\win64\obj"
+                       Name="Debug|Win32"
+                       OutputDirectory="../../../..\win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\win64\obj/Viewer3d.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\win32\objd/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win64\obj/Viewer3d.pch"
-                               AssemblerListingLocation=".\win64\obj/"
-                               ObjectFile=".\win64\obj/"
-                               ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               PrecompiledHeaderFile=".\win32\objd/Viewer3d.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\objd/"
+                               BrowseInformation="1"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib"
-                               OutputFile="../../../..\win64\vc8\bin/Viewer3d.exe"
-                               LinkIncremental="1"
+                               OutputFile="../../../..\win32\vc8\bind/Viewer3d.exe"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
-                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer3d.pdb"
                                SubSystem="2"
-                               TargetMachine="17"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="../../../..\win32\vc8\bind"
-                       IntermediateDirectory=".\win32\objd"
+                       Name="Release|x64"
+                       OutputDirectory="../../../..\win64\vc8\bin"
+                       IntermediateDirectory=".\win64\obj"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\win32\objd/Viewer3d.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\win64\obj/Viewer3d.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;WINVER=0x0500"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win32\objd/Viewer3d.pch"
-                               AssemblerListingLocation=".\win32\objd/"
-                               ObjectFile=".\win32\objd/"
-                               ProgramDataBaseFileName=".\win32\objd/"
-                               BrowseInformation="1"
+                               PrecompiledHeaderFile=".\win64\obj/Viewer3d.pch"
+                               AssemblerListingLocation=".\win64\obj/"
+                               ObjectFile=".\win64\obj/"
+                               ProgramDataBaseFileName=".\win64\obj/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
                        />
                        <Tool
                        <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 TKV3d.lib TKOpenGl.lib mfcsample.lib"
-                               OutputFile="../../../..\win32\vc8\bind/Viewer3d.exe"
-                               LinkIncremental="2"
+                               OutputFile="../../../..\win64\vc8\bin/Viewer3d.exe"
+                               LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OPT_LIB32D)"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer3d.pdb"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OPT_LIB64)"
+                               ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer3d.pdb"
                                SubSystem="2"
-                               TargetMachine="1"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories="..\res"
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories="..\res"
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories="..\res"
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories="..\res"
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
                                                UsePrecompiledHeader="1"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="2"
+                                               Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               BasicRuntimeChecks="3"
+                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
-                                               Optimization="0"
+                                               Optimization="2"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
-                                               BasicRuntimeChecks="3"
-                                               BrowseInformation="1"
                                        />
                                </FileConfiguration>
                                <FileConfiguration
index f83be1d..55c82b9 100644 (file)
@@ -65,7 +65,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                AssemblerListingLocation=".\win64\obj/"
                                ObjectFile=".\win64\obj/"
                                ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                                ObjectFile=".\win32\objd/"
                                ProgramDataBaseFileName=".\win32\objd/"
                                BrowseInformation="1"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="4"
                                CompileAs="0"
                                ObjectFile=".\win64\objd/"
                                ProgramDataBaseFileName=".\win64\objd/"
                                BrowseInformation="1"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
index a19b496..58ad7b7 100755 (executable)
@@ -32,7 +32,7 @@ ISession_Curve::~ISession_Curve()
 {
 
 }
-void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
+void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
                              const Handle(Prs3d_Presentation)& aPresentation,
                              const Standard_Integer /*aMode*/)
 {
@@ -45,14 +45,14 @@ void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresen
   StdPrs_Curve::Add (aPresentation, anAdaptorCurve, myDrawer);
 }
 
-void ISession_Curve::Compute(const Handle(Prs3d_Projector)& aProjector,
-                             const Handle(Prs3d_Presentation)& aPresentation) 
+void ISession_Curve::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
+                             const Handle(Prs3d_Presentation)& /*aPresentation*/) 
  {
 
  }
 
-void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                     const Standard_Integer aMode) 
+void ISession_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
+                                     const Standard_Integer /*aMode*/) 
 { 
 }
 
index d9e0010..136a410 100755 (executable)
@@ -214,8 +214,8 @@ void COffsetDlg::UpdateValues()
        BOOL IsOverlappedBoxCurrent = aAISContext->IsCurrent(aOverlappedBox);
 
 
-       BOOL IsAnyOverlappedObjectCurrent = 
-               IsOverlappedCylinderCurrent || IsOverlappedSphereCurrent || IsOverlappedBoxCurrent;
+       /*BOOL IsAnyOverlappedObjectCurrent = 
+               IsOverlappedCylinderCurrent || IsOverlappedSphereCurrent || IsOverlappedBoxCurrent;*/
 
 
        BOOL IsCylinderCurrent = aAISContext->IsCurrent(aCylinder);
index a535dbd..a749ca2 100755 (executable)
@@ -504,9 +504,9 @@ void CViewer3dDoc::DragEvent(const Standard_Integer  x        ,
 //-----------------------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------------------
-void CViewer3dDoc::InputEvent(const Standard_Integer  x     ,
-                                                  const Standard_Integer  y     ,
-                                   const Handle(V3d_View)& aView ) 
+void CViewer3dDoc::InputEvent(const Standard_Integer /*x*/,
+                              const Standard_Integer /*y*/,
+                              const Handle(V3d_View)& /*aView*/ )
 {
   if (myOffsetDlg && myOffsetDlg->IsWindowVisible())
     myOffsetDlg->UpdateValues();
@@ -560,7 +560,8 @@ void CViewer3dDoc::InputEvent(const Standard_Integer  x     ,
       }
     }
 
-    TCollection_AsciiString aMessage ("  TopoDS_Shape S = myAISContext->SelectedShape(); \n"
+    myCResultDialog.SetTitle("Change face color");
+    myCResultDialog.SetText("  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"
@@ -579,11 +580,7 @@ void CViewer3dDoc::InputEvent(const Standard_Integer  x     ,
                                       "  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"));
+    SetTitle("Change face color");
   }
 }
 
@@ -716,15 +713,12 @@ void CViewer3dDoc::OnFaces()
   myAISContext->OpenLocalContext();
   myAISContext->ActivateStandardMode (TopAbs_FACE);
 
-  TCollection_AsciiString aMessage ("  myAISContext->OpenLocalContext(); \n"
+  myCResultDialog.SetTitle("Standard mode: TopAbs_FACE");
+  myCResultDialog.SetText("  myAISContext->OpenLocalContext(); \n"
                                     "  \n"
                                     "  myAISContext->ActivateStandardMode(TopAbs_FACE); \n"
                                     "  \n");
-
-  CString aMsgStr (aMessage.ToCString());
-  myCResultDialog.SetTitle (CString("Standard mode: TopAbs_FACE"));
-  myCResultDialog.SetText (aMsgStr);
-  SetTitle (CString ("Standard mode: TopAbs_FACE"));
+  SetTitle("Standard mode: TopAbs_FACE");
 }
 
 //Set edges selection mode
@@ -734,15 +728,12 @@ void CViewer3dDoc::OnEdges()
   myAISContext->OpenLocalContext();
   myAISContext->ActivateStandardMode(TopAbs_EDGE);
 
-  TCollection_AsciiString aMessage ("  myAISContext->OpenLocalContext(); \n"
+  myCResultDialog.SetTitle("Standard mode: TopAbs_EDGE");
+  myCResultDialog.SetText("  myAISContext->OpenLocalContext(); \n"
                                     "  \n"
                                     "  myAISContext->ActivateStandardMode(TopAbs_EDGE); \n"
                                     "  \n");
-
-  CString aMsgStr (aMessage.ToCString());
-  myCResultDialog.SetTitle (CString ("Standard mode: TopAbs_EDGE"));
-  myCResultDialog.SetText (aMsgStr);
-  SetTitle (CString ("Standard mode: TopAbs_EDGE"));
+  SetTitle("Standard mode: TopAbs_EDGE");
 }
 
 // Set vertices selection mode
@@ -752,15 +743,12 @@ void CViewer3dDoc::OnVertices()
   myAISContext->OpenLocalContext();
   myAISContext->ActivateStandardMode (TopAbs_VERTEX);
 
-  TCollection_AsciiString aMessage ("  myAISContext->OpenLocalContext(); \n"
+  myCResultDialog.SetTitle("Standard mode: TopAbs_VERTEX");
+  myCResultDialog.SetText("  myAISContext->OpenLocalContext(); \n"
                                     "  \n"
                                     "  myAISContext->ActivateStandardMode(TopAbs_VERTEX); \n"
                                     "  \n");
-
-  CString aMsgStr (aMessage.ToCString());
-  myCResultDialog.SetTitle (CString ("Standard mode: TopAbs_VERTEX"));
-  myCResultDialog.SetText (aMsgStr);
-  SetTitle (CString ("Standard mode: TopAbs_VERTEX"));
+  SetTitle("Standard mode: TopAbs_VERTEX");
 }
 
 //Neutral selection mode
@@ -768,13 +756,10 @@ void CViewer3dDoc::OnNeutral()
 {
   myAISContext->CloseAllContexts();
 
-  TCollection_AsciiString aMessage ("  myAISContext->CloseAllContexts(); \n"
+  myCResultDialog.SetTitle("Standard mode: Neutral");
+  myCResultDialog.SetText("  myAISContext->CloseAllContexts(); \n"
                                     "  \n");
-
-  CString aMsgStr (aMessage.ToCString());
-  myCResultDialog.SetTitle (CString ("Standard mode: Neutral"));
-  myCResultDialog.SetText (aMsgStr);
-  SetTitle (CString ("Standard mode: Neutral"));
+  SetTitle("Standard mode: Neutral");
 }
 
 // Change the color of faces on a user cylinder
@@ -854,7 +839,8 @@ void CViewer3dDoc::OnFillet3d()
     myAISContext->Redisplay (S);
   }
 
-  TCollection_AsciiString aMessage ("  Handle(AIS_Shape) S = Handle(AIS_Shape)::DownCast(myAISContext->Interactive()); \n"
+  myCResultDialog.SetTitle("Make a fillet");
+  myCResultDialog.SetText("  Handle(AIS_Shape) S = Handle(AIS_Shape)::DownCast(myAISContext->Interactive()); \n"
                                     "  \n"
                                     "  BRepAPI_MakeFillet aFillet(S->Shape()); \n"
                                     "  \n"
@@ -868,11 +854,7 @@ void CViewer3dDoc::OnFillet3d()
                                     "  \n"
                                     "  myAISContext->Redisplay(S); \n"
                                     "  \n");
-
-  CString aMsgStr (aMessage.ToCString());
-  myCResultDialog.SetTitle (CString ("Make a fillet"));
-  myCResultDialog.SetText (aMsgStr);
-  SetTitle (CString ("Make a fillet"));
+  SetTitle("Make a fillet");
 }
 
 // Create and display a circle with standard tools
@@ -888,17 +870,14 @@ void CViewer3dDoc::OnCircle()
   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"
+  myCResultDialog.SetTitle("Create a circle");
+  myCResultDialog.SetText("  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"));
+  SetTitle("Create a circle");
 }
 
 void CViewer3dDoc::OnLine() 
@@ -909,7 +888,8 @@ void CViewer3dDoc::OnLine()
   Handle(AIS_Line) anAISLine = new AIS_Line (aGeomLin);
   myAISContext->Display (anAISLine);
 
-  TCollection_AsciiString aMessage ("  gp_Lin L(gp_Pnt(0.,0.,0.),gp_Dir(1.,0.,0.)); \n"
+  myCResultDialog.SetTitle("Create a line");
+  myCResultDialog.SetText("  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"
@@ -917,11 +897,7 @@ void CViewer3dDoc::OnLine()
                                     "  \n"
                                     "  myAISContext->Display(anAISLine); \n"
                                     "  \n");
-
-  CString aMsgStr (aMessage.ToCString());
-  myCResultDialog.SetTitle (CString("Create a line"));
-  myCResultDialog.SetText (aMsgStr);
-  SetTitle (CString ("Create a line"));
+  SetTitle("Create a line");
 }
 
 void CViewer3dDoc::OnNbisos() 
@@ -936,15 +912,12 @@ void CViewer3dDoc::OnNbisos()
     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"
+    myCResultDialog.SetTitle("Iso Aspect");
+    myCResultDialog.SetText("  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"));
+    SetTitle("Iso Aspect");
   }
 }
 
index ef86a6e..32489d8 100755 (executable)
@@ -166,7 +166,7 @@ void CViewer3dView::OnInitialUpdate()
   RedrawVisMode();
 }
 
-void CViewer3dView::OnDraw(CDC* pDC)
+void CViewer3dView::OnDraw(CDC* /*pDC*/)
 {
        CViewer3dDoc* pDoc = GetDocument();
        ASSERT_VALID(pDoc);
@@ -228,7 +228,7 @@ gp_Pnt ConvertClickToPoint(Standard_Real x, Standard_Real y, Handle(V3d_View) aV
        return ResultPoint;
 }
 
-void CViewer3dView::OnSize(UINT nType, int cx, int cy) 
+void CViewer3dView::OnSize(UINT /*nType*/, int /*cx*/, int /*cy*/) 
 {
   if (!myView.IsNull())
    myView->MustBeResized();
@@ -498,7 +498,7 @@ GetDocument()->UpdateResultMessageDlg("SetDirection",Message);
     }
 }
 
-void CViewer3dView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) 
+void CViewer3dView::OnKeyDown(UINT nChar, UINT /*nRepCnt*/, UINT /*nFlags*/) 
 {
   
   if( nChar == X_Key || nChar == Y_Key || nChar == Z_Key )
@@ -594,7 +594,7 @@ void CViewer3dView::OnLButtonUp(UINT nFlags, CPoint point)
     } //       else // if ( Ctrl )
 }
 
-void CViewer3dView::OnMButtonDown(UINT nFlags, CPoint point) 
+void CViewer3dView::OnMButtonDown(UINT nFlags, CPoint /*point*/) 
 {
    if ( nFlags & MK_CONTROL ) 
          {
@@ -603,7 +603,7 @@ void CViewer3dView::OnMButtonDown(UINT nFlags, CPoint point)
          }
 }
 
-void CViewer3dView::OnMButtonUp(UINT nFlags, CPoint point) 
+void CViewer3dView::OnMButtonUp(UINT nFlags, CPoint /*point*/) 
 {
    if ( nFlags & MK_CONTROL ) 
          {
@@ -629,7 +629,7 @@ void CViewer3dView::OnRButtonDown(UINT nFlags, CPoint point)
   }
 }
 
-void CViewer3dView::OnRButtonUp(UINT nFlags, CPoint point) 
+void CViewer3dView::OnRButtonUp(UINT /*nFlags*/, CPoint /*point*/) 
 {
   SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
   myView->SetComputedMode (myHlrModeIsOn);
@@ -716,7 +716,7 @@ void CViewer3dView::OnMouseMove(UINT nFlags, CPoint point)
                        {
                                BRepBuilderAPI_MakeEdge MakeEdge(p1, p2);
                                directionalEdgeShape->Set(MakeEdge.Edge());
-                               GetDocument()->GetAISContext()->Redisplay(directionalEdgeShape,0,-1);
+                               GetDocument()->GetAISContext()->Redisplay(directionalEdgeShape,0,Standard_True);
                                myCurrent_DirectionalLight->SetDirection(p2.X()-p1.X(),p2.Y()-p1.Y(),p2.Z()-p1.Z());
                                myView->UpdateLights();
                        }
@@ -738,7 +738,7 @@ void CViewer3dView::OnMouseMove(UINT nFlags, CPoint point)
                                BRepPrimAPI_MakeCone MakeCone(gp_Ax2(p1, gp_Dir(gp_Vec(p1, p2))), 
                                        0, (p1.Distance(p2))/tan(1.04), coneHeigth);
                                spotConeShape->Set(MakeCone.Solid());
-                               GetDocument()->GetAISContext()->Redisplay(spotConeShape,0,-1);
+                               GetDocument()->GetAISContext()->Redisplay(spotConeShape,0,Standard_True);
                                myCurrent_SpotLight->SetDirection(p2.X()-p1.X(),p2.Y()-p1.Y(),p2.Z()-p1.Z());
                                myView->UpdateLights();
                        }
@@ -753,7 +753,7 @@ void CViewer3dView::OnMouseMove(UINT nFlags, CPoint point)
                                BRepPrimAPI_MakeCone MakeCone(gp_Ax2(p1, gp_Dir(gp_Vec(p1, p2))), 
                                        0, p2.Distance(p3), coneHeigth);
                                spotConeShape->Set(MakeCone.Solid());
-                               GetDocument()->GetAISContext()->Redisplay(spotConeShape,0,-1);
+                               GetDocument()->GetAISContext()->Redisplay(spotConeShape,0,Standard_True);
                                myCurrent_SpotLight->SetAngle(atan(p2.Distance(p3)/p1.Distance(p2))) ;
                                myView->UpdateLights();
                        }
@@ -827,7 +827,7 @@ void CViewer3dView::DrawRectangle(const Standard_Integer  MinX    ,
     else if (aLineStyle == Default) 
         { m_Pen = NULL;        m_DrawMode = R2_MERGEPENNOT;}
 
-    CPen* aOldPen;
+    CPen* aOldPen = NULL;
     CClientDC clientDC(this);
     if (m_Pen) aOldPen = clientDC.SelectObject(m_Pen);
     clientDC.SetROP2(m_DrawMode);
index 3dfdf4d..5d16c9e 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 9965e3a..8c8a077 100644 (file)
       <AssemblerListingLocation>.\win32\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win32\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win64\obj/</AssemblerListingLocation>
       <ObjectFileName>.\win64\obj/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\obj/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
     </ClCompile>
       <AssemblerListingLocation>.\win32\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win32\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win32\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
       <AssemblerListingLocation>.\win64\objd/</AssemblerListingLocation>
       <ObjectFileName>.\win64\objd/</ObjectFileName>
       <ProgramDataBaseFileName>.\win64\objd/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
index 03ab453..1e5dcfb 100644 (file)
@@ -64,7 +64,7 @@
                                AssemblerListingLocation=".\win32\obj/"
                                ObjectFile=".\win32\obj/"
                                ProgramDataBaseFileName=".\win32\obj/"
-                               WarningLevel="3"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
                                CompileAs="0"
                        />
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="../../../../win64\vc8\bin"
-                       IntermediateDirectory=".\win64\objd"
+                       Name="Debug|Win32"
+                       OutputDirectory="../../../../win32\vc8\bind"
+                       IntermediateDirectory=".\win32\objd"
                        ConfigurationType="1"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="2"
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\win64\obj/ImportExport.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\win32\objd/ImportExport.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OPT_INC)"
-                               PreprocessorDefinitions="NDEBUG;WIN64;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
-                               StringPooling="true"
-                               RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;WINVER=0x0500"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\win64\obj/ImportExport.pch"
-                               AssemblerListingLocation=".\win64\obj/"
-                               ObjectFile=".\win64\obj/"
-                               ProgramDataBaseFileName=".\win64\obj/"
-                               WarningLevel="3"
+                               PrecompiledHeaderFile=".\win32\objd/ImportExport.pch"
+                               AssemblerListingLocation=".\win32\objd/"
+                               ObjectFile=".\win32\objd/"
+                               ProgramDataBaseFileName=".\win32\objd/"
+                               WarningLevel="4"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="4"
                                CompileAs="0"
                        />
                        <Tool
@@