Issue 0022171:

[modules/gui.git] / src / OCCViewer / OCCViewer_ViewModel.cxx

diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index b728482f16e32c342b4c361e9ca408cf94221bd2..bb5d8df0779e2d940c8ac1f812ff7712e533714d 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -61,7 +61,6 @@
 
 #include <Visual3d_View.hxx>
 
-#include <Basics_OCCTVersion.hxx>
 
 // VSR: Uncomment below line to allow texture background support in OCC viewer
 #define OCC_ENABLE_TEXTURED_BACKGROUND
@@ -99,23 +98,28 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron)
   myTrihedronSize(100)
 {
   // init CasCade viewers
-  myV3dViewer = OCCViewer_VService::Viewer3d( "", (short*) "Viewer3d", "", 1000.,
-                                              V3d_XposYnegZpos, true, true );
-
-  myV3dViewer->Init();
-
-  myV3dCollector = OCCViewer_VService::Viewer3d( "", (short*) "Collector3d", "", 1000.,
-                                                 V3d_XposYnegZpos, true, true );
-  myV3dCollector->Init();
+  myV3dViewer = OCCViewer_VService::CreateViewer( TCollection_ExtendedString("Viewer3d").ToExtString() );
+  //myV3dViewer->Init(); // to avoid creation of the useless perspective view (see OCCT issue 0024267)
+  myV3dViewer->SetDefaultLights();
+
+#if OCC_VERSION_LARGE <= 0x06060000 // Porting to OCCT higher 6.6.0 version
+  myV3dCollector = OCCViewer_VService::CreateViewer( TCollection_ExtendedString("Collector3d").ToExtString() );
+  //myV3dCollector->Init(); // to avoid creation of the useless perspective view (see OCCT issue 0024267)
+  myV3dCollector->SetDefaultLights();
+#endif
 
   // init selector
-  myAISContext = new AIS_InteractiveContext( myV3dViewer, myV3dCollector);
-
+#if OCC_VERSION_LARGE <= 0x06060000 
+  myAISContext = new AIS_InteractiveContext( myV3dViewer, myV3dCollector );
+#else
+  myAISContext = new AIS_InteractiveContext( myV3dViewer );
+#endif
   myAISContext->SelectionColor( Quantity_NOC_WHITE );
   
   // display isoline on planar faces (box for ex.)
   myAISContext->IsoOnPlane( true );
 
+  /*
   double h = QApplication::desktop()->screenGeometry( QApplication::desktop()->primaryScreen() ).height() / 300. ;
   Handle(Prs3d_Drawer) drawer = myAISContext->DefaultDrawer();
   Handle(Prs3d_TextAspect) ta = drawer->TextAspect();
@@ -124,9 +128,10 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron)
   drawer->SetTextAspect(ta);
   drawer->AngleAspect()->SetTextAspect(ta);
   drawer->LengthAspect()->SetTextAspect(ta);
+  */
   
   /* create trihedron */
-  if( DisplayTrihedron )
+  if ( DisplayTrihedron )
   {
     Handle(Geom_Axis2Placement) anAxis = new Geom_Axis2Placement(gp::XOY());
     myTrihedron = new AIS_Trihedron(anAxis);
@@ -138,15 +143,12 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron)
     myTrihedron->SetSize(100);
     Handle(AIS_Drawer) drawer = myTrihedron->Attributes();
     if (drawer->HasDatumAspect()) {
-        Handle(Prs3d_DatumAspect) daspect = drawer->DatumAspect();
-        daspect->FirstAxisAspect()->SetColor(Quantity_Color(1.0, 0.0, 0.0, Quantity_TOC_RGB));
-        daspect->SecondAxisAspect()->SetColor(Quantity_Color(0.0, 1.0, 0.0, Quantity_TOC_RGB));
-        daspect->ThirdAxisAspect()->SetColor(Quantity_Color(0.0, 0.0, 1.0, Quantity_TOC_RGB));
-    }
-
-    myAISContext->Display(myTrihedron);
-    myAISContext->Deactivate(myTrihedron);
+      Handle(Prs3d_DatumAspect) daspect = drawer->DatumAspect();
+      daspect->FirstAxisAspect()->SetColor(Quantity_Color(1.0, 0.0, 0.0, Quantity_TOC_RGB));
+      daspect->SecondAxisAspect()->SetColor(Quantity_Color(0.0, 1.0, 0.0, Quantity_TOC_RGB));
+      daspect->ThirdAxisAspect()->SetColor(Quantity_Color(0.0, 0.0, 1.0, Quantity_TOC_RGB));
     }
+  }
 
   // set interaction style to standard
   myInteractionStyle = 0;
@@ -174,7 +176,9 @@ OCCViewer_Viewer::~OCCViewer_Viewer()
 {
   myAISContext.Nullify();
   myV3dViewer.Nullify();
+#if OCC_VERSION_LARGE <= 0x06060000
   myV3dCollector.Nullify();
+#endif
 }
 
 /*!
@@ -250,6 +254,7 @@ SUIT_ViewWindow* OCCViewer_Viewer::createView( SUIT_Desktop* theDesktop )
   vw->setBackground( background(0) ); // 0 means MAIN_VIEW (other views are not yet created here)
   // connect signal from viewport
   connect(view->getViewPort(), SIGNAL(vpClosed()), this, SLOT(onViewClosed()));
+  connect(view->getViewPort(), SIGNAL(vpMapped()), this, SLOT(onViewMapped()));
   return view;
 }
 
@@ -408,6 +413,11 @@ void OCCViewer_Viewer::onViewClosed()
   }
 }
 
+void OCCViewer_Viewer::onViewMapped()
+{
+  setTrihedronShown( true );
+}
+
 int OCCViewer_Viewer::getTopLayerId()
 {
 #if OCC_VERSION_LARGE > 0x06050200
@@ -719,12 +729,14 @@ bool OCCViewer_Viewer::isInViewer( const Handle(AIS_InteractiveObject)& obj,
   AIS_ListOfInteractive List;
   myAISContext->DisplayedObjects(List);
 
+#if OCC_VERSION_LARGE <= 0x06060000
   if( !onlyInViewer )
   {
     AIS_ListOfInteractive List1;
     myAISContext->ObjectsInCollector(List1);
     List.Append(List1);
   }
+#endif
 
   AIS_ListIteratorOfListOfInteractive ite(List);
   for ( ; ite.More(); ite.Next() )
@@ -821,10 +833,13 @@ void OCCViewer_Viewer::setTrihedronShown( const bool on )
   if ( myTrihedron.IsNull() )
     return;
 
-  if ( on )
+  if ( on ) {
     myAISContext->Display( myTrihedron );
-  else
+    myAISContext->Deactivate(myTrihedron);
+  }
+  else {
     myAISContext->Erase( myTrihedron );
+  }
 }
 
 /*!
@@ -986,6 +1001,9 @@ bool OCCViewer_Viewer::computeTrihedronSize( double& theNewSize, double& theSize
  * Update the size of the trihedron
  */
 void OCCViewer_Viewer::updateTrihedron() {
+  if ( myTrihedron.IsNull() )
+    return;
+
   if(myIsRelative){
     double newSz, oldSz;