Changeset 1196 for trunk/source/visualization/OpenInventor

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/visualization/OpenInventor

Files:

• History (modified) (2 diffs)
• src/G4OpenInventorViewer.cc (modified) (3 diffs)
• src/G4OpenInventorWin.cc (modified) (1 diff)
• src/SoGL2PSAction.cc (modified) (1 diff)
• src/SoMarkerSet.cc (modified) (1 diff)

trunk/source/visualization/OpenInventor/History

@@ -1 @@
-$Id: History,v 1.101 2009/09/18 12:48:43 lgarnier Exp $
+$Id: History,v 1.102 2009/09/29 21:23:36 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+29 September 2009  John Allison  (openinventor-V09-02-02)
+- Tagged.
 
 18 August 2009 Laurent Garnier

trunk/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc

@@ -477 +477 @@
 
 void G4OpenInventorViewer::WritePostScript(const G4String& aFile) {
-#ifdef G4DEBUG_VIS_OI
-  printf("G4OpenInventorViewer::WritePostScript %s\n",aFile.c_str());
-#endif
   if(!fGL2PSAction) return;
   fGL2PSAction->setFileName(aFile.c_str());
   G4cout << "Produce " << aFile << "..." << G4endl;
   if (fGL2PSAction->enableFileWriting()) {
-#ifdef G4DEBUG_VIS_OI
-    printf("G4OpenInventorViewer::WritePostScript produce OK\n");
-#endif
     ViewerRender();
     fGL2PSAction->disableFileWriting();
@@ -493 +487 @@
 
 void G4OpenInventorViewer::WritePixmapPostScript(const G4String& aFile) {
-#ifdef G4DEBUG_VIS_OI
-  printf("G4OpenInventorViewer::WritePixmapPostScript %s\n",aFile.c_str());
-#endif
-
   fSoImageWriter->fileName.setValue(aFile.c_str());
   //imageWriter->format.setValue(SoImageWriter::POST_SCRIPT);
@@ -511 +501 @@
            << G4endl;
   }
-#ifdef G4DEBUG_VIS_OI
-  printf("G4OpenInventorViewer::WritePixmapPostScript END\n");
-#endif
 }  
 

trunk/source/visualization/OpenInventor/src/G4OpenInventorWin.cc

@@ -52 +52 @@
 
   SetInteractorManager (G4Win32::getInstance());
-  GetInteractorManager () -> RemoveDispatcher((G4DispatchFunction)G4Win32::DispatchWin32Event);  
+  GetInteractorManager () -> RemoveDispatcher((G4DispatchFunction)G4Win32::dispatchWin32Event);  
 
   //  GetInteractorManager () -> AddDispatcher((G4DispatchFunction)SoWin::dispatchEvent);

trunk/source/visualization/OpenInventor/src/SoGL2PSAction.cc

@@ -71 +71 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef G4DEBUG_VIS_OI
-    printf("SoGL2PSAction::enableFileWriting\n");
-#endif
   fFile = ::fopen(fFileName,"w");
   if(!fFile) {

trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc

@@ -717 +717 @@
     w = h = 5;
     xorig = yorig = 2;
+    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
+    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
+    delete bitmap;
   } else if((aStyle>=18)&&(aStyle<36)) {
     w = h = 7;
     xorig = yorig = 3;
+    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
+    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
+    delete bitmap;
   } else if((aStyle>=36)&&(aStyle<54)) {
     w = h = 9;
     xorig = yorig = 4;
+    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
+    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
+    delete bitmap;
   } else {
     return;
   }
-  if (w != 0) {
-    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
-    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
-    delete bitmap;
-  }
-#ifdef G4DEBUG_VIS_OI
-  printf("DM %d %d %f %f",w,h,xorig,yorig);
-#endif
 
   if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) {
-#ifdef G4DEBUG_VIS_OI
-    printf(" GL2PS ");
-#endif
-    ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove);
+    ((SoGL2PSAction*)aAction)->addBitmap(w,h,xorig,yorig,xmove,ymove);
   }