Changeset 842 for trunk

Timestamp:

Jun 11, 2008, 4:16:27 PM (17 years ago)

Author:

garnier

Message:

updates from the head of geant4 in order to compile

Location:

trunk/source

Files:

• intercoms/History (modified) (2 diffs)
• intercoms/include/G4UIcommandTree.hh (modified) (2 diffs)
• intercoms/src/G4UIcommandTree.cc (modified) (3 diffs)
• visualization/modeling/History (modified) (2 diffs)
• visualization/modeling/include/G4BoundingSphereScene.hh (modified) (2 diffs)
• visualization/modeling/include/G4PhysicalVolumeMassScene.hh (modified) (2 diffs)
• visualization/modeling/include/G4PhysicalVolumeSearchScene.hh (modified) (2 diffs)

trunk/source/intercoms/History

@@ -1 @@
-$Id: History,v 1.70 2007/08/10 09:47:43 kmura Exp $
+$Id: History,v 1.71 2008/01/30 11:20:03 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+30th January 2007, Laurent Garnier
+ - Add a new function in G4UIcommandTree to find a subtree
 
 August 10, 2007 K.Murakami (intercoms-V09-00-01)

trunk/source/intercoms/include/G4UIcommandTree.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UIcommandTree.hh,v 1.15 2006/06/29 19:08:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UIcommandTree.hh,v 1.16 2008/01/30 11:20:03 lgarnier Exp $
+// GEANT4 tag $Name: HEAD $
 //
 
@@ -56 +56 @@
       void RemoveCommand(G4UIcommand * aCommand);
       G4UIcommand * FindPath(const char* commandPath);
+      G4UIcommandTree * FindCommandTree(const char* commandPath);
       void List();
       void ListCurrent();

trunk/source/intercoms/src/G4UIcommandTree.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIcommandTree.cc,v 1.13 2006/06/29 19:08:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UIcommandTree.cc,v 1.14 2008/01/30 11:20:03 lgarnier Exp $
+// GEANT4 tag $Name: HEAD $
 //
 
@@ -156 +156 @@
 }
 
+// L. Garnier 01.28.08 This function has not a good name. In fact, it try
+// to match a command name, not a path. It should be rename as FindCommandName
+
 G4UIcommand * G4UIcommandTree::FindPath(const char* commandPath)
 {
@@ -183 +186 @@
       if( nextPath == tree[i_thTree]->GetPathName() )
       { return tree[i_thTree]->FindPath( commandPath ); }
+    }
+  }
+  return NULL;
+}
+
+
+/**
+ * Try to match a command or a path with the one given.
+ * @commandPath : command or path to match
+ * @return the commandTree found or NULL if not
+ */
+G4UIcommandTree * G4UIcommandTree::FindCommandTree(const char* commandPath)
+{
+  G4String remainingPath = commandPath;
+  if( remainingPath.index( pathName ) == std::string::npos )
+  { return NULL; }
+  remainingPath.remove(0,pathName.length());
+  G4int i = remainingPath.first('/');
+  if( i != G4int(std::string::npos) )
+  {
+    // Find path
+    G4String nextPath = pathName;
+    nextPath.append(remainingPath(0,i+1));
+    G4int n_treeEntry = tree.size();
+    for( G4int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
+    {
+      if (tree[i_thTree]->GetPathName() == commandPath) {
+        return tree[i_thTree];
+      }
+      else if( nextPath == tree[i_thTree]->GetPathName() ) {
+        return tree[i_thTree]->FindCommandTree( commandPath );
+      }
     }
   }

trunk/source/visualization/modeling/History

@@ -1 @@
-$Id: History,v 1.103 2007/11/10 14:56:54 allison Exp $
+$Id: History,v 1.104 2008/01/04 21:59:15 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/modeling
 ---------------------------------------
+
+4th January 2008  John Allison  (modeling-V09-01-00)
+- Adapted to new BeginPrimitives2D signature.
 
 10th November 2007  John Allison  (modeling-V09-00-00)

trunk/source/visualization/modeling/include/G4BoundingSphereScene.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4BoundingSphereScene.hh,v 1.17 2006/06/29 21:30:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4BoundingSphereScene.hh,v 1.18 2008/01/04 21:59:15 allison Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -91 +91 @@
   virtual void BeginPrimitives (const G4Transform3D&) {}
   virtual void EndPrimitives () {}
-  virtual void BeginPrimitives2D () {}
+  virtual void BeginPrimitives2D (const G4Transform3D&) {}
   virtual void EndPrimitives2D () {}
   virtual void AddPrimitive (const G4Polyline&)   {}

trunk/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4PhysicalVolumeMassScene.hh,v 1.8 2006/11/05 20:38:09 allison Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PhysicalVolumeMassScene.hh,v 1.9 2008/01/04 21:59:15 allison Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -115 +115 @@
   virtual void BeginPrimitives (const G4Transform3D&) {}
   virtual void EndPrimitives () {}
-  virtual void BeginPrimitives2D () {}
+  virtual void BeginPrimitives2D (const G4Transform3D&) {}
   virtual void EndPrimitives2D () {}
   virtual void AddPrimitive (const G4Polyline&)   {}

trunk/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4PhysicalVolumeSearchScene.hh,v 1.17 2006/06/29 21:30:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4PhysicalVolumeSearchScene.hh,v 1.18 2008/01/04 21:59:15 allison Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -83 +83 @@
   virtual void BeginPrimitives (const G4Transform3D&) {}
   virtual void EndPrimitives () {}
-  virtual void BeginPrimitives2D () {}
+  virtual void BeginPrimitives2D (const G4Transform3D&) {}
   virtual void EndPrimitives2D () {}
   virtual void AddPrimitive (const G4Polyline&)   {}