Changeset 1315 for trunk/source/visualization/HepRep/src

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/visualization/HepRep/src

Files:

• G4HepRepFileSceneHandler.cc (modified) (10 diffs)
• G4HepRepMessenger.cc (modified) (7 diffs)

trunk/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HepRepFileSceneHandler.cc,v 1.68 2009/12/16 17:51:21 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4HepRepFileSceneHandler.cc,v 1.69 2010/06/05 06:25:03 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -210 +210 @@
 #endif
         
+        // HepRApp does not correctly represent the end faces of cones at
+        // non-standard angles, let the base class convert these solids to polygons.    
+        CLHEP::HepRotation r = fpObjectTransformation->getRotation();   
+        G4bool linedUpWithAnAxis = (std::fabs(r.phiX())<=.001 ||  
+                                                                std::fabs(r.phiY())<=.001 || 
+                                                                std::fabs(r.phiZ())<=.001 ||
+                                                                std::fabs(r.phiX()-pi)<=.001 ||
+                                                                std::fabs(r.phiY()-pi)<=.001 ||
+                                                                std::fabs(r.phiZ()-pi)<=.001);  
+        //G4cout << "Angle X:" << r.phiX() << ", Angle Y:" << r.phiY() << ", Angle Z:" << r.phiZ() << G4endl;
+        //G4cout << "linedUpWithAnAxis:" << linedUpWithAnAxis << G4endl;
+        
         // HepRep does not have a primitive for a cut cone,
         // so if this cone is cut, let the base class convert this
         // solid to polygons.
-        if (cons.GetDeltaPhiAngle() < twopi) {
+        G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+        if (cons.GetDeltaPhiAngle() < twopi || !linedUpWithAnAxis || messenger->renderCylAsPolygons())
+        {
                 G4VSceneHandler::AddSolid(cons);  // Invoke default action.
         } else {
@@ -278 +292 @@
         // so if this cylinder is cut, let the base class convert this
         // solid to polygons.
-        if (tubs.GetDeltaPhiAngle() < twopi || !linedUpWithAnAxis)
+        G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+        if (tubs.GetDeltaPhiAngle() < twopi || !linedUpWithAnAxis || messenger->renderCylAsPolygons())
         {
                 G4VSceneHandler::AddSolid(tubs);  // Invoke default action.
@@ -291 +306 @@
                 haveVisible = false;
                 AddHepRepInstance("Cylinder", NULL);
-                
-                G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
                 
                 if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
@@ -475 +488 @@
         if (!pTrModel) G4Exception
                 ("G4HepRepFileSceneHandler::AddCompound(const G4VTrajectory&): Not a G4TrajectoriesModel.");
-        G4int drawingMode = pTrModel->GetDrawingMode();
         
         // Pointers to hold trajectory attribute values and definitions.
@@ -551 +563 @@
                 // Would rather be able to get these attDefs without needing a reference from any
                 // particular point, but don't know how to do that.
-                if ((drawingMode!=0 || trajContext->GetDrawStepPts() || trajContext->GetDrawAuxPts())
+                if ((trajContext->GetDrawStepPts() || trajContext->GetDrawAuxPts())
                         && traj.GetPointEntries()>0) {
                         G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(0);
@@ -626 +638 @@
         
         // Draw step points.
-        if (drawingMode!=0 || trajContext->GetDrawStepPts()) {
+        if (trajContext->GetDrawStepPts()) {
                 if (!doneInitTraj)
                         InitTrajectory();
@@ -642 +654 @@
                 G4bool visible;
                 G4bool square;
-                if (drawingMode==0) {
-                        G4Colour colour = trajContext->GetStepPtsColour();
-                        redness = colour.GetRed();
-                        greenness = colour.GetGreen();
-                        blueness = colour.GetBlue();
-                        markSize = (G4int) trajContext->GetStepPtsSize();
-                        visible = (G4int) trajContext->GetStepPtsVisible();
-                        square = (trajContext->GetStepPtsType()==G4Polymarker::squares);
-                } else {
-                        redness = 1.;
-                        greenness = 1.;
-                        blueness = 1.;
-                        markSize = std::abs(drawingMode/1000);
-                        visible = true;
-                        square = false;
-                }
+                G4Colour colour = trajContext->GetStepPtsColour();
+                redness = colour.GetRed();
+                greenness = colour.GetGreen();
+                blueness = colour.GetBlue();
+                markSize = (G4int) trajContext->GetStepPtsSize();
+                visible = (G4int) trajContext->GetStepPtsVisible();
+                square = (trajContext->GetStepPtsType()==G4Polymarker::squares);
 
                 // Avoiding drawing anything black on black.  
@@ -735 +738 @@
         
         // Draw Auxiliary Points
-        if (drawingMode!=0 || trajContext->GetDrawAuxPts()) {
+        if (trajContext->GetDrawAuxPts()) {
                 if (!doneInitTraj)
                         InitTrajectory();
@@ -751 +754 @@
                 G4bool visible;
                 G4bool square;
-                if (drawingMode==0) {
-                        G4Colour colour = trajContext->GetAuxPtsColour();
-                        redness = colour.GetRed();
-                        greenness = colour.GetGreen();
-                        blueness = colour.GetBlue();
-                        markSize = (G4int) trajContext->GetAuxPtsSize();
-                        visible = (G4int) trajContext->GetAuxPtsVisible();
-                        square = (trajContext->GetAuxPtsType()==G4Polymarker::squares);
-                } else {
-                        redness = 1.;
-                        greenness = 1.;
-                        blueness = 1.;
-                        markSize = std::abs(drawingMode/1000);
-                        visible = true;
-                        square = false;
-                }
+                G4Colour colour = trajContext->GetAuxPtsColour();
+                redness = colour.GetRed();
+                greenness = colour.GetGreen();
+                blueness = colour.GetBlue();
+                markSize = (G4int) trajContext->GetAuxPtsSize();
+                visible = (G4int) trajContext->GetAuxPtsVisible();
+                square = (trajContext->GetAuxPtsType()==G4Polymarker::squares);
 
                 // Avoiding drawing anything black on black.  

trunk/source/visualization/HepRep/src/G4HepRepMessenger.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HepRepMessenger.cc,v 1.11 2009/11/23 05:42:28 perl Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4HepRepMessenger.cc,v 1.12 2010/06/05 06:25:03 perl Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 #include "G4HepRepMessenger.hh"
@@ -100 +100 @@
         }
         setCullInvisiblesCommand->AvailableForStates(G4State_Idle);
+                
+        renderCylAsPolygonsCommand = new G4UIcmdWithABool("/vis/heprep/renderCylAsPolygons", this);
+        renderCylAsPolygonsCommand->SetGuidance("Render cylinders and cones as polygons.");
+        renderCylAsPolygonsCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
+        renderCylAsPolygonsCommand->SetParameterName("flag",false);
+        renderCylAsPolygonsCommand->SetDefaultValue(true);
+        renderCylAsPolygonsCommand->AvailableForStates(G4State_Idle);
                 
     setEventNumberSuffixCommand = new G4UIcmdWithAString("/vis/heprep/setEventNumberSuffix", this);
@@ -122 +129 @@
     addPointAttributesCommand->SetDefaultValue(false);
     addPointAttributesCommand->AvailableForStates(G4State_Idle);
-
-    useSolidsCommand = new G4UIcmdWithABool("/vis/heprep/useSolids", this);
-    useSolidsCommand->SetGuidance("Use HepRep Solids, rather than Geant4 Primitives.");
-        useSolidsCommand->SetGuidance("This command is used by HepRepXML, not by HepRepFile.");
-    useSolidsCommand->SetParameterName("flag",false);
-    useSolidsCommand->SetDefaultValue(true);
-    useSolidsCommand->AvailableForStates(G4State_Idle);
+                
+        useSolidsCommand = new G4UIcmdWithABool("/vis/heprep/useSolids", this);
+        useSolidsCommand->SetGuidance("Use HepRep Solids, rather than Geant4 Primitives.");
+        useSolidsCommand->SetGuidance("This command is used by HepRepXML, not by HepRepFile..");
+        useSolidsCommand->SetParameterName("flag",false);
+        useSolidsCommand->SetDefaultValue(true);
+        useSolidsCommand->AvailableForStates(G4State_Idle);
 }
 
@@ -136 +143 @@
         delete setOverwriteCommand;
         delete setCullInvisiblesCommand;
+    delete renderCylAsPolygonsCommand;
     delete setEventNumberSuffixCommand;
     delete appendGeometryCommand;
@@ -152 +160 @@
     } else if (command==setCullInvisiblesCommand) {
         return cullInvisibles; 
+    } else if (command==renderCylAsPolygonsCommand) {
+        return renderCylAsPolygonsCommand->ConvertToString(cylAsPolygons);
     } else if (command==setEventNumberSuffixCommand) {
         return suffix; 
@@ -174 +184 @@
     } else if (command==setCullInvisiblesCommand) {
                 cullInvisibles = setCullInvisiblesCommand->GetNewBoolValue(newValue);
+    } else if (command==renderCylAsPolygonsCommand) {
+        cylAsPolygons = renderCylAsPolygonsCommand->GetNewBoolValue(newValue);
     } else if (command==setEventNumberSuffixCommand) {
         suffix = newValue;
@@ -201 +213 @@
 }
 
+G4bool G4HepRepMessenger::renderCylAsPolygons() {
+    return cylAsPolygons;
+}
+
 G4String G4HepRepMessenger::getEventNumberSuffix() {
     return suffix;