Ignore:
Timestamp:
Nov 9, 2007, 3:32:25 PM (18 years ago)
Author:
garnier
Message:

r627@mac-90108: laurentgarnier | 2007-11-09 07:57:42 +0100
modif dans les includes directives

Location:
trunk/geant4/visualization/OpenGL/include
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/visualization/OpenGL/include/G4OpenGL.hh

    r529 r593  
    2424// ********************************************************************
    2525//
    26 // $Id: G4OpenGL.hh,v 1.4 2006/06/29 21:17:36 gunter Exp $
    27 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     26// $Id: G4OpenGL.hh,v 1.5 2007/02/08 14:01:55 allison Exp $
     27// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2828//
    2929// G.Barrand.
    … …  
    3939#include <GL/glu.h>
    4040
     41#define G4OPENGL_DBL_MAX 1.e308
     42
    4143#endif

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLFontBaseStore.hh

    r529 r593  
    2525//
    2626// $Id: G4OpenGLFontBaseStore.hh,v 1.3 2006/06/29 21:17:38 gunter Exp $
    27 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2828//
    2929// J.Allison  Apr 2005.

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQt.hh

    r533 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateQt.hh,v 1.7 2007/06/25 21:17:44 $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: G4OpenGLImmediateQt.hh,v 1.1 2007/09/28 14:44:13 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

    r561 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateQtViewer.hh,v 1.9 2007/06/25 21:17:46 $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: G4OpenGLImmediateQtViewer.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4040#include "G4OpenGLImmediateViewer.hh"
    4141#include "G4OpenGLQtViewer.hh"
    42 #include <QGLWidget>
     42
     43#include <QtOpenGL/QGLWidget>
    4344
    4445#include "globals.hh"

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh

    r529 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateSceneHandler.hh,v 1.11 2006/08/16 10:34:36 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.13 2007/04/04 16:50:26 allison Exp $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//
    … …  
    5959  void EndModeling ();
    6060  void AddPrimitive (const G4Polyline&);
     61  void AddPrimitive (const G4Polymarker&);
     62  void AddPrimitive (const G4Text& text);
    6163  void AddPrimitive (const G4Circle&);
    6264  void AddPrimitive (const G4Square&);
    63   // Explicitly invoke base class methods to avoid warnings about
    64   // hiding of base class methods...
    65   void AddPrimitive (const G4Text& text) {
    66     G4OpenGLSceneHandler::AddPrimitive (text);
    67   }
    68   void AddPrimitive (const G4Polyhedron& polyhedron) {
    69     G4OpenGLSceneHandler::AddPrimitive (polyhedron);
    70   }
    71   void AddPrimitive (const G4NURBS& nurbs) {
    72     G4OpenGLSceneHandler::AddPrimitive (nurbs);
    73   }
    74   void AddPrimitive(const G4Polymarker& polymarker) {
    75     G4OpenGLSceneHandler::AddPrimitive (polymarker);
    76   }
    77   void AddPrimitive (const G4Scale& scale) {
    78     G4OpenGLSceneHandler::AddPrimitive (scale);
    79   }
     65  void AddPrimitive (const G4Scale& scale);
     66  void AddPrimitive (const G4Polyhedron&);
     67  void AddPrimitive (const G4NURBS&);
    8068  void ClearTransientStore ();
    8169

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateViewer.hh,v 1.9 2006/09/04 12:07:59 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateWin32.hh,v 1.7 2006/06/29 21:17:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.9 2006/06/29 21:17:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateX.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateX.hh,v 1.7 2006/06/29 21:17:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateXViewer.hh,v 1.9 2006/07/03 16:38:13 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateXm.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateXm.hh,v 1.7 2006/06/29 21:17:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLImmediateXmViewer.hh,v 1.9 2006/07/03 16:38:13 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

    r586 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLQtExportDialog.hh,v 0.1 2007/09/20 15:18:20 garnier $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLQtExportDialog.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
     28// GEANT4 tag $Name:
    2929//
    3030//
    … …  
    3535#define G4OPENGLQTEXPORTDIALOG_HH
    3636
    37 #include <qvariant.h>
    38 #include <qdialog.h>
     37#include <QtGui/QDialog.h>
    3938
    4039class QButtonGroup;
    … …  
    4746class QLineEdit;
    4847
     48/** The G4OpenGLQtExportDialog class provide a Dialog displaying differents options
     49  for each file format
     50 */
    4951class G4OpenGLQtExportDialog : public QDialog
    5052{
    … …  
    5254
    5355public:
    54   G4OpenGLQtExportDialog(QWidget* parent, QString name, int, int);
     56  /** Construct a G4OpenGLQtExportDialog
     57      @param parent : parent widget
     58      @param name : name of the saved file with extention
     59      @param height : height of the original file
     60      @param width : width of the original file
     61  */
     62  G4OpenGLQtExportDialog(QWidget* parent, QString name, int height =0, int width=0);
     63
     64  /** Destroys G4OpenGLQtExportDialog */
    5565  ~G4OpenGLQtExportDialog();
    5666
     67  /** @return the value of the slider if format has a slider widget, instead return -1 */
    5768  int getSliderValue();
     69
     70  /** return the new width for file if format has a width widget, instead return -1 */
    5871  int getWidth();
     72
     73  /** return the new height for file if format has a height widget, instead return -1 */
    5974  int getHeight();
    60   int getTransparency();
     75
     76  /** return the value of the transparency if format has a transparency, instead return -1 */
     77  bool getTransparency();
     78
     79  /** return the numbers of colors in the picture if format has a BW/Color widget, instead return -1 */
    6180  int getNbColor();
    6281
    6382public slots:
     83
     84/** Called by a clic on modify/original size button.This will
     85    invert buttons and hide/unhide size
     86*/
    6487  void changeSizeBox(bool); 
     88
     89  /** Called by changing value in height lineEdit. If ratio is keep, will also change the width
     90   */
    6591  void textWidthChanged(const QString &);
     92
     93  /** Called by changing value in width lineEdit. If ratio is keep, will also change the height
     94   */
    6695  void textHeightChanged(const QString &);
    67 
    68 signals:
    69   void options(const QString&, const QString&, int, bool);
    70   void exportAll(const QString&, const QString&, int, bool);
    7196
    7297private:
    … …  
    80105  QSlider * qualitySlider;
    81106  QLabel *formatLabel;
    82   QRadioButton* color,*BW;
     107  QRadioButton* colorButton,*BWButton;
    83108  QRadioButton* original,* modify;
    84109  QLineEdit* height,*width;

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

    r588 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.hh,v 1.13 2006/06/29 21:18:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: G4OpenGLQtViewer.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4242#include "G4OpenGLSceneHandler.hh"
    4343
    44 #include <QObject>
    45 #include <QGLWidget>
    46 #include <QDialog>
    47 #include <QContextMenuEvent>
    48 #include <QMenu>
    49 #include <QPoint>
    50 #include <QImage>
     44#include <QtCore/QObject>
     45#include <QtCore/QPoint>
     46
     47class QGLWidget;
     48class QDialog;
     49class QContextMenuEvent;
     50class QMenu;
     51class QImage;
     52class QAction;
    5153
    5254class G4OpenGLSceneHandler;

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLSceneHandler.hh

    r529 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLSceneHandler.hh,v 1.20 2006/08/30 11:37:34 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLSceneHandler.hh,v 1.23 2007/04/04 16:50:26 allison Exp $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//
    … …  
    4545#include "G4VSceneHandler.hh"
    4646#include "G4OpenGLViewer.hh"
     47#include "G4OpenGLBitMapStore.hh"
     48#include <map>
    4749
    48 // Base class for various OpenGLScene classes.
     50class G4AttHolder;
     51
     52// Base class for various OpenGLSceneHandler classes.
    4953class G4OpenGLSceneHandler: public G4VSceneHandler {
    5054
     55  friend class G4OpenGLViewer;
     56
    5157public:
     58  virtual void BeginPrimitives (const G4Transform3D& objectTransformation);
     59  virtual void EndPrimitives ();
     60  virtual void BeginPrimitives2D ();
     61  virtual void EndPrimitives2D ();
    5262  void AddPrimitive (const G4Polyline&);
     63  void AddPrimitive (const G4Polymarker&);
    5364  void AddPrimitive (const G4Text&);
    5465  void AddPrimitive (const G4Circle&);
    5566  void AddPrimitive (const G4Square&);
     67  void AddPrimitive (const G4Scale&);
    5668  void AddPrimitive (const G4Polyhedron&);
    5769  void AddPrimitive (const G4NURBS&);
    58   // Explicitly invoke base class methods to avoid warnings about
    59   // hiding of base class methods...
    60   void AddPrimitive(const G4Polymarker& polymarker) {
    61     G4VSceneHandler::AddPrimitive (polymarker);
    62   }
    63   void AddPrimitive (const G4Scale& scale) {
    64     G4VSceneHandler::AddPrimitive (scale);
    65   }
    6670
     71  void PreAddSolid (const G4Transform3D& objectTransformation,
     72                    const G4VisAttributes&);
    6773  void AddSolid (const G4Box&);
    6874  void AddSolid (const G4Cons&);
    … …  
    8995  const G4Polyhedron* CreateCutawayPolyhedron ();
    9096
     97  GLuint fPickName;
     98  std::map<GLuint, G4AttHolder*> fPickMap;  // For picking.
     99  void ClearAndDestroyAtts();  // Destroys att holders and clears pick map.
     100
    91101private:
    92102
    93   void AddCircleSquare (const G4VMarker&, G4int nSides);
    94   /**************************************************
    95   Not needed - but see note on future development in .cc.
    96   void DrawScreenPolygon (G4double size,
    97                           const G4Point3D& centre,
    98                           G4int nSides);
    99   // Draws in screen coordinates.
    100   *********************************/
     103  void AddCircleSquare (const G4VMarker&, G4OpenGLBitMapStore::Shape);
    101104
    102   void DrawXYPolygon (G4double size,
    103                       const G4Point3D& centre,
    104                       G4int nSides);
     105  void DrawXYPolygon
     106  (G4OpenGLBitMapStore::Shape,
     107   G4double size,
     108   const G4Point3D& centre,
     109   const G4VisAttributes* pApplicableVisAtts);
    105110  // Draws in world coordinates a polygon in the screen plane knowing
    106111  // viewpoint direction and up vector.
    107112
    108113  static const GLubyte fStippleMaskHashed [128];
     114
     115  G4bool fProcessingPolymarker;
    109116};
    110117

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLSceneHandler.icc

    r529 r593  
    2626//
    2727// $Id: G4OpenGLSceneHandler.icc,v 1.7 2006/06/29 21:17:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredQt.hh

    r561 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQt.hh,v 1.7 2007/06/25 21:17:44 $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: G4OpenGLStoredQt.hh,v 1.1 2007/09/28 14:44:13 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

    r561 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.hh,v 1.9 2007/06/25 21:17:46 $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: G4OpenGLStoredQtViewer.hh,v 1.2 2007/11/08 17:00:51 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4040#include "G4OpenGLStoredViewer.hh"
    4141#include "G4OpenGLQtViewer.hh"
    42 #include <QGLWidget>
    43 #include <QApplication>
    44 #include <QMouseEvent>
    45 #include <QContextMenuEvent>
     42
     43#include <QtOpenGL/QGLWidget>
     44
     45class QMouseEvent;
     46class QContextMenuEvent;
    4647
    4748class G4OpenGLStoredSceneHandler;

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

    r529 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.21 2006/08/30 11:43:57 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLStoredSceneHandler.hh,v 1.24 2007/04/04 16:50:26 allison Exp $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//
    … …  
    6363  void EndModeling ();
    6464  void AddPrimitive (const G4Polyline&);
     65  void AddPrimitive (const G4Polymarker&);
    6566  void AddPrimitive (const G4Circle&);
    6667  void AddPrimitive (const G4Square&);
    67   void AddPrimitive (const G4Polymarker& polymarker);
    68   // Explicitly invoke base class methods to avoid warnings about
    69   // hiding of base class methods...
    70   void AddPrimitive (const G4Text& text) {
    71     G4OpenGLSceneHandler::AddPrimitive (text);
    72   }
    73   void AddPrimitive (const G4Polyhedron& polyhedron) {
    74     G4OpenGLSceneHandler::AddPrimitive (polyhedron);
    75   }
    76   void AddPrimitive (const G4NURBS& nurbs) {
    77     G4OpenGLSceneHandler::AddPrimitive (nurbs);
    78   }
    79   void AddPrimitive (const G4Scale& scale) {
    80     G4OpenGLSceneHandler::AddPrimitive (scale);
    81   }
     68  void AddPrimitive (const G4Text&);
     69  void AddPrimitive (const G4Scale&);
     70  void AddPrimitive (const G4Polyhedron&);
     71  void AddPrimitive (const G4NURBS&);
    8272  void ClearStore ();
    8373  void ClearTransientStore ();
    … …  
    9888  struct PO {
    9989    PO(G4int id, const G4Transform3D& tr = G4Transform3D()):
    100       fDisplayListId(id), fTransform(tr) {}
     90      fDisplayListId(id), fTransform(tr), fPickName(0) {}
    10191    G4int fDisplayListId;
    10292    G4Transform3D fTransform;
     93    GLuint fPickName;
    10394  };
    10495  std::vector<PO> fPOList;
    … …  
    10798  struct TO {
    10899    TO(G4int id, const G4Transform3D& tr = G4Transform3D()):
    109       fDisplayListId(id), fTransform(tr),
    110       fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {}
     100      fDisplayListId(id), fTransform(tr), fPickName(0),
     101      fStartTime(-G4OPENGL_DBL_MAX), fEndTime(G4OPENGL_DBL_MAX) {}
    111102    G4int fDisplayListId;
    112103    G4Transform3D fTransform;
     104    GLuint fPickName;
    113105    G4double fStartTime, fEndTime;  // Time range (e.g., for trajectory steps).
    114106    G4Colour fColour;
    … …  
    119111  // A proper implementation would use geometry hierarchy.
    120112  std::map <const G4VSolid*, G4int, std::less <const G4VSolid*> > fSolidMap;
     113
     114private:
     115  G4bool fProcessing2D;
    121116};
    122117

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredViewer.hh,v 1.9 2006/06/29 21:18:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredWin32.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredWin32.hh,v 1.7 2006/06/29 21:18:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.7 2006/06/29 21:18:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredX.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredX.hh,v 1.7 2006/06/29 21:18:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredXViewer.hh,v 1.7 2006/07/03 16:38:13 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredXm.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredXm.hh,v 1.6 2006/06/29 21:18:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLStoredXmViewer.hh,v 1.7 2006/07/03 16:38:13 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLTransform3D.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLTransform3D.hh,v 1.7 2006/06/29 21:18:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLViewer.hh

    r529 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.hh,v 1.18 2006/09/19 16:13:15 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLViewer.hh,v 1.20 2007/05/08 11:04:11 allison Exp $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//
    … …  
    3838
    3939#include "G4VViewer.hh"
     40#include "G4OpenGL.hh"
    4041
    4142class G4OpenGLSceneHandler;
    … …  
    6263  void HLRThirdPass ();
    6364  void InitializeGLView ();
     65  void Pick(GLdouble x, GLdouble y);
    6466  virtual void CreateFontLists () {}
     67  virtual void print();
     68//////////////////////////////Vectored PostScript production functions///
     69  void printBuffer(GLint, GLfloat*);
     70  GLfloat* spewPrimitiveEPS (FILE*, GLfloat*);
     71  void spewSortedFeedback (FILE*, GLint, GLfloat*);
     72  void spewWireframeEPS (FILE*, GLint, GLfloat*, const char*);
     73  void print3DcolorVertex(GLint, GLint*, GLfloat*);
     74  G4float                           pointSize;
     75  char                              print_string[50];
     76  G4bool                            print_colour;
     77  G4bool                            vectored_ps;
     78
     79  G4OpenGLSceneHandler& fOpenGLSceneHandler;
    6580  G4Colour background;      //the OpenGL clear colour
    6681  G4bool
    … …  
    8095};
    8196
     97typedef struct G4OpenGLViewerFeedback3Dcolor {
     98  GLfloat x;
     99  GLfloat y;
     100  GLfloat z;
     101  GLfloat red;
     102  GLfloat green;
     103  GLfloat blue;
     104  GLfloat alpha;
     105} Feedback3Dcolor;
     106
    82107#endif
    83108

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh

    r529 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLViewerMessenger.hh,v 1.4 2006/09/19 16:14:21 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLViewerMessenger.hh,v 1.5 2007/05/08 11:04:11 allison Exp $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929
    3030#ifndef G4OPENGLVIEWERMESSENGER_HH
    … …  
    3737class G4UIdirectory;
    3838class G4UIcommand;
     39class G4UIcmdWithoutParameter;
    3940class G4UIcmdWithADouble;
    4041class G4UIcmdWithABool;
     42class G4UIcmdWithAString;
    4143
    4244class G4OpenGLViewerMessenger: public G4UImessenger {
    … …  
    5052  static G4OpenGLViewerMessenger* fpInstance;
    5153  G4UIdirectory* fpDirectory;
     54  G4UIcmdWithoutParameter* fpCommandPrintEPS;
    5255  G4UIdirectory* fpDirectorySet;
    5356  G4UIcommand* fpCommandDisplayHeadTime;
    … …  
    5558  G4UIcommand* fpCommandEndTime;
    5659  G4UIcmdWithADouble* fpCommandFade;
     60  G4UIcmdWithAString* fpCommandPrintMode;
    5761  G4UIcommand* fpCommandStartTime;
    5862  G4UIcmdWithABool* fpCommandTransparency;

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLWin32Viewer.hh,v 1.13 2006/06/29 21:18:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXViewer.hh

    r529 r593  
    2525//
    2626//
    27 // $Id: G4OpenGLXViewer.hh,v 1.26 2006/11/01 11:22:27 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01 $
     27// $Id: G4OpenGLXViewer.hh,v 1.27 2007/05/08 11:04:11 allison Exp $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//
    … …  
    5353
    5454  friend class G4OpenGLXViewerMessenger;
     55  friend class G4OpenGLXmViewer;
    5556
    5657public:
    … …  
    5960  void SetView ();
    6061  void ShowView ();
    61   void print();
    6262
    6363protected:
    … …  
    6666  virtual void CreateMainWindow ();
    6767  virtual void CreateFontLists ();
     68  void print();
    6869
    6970  static int snglBuf_RGBA[12];
    7071  static int dblBuf_RGBA[13];
    7172
    72   char                              print_string[50];
    73   G4bool                            print_colour,
    74                                     vectored_ps;
    75 
    76 //////////////////////////////Vectored PostScript production functions//////////////////////////////
    77   void printBuffer(GLint, GLfloat*);
    78   GLfloat* spewPrimitiveEPS (FILE*, GLfloat*);
    79   void spewSortedFeedback (FILE*, GLint, GLfloat*);
    80   void spewWireframeEPS (FILE*, GLint, GLfloat*, const char*);
    81   void print3DcolorVertex(GLint, GLint*, GLfloat*);
    82   G4float                           pointSize;
    83 
    84 
    85 //////////////////////////////Pixmap (screen dump) production functions//////////////////////////////
     73//////////////////////////////Pixmap (screen dump) production functions/////
    8674  GLubyte* grabPixels (int inColor,
    8775                       unsigned int width,
    … …  
    129117};
    130118
    131 typedef struct G4OpenGLXViewerFeedback3Dcolor {
    132   GLfloat x;
    133   GLfloat y;
    134   GLfloat z;
    135   GLfloat red;
    136   GLfloat green;
    137   GLfloat blue;
    138   GLfloat alpha;
    139 } Feedback3Dcolor;
    140 
    141119#endif
    142120

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmBox.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmBox.hh,v 1.7 2006/06/29 21:18:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.6 2006/06/29 21:18:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmFramedBox.hh,v 1.7 2006/06/29 21:18:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmPushButton.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmPushButton.hh,v 1.7 2006/06/29 21:18:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmRadioButton.hh,v 1.7 2006/06/29 21:18:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmResources.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmResources.hh,v 1.5 2006/06/29 21:18:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmSeparator.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmSeparator.hh,v 1.6 2006/06/29 21:18:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmSliderBar.hh,v 1.7 2006/06/29 21:18:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmTextField.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmTextField.hh,v 1.7 2006/06/29 21:18:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmTopLevelShell.hh,v 1.6 2006/06/29 21:18:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.6 2006/06/29 21:18:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.6 2006/06/29 21:18:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmVWidgetObject.hh,v 1.6 2006/06/29 21:18:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmVWidgetShell.hh,v 1.6 2006/06/29 21:18:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmViewer.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmViewer.hh,v 1.10 2006/06/29 21:18:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929//
    3030//

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLXmViewerMessenger.hh

    r529 r593  
    2626//
    2727// $Id: G4OpenGLXmViewerMessenger.hh,v 1.4 2006/06/29 21:18:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: geant4-09-00-ref-01 $
    2929
    3030#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
Note: See TracChangeset for help on using the changeset viewer.