Changeset 1125


Ignore:
Timestamp:
Oct 13, 2009, 3:28:26 PM (15 years ago)
Author:
garnier
Message:

update par rapport a cvs

Location:
trunk/source/visualization/OpenGL
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/History

    r1095 r1125  
    1 $Id: History,v 1.146 2009/08/19 13:28:10 lgarnier Exp $
     1$Id: History,v 1.147 2009/09/29 21:28:51 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     1913 October 2009 Laurent Garnier
     20 - G4OpenGLImmediateQtViewer/StoredQtViewer : some cleaning
     21++ - G4OpenGLImmediateQtViewer : Remove picking to true at initialisation
     22++ - G4OpenGLQtViewer :  Fix a drawing problem on mac OS X 10.6
     23 - G4OpenGLSceneHandler.cc : Fix a compilation error on mac OS X 10.5.8
     24++ - G4OpenGLStoredQtViewer.cc : Fix a problem on width() and height() methods
     25   on mac OSX 10.6 and Qt4.6(devel version).
     26??   - G4OpenGLXmViewer.cc : send an exposure event at each resize event.
     27?? - G4OpenGLXmWindowHandlingCallbacks.cc
     28 
     2929 September 2009  John Allison  (opengl-V09-02-07)
     30- Tagged.
    1931
    203218 August 2009 Laurent Garnier

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

    r1114 r1125  
    4040#include "G4OpenGLQtViewer.hh"
    4141
    42 #include <QGLWidget> // include <qglwidget.h>
     42#include <qgl.h> // include <qglwidget.h>
    4343
    4444#include "globals.hh"

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

    r1123 r1125  
    4040#include "G4OpenGLQtViewer.hh"
    4141
    42 #include <QGLWidget> // include <qglwidget.h>
     42#include <qgl.h>  // include qglwidget
    4343
    4444class QMouseEvent;
    4545class QWheelEvent;
    46 class QPaintEvent;
    4746class QContextMenuEvent;
    4847
    … …  
    7271  void contextMenuEvent(QContextMenuEvent *e);
    7372  void keyPressEvent (QKeyEvent * event);
    74   void paintEvent ( QPaintEvent * event ); 
    7573private:
    7674  void ComputeView ();
    77   GLuint box;
     75
    7876  //  QImage glBufferImage;
    7977};

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

    r1124 r1125  
    3333
    3434#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    35 //#define QT_STORE_46_DBG 1
    3635
    3736#include "G4VViewer.hh"
    … …  
    5049{
    5150
    52 #ifdef G4DEBUG_VIS_OGL
    53   printf("G4OpenGLImmediateQtViewer::Creation...................before.............%d x %d\n",width(),height());
    54 #endif
    55 
    56 
    5751#if QT_VERSION < 0x040000
    5852  setFocusPolicy(QWidget::StrongFocus); // enable keybord events
    … …  
    8377}
    8478
    85 #ifdef QT_STORE_46_DBG
    86 void G4OpenGLImmediateQtViewer::initializeGL () {
    87   glShadeModel(GL_SMOOTH);                                                      // Enable Smooth Shading
    88   glClearColor(0.0f, 0.0f, 0.0f, 0.5f);                         // Black Background
    89   glClearDepth(1.0f);                                                                   // Depth Buffer Setup
    90   glEnable(GL_DEPTH_TEST);                                                      // Enables Depth Testing
    91   glDepthFunc(GL_LEQUAL);                                                               // The Type Of Depth Testing To Do
    92   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);    // Really Nice Perspective Calculations
    93  
    94 
    95  return;                                                                                // Initialization Went OK
    96 
    97  
    98  }
    99 #else
    10079void G4OpenGLImmediateQtViewer::initializeGL () {
    10180
    … …  
    12099
    121100}
    122 #endif
     101
    123102
    124103/** To ensure compatibility with DrawView method
    … …  
    138117
    139118
    140 #ifdef QT_STORE_46_DBG
    141 void G4OpenGLImmediateQtViewer::ComputeView () {
    142  }
    143 #else
    144119void G4OpenGLImmediateQtViewer::ComputeView () {
    145120
    … …  
    180155  fHasToRepaint = true;
    181156}
    182 #endif
    183157
    184158void G4OpenGLImmediateQtViewer::FinishView()
    … …  
    198172   - Lors du resize de la fenetre, on doit non pas redessiner le detecteur, mais aussi les evenements
    199173*/
    200 #ifdef QT_STORE_46_DBG
    201 void G4OpenGLImmediateQtViewer::resizeGL(
    202                                       int width
    203                                       ,int height)
    204 { 
    205 #ifdef G4DEBUG_VIS_OGL
    206   printf("G4OpenGLImmediateQtViewer::resizeGL\n");
    207 #endif
    208   if (height==0)                                                                                // Prevent A Divide By Zero By
    209     {
    210       height=1;                                                                         // Making Height Equal One
    211     }
    212  
    213   glViewport(0,0,width,height);                                         // Reset The Current Viewport
    214  
    215   glMatrixMode(GL_PROJECTION);                                          // Select The Projection Matrix
    216   glLoadIdentity();                                                                     // Reset The Projection Matrix
    217  
    218   // Calculate The Aspect Ratio Of The Window
    219   gluPerspective(45.0f,(GLfloat)width/(GLfloat)height,0.1f,100.0f);
    220  
    221   glMatrixMode(GL_MODELVIEW);                                                   // Select The Modelview Matrix
    222   glLoadIdentity();                                                                     // Reset The Modelview Matrix
    223  
    224 }
    225 #else
    226174void G4OpenGLImmediateQtViewer::resizeGL(
    227175 int aWidth
    … …  
    231179  fHasToRepaint = sizeHasChanged();
    232180}
    233 #endif
    234 
    235 
    236 #ifdef QT_STORE_46_DBG
    237 void G4OpenGLImmediateQtViewer::paintGL()
    238 {
    239 #ifdef G4DEBUG_VIS_OGL
    240   printf("G4OpenGLImmediateQtViewer::paintGL\n");
    241 #endif
    242     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    243     glMatrixMode(GL_MODELVIEW);
    244     glLoadIdentity();
    245     gluLookAt(1,1,1,0,0,0,0,0,1);
    246 
    247     glBegin(GL_QUADS);
    248     //carré rouge
    249     glColor3ub(255,0,0);
    250     glVertex3d(1,1,0);
    251     glVertex3d(1,0,0);
    252     glVertex3d(0,0,0);
    253     glVertex3d(0,1,0);
    254     //carré vert
    255     glColor3ub(0,255,0);
    256     glVertex3d(1,1,0);
    257     glVertex3d(2,1,0);
    258     glVertex3d(2,0,0);
    259     glVertex3d(1,0,0);
    260     //carré vert
    261     glColor3ub(0,255,0);
    262     glVertex3d(0,2,0);
    263     glVertex3d(1,2,0);
    264     glVertex3d(1,1,0);
    265     glVertex3d(0,1,0);
    266     //carré bleu
    267     glColor3ub(0,0,255);
    268     glVertex3d(2,2,0);
    269     glVertex3d(2,1,0);
    270     glVertex3d(1,1,0);
    271     glVertex3d(1,2,0);
    272     //carré bleu
    273     glColor3ub(0,0,255);
    274     glVertex3d(1,0,0);
    275     glVertex3d(1,1,0);
    276     glVertex3d(1,1,1);
    277     glVertex3d(1,0,1);
    278     //carré blanc
    279     glColor3ub(255,255,255);
    280     glVertex3d(1,1,0);
    281     glVertex3d(0,1,0);
    282     glVertex3d(0,1,1);
    283     glVertex3d(1,1,1);
    284     //carré rouge
    285     glColor3ub(255,0,0);
    286     glVertex3d(1,1,1);
    287     glVertex3d(1,0,1);
    288     glVertex3d(0,0,1);
    289     glVertex3d(0,1,1);
    290     glEnd();
    291 }
    292 
    293 #else
     181
     182
    294183void G4OpenGLImmediateQtViewer::paintGL()
    295184{
    … …  
    325214#endif
    326215}
    327 #endif
    328 
    329216
    330217void G4OpenGLImmediateQtViewer::mousePressEvent(QMouseEvent *event)

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

    r1049 r1125  
    5858(G4VGraphicsSystem& system,const G4String& name):
    5959  G4OpenGLSceneHandler (system, fSceneIdCount++, name)
    60 {
    61 #ifdef G4DEBUG_VIS_OGL
    62   printf("INIT G4OpenGLImmediateSceneHandler (after G4OpenGLSceneHandler (system, fSceneIdCount++, name)\n");
    63 #endif
    64 }
     60{}
    6561
    6662G4OpenGLImmediateSceneHandler::~G4OpenGLImmediateSceneHandler ()

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc

    r1049 r1125  
    4242G4VViewer (scene, -1),
    4343G4OpenGLViewer (scene)
    44 {
    45 #ifdef G4DEBUG_VIS_OGL
    46   printf("INIT G4OpenGLImmediateViewer (after G4VViewer and G4OpenGLVIewer \n");
    47 #endif
    48 }
     44{}
    4945
    5046void G4OpenGLImmediateViewer::ProcessView ()
    5147{
    52   printf("G4OpenGLImmediateViewer::ProcessView\n");
    53 
    5448  const G4Planes& cutaways = fVP.GetCutawayPlanes();
    5549  G4bool cutawayUnion = fVP.IsCutaway() &&

  • trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

    r1124 r1125  
    135135    foreach (QWidget *widget, QApplication::allWidgets()) {
    136136      if ((found== false) && (widget->inherits("QMainWindow"))) {
    137 #ifdef G4DEBUG_VIS_OGL
    138         printf("G4OpenGLQtViewer::CreateMainWindow on top of ................................%d\n",widget);
    139 #endif
    140137        fGLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
    141138        found = true;
    142 #ifdef G4DEBUG_VIS_OGL
    143         printf("G4OpenGLQtViewer::CreateMainWindow after creation................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight());
    144 #endif
    145         fGLWindow->resize(432,245);
    146 #ifdef G4DEBUG_VIS_OGL
    147         int sw = 0;
    148         int sh = 0;
    149         if (!fGLWindow->isMaximized() && !fGLWindow->isFullScreen()) {
    150           sw = fGLWindow->normalGeometry().width();
    151           sh = fGLWindow->normalGeometry().height();
    152         } else {
    153           sw = fGLWindow->frameGeometry().width();
    154           sh = fGLWindow->frameGeometry().height();
    155         }
    156 printf("G4OpenGLQtViewer::CreateMainWindow after creation-> set size................................%d x %d should equal %d x %d\n",sw,sh,432,245);
    157        
    158 #endif
    159139      }
    160140    }
    161141#endif
    162 
    163 #ifdef G4DEBUG_VIS_OGL
    164   printf("G4OpenGLQtViewer::CreateMainWindow TOP................................%d x %d\n",fGLWindow->width(),fGLWindow->height());
    165 #endif
    166 #ifdef G4DEBUG_VIS_OGL
    167   printf("G4OpenGLQtViewer::CreateMainWindow................................%d x %d\n",glWidget->width(),glWidget->height());
    168 #endif
    169 
    170142
    171143#if QT_VERSION < 0x040000
    … …  
    209181    YPos = offset;
    210182  }
    211 #ifdef G4DEBUG_VIS_OGL
    212   printf("G4OpenGLQtViewer::CreateMainWindow before size................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight());
    213 #endif
    214183  fGLWindow->resize(getWinWidth(), getWinHeight());
    215 #ifdef G4DEBUG_VIS_OGL
    216   printf("G4OpenGLQtViewer::CreateMainWindow TOP end................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),getWinWidth(), getWinHeight());
    217 #endif
    218 
    219 
    220   fGLWindow->resize(432,245);
    221 #ifdef G4DEBUG_VIS_OGL
    222   printf("G4OpenGLQtViewer::CreateMainWindow TOP end 2................................%d x %d should equal %d x %d\n",fGLWindow->width(),fGLWindow->height(),432,245);
    223 #endif
    224184  fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
    225185  fGLWindow->show();
    226 #ifdef G4DEBUG_VIS_OGL
    227   printf("G4OpenGLQtViewer::CreateMainWindow TOP end after show................................%d x %d\n",fGLWindow->width(),fGLWindow->height());
    228 #endif
    229186 
    230187  if(!fWindow) return;
    231 #ifdef G4DEBUG_VIS_OGL
    232   printf("G4OpenGLQtViewer::CreateMainWindow glWidget END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
    233 #endif
    234188
    235189  if (!fContextMenu)
    … …  
    279233  ,fLaunchSpinDelay(100)
    280234{
    281 #ifdef G4DEBUG_VIS_OGL
    282   printf("G4OpenGLQtViewer::Creation ...............\n");
    283 #endif
    284235
    285236  // launch Qt if not
    … …  
    14771428{
    14781429  glFlush ();
     1430
     1431  // L. Garnier 10/2009 : Not necessary and cause problems on mac OS X 10.6
    14791432  //  fWindow->swapBuffers ();
    14801433}

  • trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

    r1116 r1125  
    8484  fProcessing2D (false),
    8585  fProcessingPolymarker(false)
    86 {
    87 #ifdef G4DEBUG_VIS_OGL
    88   printf("INIT G4OpenGLSceneHandler (after G4OpenGLSceneHandler G4VSceneHandler (system, id, name)\n");
    89 #endif
    90 }
     86{}
    9187
    9288G4OpenGLSceneHandler::~G4OpenGLSceneHandler ()
    … …  
    262258void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
    263259
    264 #ifdef G4DEBUG_VIS_OGL
    265   printf ("G4OpenGLSceneHandler::AddPrimitives TEXT\n");
    266 #endif 
    267260  // Loads G4Atts for picking...
    268261  if (fpViewer->GetViewParameters().IsPicking()) {
    269 #ifdef G4DEBUG_VIS_OGL
    270   printf ("G4OpenGLSceneHandler::AddPrimitives PICKING\n");
    271 #endif 
    272262    G4AttHolder* holder = new G4AttHolder;
    273263    LoadAtts(text, holder);
    … …  
    281271  G4String textString = text.GetText();
    282272
    283 #ifdef G4DEBUG_VIS_OGL
    284   printf ("G4OpenGLSceneHandler::AddPrimitives TEXT -%s-X:%f Y:%f Z:%f- - Red:%f Green:%f Blue:%f--\n",textString.c_str(),position.x(),position.y(),position.z(),c.GetRed (), c.GetGreen (), c.GetBlue ());
    285 #endif 
    286 
    287273  G4int font_base = G4OpenGLFontBaseStore::GetFontBase(fpViewer,size);
    288 #ifdef G4DEBUG_VIS_OGL
    289   printf ("G4OpenGLSceneHandler::AddPrimitives getFontBase ?size=%f-recu:%d-\n",size,font_base);
    290 #endif 
    291274  if (font_base < 0) {
    292 #ifdef G4DEBUG_VIS_OGL
    293     printf ("G4OpenGLSceneHandler::AddPrimitives NO FONT BASE--\n");
    294 #endif 
    295275   
    296 #ifdef G4DEBUG_VIS_OGL
    297     printf ("G4OpenGLSceneHandler::AddPrimitives SPECIAL CASE\n");
    298 #endif 
    299276    G4OpenGLQtViewer* oGLSQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
    300277    if (oGLSQtViewer) {
    … …  
    306283    ++callCount;
    307284    if (callCount <= 10 || callCount%100 == 0) {
    308      
    309      
    310      
    311285      G4cout <<
    312286        "G4OpenGLSceneHandler::AddPrimitive (const G4Text&) call count "
    … …  
    500474//Method for handling G4Polyhedron objects for drawing solids.
    501475void G4OpenGLSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
     476
    502477  // Assume all facets are planar convex quadrilaterals.
    503478  // Draw each facet individually
    504 #ifdef G4DEBUG_VIS_OGL
    505   printf ("G4OpenGLSceneHandler::AddPrimitives BEGIN poly\n");
    506 #endif 
     479 
    507480  if (polyhedron.GetNoFacets() == 0) return;
    508 #ifdef G4DEBUG_VIS_OGL
    509     printf ("G4OpenGLSceneHandler::AddPrimitives BEGIN 2 poly %d ++ %d\n",fpViewer,fpViewer->GetViewParameters().IsPicking());
    510 #endif
    511481
    512482  // Loads G4Atts for picking...
    513483  if (fpViewer->GetViewParameters().IsPicking()) {
    514484    G4AttHolder* holder = new G4AttHolder;
    515     const G4Visible vis;
    516 #ifdef G4DEBUG_VIS_OGL
    517     printf ("G4OpenGLSceneHandler::AddPrimitives poly %d\n",&polyhedron);
    518 #endif
    519485    LoadAtts(polyhedron, holder);
    520     //    LoadAtts(polyhedron, holder);
    521486    fPickMap[fPickName] = holder;
    522487  }

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

    r1124 r1125  
    4747  QGLWidget()
    4848{
    49 #ifdef G4DEBUG_VIS_OGL
    50   printf("G4OpenGLStoredQtViewer::Creation...................before.............%d x %d\n",width(),height());
    51 #endif
    5249
    5350#if QT_VERSION < 0x040000
    … …  
    7370#endif
    7471  fReadyToPaint = false;
    75 #ifdef G4DEBUG_VIS_OGL
    76   printf("G4OpenGLStoredQtViewer::Initialize...................before.............%d x %d\n",width(),height());
    77 #endif
    7872  CreateMainWindow (this,QString(fName));
    79 #ifdef G4DEBUG_VIS_OGL
    80   printf("G4OpenGLStoredQtViewer::Initialize...................after.............%d x %d\n",width(),height());
    81 #endif
    8273  CreateFontLists ();
    8374 
    … …  
    213204                                      ,int aHeight)
    214205{ 
    215 #ifdef G4DEBUG_VIS_OGL
    216   printf("G4OpenGLStoredQtViewer::resizeEvent..%d x %d   vvvvvv\n",aWidth,aHeight);
    217 #endif
    218 #ifdef G4DEBUG_VIS_OGL
    219   printf("G4OpenGLStoredQtViewer::resizeEvent size ? %d x %d\n",width(),height());
    220 #endif
    221206  // Set new size, it will be update when next Repaint()->SetView() called
    222207  ResizeWindow(aWidth,aHeight);
    223208  fHasToRepaint = sizeHasChanged();
    224 #ifdef G4DEBUG_VIS_OGL
    225   printf("G4OpenGLStoredQtViewer::resizeEvent..      ^^^^^^^^\n");
    226 #endif
    227209}
    228210
    … …  
    241223  //    EXECEPT WHEN MOUSE MOVE EVENT
    242224  if ( !fHasToRepaint) {
    243 #ifdef G4DEBUG_VIS_OGL
    244   printf("G4OpenGLStoredQtViewer::paintGL size ? %d x %d\n",width(),height());
    245 #endif
     225    // L. Garnier : Trap to get the size with mac OSX 10.6 and Qt 4.6(devel)
     226    // Tested on Qt4.5 on mac, 4.4 on windows, 4.5 on unbuntu
     227    int sw = 0;
     228    int sh = 0;
     229    if (!isMaximized() && !isFullScreen()) {
     230      sw = normalGeometry().width();
     231      sh = normalGeometry().height();
     232    } else {
     233      sw = frameGeometry().width();
     234      sh = frameGeometry().height();
     235    }
    246236#ifdef G4DEBUG_VIS_OGL
    247237    printf("G4OpenGLStoredQtViewer::paintGL %d = %d    %d = %d\n",getWinWidth(),width(),getWinHeight(),height());
    248         int sw = 0;
    249         int sh = 0;
    250         if (!isMaximized() && !isFullScreen()) {
    251           sw = normalGeometry().width();
    252           sh = normalGeometry().height();
    253         } else {
    254           sw = frameGeometry().width();
    255           sh = frameGeometry().height();
    256         }
    257 printf("G4OpenGLStoredQtViewer::paintGL ................................%d x %d \n",sw,sh);
    258        
    259 #endif
    260     if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) {
     238    printf("G4OpenGLStoredQtViewer::paintGL ................................%d x %d \n",sw,sh);
     239   
     240#endif
     241    if (((getWinWidth() == (unsigned int)sw) &&(getWinHeight() == (unsigned int)sh)) {
    261242      return;
    262243    }
    … …  
    318299}
    319300
    320 
    321 void G4OpenGLStoredQtViewer::paintEvent ( QPaintEvent * event ) 
    322 {
    323 #ifdef G4DEBUG_VIS_OGL
    324   printf("G4OpenGLStoredQtViewer::paintEvent...................repaint.............%d x %d\n",width(),height());
    325 #endif
    326   QGLWidget::paintEvent(event);
    327 }
    328 
    329301void G4OpenGLStoredQtViewer::updateQWidget() {
    330302  fHasToRepaint= true;

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

    r1121 r1125  
    4141#include "G4Text.hh"
    4242#include "G4Circle.hh"
    43 #include "G4UnitsTable.hh" // for G4BestUnit
     43#include "G4UnitsTable.hh"
    4444#include "G4Scene.hh"
    4545
    … …  
    5050fG4OpenGLStoredSceneHandler (sceneHandler)
    5151{
    52 #ifdef G4DEBUG_VIS_OGL
    53   printf("G4OpenGLStoredViewer::Creation ...............\n");
    54 #endif
    5552  fLastVP = fDefaultVP; // Not sure if this gets executed before or
    5653  // after G4VViewer::G4VViewer!!  Doesn't matter much.

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc

    r1104 r1125  
    6161
    6262void G4OpenGLStoredXmViewer::Initialise () {
    63 #ifdef G4DEBUG_VIS_OGL
    64   printf("G4OpenGLStoredXmViewer::Initialise \n");
    65 #endif
    6663
    6764  CreateGLXContext (vi_stored);

  • trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

    r1124 r1125  
    139139
    140140void G4OpenGLViewer::ResizeWindow(unsigned int aWidth, unsigned int aHeight) {
    141 #ifdef G4DEBUG_VIS_OGL
    142   printf("G4OpenGLViewer::ResizeWindow %d x %d\n",aWidth, aHeight);
    143 #endif
    144141  if ((fWinSize_x != aWidth) || (fWinSize_y != aHeight)) {
    145142    fWinSize_x = aWidth;
    … …  
    149146    fSizeHasChanged = false;
    150147  }
    151 #ifdef G4DEBUG_VIS_OGL
    152   printf("G4OpenGLViewer::ResizeWindow END changed=%d  %d x %d\n",fSizeHasChanged,fWinSize_x,fWinSize_y);
    153 #endif
    154148}
    155149

  • trunk/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc

    r1049 r1125  
    629629                        frame      // widget to be used for work window
    630630                        );
    631  
     631
    632632  XtRealizeWidget(shell);
    633633 
    … …  
    647647  glXMakeCurrent (dpy, win, cx);
    648648
    649    // This should be add AFTER glXMakeCurrent done because it will fire a resizeCallback
     649  // This should be add AFTER glXMakeCurrent done because it will fire a resizeCallback
    650650  XtAddCallback (glxarea,
    651                 XmNresizeCallback,
     651                XmNresizeCallback,
    652652                 resize_callback,
    653                 this);
     653                this);
    654654 
    655655  XtAddCallback (glxarea,
Note: See TracChangeset for help on using the changeset viewer.