0028060: Samples - Objects in Geometry/Viewer2d have incorrect color
authorkgv <kgv@opencascade.com>
Tue, 8 Nov 2016 09:30:31 +0000 (12:30 +0300)
committerapn <apn@opencascade.com>
Tue, 8 Nov 2016 15:45:07 +0000 (18:45 +0300)
Broken custom presentations Sample2D_Text and ISession_Text
have been replaced by AIS_TextLabel.

ISession2D_Curve::Compute() - fixed defining the group without presentation aspects.
GeomSources - fixed assigning custom attributes.

32 files changed:
samples/mfc/standard/01_Geometry/CMakeLists.txt
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj.filters
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj.filters
samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj.filters
samples/mfc/standard/01_Geometry/adm/win/vc14/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc14/Geometry.vcxproj.filters
samples/mfc/standard/01_Geometry/src/GeomSources.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp [deleted file]
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h [deleted file]
samples/mfc/standard/01_Geometry/src/StdAfx.h
samples/mfc/standard/03_Viewer2d/src/StdAfx.h
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Text.h [deleted file]
samples/mfc/standard/mfcsample/CMakeLists.txt
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters
samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters
samples/mfc/standard/mfcsample/adm/win/vc14/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc14/mfcsample.vcxproj.filters

index b7365da..9c0eb68 100644 (file)
@@ -32,13 +32,11 @@ set (Geometry_ISESSION2D_HEADER_FILES ${Geometry_ISESSION2D_DIR}/ISession_Curve.
                                       ${Geometry_ISESSION2D_DIR}/ISession_Direction.h
                                       ${Geometry_ISESSION2D_DIR}/ISession_Point.h
                                       ${Geometry_ISESSION2D_DIR}/ISession_Surface.h
-                                      ${Geometry_ISESSION2D_DIR}/ISession_Text.h
                                       ${Geometry_ISESSION2D_DIR}/ISession2D_Curve.h)
 set (Geometry_ISESSION2D_SOURCE_FILES ${Geometry_ISESSION2D_DIR}/ISession_Curve.cpp
                                       ${Geometry_ISESSION2D_DIR}/ISession_Direction.cpp
                                       ${Geometry_ISESSION2D_DIR}/ISession_Point.cpp
                                       ${Geometry_ISESSION2D_DIR}/ISession_Surface.cpp
-                                      ${Geometry_ISESSION2D_DIR}/ISession_Text.cpp
                                       ${Geometry_ISESSION2D_DIR}/ISession2D_Curve.cpp)
 
 set (Geometry_RESOURCE_DIR            ${MFC_STANDARD_SAMPLES_DIR}/01_Geometry/res)
index 60a9645..73967fd 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Point.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
     <ClInclude Include="..\..\..\src\MainFrm.h" />
     <ClInclude Include="..\..\..\res\resource.h" />
     <ClInclude Include="..\..\..\src\StdAfx.h" />
index 185f27e..a56b5b8 100644 (file)
@@ -66,9 +66,6 @@
     <ClCompile Include="..\..\..\src\ISession2D\ISession_Surface.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Filter>Source Files\ISession2d</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\MainFrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
index 12b31f9..a5be7ba 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Point.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
     <ClInclude Include="..\..\..\src\MainFrm.h" />
     <ClInclude Include="..\..\..\res\resource.h" />
     <ClInclude Include="..\..\..\src\StdAfx.h" />
index 185f27e..a56b5b8 100644 (file)
@@ -66,9 +66,6 @@
     <ClCompile Include="..\..\..\src\ISession2D\ISession_Surface.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Filter>Source Files\ISession2d</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\MainFrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
index 5970f5f..563abf4 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Point.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
     <ClInclude Include="..\..\..\src\MainFrm.h" />
     <ClInclude Include="..\..\..\res\resource.h" />
     <ClInclude Include="..\..\..\src\StdAfx.h" />
index 185f27e..a56b5b8 100644 (file)
@@ -66,9 +66,6 @@
     <ClCompile Include="..\..\..\src\ISession2D\ISession_Surface.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Filter>Source Files\ISession2d</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\MainFrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
index 8c2f1d8..ca257a9 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Point.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
     <ClInclude Include="..\..\..\src\MainFrm.h" />
     <ClInclude Include="..\..\..\res\resource.h" />
     <ClInclude Include="..\..\..\src\StdAfx.h" />
index 185f27e..a56b5b8 100644 (file)
@@ -66,9 +66,6 @@
     <ClCompile Include="..\..\..\src\ISession2D\ISession_Surface.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession_Text.cpp">
-      <Filter>Source Files\ISession2d</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\res\Geometry.rc">
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\MainFrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
index 0c433bc..dabb998 100755 (executable)
@@ -8,6 +8,7 @@
 #include "MainFrm.h"
 #include <Geom_Curve.hxx>
 #include <Geom2d_Curve.hxx>
+
 GeomSources::GeomSources()
 {
 }
@@ -104,35 +105,43 @@ void GeomSources::AddSeparator(CGeometryDoc* /*aDoc*/,TCollection_AsciiString& a
 {
   aMessage+= "------------------------------------------------------------------------\n";
 }
-void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
-                          const gp_Pnt2d& aPoint,
-                          const char* aText,
-                          Standard_Boolean UpdateViewer,
-                          Standard_Real anXoffset,
-                          Standard_Real anYoffset,
-                          Standard_Real TextScale)
+void GeomSources::DisplayPoint (CGeometryDoc* theDoc,
+                                const gp_Pnt2d& thePoint,
+                                const char* theText,
+                                Standard_Boolean theToUpdateViewer,
+                                Standard_Real theXoffset,
+                                Standard_Real theYoffset,
+                                Standard_Real theTextScale)
 {
-  Handle(ISession_Point) aGraphicPoint = new ISession_Point(aPoint);
-  aDoc->GetISessionContext()->Display(aGraphicPoint,UpdateViewer);
-  Handle(ISession_Text)  aGraphicText = new ISession_Text(aText,aPoint.X()+anXoffset,aPoint.Y()+anYoffset);
-  aGraphicText->SetScale  (TextScale);
-  aDoc->GetISessionContext()->Display(aGraphicText,UpdateViewer);
+  Handle(ISession_Point) aGraphicPoint = new ISession_Point (thePoint);
+  theDoc->GetISessionContext()->Display (aGraphicPoint, Standard_False);
+
+  Handle(AIS_TextLabel) aLabel = new AIS_TextLabel();
+  aLabel->SetText (theText);
+  aLabel->SetPosition (gp_Pnt (thePoint.X() + theXoffset, thePoint.Y() + theYoffset, 0.0));
+  //aLabel->SetHeight (theTextScale);
+  (void )theTextScale;
+  theDoc->GetISessionContext()->Display (aLabel, theToUpdateViewer);
 }
 
-void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
-                          const gp_Pnt& aPoint,
-                          const char* aText,
-                          Standard_Boolean UpdateViewer,
-                          Standard_Real anXoffset,
-                          Standard_Real anYoffset,
-                          Standard_Real aZoffset,
-                          Standard_Real TextScale)
+void GeomSources::DisplayPoint (CGeometryDoc* theDoc,
+                                const gp_Pnt& thePoint,
+                                const char* theText,
+                                Standard_Boolean theToUpdateViewer,
+                                Standard_Real theXoffset,
+                                Standard_Real theYoffset,
+                                Standard_Real theZoffset,
+                                Standard_Real theTextScale)
 {
-  Handle(ISession_Point) aGraphicPoint = new ISession_Point(aPoint);
-  aDoc->GetAISContext()->Display(aGraphicPoint,UpdateViewer);
-  Handle(ISession_Text)  aGraphicText = new ISession_Text(aText,aPoint.X()+anXoffset,aPoint.Y()+anYoffset,aPoint.Z()+aZoffset);
-  aGraphicText->SetScale  (TextScale);
-  aDoc->GetAISContext()->Display(aGraphicText,UpdateViewer);
+  Handle(ISession_Point) aGraphicPoint = new ISession_Point (thePoint);
+  theDoc->GetAISContext()->Display (aGraphicPoint, Standard_False);
+
+  Handle(AIS_TextLabel) aLabel = new AIS_TextLabel();
+  aLabel->SetText (theText);
+  aLabel->SetPosition (gp_Pnt (thePoint.X() + theXoffset, thePoint.Y() + theYoffset, thePoint.Z() + theZoffset));
+  //aLabel->SetHeight (theTextScale);
+  (void )theTextScale;
+  theDoc->GetAISContext()->Display (aLabel, theToUpdateViewer);
 }
 
 void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
@@ -157,15 +166,14 @@ void GeomSources::DisplayCurveAndCurvature(CGeometryDoc* aDoc,
   aDoc->GetISessionContext()->Display(aGraphicCurve,UpdateViewer);
 }
 
-void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
-                          Handle(Geom_Curve) aCurve,
-                          Quantity_NameOfColor aNameOfColor, 
-                          Standard_Boolean UpdateViewer)
+void GeomSources::DisplayCurve (CGeometryDoc* theDoc,
+                                Handle(Geom_Curve) theCurve,
+                                Quantity_NameOfColor theNameOfColor,
+                                Standard_Boolean theToUpdateViewer)
 {
-  Handle(ISession_Curve) aGraphicCurve = new ISession_Curve(aCurve);
-  aDoc->GetAISContext()->SetColor(aGraphicCurve,aNameOfColor, Standard_False);
-  aGraphicCurve->Attributes()->LineAspect()->SetColor(aNameOfColor);
-  aDoc->GetAISContext()->Display(aGraphicCurve,UpdateViewer);
+  Handle(ISession_Curve) aGraphicCurve = new ISession_Curve (theCurve);
+  aGraphicCurve->Attributes()->SetLineAspect (new Prs3d_LineAspect (theNameOfColor, Aspect_TOL_SOLID, 1.0));
+  theDoc->GetAISContext()->Display (aGraphicCurve, theToUpdateViewer);
 }
 
 void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
@@ -176,20 +184,26 @@ void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
     aDoc->GetAISContext()->Display(aGraphicCurve,UpdateViewer);
 }
 
-
-
-
-void GeomSources::DisplaySurface(CGeometryDoc* aDoc,
-                          Handle(Geom_Surface) aSurface,
-                          Quantity_NameOfColor aNameOfColor, 
-                          Standard_Boolean UpdateViewer)
+void GeomSources::DisplaySurface (CGeometryDoc* theDoc,
+                                  Handle(Geom_Surface) theSurface,
+                                  Quantity_NameOfColor theNameOfColor,
+                                  Standard_Boolean theToUpdateViewer)
 {
-  Handle(ISession_Surface) aGraphicalSurface = new ISession_Surface(aSurface);
-  aDoc->GetAISContext()->SetColor(aGraphicalSurface,aNameOfColor, Standard_False);
-  aGraphicalSurface->Attributes()->FreeBoundaryAspect()->SetColor(aNameOfColor);
-  aGraphicalSurface->Attributes()->UIsoAspect()->SetColor(aNameOfColor);
-  aGraphicalSurface->Attributes()->VIsoAspect()->SetColor(aNameOfColor);
-  aDoc->GetAISContext()->Display(aGraphicalSurface,UpdateViewer);
+  const Handle(AIS_InteractiveContext)& aCtx = theDoc->GetAISContext();
+  Handle(Prs3d_ShadingAspect) aShadeAspect = new Prs3d_ShadingAspect();
+  Handle(Prs3d_LineAspect)    aLineAspect  = new Prs3d_LineAspect (theNameOfColor, Aspect_TOL_SOLID, 1.0);
+  Handle(Prs3d_IsoAspect)     anIsoAspect  = new Prs3d_IsoAspect  (theNameOfColor, Aspect_TOL_SOLID, 1.0,
+                                                                   aCtx->DefaultDrawer()->UIsoAspect()->Number());
+  aShadeAspect->SetColor (theNameOfColor);
+
+  Handle(ISession_Surface) aGraphicalSurface = new ISession_Surface (theSurface);
+  const Handle(Prs3d_Drawer)& aDrawer      = aGraphicalSurface->Attributes();
+  aDrawer->SetShadingAspect      (aShadeAspect);
+  aDrawer->SetLineAspect         (aLineAspect);
+  aDrawer->SetFreeBoundaryAspect (aLineAspect);
+  aDrawer->SetUIsoAspect         (anIsoAspect);
+  aDrawer->SetVIsoAspect         (anIsoAspect);
+  aCtx->Display (aGraphicalSurface, theToUpdateViewer);
 }
 
 void GeomSources::DisplaySurface(CGeometryDoc* aDoc,
index 5f8bd1e..30fa4da 100755 (executable)
 
 IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Curve,AIS_InteractiveObject)
 
-
 ISession2D_Curve::ISession2D_Curve(const Handle(Geom2d_Curve) aGeom2dCurve,
                                    const Aspect_TypeOfLine aTypeOfLine,
                                    const Aspect_WidthOfLine aWidthOfLine,
                                    const Standard_Integer aColorIndex)
-                                   :AIS_InteractiveObject()
 {
   myGeom2dCurve = aGeom2dCurve;
   myTypeOfLine  = aTypeOfLine ;
@@ -28,10 +26,13 @@ ISession2D_Curve::ISession2D_Curve(const Handle(Geom2d_Curve) aGeom2dCurve,
   myradiusratio = 1;
 }
 
-void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
-                               const Handle(Prs3d_Presentation)& aPresentation,
-                               const Standard_Integer /*aMode*/) 
+void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
+                               const Handle(Prs3d_Presentation)& thePrs,
+                               const Standard_Integer )
 {
+  Handle(Graphic3d_Group) aPrsGroup = Prs3d_Root::CurrentGroup (thePrs);
+  aPrsGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect());
+  aPrsGroup->SetGroupPrimitivesAspect (myDrawer->PointAspect()->Aspect());
 
   Geom2dAdaptor_Curve anAdaptor(myGeom2dCurve);
   GCPnts_QuasiUniformDeflection anEdgeDistrib(anAdaptor,1.e-2);
@@ -42,7 +43,7 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPr
     for(Standard_Integer i=1;i<=anEdgeDistrib.NbPoints();++i)
       aCurve->AddVertex(anEdgeDistrib.Value(i));
 
-    Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(aCurve);
+    aPrsGroup->AddPrimitiveArray (aCurve);
   }
 
   if (myDisplayPole) 
@@ -56,7 +57,7 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPr
         gp_Pnt2d CurrentPoint = aBezier->Pole(i);
         anArrayOfVertex->AddVertex(CurrentPoint.X(),CurrentPoint.Y(),0.);
       }
-      Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(anArrayOfVertex);
+      aPrsGroup->AddPrimitiveArray (anArrayOfVertex);
     }
 
     if (anAdaptor.GetType() == GeomAbs_BSplineCurve  )
@@ -71,7 +72,7 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPr
         gp_Pnt2d CurrentPoint = aBSpline->Pole(i);
         anArrayOfVertex->AddVertex(CurrentPoint.X(),CurrentPoint.Y(),0.);
       }
-      Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(anArrayOfVertex);
+      aPrsGroup->AddPrimitiveArray (anArrayOfVertex);
     }
   }
 
@@ -108,7 +109,7 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPr
             Handle(Graphic3d_ArrayOfPolylines) aSegment = new Graphic3d_ArrayOfPolylines(2);
             aSegment->AddVertex(P1.X(),P1.Y(),0.);
             aSegment->AddVertex(P3.X(),P3.Y(),0.);
-            Prs3d_Root::CurrentGroup(aPresentation)->AddPrimitiveArray(aSegment);
+            aPrsGroup->AddPrimitiveArray (aSegment);
           }
         }
         t += step;
@@ -116,10 +117,3 @@ void ISession2D_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPr
     }
   }
 }
-
-void ISession2D_Curve::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
-                                        const Standard_Integer /*aMode*/) 
-{ 
-}
-
-
index 6fee7da..ad5fefc 100755 (executable)
@@ -64,9 +64,9 @@ public:
 private: 
 
   // Methods PRIVATE
-  // 
+  virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const { return theMode == 0; }
   virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
-  void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
+  void ComputeSelection(const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
   // Fields PRIVATE
   //
index a712c3d..267690e 100755 (executable)
@@ -14,48 +14,23 @@ IMPLEMENT_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
 static char THIS_FILE[]=__FILE__;
 #endif
 
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-
-ISession_Curve::ISession_Curve(const Handle(Geom_Curve)& aCurve)
-:AIS_InteractiveObject(),myCurve(aCurve)
-{
-
-}
-
-ISession_Curve::~ISession_Curve()
-{
-
-}
-void ISession_Curve::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
-                             const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer aMode)
+void ISession_Curve::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+                              const Handle(Prs3d_Presentation)& thePrs,
+                              const Standard_Integer theMode)
 {
-    GeomAdaptor_Curve anAdaptorCurve(myCurve);
-    Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer();
-    aDrawer->LineAspect()->SetColor(Quantity_NOC_RED);
-
-    switch (aMode)
+  GeomAdaptor_Curve anAdaptorCurve (myCurve);
+  switch (theMode)
+  {
+    case 1:
     {
-        case 1 :
-        StdPrs_PoleCurve::Add(aPresentation, anAdaptorCurve,aDrawer);
-        case 0 :
-        StdPrs_Curve::Add( aPresentation, anAdaptorCurve ,myDrawer);
-        break;
+      Handle(Prs3d_Drawer) aPoleDrawer = new Prs3d_Drawer();
+      aPoleDrawer->SetLineAspect (new Prs3d_LineAspect (Quantity_NOC_RED, Aspect_TOL_SOLID, 1.0));
+      StdPrs_PoleCurve::Add (thePrs, anAdaptorCurve, aPoleDrawer);
     }
+    case 0:
+    {
+      StdPrs_Curve::Add (thePrs, anAdaptorCurve, myDrawer);
+      break;
+    }
+  }
 }
-
-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*/) 
-{ 
-}
-
-
index 54fc440..0eba44f 100755 (executable)
@@ -2,33 +2,27 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_ISESSION_CURVE_H__F981CB93_A3CC_11D1_8DA3_0800369C8A03__INCLUDED_)
-#define AFX_ISESSION_CURVE_H__F981CB93_A3CC_11D1_8DA3_0800369C8A03__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
+
 #include <Standard_Macro.hxx>
 #include <Standard_DefineHandle.hxx>
 #include "AIS_InteractiveObject.hxx"
-class ISession_Curve;
-DEFINE_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
 
 class ISession_Curve : public AIS_InteractiveObject  
 {
-public:
-  ISession_Curve(const Handle(Geom_Curve)& aCurve);
-  virtual ~ISession_Curve();
-
   DEFINE_STANDARD_RTTIEXT(ISession_Curve,AIS_InteractiveObject)
+public:
+  ISession_Curve(const Handle(Geom_Curve)& theCurve) : myCurve (theCurve) {}
+  virtual ~ISession_Curve() {}
 
 private:
 
   Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ;
-  Standard_EXPORT virtual  void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation) ;
-  void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;
+  virtual void Compute(const Handle(Prs3d_Projector)& ,const Handle(Prs3d_Presentation)& ) {}
+  virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
 
+private:
   Handle(Geom_Curve) myCurve;
 };
 
-#endif // !defined(AFX_ISESSION_CURVE_H__F981CB93_A3CC_11D1_8DA3_0800369C8A03__INCLUDED_)
+DEFINE_STANDARD_HANDLE(ISession_Curve,AIS_InteractiveObject)
index 8475fbc..ff9298a 100755 (executable)
@@ -18,50 +18,30 @@ static char THIS_FILE[]=__FILE__;
 
 IMPLEMENT_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
 
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-ISession_Surface::ISession_Surface(const Handle(Geom_Surface)& aSurface)
-:AIS_InteractiveObject(),mySurface(aSurface)
-{
-}
-
-ISession_Surface::~ISession_Surface()
+void ISession_Surface::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
+                                const Handle(Prs3d_Presentation)& thePrs,
+                                const Standard_Integer theMode)
 {
-
-}
-void ISession_Surface::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
-                             const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer aMode)
-{
-
-    GeomAdaptor_Surface anAdaptorSurface(mySurface);
-    Handle(GeomAdaptor_HSurface) anAdaptorHSurface = new GeomAdaptor_HSurface(mySurface);
-
-    Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer();
-    aDrawer->LineAspect()->SetColor(Quantity_NOC_YELLOW3);
-
-    switch (aMode)
+  GeomAdaptor_Surface anAdaptorSurface (mySurface);
+  Handle(GeomAdaptor_HSurface) anAdaptorHSurface = new GeomAdaptor_HSurface (mySurface);
+
+  Handle(Prs3d_Drawer) aPoleDrawer = new Prs3d_Drawer();
+  aPoleDrawer->SetLineAspect (new Prs3d_LineAspect (Quantity_NOC_YELLOW3, Aspect_TOL_SOLID, 1.0));
+  switch (theMode)
+  {
+    case 2:
     {
-        case 2:
-             StdPrs_ShadedSurface::Add(aPresentation,anAdaptorSurface,myDrawer);
-        break;
-        case 1 :
-          StdPrs_WFPoleSurface::Add(aPresentation,anAdaptorSurface,aDrawer);
-        case 0 :
-          StdPrs_WFSurface::Add(aPresentation,anAdaptorHSurface,myDrawer);
-        break;
+           StdPrs_ShadedSurface::Add (thePrs, anAdaptorSurface, myDrawer);
+      break;
     }
-
-}
-
-void ISession_Surface::Compute(const Handle(Prs3d_Projector)& /*aProjector*/,
-                               const Handle(Prs3d_Presentation)& /*aPresentation*/) 
-{
+    case 1:
+    {
+      StdPrs_WFPoleSurface::Add (thePrs, anAdaptorSurface, aPoleDrawer);
+    }
+    case 0:
+    {
+      StdPrs_WFSurface::Add (thePrs, anAdaptorHSurface, myDrawer);
+      break;
+    }
+  }
 }
-
-void ISession_Surface::ComputeSelection(const Handle(SelectMgr_Selection)& /*aSelection*/,
-                                       const Standard_Integer /*aMode*/) 
-{ 
-}
\ No newline at end of file
index f31a7cd..0ddb6f2 100755 (executable)
@@ -2,33 +2,29 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_ISESSION_SURFACE_H__27F86F5A_A6A4_11D1_8DA4_0800369C8A03__INCLUDED_)
-#define AFX_ISESSION_SURFACE_H__27F86F5A_A6A4_11D1_8DA4_0800369C8A03__INCLUDED_
-
-#if _MSC_VER >= 1000
 #pragma once
-#endif // _MSC_VER >= 1000
 
 #include <Standard_Macro.hxx>
 #include <Standard_DefineHandle.hxx>
-class ISession_Surface;
-DEFINE_STANDARD_HANDLE(ISession_Surface,AIS_InteractiveObject)
+
 class ISession_Surface : public AIS_InteractiveObject  
 {
+  DEFINE_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
 public:
-       ISession_Surface();
-       ISession_Surface(const Handle(Geom_Surface)& aSurface);
-       virtual ~ISession_Surface();
 
-DEFINE_STANDARD_RTTIEXT(ISession_Surface,AIS_InteractiveObject)
+  ISession_Surface (const Handle(Geom_Surface)& theSurface) : mySurface (theSurface) {}
+  virtual ~ISession_Surface() {}
+
 private:
 
-Standard_EXPORT virtual  void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
-Standard_EXPORT virtual  void Compute(const Handle(Prs3d_Projector)& aProjector,const Handle(Prs3d_Presentation)& aPresentation);
-void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode);
+  Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0);
+  virtual void Compute (const Handle(Prs3d_Projector)& ,const Handle(Prs3d_Presentation)& ) {}
+  virtual void ComputeSelection (const Handle(SelectMgr_Selection)& ,const Standard_Integer ) {}
+
+private:
 
-Handle(Geom_Surface) mySurface;
+  Handle(Geom_Surface) mySurface;
 
 };
 
-#endif // !defined(AFX_ISESSION_SURFACE_H__27F86F5A_A6A4_11D1_8DA4_0800369C8A03__INCLUDED_)
+DEFINE_STANDARD_HANDLE(ISession_Surface, AIS_InteractiveObject)
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp
deleted file mode 100755 (executable)
index 29a5286..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-// ISession_Text.cpp: implementation of the ISession_Text class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "stdafx.h"
-#include "..\\GeometryApp.h"
-#include "ISession_Text.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-//#define new DEBUG_NEW
-#endif
-
-IMPLEMENT_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-ISession_Text::ISession_Text()
-{
-
-}
-
-ISession_Text::ISession_Text
-                 (const TCollection_AsciiString& aText, 
-                  const Standard_Real            anX ,        // = 0
-                  const Standard_Real            anY ,        // = 0
-                  const Standard_Real            aZ  ,        // = 0
-                             const Quantity_PlaneAngle      anAngle,     // = 0.0
-                             const Standard_Real            aslant,      // = 0.0
-                             const Standard_Integer         aColorIndex, // = 0
-                             const Standard_Integer         aFontIndex,  // = 1
-                             const Quantity_Factor          aScale)      // = 1
-                  :AIS_InteractiveObject(),MyText(aText),MyX(anX),MyY(anY),MyZ(aZ),
-                  MyAngle(anAngle),MySlant(aslant),MyFontIndex(aFontIndex),
-                  MyColorIndex(aColorIndex),MyScale(aScale),MyWidth(0),MyHeight(0)
-{
-
-}
-
-ISession_Text::ISession_Text
-                 (const TCollection_AsciiString& aText, 
-                  gp_Pnt&                        aPoint,
-                             const Quantity_PlaneAngle      anAngle,     // = 0.0
-                             const Standard_Real            aslant,      // = 0.0
-                             const Standard_Integer         aColorIndex, // = 0
-                             const Standard_Integer         aFontIndex,  // = 1
-                             const Quantity_Factor          aScale)      // = 1
-                  :AIS_InteractiveObject(),MyText(aText),MyX(aPoint.X()),MyY(aPoint.Y()),MyZ(aPoint.Z()),
-                  MyAngle(anAngle),MySlant(aslant),MyFontIndex(aFontIndex),
-                  MyColorIndex(aColorIndex),MyScale(aScale),MyWidth(0),MyHeight(0)
-{
-
-}
-
-ISession_Text::~ISession_Text()
-{
-
-}
-
-void ISession_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
-                            const Handle(Prs3d_Presentation)& aPresentation,
-                            const Standard_Integer /*aMode*/)
-{
-  Prs3d_Text::Draw (Prs3d_Root::CurrentGroup (aPresentation), myDrawer->TextAspect(), MyText, gp_Pnt(MyX, MyY, MyZ));
-}
-
-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*/)
-{
-}
-
diff --git a/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h b/samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h
deleted file mode 100755 (executable)
index aa8fc59..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-// ISession_Text.h: interface for the ISession_Text class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_ISESSION_TEXT_H__A9B277C4_A69E_11D1_8DA4_0800369C8A03__INCLUDED_)
-#define AFX_ISESSION_TEXT_H__A9B277C4_A69E_11D1_8DA4_0800369C8A03__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_Integer.hxx>
-#include <Quantity_Factor.hxx>
-#include <Quantity_PlaneAngle.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <Standard_OStream.hxx>
-#include <Standard_IStream.hxx>
-#include <Standard_CString.hxx>
-#include <SelectMgr_SelectableObject.hxx>
-
-class TCollection_AsciiString;
-class SelectMgr_Selection;
-class ISession_Text;
-DEFINE_STANDARD_HANDLE(ISession_Text,AIS_InteractiveObject)
-class ISession_Text : public AIS_InteractiveObject  
-{
-public:
-       ISession_Text();
-
-    ISession_Text           (const TCollection_AsciiString& aText,
-                             const Standard_Real            anX         = 0   ,
-                             const Standard_Real            anY         = 0   ,
-                             const Standard_Real            aZ          = 0   ,
-                             const Quantity_PlaneAngle      anAngle     = 0.0 ,
-                             const Standard_Real            aSlant      = 0.0 ,
-                             const Standard_Integer         aColorIndex = 1   ,
-                             const Standard_Integer         aFontIndex  = 1   ,
-                             const Quantity_Factor          aScale      = 0.1   );
-    ISession_Text
-                            (const TCollection_AsciiString& aText, 
-                             gp_Pnt&                        aPoint,
-                             const Quantity_PlaneAngle      anAngle     = 0.0 ,
-                             const Standard_Real            aSlant      = 0.0 ,
-                             const Standard_Integer         aColorIndex = 1   ,
-                             const Standard_Integer         aFontIndex  = 1   ,
-                             const Quantity_Factor          aScale      = 0.1   );
-
-       virtual ~ISession_Text();
-
-inline   Standard_Integer        NbPossibleSelection() const;
-inline   TCollection_AsciiString GetText() const;
-inline   void                    SetText(const TCollection_AsciiString& atext) ;
-inline   void                    GetCoord(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const ;
-inline   void                    SetCoord(const Standard_Real X, const Standard_Real Y, const Standard_Real Z=0);
-inline   Standard_Real           GetAngle() const;
-inline   void                    SetAngle(const Standard_Real aNewAngle) ;
-inline   Standard_Real           GetSlant() const;
-inline   void                    SetSlant(const Standard_Real aNewSlant) ;
-inline   Standard_Integer        GetColorIndex() const;
-inline   void                    SetColorIndex(const Standard_Integer aNewColorIndex) ;
-inline   Standard_Integer        GetFontIndex() const;
-inline   void                    SetFontIndex(const Standard_Integer aNewFontIndex) ;
-inline   Quantity_Factor         GetScale() const;
-inline   void                    SetScale  (const Quantity_Factor aNewScale) ;
-
-
-DEFINE_STANDARD_RTTIEXT(ISession_Text,AIS_InteractiveObject)
-
-private: 
-
-  void Compute          (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
-                        const Handle(Prs3d_Presentation)& aPresentation,
-                        const Standard_Integer aMode);
-  void Compute          (const Handle(Prs3d_Projector)& aProjector,
-                        const Handle(Prs3d_Presentation)& aPresentation);
-  void ComputeSelection (const Handle(SelectMgr_Selection)& aSelection,
-                        const Standard_Integer unMode) ;
-
-
- // Fields PRIVATE
- //
-TCollection_AsciiString MyText       ; 
-Standard_Real           MyX          ;
-Standard_Real           MyY          ;
-Standard_Real           MyZ          ;
-Standard_Real           MyAngle      ;
-Standard_Real           MySlant      ;
-Standard_Integer        MyColorIndex ;
-Standard_Integer        MyFontIndex  ;
-Quantity_Factor         MyScale      ;
-Standard_Real           MyWidth      ;
-Standard_Real           MyHeight     ;
-
-
-};
-
- inline Standard_Integer ISession_Text::NbPossibleSelection() const 
-{ return 1; }
-
-inline TCollection_AsciiString ISession_Text::GetText() const 
-{  return MyText ; }
-
-inline void ISession_Text::SetText(const TCollection_AsciiString& atext)
-{  MyText = atext; }
-
-inline void ISession_Text::GetCoord(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const 
-{  X = MyX;  Y = MyY; Z = MyZ;}
-
-inline void ISession_Text::SetCoord(const Standard_Real X, const Standard_Real Y, const Standard_Real Z)
-{  MyX = X ;  MyY = Y ;  MyZ = Z ;}
-
-inline Standard_Real ISession_Text::GetAngle() const 
-{  return MyAngle; }
-
-inline void ISession_Text::SetAngle(const Standard_Real aNewAngle)
-{  MyAngle = aNewAngle; }
-
-inline Standard_Real ISession_Text::GetSlant() const 
-{  return MySlant; }
-
-inline void ISession_Text::SetSlant(const Standard_Real aNewSlant)
-{  MySlant = aNewSlant; }
-
-inline Standard_Integer ISession_Text::GetColorIndex() const 
-{  return MyColorIndex; }
-
-inline void ISession_Text::SetColorIndex(const Standard_Integer aNewColorIndex)
-{  MyColorIndex = aNewColorIndex; }
-
-inline Standard_Integer ISession_Text::GetFontIndex() const 
-{ return MyFontIndex; }
-
-inline void ISession_Text::SetFontIndex(const Standard_Integer aNewFontIndex)
-{  MyFontIndex = aNewFontIndex; }
-
-inline Quantity_Factor ISession_Text::GetScale() const 
-{  return MyScale; }
-
-inline void ISession_Text::SetScale(const Quantity_Factor aNewScale)
-{  MyScale  = aNewScale; }
-
-#endif // !defined(AFX_ISESSION_TEXT_H__A9B277C4_A69E_11D1_8DA4_0800369C8A03__INCLUDED_)
index 195d2b8..24161de 100755 (executable)
@@ -80,6 +80,7 @@
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_Shape.hxx>
 #include <AIS_Point.hxx>
+#include <AIS_TextLabel.hxx>
 #include <Aspect_Grid.hxx>
 #include <Aspect_Window.hxx>
 #include <Aspect_Background.hxx>
 #include "ISession_Direction.h"
 #include "ISession_Curve.h"
 #include "ISession_Surface.h"
-#include "ISession_Text.h"
 #include "ISession_Point.h"
 
 #include <UnitsAPI.hxx>
index 100ccc9..d174ce7 100755 (executable)
@@ -74,6 +74,7 @@
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_LocalContext.hxx>
+#include <AIS_TextLabel.hxx>
 #include <AIS_TexturedShape.hxx>
 
 #include <Aspect_TypeOfline.hxx>
index 0ecfec8..a625a10 100755 (executable)
@@ -5,7 +5,6 @@
 #include "Viewer2dDoc.h"
 #include "OCC_App.h"
 #include "Primitive\Sample2D_Markers.h"
-#include "Primitive\Sample2D_Text.h"
 #include "Primitive\Sample2D_Face.h"
 #include "Primitive\Sample2D_Image.h"
 
@@ -64,75 +63,69 @@ void CViewer2dDoc::OnBUTTONErase()
 
 void CViewer2dDoc::OnBUTTONTestText() 
 {
- int aColor= 1;
- Standard_Real j;
- for (j=15;j<=20;j++)
+  int aColor = Quantity_NOC_MATRABLUE;
+  for (Standard_Real j = 15; j <= 20; j++)
   {
-    TCollection_AsciiString Text("font 0 scale ");Text+=j/20.0;
-    Handle (Sample2D_Text) aText  = 
-        new Sample2D_Text(Text,
-                       gp_Pnt(0.0,15.0*(j-15.0),0.0),    //  thePosition
-                       10.0*M_PI,                        //  theAngle    
-                       (Quantity_NameOfColor)(aColor++), //  theColor  
-                       Font_FA_Regular,                  //  theFontAspect  
-                       "Courier",                        //  theFont
-                       j,                                // theScale
-                       Graphic3d_HTA_LEFT,
-                       Graphic3d_VTA_BOTTOM,
-                       Standard_False);                  // aIsZoomable
-
+    Handle(AIS_TextLabel) aText = new AIS_TextLabel();
+    aText->SetText (TCollection_AsciiString ("font 0 scale ") + (j / 20.0));
+    aText->SetPosition (gp_Pnt (0.0, 15.0 * (j - 15.0), 0.0));
+    aText->SetAngle (30.0 * M_PI / 180.0);
+    aText->SetColor (Quantity_NameOfColor(aColor++));
+    aText->SetFontAspect (Font_FA_Regular);
+    aText->SetFont ("Courier");
+    aText->SetHeight (j);
+    aText->SetHJustification (Graphic3d_HTA_LEFT);
+    aText->SetVJustification (Graphic3d_VTA_BOTTOM);
+    aText->SetZoomable (Standard_False);
     myAISContext->Display(aText, Standard_False);
   }
 
-  for (j=10;j<=15;j++)
+  for (Standard_Real j = 10; j <= 15; j++)
   {
-    TCollection_AsciiString Text("font 1 scale ");Text+=j/10.0;
-    Handle (Sample2D_Text) aText  = 
-        new Sample2D_Text(Text,
-                       gp_Pnt(80.,15.0*(j-10.0),0.0),     //  thePosition
-                       0.0,                               //  theAngle    
-                       (Quantity_NameOfColor)(aColor++),  //  theColor  
-                       Font_FA_BoldItalic,                //  theFontAspect  
-                       "Cambria",                         //  theFont
-                       j*2,                               // theScale
-                       Graphic3d_HTA_LEFT,
-                       Graphic3d_VTA_BOTTOM,
-                       Standard_False);                   // aIsZoomable
-
+    Handle(AIS_TextLabel) aText = new AIS_TextLabel();
+    aText->SetText (TCollection_AsciiString ("font 1 scale ") + (j / 10.0));
+    aText->SetPosition (gp_Pnt (80.0, 15.0 * (j - 10.0), 0.0));
+    aText->SetAngle (0.0);
+    aText->SetColor (Quantity_NameOfColor(aColor++));
+    aText->SetFontAspect (Font_FA_BoldItalic);
+    aText->SetFont ("Cambria");
+    aText->SetHeight (j * 2);
+    aText->SetHJustification (Graphic3d_HTA_LEFT);
+    aText->SetVJustification (Graphic3d_VTA_BOTTOM);
+    aText->SetZoomable (Standard_False);
     myAISContext->Display(aText, Standard_False);
   }
-  aColor = 1;
-  for (j=5;j<=10;j++)
+
+  aColor = Quantity_NOC_MATRABLUE;
+  for (Standard_Real j = 5; j <= 10; j++)
   {
-    TCollection_AsciiString Text("font 2 scale ");Text+=j/10.0; 
-    Handle (Sample2D_Text) aText  = 
-        new Sample2D_Text(Text,
-                       gp_Pnt(140.0,15.0*(j-5.0),0.0),   //  thePosition
-                       0.0,                              //  theAngle    
-                       (Quantity_NameOfColor)(aColor++), //  theColor  
-                       Font_FA_Bold,                     //  theFontAspect  
-                       "Arial",                          //  theFont
-                       j*2,                              // theScale
-                       Graphic3d_HTA_LEFT,
-                       Graphic3d_VTA_BOTTOM,
-                       Standard_False);                  // aIsZoomable
-    myAISContext->Display(aText,Standard_False);
+    Handle(AIS_TextLabel) aText = new AIS_TextLabel();
+    aText->SetText (TCollection_AsciiString ("font 2 scale ") + (j / 10.0));
+    aText->SetPosition (gp_Pnt (140.0, 15.0 * (j - 5.0), 0.0));
+    aText->SetAngle (0.0);
+    aText->SetColor (Quantity_NameOfColor(aColor++));
+    aText->SetFontAspect (Font_FA_Bold);
+    aText->SetFont ("Arial");
+    aText->SetHeight (j * 2);
+    aText->SetHJustification (Graphic3d_HTA_LEFT);
+    aText->SetVJustification (Graphic3d_VTA_BOTTOM);
+    aText->SetZoomable (Standard_False);
+    myAISContext->Display(aText, Standard_False);
   }
-for (j=10;j<=15;j++)
+  for (Standard_Real j = 10; j <= 15; j++)
   {
-    TCollection_AsciiString Text("font 3 scale ");Text+=j/10.0;
-        Handle (Sample2D_Text) aText  = 
-        new Sample2D_Text(Text,
-                       gp_Pnt(200.0,15.0*(j-10.0),0.0), //  thePosition
-                       0.0,                             //  theAngle    
-                       (Quantity_NameOfColor)(aColor++),//  theColor  
-                       Font_FA_Italic,                  //  theFontAspect  
-                       "Georgia",                       //  theFont
-                       j*2,                             // theScale
-                       Graphic3d_HTA_LEFT,
-                       Graphic3d_VTA_BOTTOM,
-                       Standard_False);                 // aIsZoomable
-        myAISContext->Display(aText,Standard_False);
+    Handle(AIS_TextLabel) aText = new AIS_TextLabel();
+    aText->SetText (TCollection_AsciiString ("font 3 scale ") + (j / 10.0));
+    aText->SetPosition (gp_Pnt (200.0, 15.0 * (j - 10.0), 0.0));
+    aText->SetAngle (0.0);
+    aText->SetColor (Quantity_NameOfColor(aColor++));
+    aText->SetFontAspect (Font_FA_Italic);
+    aText->SetFont ("Georgia");
+    aText->SetHeight (j * 2);
+    aText->SetHJustification (Graphic3d_HTA_LEFT);
+    aText->SetVJustification (Graphic3d_VTA_BOTTOM);
+    aText->SetZoomable (Standard_False);
+    myAISContext->Display(aText, Standard_False);
   }
 
   FitAll2DViews(Standard_True); // Update Viewer
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp b/samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp
deleted file mode 100755 (executable)
index db2bebe..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "stdafx.h"
-
-#include "Sample2D_Text.h"
-
-IMPLEMENT_STANDARD_RTTIEXT(Sample2D_Text,AIS_InteractiveObject)
-
-Sample2D_Text::Sample2D_Text   (const TCollection_AsciiString& theText,
-                 const gp_Pnt&                  thePosition,
-                 const Quantity_PlaneAngle      theAngle,
-                 const Quantity_Color           theColor,
-                 const Font_FontAspect          theFontAspect,
-                 const Standard_CString         theFont,
-                 const Standard_Real            theHeight,
-                 const Graphic3d_HorizontalTextAlignment theHAlign,
-                 const Graphic3d_VerticalTextAlignment theVAlign,
-                 const Standard_Boolean         theIsZoomable)
-:AIS_InteractiveObject()
-{
-  myText       =  theText      ; 
-  myPosition   =  thePosition  ;
-  myAngle      =  theAngle     ;
-  myColor      =  theColor     ;
-  myFontAspect =  theFontAspect;
-  myFont       =  theFont      ;
-  myColor      =  theColor     ;
-  myHeight     =  theHeight    ;
-  myIsZoomable = theIsZoomable ;
-  myHAlign     = theHAlign     ;
-  myVAlign     = theVAlign     ;
-}
-
-void Sample2D_Text::Compute (const Handle(PrsMgr_PresentationManager3d)& /*aPresentationManager*/,
-                             const Handle(Prs3d_Presentation)& aPresentation,
-                             const Standard_Integer /*aMode*/)
-{
-  aPresentation->Clear();
-
-  Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect();
-
-  asp->SetFont(myFont);
-  asp->SetColor(myColor);
-  asp->SetHeight(myHeight);
-
-  asp->SetHorizontalJustification(myHAlign);
-  asp->SetVerticalJustification(myVAlign);
-  asp->Aspect()->SetTextZoomable(myIsZoomable == Standard_True);
-  asp->Aspect()->SetTextAngle(myAngle);
-  asp->Aspect()->SetTextFontAspect(myFontAspect);
-  asp->SetHeight(myHeight);
-  Prs3d_Text::Draw (Prs3d_Root::CurrentGroup (aPresentation), asp, myText, myPosition);
-}
diff --git a/samples/mfc/standard/Common/Primitive/Sample2D_Text.h b/samples/mfc/standard/Common/Primitive/Sample2D_Text.h
deleted file mode 100755 (executable)
index 53376aa..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef _Sample2D_Text_HeaderFile
-#define _Sample2D_Text_HeaderFile
-#include <Standard_Macro.hxx>
-#include <Standard_DefineHandle.hxx>
-#include <Graphic3d_HorizontalTextAlignment.hxx>
-#include <Graphic3d_VerticalTextAlignment.hxx>
-#include <TCollection_AsciiString.hxx>
-
-class Sample2D_Text;
-DEFINE_STANDARD_HANDLE(Sample2D_Text,AIS_InteractiveObject)
-class Sample2D_Text : public AIS_InteractiveObject 
-{
-
-public:
-
-Standard_EXPORT 
-  Sample2D_Text  (const TCollection_AsciiString& theText,const gp_Pnt&  thePosition,
-                 const Quantity_PlaneAngle      theAngle      = 0.0 ,
-                 const Quantity_Color           theColor       = Quantity_NOC_YELLOW,
-                 const Font_FontAspect          theFontAspect  = Font_FA_Regular,
-                 const Standard_CString         theFont        = "Courier",
-                 const Standard_Real          theHeight       = 1,
-                 const Graphic3d_HorizontalTextAlignment  theHAlign      = Graphic3d_HTA_LEFT,
-                 const Graphic3d_VerticalTextAlignment  theVAlign      = Graphic3d_VTA_BOTTOM,
-                 const Standard_Boolean         theIsZoomable  = Standard_True);
-
-inline   TCollection_AsciiString GetText() const {  return myText ; }
-inline   void                    SetText(const TCollection_AsciiString& theText) {  myText = theText; }
-inline   void                    GetCoord(gp_Pnt& thePosition) const {  thePosition=gp_Pnt(myPosition); }
-inline   void                    SetCoord(const gp_Pnt& thePosition) {  myPosition = thePosition; }
-inline   Standard_Real           GetAngle() const {  return myAngle; }
-inline   void                    SetAngle(const Standard_Real theAngle) {  myAngle = theAngle; }
-inline   Quantity_Color          GetColor() const {  return myColor; }
-inline   void                    SetColor(const Quantity_Color theColor) {  myColor = theColor; }
-inline   Quantity_Factor         GetScale() const {  return myScale; }
-inline   void                    SetScale  (const Quantity_Factor theScale) {  myScale  = theScale; }
-inline   Standard_Boolean        GetIsZoomable() const { return myIsZoomable; }
-inline   void                    SetIsZoomable(const Standard_Boolean theIsZoomable) { myIsZoomable = theIsZoomable;}
-
-
-DEFINE_STANDARD_RTTIEXT(Sample2D_Text,AIS_InteractiveObject)
-
-private: 
- void Compute (  const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
-                  const Handle(Prs3d_Presentation)& aPresentation,
-                  const Standard_Integer aMode);
-
- void ComputeSelection (const Handle(SelectMgr_Selection)& /*aSelection*/,
-                        const Standard_Integer /*aMode*/)
- {
-
- }
-
-
-TCollection_AsciiString   myText            ; 
-gp_Pnt                    myPosition        ;
-Standard_Real             myAngle           ;
-Quantity_Color            myColor           ;
-Standard_CString          myFont            ;
-Quantity_Factor           myScale           ;
-Standard_Real             myHeight          ;
-Font_FontAspect           myFontAspect      ; 
-Standard_Boolean          myIsZoomable      ;
-Graphic3d_HorizontalTextAlignment   myHAlign ;
-Graphic3d_VerticalTextAlignment     myVAlign ;
-
-};
-
-#endif
index 05664ef..767bf85 100644 (file)
@@ -52,12 +52,10 @@ set (COMMON_ISESSION2D_SOURCE_FILES ${COMMON_ISESSION2D_DIR}/ISession2D_Shape.cp
 set (COMMON_PRIMITIVE_DIR          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/Primitive)
 set (COMMON_PRIMITIVE_HEADER_FILES ${COMMON_PRIMITIVE_DIR}/Sample2D_Face.h
                                    ${COMMON_PRIMITIVE_DIR}/Sample2D_Image.h
-                                   ${COMMON_PRIMITIVE_DIR}/Sample2D_Markers.h
-                                   ${COMMON_PRIMITIVE_DIR}/Sample2D_Text.h )
+                                   ${COMMON_PRIMITIVE_DIR}/Sample2D_Markers.h )
 set (COMMON_PRIMITIVE_SOURCE_FILES ${COMMON_PRIMITIVE_DIR}/Sample2D_Face.cpp
                                    ${COMMON_PRIMITIVE_DIR}/Sample2D_Image.cpp
-                                   ${COMMON_PRIMITIVE_DIR}/Sample2D_Markers.cpp
-                                   ${COMMON_PRIMITIVE_DIR}/Sample2D_Text.cpp )
+                                   ${COMMON_PRIMITIVE_DIR}/Sample2D_Markers.cpp )
 
 # Common Resource2D
 set (COMMON_RESOURCE2D_DIR          ${MFC_STANDARD_COMMON_SAMPLES_DIR}/Resource2D)
index 6a4b07e..ca2b558 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Face.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Image.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h" />
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h" />
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h" />
   </ItemGroup>
   <ItemGroup>
index 9e1f073..9a0cc52 100644 (file)
     <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Markers.cpp">
       <Filter>Source Files\Primitive-src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Filter>Source Files\Primitive-src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Filter>Source Files\ISession2D-src</Filter>
     </ClCompile>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h">
       <Filter>Header Files\Primitive-headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h">
-      <Filter>Header Files\Primitive-headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h">
       <Filter>Header Files\ISession2D-headers</Filter>
     </ClInclude>
index f688c8d..7ec5dd2 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Face.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Image.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h" />
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h" />
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h" />
   </ItemGroup>
   <ItemGroup>
index dfe07fc..5c27291 100644 (file)
     <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Markers.cpp">
       <Filter>Source Files\Primitive-src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Filter>Source Files\Primitive-src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Filter>Source Files\ISession2D-src</Filter>
     </ClCompile>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h">
       <Filter>Header Files\Primitive-headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h">
-      <Filter>Header Files\Primitive-headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h">
       <Filter>Header Files\ISession2D-headers</Filter>
     </ClInclude>
index e8d0700..6511d76 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Face.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Image.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h" />
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h" />
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h" />
   </ItemGroup>
   <ItemGroup>
index dfe07fc..5c27291 100644 (file)
     <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Markers.cpp">
       <Filter>Source Files\Primitive-src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Filter>Source Files\Primitive-src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Filter>Source Files\ISession2D-src</Filter>
     </ClCompile>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h">
       <Filter>Header Files\Primitive-headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h">
-      <Filter>Header Files\Primitive-headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h">
       <Filter>Header Files\ISession2D-headers</Filter>
     </ClInclude>
index 3f75f8c..c18792c 100644 (file)
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Face.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Image.h" />
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h" />
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h" />
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h" />
   </ItemGroup>
   <ItemGroup>
index dfe07fc..5c27291 100644 (file)
     <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Markers.cpp">
       <Filter>Source Files\Primitive-src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\Common\Primitive\Sample2D_Text.cpp">
-      <Filter>Source Files\Primitive-src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.cpp">
       <Filter>Source Files\ISession2D-src</Filter>
     </ClCompile>
     <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Markers.h">
       <Filter>Header Files\Primitive-headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\Common\Primitive\Sample2D_Text.h">
-      <Filter>Header Files\Primitive-headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\Common\ISession2D\ISession2D_Shape.h">
       <Filter>Header Files\ISession2D-headers</Filter>
     </ClInclude>