0021189: Clean up KAS:dev:ros and Products

VoxelDemo is modified to be compliant with OCC 6.5.4
Update of environment files and VS projects.

diff --git a/samples/qt/VoxelDemo/VoxelDemo-vc9.sln b/samples/qt/VoxelDemo/VoxelDemo-vc9.sln
new file mode 100644 (file)
index 0000000..fabee77
--- /dev/null
+++ b/samples/qt/VoxelDemo/VoxelDemo-vc9.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Win32 = Debug|Win32
+               Release|Win32 = Release|Win32
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.ActiveCfg = Debug|Win32
+               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.Build.0 = Debug|Win32
+               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.ActiveCfg = Release|Win32
+               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.Build.0 = Release|Win32
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal

diff --git a/samples/qt/VoxelDemo/VoxelDemo.sln b/samples/qt/VoxelDemo/VoxelDemo.sln
deleted file mode 100644 (file)
index 1e5a741..0000000
--- a/samples/qt/VoxelDemo/VoxelDemo.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}"
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.ActiveCfg = Debug|Win32
-               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.Build.0 = Debug|Win32
-               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.ActiveCfg = Release|Win32
-               {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal

diff --git a/samples/qt/VoxelDemo/VoxelDemo.vcproj b/samples/qt/VoxelDemo/VoxelDemo.vcproj
index 538b89c1e2068df36bd27f075472d454f5f45708..1745563d363424894826eae33022ce6aa817ad45 100644 (file)
--- a/samples/qt/VoxelDemo/VoxelDemo.vcproj
+++ b/samples/qt/VoxelDemo/VoxelDemo.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="9.00"
        Name="VoxelDemo"
        ProjectGUID="{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}"
        RootNamespace="VoxelDemo"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
        >
        <Platforms>
                <Platform
@@ -40,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="$(CSF_OPT_INC);.\inc"
+                               AdditionalIncludeDirectories=".\inc;$(CSF_OPT_INC)"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -66,6 +67,8 @@
                                AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
                                GenerateDebugInformation="true"
                                SubSystem="1"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                TargetMachine="1"
                        />
                        <Tool
@@ -86,9 +89,6 @@
                        <Tool
                                Name="VCAppVerifierTool"
                        />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
                        <Tool
                                Name="VCPostBuildEventTool"
                        />
@@ -144,6 +144,8 @@
                                SubSystem="1"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
                                TargetMachine="1"
                        />
                        <Tool
@@ -164,9 +166,6 @@
                        <Tool
                                Name="VCAppVerifierTool"
                        />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
                        <Tool
                                Name="VCPostBuildEventTool"
                        />
@@ -218,7 +217,7 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp"
+                                               CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp&#x0D;&#x0A;"
                                                Outputs="moc\moc_$(InputName).cpp"
                                        />
                                </FileConfiguration>
@@ -227,7 +226,7 @@
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp"
+                                               CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp&#x0D;&#x0A;"
                                                Outputs="moc\moc_$(InputName).cpp"
                                        />
                                </FileConfiguration>

diff --git a/samples/qt/VoxelDemo/inc/Viewer.h b/samples/qt/VoxelDemo/inc/Viewer.h
index ee57227eb3e7142cc9c2323fe3ce6d5385e3f45c..41c8f2dff5a5fc87d38e7c2a87cfb2b14910d118 100644 (file)
--- a/samples/qt/VoxelDemo/inc/Viewer.h
+++ b/samples/qt/VoxelDemo/inc/Viewer.h
@@ -8,7 +8,9 @@
 #include <QWidget.h>
 
 #include <AIS_InteractiveContext.hxx>
+#include <OpenGl_GraphicDriver.hxx>
 #include <V3d_View.hxx>
+#include <OpenGl_View.hxx>
 
 #include <Voxel_Prs.hxx>
 #include <Voxel_Selector.hxx>
@@ -25,6 +27,7 @@ public:
 
        Handle(AIS_InteractiveContext) getIC() const { return myIC; }
        Handle(V3d_View) getView() const { return myView; }
+    Handle(OpenGl_GraphicDriver) getGraphicDriver() const { return myGraphicDriver; }
     Voxel_Selector& getSelector() { return mySelector; }
     void setPrs(const Handle(Voxel_Prs)& prs) { myPrs = prs; }
        virtual QPaintEngine*          paintEngine() const;
@@ -47,6 +50,7 @@ protected:
 private:
        Handle(AIS_InteractiveContext) myIC;
        Handle(V3d_View)               myView;
+    Handle(OpenGl_GraphicDriver)   myGraphicDriver;
 
        bool myRotate;
        bool myZoom;

diff --git a/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h b/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
index cb89ac2bfd8dcb547221cc9109d9af76a578422c..a36cca95ead748d28c87167a817382c54b8bbbe7 100644 (file)
--- a/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
+++ b/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
@@ -24,6 +24,8 @@
 #include "Voxel_VisData.h"
 #include <Graphic3d_CBounds.hxx>
 
+class Handle(OpenGl_GraphicDriver);
+
 class VoxelClient_VisDrawer
 {
 public:
@@ -32,7 +34,7 @@ public:
 
 public:
 
-    Standard_EXPORT static void Init();
+  Standard_EXPORT static void Init (Handle(OpenGl_GraphicDriver)& theDriver);
 
        Standard_EXPORT VoxelClient_VisDrawer(Voxel_VisData* theData);
        Standard_EXPORT virtual ~VoxelClient_VisDrawer();

diff --git a/samples/qt/VoxelDemo/msvc.bat b/samples/qt/VoxelDemo/msvc.bat
index fc4216854b23c9302267ad26e34ca1ce46129cdb..a5b3b6c60dc670d59c89891bb319de7dfb77a158 100644 (file)
--- a/samples/qt/VoxelDemo/msvc.bat
+++ b/samples/qt/VoxelDemo/msvc.bat
@@ -1,6 +1,4 @@
-set CASROOT=D:\OCC653\ros
-set QTDIR=D:\qt\4.8.2
-set PATH=%QTDIR%\bin;%PATH%
+call ../../../env.bat %1 %2 %3
 
-call %CASROOT%/env.bat %1 %2 %3
-call %CASROOT%/msvc.bat %1 %2 %3 VoxelDemo.sln
+if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% VoxelDemo-%VCVER%.sln
+if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" VoxelDemo-%VCVER%.sln
\ No newline at end of file

diff --git a/samples/qt/VoxelDemo/run.bat b/samples/qt/VoxelDemo/run.bat
new file mode 100644 (file)
index 0000000..33b0b79
--- /dev/null
+++ b/samples/qt/VoxelDemo/run.bat
@@ -0,0 +1,22 @@
+call ../../../env.bat %1 %2 %3
+
+IF not "%CASDEB%" EQU "" (
+SET BIN_DIR=Debug
+) ELSE (
+SET BIN_DIR=Release
+)
+
+if not exist "%BIN_DIR%\VoxelDemo.exe" goto ERR_EXE
+
+echo Starting VoxelDemo .....
+start /D "%BIN_DIR%" VoxelDemo.exe
+
+goto END
+
+:ERR_EXE
+echo Executable %BIN_DIR%\VoxelDemo.exe not found."
+echo Probably you didn't compile the application.
+pause
+goto END
+
+:END
\ No newline at end of file

diff --git a/samples/qt/VoxelDemo/src/Application.cpp b/samples/qt/VoxelDemo/src/Application.cpp
index c4379b042f5fa0e778c11866b71cc388ad42ee71..0a1ae077bb5c8390e6619c00d384d61fc90389ea 100644 (file)
--- a/samples/qt/VoxelDemo/src/Application.cpp
+++ b/samples/qt/VoxelDemo/src/Application.cpp
@@ -319,7 +319,7 @@ Application::Application()
     myDisplayedZMin = -DBL_MAX;
     myDisplayedZMax =  DBL_MAX;
 
-       VoxelClient_VisDrawer::Init();
+       VoxelClient_VisDrawer::Init(myViewer->getGraphicDriver());
 
     resize( 450, 600 );
 }

diff --git a/samples/qt/VoxelDemo/src/Viewer.cpp b/samples/qt/VoxelDemo/src/Viewer.cpp
index d0304bfb541336b24980b71310c06b62fba85f15..9008c07817e97e7bc98086a1e54790cb95c7046f 100644 (file)
--- a/samples/qt/VoxelDemo/src/Viewer.cpp
+++ b/samples/qt/VoxelDemo/src/Viewer.cpp
@@ -19,9 +19,15 @@ static Handle(Graphic3d_WNTGraphicDevice) device;
 Viewer::Viewer(QWidget* parent):QWidget(parent)
 {
     if(device.IsNull())
+    {
         device = new Graphic3d_WNTGraphicDevice();
+        if (!device->GraphicDriver().IsNull())
+        {
+            myGraphicDriver = Handle(OpenGl_GraphicDriver)::DownCast(device->GraphicDriver());
+        }
+    }
     
-               Handle(V3d_Viewer) aViewer = new V3d_Viewer(device, TCollection_ExtendedString("Visu3D").ToExtString(), "",
+       Handle(V3d_Viewer) aViewer = new V3d_Viewer(device, TCollection_ExtendedString("Visu3D").ToExtString(), "",
                                                 1000, V3d_XposYnegZpos,
                                                 Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT,
                                                 true, true, V3d_TEX_NONE);

diff --git a/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx b/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
index e75fbc7228b20c7d7057a969021e5e9caddbcab5..88497ec46dc10770bc83e86d4f62cfea8f8451f4 100644 (file)
--- a/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
+++ b/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
@@ -27,7 +27,7 @@
 
 #include <InterfaceGraphic_telem.hxx>
 #include <OpenGl_Element.hxx>
-#include <OpenGl_Callback.hxx>
+#include <OpenGl_GraphicDriver.hxx>
 #include <OpenGl_NamedStatus.hxx>
 
 #include <GL/gl.h>
@@ -46,6 +46,11 @@ public:
 
   void Render (const Handle(OpenGl_Workspace) &theWorkspace) const;
 
+  virtual void Release (const Handle(OpenGl_Context)& theContext)
+  {
+    //
+  }
+
 private:
 
   VoxelClient_VisDrawer* myHandler;
@@ -126,16 +131,14 @@ static OpenGl_Element* VisDrawerCallBack (const Graphic3d_CUserDraw* theUserDraw
 }
 
 /**************************************************************************/
-void VoxelClient_VisDrawer::Init()
+void VoxelClient_VisDrawer::Init (Handle(OpenGl_GraphicDriver)& theDriver)
 {
     static Standard_Boolean isInitializeded(Standard_False);
 
     if (!isInitializeded)
     {
         isInitializeded = Standard_True;
-
-        OpenGl_UserDrawCallback& aCallback = UserDrawCallback ();
-        aCallback = VisDrawerCallBack;
+        theDriver->UserDrawCallback() = VisDrawerCallBack;
     }
 }