Changeset 1096

Timestamp:

Aug 19, 2009, 3:47:27 PM (15 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization/RayTracer

Files:

• History (modified) (2 diffs)
• include/G4RayTracerXViewer.hh (modified) (2 diffs)
• src/G4RTXScanner.cc (modified) (2 diffs)
• src/G4RayTracer.cc (modified) (1 diff)
• src/G4RayTracerViewer.cc (modified) (2 diffs)
• src/G4RayTracerX.cc (modified) (1 diff)
• src/G4RayTracerXViewer.cc (modified) (2 diffs)

trunk/source/visualization/RayTracer/History

@@ -1 @@
-$Id: History,v 1.54 2008/04/04 13:52:48 allison Exp $
+$Id: History,v 1.56 2009/08/19 08:39:19 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
 History file for Ray Tracer category
 ---------------------------------------
+
+19 August 2009 Laurent Garnier
+ - G4RayTracerViewer.cc, G4RayTracerXViewer.cc : Fix an bad use of fVP
+   parameters
+
+18 August 2009 Laurent Garnier
+ - G4RayTracerXViewer, G4RTXScanner : Fix a crash introduce by the 
+   new way of handling window size hints (January 2009)
 
 4th April 2008  John Allison  (raytracer-V09-01-00)

trunk/source/visualization/RayTracer/include/G4RayTracerXViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4RayTracerXViewer.hh,v 1.3 2006/06/29 21:23:43 gunter Exp $
+// $Id: G4RayTracerXViewer.hh,v 1.4 2009/08/18 14:13:57 lgarnier Exp $
 // GEANT4 tag $Name:  $
 
@@ -41 +41 @@
   G4RayTracerXViewer(G4VSceneHandler&,const G4String& name);
   virtual ~G4RayTracerXViewer();
+  void Initialise ();
 };
 

trunk/source/visualization/RayTracer/src/G4RTXScanner.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RTXScanner.cc,v 1.5 2007/05/22 17:10:42 allison Exp $
+// $Id: G4RTXScanner.cc,v 1.6 2009/08/18 10:47:15 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -150 +150 @@
       height = 600;
     }
+  } else {
+    G4cout << "ERROR: Geometry string \""
+           << XGeometryString      
+           << "\" is empty.  Using \"600x600\"."
+           << G4endl;
+    width = 600;
+    height = 600;  
   }
   size_hints->width = width;

trunk/source/visualization/RayTracer/src/G4RayTracer.cc

@@ -55 +55 @@
 G4VViewer* G4RayTracer::CreateViewer (G4VSceneHandler& sceneHandler,
                                       const G4String& name) {
+  printf("G4RayTracer::CreateViewer\n");
   G4VViewer* pViewer = new G4RayTracerViewer (sceneHandler, name);
   if (pViewer) {

trunk/source/visualization/RayTracer/src/G4RayTracerViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RayTracerViewer.cc,v 1.17 2007/01/05 17:05:11 allison Exp $
+// $Id: G4RayTracerViewer.cc,v 1.18 2009/08/19 08:39:19 lgarnier Exp $
 // GEANT4 tag $Name:  $
 
@@ -47 +47 @@
   theTracer = aTracer;
   if (!aTracer) theTracer = new G4TheRayTracer;
-  theTracer->SetNColumn(fVP.GetWindowSizeHintX());
-  theTracer->SetNRow(fVP.GetWindowSizeHintY());
 }
 

trunk/source/visualization/RayTracer/src/G4RayTracerX.cc

@@ -55 +55 @@
 G4VViewer* G4RayTracerX::CreateViewer (G4VSceneHandler& sceneHandler,
                                        const G4String& name) {
+  printf("G4RayTracerX::CreateViewer\n");
   G4VViewer* pViewer = new G4RayTracerXViewer (sceneHandler, name);
   if (pViewer) {

trunk/source/visualization/RayTracer/src/G4RayTracerXViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4RayTracerXViewer.cc,v 1.5 2006/06/29 21:24:19 gunter Exp $
+// $Id: G4RayTracerXViewer.cc,v 1.7 2009/08/19 08:39:19 lgarnier Exp $
 // GEANT4 tag $Name:  $
 
@@ -47 +47 @@
                     new G4TheRayTracer(new G4RTJpegMaker, new G4RTXScanner))
 {
+}
+
+void G4RayTracerXViewer::Initialise() {
+
+  if (theTracer) {
+    theTracer->SetNColumn(fVP.GetWindowSizeHintX());
+    theTracer->SetNRow(fVP.GetWindowSizeHintY());
+  }
+
   // Set up X Window...
   G4RTXScanner* theXScanner = (G4RTXScanner*)theTracer->GetScanner();