Import Geant4 8.1.0 source tree

source/visualization/OpenInventor/src/G4OpenInventorViewer.cc

@@ -1,23 +1,26 @@
 //
 // ********************************************************************
-// * DISCLAIMER                                                       *
+// * License and Disclaimer                                           *
 // *                                                                  *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in:                      *
-// *   http://cern.ch/geant4/license                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
 // *                                                                  *
 // * Neither the authors of this software system, nor their employing *
 // * institutes,nor the agencies providing financial support for this *
 // * work  make  any representation or  warranty, express or implied, *
 // * regarding  this  software system or assume any liability for its *
-// * use.                                                             *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
 // *                                                                  *
-// * This  code  implementation is the  intellectual property  of the *
-// * GEANT4 collaboration.                                            *
-// * By copying,  distributing  or modifying the Program (or any work *
-// * based  on  the Program)  you indicate  your  acceptance of  this *
-// * statement, and all its terms.                                    *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
 #ifdef G4VIS_BUILD_OI_DRIVER
@@ -326,7 +329,7 @@ G4OpenInventorViewer::lookedAt(SoCamera* camera,SbVec3f & dir, SbVec3f & up)
 
 void G4OpenInventorViewer::DrawView () {
   //G4cout << "debug Iv::DrawViewer " <<G4endl;
-  KernelVisitDecision();
+  if (!fNeedKernelVisit) KernelVisitDecision();
   ProcessView();
   FinishView();
 }
@@ -411,13 +414,17 @@ void G4OpenInventorViewer::DeselectionCB(
 */
 
 void G4OpenInventorViewer::DrawDetector() {
+  /* Replace this... - JA
   // DrawView does a ClearStore. Do not clear the transient store :
   SoSeparator* tmp = fG4OpenInventorSceneHandler.fTransientRoot;
   fG4OpenInventorSceneHandler.fTransientRoot = new SoSeparator;
-  KernelVisitDecision();
+  if (!fNeedKernelVisit) KernelVisitDecision();
   ProcessView();
   fG4OpenInventorSceneHandler.fTransientRoot->unref();
   fG4OpenInventorSceneHandler.fTransientRoot = tmp;
+  */
+  // ...by this... - JA
+  DrawView();
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -591,8 +598,6 @@ void G4OpenInventorViewer::SetSolid() {
     break;
   }
   SetViewParameters(vp);
-  fModified = false; // To avoid a SetView in G4VViewer::ProcessView 
-                     // that will change the camera.
   DrawDetector();
 }
 void G4OpenInventorViewer::SetWireFrame() {
@@ -611,8 +616,6 @@ void G4OpenInventorViewer::SetWireFrame() {
     break;
   }
   SetViewParameters(vp);
-  fModified = false; // To avoid a SetView in G4VViewer::ProcessView 
-                     // that will change the camera.
   DrawDetector();
 }
 
@@ -638,18 +641,21 @@ void G4OpenInventorViewer::SetReducedWireFrame(bool aValue) {
     break;
   }
   SetViewParameters(vp);
-  fModified = false; // To avoid a SetView in G4VViewer::ProcessView 
-                     // that will change the camera.
   NeedKernelVisit(); // Just in case it was alread in wire framw.
   DrawDetector();
 }
 
 void G4OpenInventorViewer::UpdateScene() {
+  /* Replace this... - JA
   fG4OpenInventorSceneHandler.ClearStore();
   ClearView();
-  KernelVisitDecision();
+  if (!fNeedKernelVisit) KernelVisitDecision();
   ProcessView();
   ShowView();
+  */
+  // ...by this - JA
+  NeedKernelVisit();
+  DrawView();
 }
 G4String G4OpenInventorViewer::Help(const G4String& aTopic) {
   if(aTopic=="controls") {