Import Geant4 10.7.0.beta source tree

source/visualization/management/include/G4VVisCommand.hh

@@ -118,6 +118,8 @@ protected:
 
   void CheckSceneAndNotifyHandlers (G4Scene* = nullptr);
 
+  G4bool CheckView();  // False if not valid
+
   void G4VisCommandsSceneAddUnsuccessful(G4VisManager::Verbosity verbosity);
 
   void CopyGuidanceFrom

source/visualization/management/include/G4VisCommandsGeometrySet.hh

@@ -83,6 +83,23 @@ private:
   G4bool fForce;
 };
 
+class G4VisCommandGeometrySetForceCloudFunction:
+public G4VVisCommandGeometrySetFunction {
+public:
+  virtual ~G4VisCommandGeometrySetForceCloudFunction() {}
+  G4VisCommandGeometrySetForceCloudFunction
+  (G4bool force, G4int nPoints)
+  :fForce(force)
+  ,fNPoints(nPoints) {}
+  void operator() (G4VisAttributes* visAtts) const {
+    visAtts->SetForceCloud(fForce);
+    visAtts->SetForceNumberOfCloudPoints(fNPoints);
+  }
+private:
+  G4bool fForce;
+  G4int  fNPoints;
+};
+
 class G4VisCommandGeometrySetForceLineSegmentsPerCircleFunction:
   public G4VVisCommandGeometrySetFunction {
 public:
@@ -217,6 +234,21 @@ private:
   G4UIcommand* fpCommand;
 };
 
+class G4VisCommandGeometrySetForceCloud:
+  public G4VVisCommandGeometrySet {
+public:
+  G4VisCommandGeometrySetForceCloud ();
+  virtual ~G4VisCommandGeometrySetForceCloud ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandGeometrySetForceCloud
+  (const G4VisCommandGeometrySetForceCloud&);
+  G4VisCommandGeometrySetForceCloud& operator=
+  (const G4VisCommandGeometrySetForceCloud&);
+  G4UIcommand* fpCommand;
+};
+
 class G4VisCommandGeometrySetForceSolid:
   public G4VVisCommandGeometrySet {
 public:

source/visualization/management/include/G4VisCommandsListManager.hh

@@ -214,6 +214,8 @@ void G4VisCommandManagerMode<Manager>::SetNewValue(G4UIcommand*, G4String name)
 {
   assert (0 != fpManager);
   fpManager->SetMode(name);
+  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
+  if (visManager) visManager->NotifyHandlers();
 }    
 
 #endif

source/visualization/management/include/G4VisExecutive.icc

@@ -216,7 +216,9 @@ G4VisExecutive::RegisterGraphicsSystems () {
   G4VGraphicsSystem* oi  = 0;
 #ifdef G4VIS_USE_OIX
   oi = new G4OpenInventorX;
-#elif G4VIS_USE_OIWIN32
+#elif defined(G4VIS_USE_OIQT)
+  oi = new G4OpenInventorQt;
+#elif defined(G4VIS_USE_OIWIN32)
   oi = new G4OpenInventorWin32;
 #endif
   if (oi) {
@@ -230,10 +232,6 @@ G4VisExecutive::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4OpenInventorXtExtended);
 #endif
 
-#ifdef G4VIS_USE_OIQT
-  RegisterGraphicsSystem(new G4OpenInventorQt);
-#endif
-
 #ifdef G4VIS_USE_RAYTRACERX
   RegisterGraphicsSystem (new G4RayTracerX);
 #endif