Import Geant4 10.6.0.beta source tree

2019-06-28 11:59:04 +02:00
parent 28a70706e0
commit d0f911957d
1056 changed files with 95168 additions and 78160 deletions
@@ -19,6 +19,34 @@ committal in the CVS repository !
 History file for visualization/OpenInventor
 -------------------------------------------

+14 June 2019  Gabriele Cosmo (openinventor-V10-05-06)
+- Fixed compilation error in G4OpenInventorViewer::CompareForKernelVisit()
+  for typo introduced in previous tag...
+
+13 June 2019  John Allison (openinventor-V10-05-05)
+- Part of vis-V10-05-20.
+- Test number of cloud points for kernel visit.
+
+10 June 2019  John Allison (openinventor-V10-05-04)
+- Part of vis-V10-05-19.
+- G4OpenInventorXtExaminerViewer.cc and wheelmouse.cc:
+  Add #ifdef G4VIS_BUILD_OIX_DRIVER
+
+16 May 2019  Gabriele Cosmo (openinventor-V10-05-03)
+- Fixed compilation warning from gcc-9.1 in SoCounterAction for setting
+  of name, apparently not allowed in OpenInventor.
+
+18 March 2019  Gabriele Cosmo (openinventor-V10-05-02)
+- Corrected typo in comments.
+
+12 March 2019  John Allison (openinventor-V10-05-01)
+- Fix compiler warnings about new cloud style.
+  Note: this does not yet mean that OI can handle cloud style. In fact
+  I think it will render in wireframe if cloud is selected.
+
+11 March 2019  Gabriele Cosmo (openinventor-V10-05-00)
+- Fixed typos in printouts in SbPainterPS.
+
 22 August 2018  Gabriele Cosmo (openinventor-V10-04-08)
 - sources.cmake: make OIQT driver installation optional when QT is
  selected for CMake configuration (SoQt library is not mandatory
@@ -278,7 +278,7 @@ private:
      float distanceToBeamlineStart;
      std::string name;

-      bool operator<(elementForSorting const &other) const
+      G4bool operator<(elementForSorting const &other) const
      {
         if (closestPointZCoord < other.closestPointZCoord)
            return true;
@@ -42,7 +42,7 @@ public:
  enum LookFor { NODE = 1,TYPE = 2, NAME = 3 };
  void setLookFor(LookFor);
  void setType(const SoType,SbBool = TRUE);
-  void setName(const SbName);
+//  void setName(const SbName);
 public:
  int getCount() const;
 protected:
@@ -608,7 +608,7 @@ void G4OpenInventorSceneHandler::GeneratePrerequisites()

    // This call comes from a G4PhysicalVolumeModel.  drawnPVPath is
    // the path of the current drawn (non-culled) volume in terms of
-    // drawn (non-culled) ancesters.  Each node is identified by a
+    // drawn (non-culled) ancestors.  Each node is identified by a
    // PVNodeID object, which is a physical volume and copy number.  It
    // is a vector of PVNodeIDs corresponding to the geometry hierarchy
    // actually selected, i.e., not culled.
@@ -682,6 +682,9 @@ void G4OpenInventorSceneHandler::GeneratePrerequisites()
      case (G4ViewParameters::hlhsr):
 	fModelingSolid = true;
 	break;
+      case (G4ViewParameters::cloud):
+        fModelingSolid = false;
+        break;
      }

      SoMaterial* material = 
@@ -792,6 +795,9 @@ void G4OpenInventorSceneHandler::AddProperties(const G4VisAttributes* visAtts)
  case (G4ViewParameters::hlhsr):
    fModelingSolid = true;
    break;
+  case (G4ViewParameters::cloud):
+    fModelingSolid = false;
+    break;
  }

  // Edge visibility...
@@ -158,6 +158,7 @@ G4bool G4OpenInventorViewer::CompareForKernelVisit(G4ViewParameters& vp) {

  if (
      (vp.GetDrawingStyle ()    != fVP.GetDrawingStyle ())    ||
+      (vp.GetNumberOfCloudPoints()  != fVP.GetNumberOfCloudPoints())  ||
      (vp.IsAuxEdgeVisible ()   != fVP.IsAuxEdgeVisible ())   ||
      (vp.IsCulling ()          != fVP.IsCulling ())          ||
      (vp.IsCullingInvisible () != fVP.IsCullingInvisible ()) ||
@@ -667,6 +668,9 @@ void G4OpenInventorViewer::SetSolid() {
    break;
  case G4ViewParameters::hlhsr:
    break;
+  case G4ViewParameters::cloud:
+    vp.SetDrawingStyle(G4ViewParameters::hsr);
+    break;
  }
  SetViewParameters(vp);
  DrawDetector();
@@ -685,6 +689,9 @@ void G4OpenInventorViewer::SetWireFrame() {
  case G4ViewParameters::hlhsr:
    vp.SetDrawingStyle(G4ViewParameters::hlr);
    break;
+  case G4ViewParameters::cloud:
+    vp.SetDrawingStyle(G4ViewParameters::wireframe);
+    break;
  }
  SetViewParameters(vp);
  DrawDetector();
@@ -710,6 +717,9 @@ void G4OpenInventorViewer::SetReducedWireFrame(bool aValue) {
  case G4ViewParameters::hlhsr:
    vp.SetDrawingStyle(G4ViewParameters::hlr);
    break;
+  case G4ViewParameters::cloud:
+    vp.SetDrawingStyle(G4ViewParameters::wireframe);
+    break;
  }
  SetViewParameters(vp);
  NeedKernelVisit(); // Just in case it was alread in wire framw.
@@ -27,6 +27,8 @@
 // Open Inventor Xt Extended Viewer - 30 Oct 2012
 // Rastislav Ondrasek, Pierre-Luc Gagnon, Frederick Jones TRIUMF

+#ifdef G4VIS_BUILD_OIX_DRIVER
+
 #include <stdio.h>
 #include <string.h>
 #include <string>
@@ -4936,3 +4938,5 @@ G4bool HookEventProcState::Notify(G4ApplicationState requiredState)
   }
   return true;
 }
+
+#endif // G4VIS_BUILD_OIX_DRIVER
@@ -1011,7 +1011,7 @@ void SbPainterPS::putImageInStream (
    }
  }
  if(status==0) 
-    ::printf("SbPainterPS::putImageInStream: problem to retreive some pixel rgb.\n");
+    ::printf("SbPainterPS::putImageInStream: problem to retrieve some pixel rgb.\n");
  putRestoreStateInStream();
 }
 //////////////////////////////////////////////////////////////////////////////
@@ -95,9 +95,9 @@ void SoCounterAction::setType(const SoType aType,SbBool aCheckDerived) {
  fType = aType;
  fCheckDerived = aCheckDerived;
 }
-void SoCounterAction::setName(const SbName aName){
-  fName = aName;
-}
+//void SoCounterAction::setName(const SbName aName){
+//  fName = aName;
+//}
 int SoCounterAction::getCount() const {
  return fCount;
 }
@@ -22,6 +22,8 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

+#ifdef G4VIS_BUILD_OIX_DRIVER
+
 #include <X11/Intrinsic.h>
 #include <X11/Xlib.h>
 #include <Xm/Xm.h>
@@ -141,3 +143,5 @@ void xmAddMouseEventHandler(Widget w)
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
+
+#endif // G4VIS_BUILD_OIX_DRIVER