From: san <san@opencascade.com>
Date: Fri, 18 Oct 2013 09:23:25 +0000 (+0400)
Subject: 0024267: Exception in Visual3d_ViewManager::Redraw() when color scale is displayed
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=1a3ab76acfc1ae51345e4e45049b04bbbd24ed85;p=occt-copy.git

0024267: Exception in Visual3d_ViewManager::Redraw() when color scale is displayed
Removing V3d_Viewer::Init() and the default views created internally by the viewer.
---

diff --git a/src/V3d/V3d_Viewer.cdl b/src/V3d/V3d_Viewer.cdl
index f6e63512bf..277f7cc8a0 100755
--- a/src/V3d/V3d_Viewer.cdl
+++ b/src/V3d/V3d_Viewer.cdl
@@ -112,10 +112,6 @@ is
         ---Purpose: creates a view in the viewer according to its
         --          default parameters.
 
-        DefaultOrthographicView(me: mutable) returns mutable OrthographicView from V3d;
-
-        DefaultPerspectiveView(me: mutable) returns mutable PerspectiveView from V3d;
-
         -------------------------------------------------------
         ---Category: Methods to modify the status of the viewer
         -------------------------------------------------------
@@ -631,8 +627,6 @@ is
         --          directional-light V3d_XnegYneg
         --          ambient-light
 
-        Init(me: mutable);
-
         IsActive(me; aView: View from V3d)
         returns Boolean from Standard is private;
 
@@ -700,8 +694,6 @@ fields
         MySurfaceDetail:        TypeOfSurfaceDetail from V3d ;
         MyDefaultAngle:         PlaneAngle from Quantity;
         MyDefaultTypeOfView:    TypeOfView from V3d;
-        MyDefaultOrthographicView: OrthographicView from V3d;
-        MyDefaultPerspectiveView: PerspectiveView from V3d;
         MyCurrentSelectedLight:   Light from V3d;
         myActiveViewsIterator: ListIteratorOfListOfTransient from TColStd;
         myDefinedViewsIterator: ListIteratorOfListOfTransient from TColStd;
diff --git a/src/V3d/V3d_Viewer.cxx b/src/V3d/V3d_Viewer.cxx
index f3ccb78cf7..f15aa8c5fe 100755
--- a/src/V3d/V3d_Viewer.cxx
+++ b/src/V3d/V3d_Viewer.cxx
@@ -125,16 +125,6 @@ void V3d_Viewer::SetViewOn( ) {
     SetViewOn(ActiveView());};
 }
 
-Handle(V3d_OrthographicView) V3d_Viewer::DefaultOrthographicView() {
-
-  return MyDefaultOrthographicView;
-}
-
-Handle(V3d_PerspectiveView) V3d_Viewer::DefaultPerspectiveView () {
-
-  return MyDefaultPerspectiveView;
-}
-
 void V3d_Viewer::SetViewOff( ) {
 
   for (InitDefinedViews();MoreDefinedViews();NextDefinedViews()){
diff --git a/src/V3d/V3d_Viewer_2.cxx b/src/V3d/V3d_Viewer_2.cxx
index 1d281c71df..2f995028b5 100755
--- a/src/V3d/V3d_Viewer_2.cxx
+++ b/src/V3d/V3d_Viewer_2.cxx
@@ -114,9 +114,3 @@ void V3d_Viewer::SetDefaultLights()
   SetLightOn (new V3d_DirectionalLight (this, V3d_Zneg, Quantity_NOC_WHITE, Standard_True));
   SetLightOn (new V3d_AmbientLight (this));
 }
-
-void V3d_Viewer::Init() {
-  MyDefaultPerspectiveView = new V3d_PerspectiveView(this);
-  MyDefaultOrthographicView = new V3d_OrthographicView(this);
-  SetDefaultLights();
-}