Ignore:
Timestamp:
Dec 3, 2008, 7:03:25 PM (16 years ago)
Author:
garnier
Message:

suppres des debug et modif des WinSize

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

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/History

    r873 r897  
    2020History file for visualization/OpenGL
    2121-------------------------------------
     22
     232 December, Laurent Garnier
     24 - G4OpenGLImmediateXmViewer,G4OpenGLStoredXmViewer,G4OpenGLXmViewer
     25   G4OpenGLImmediateXViewer, G4OpenGLStoredXViewer, G4OpenGLXViewer,
     26   G4OpenGLXmWindowHandlingCallbacks,
     27   G4OpenGLImmediateQtViewer.cc, G4OpenGLStoredQtViewer, G4OpenGLQtViewer
     28   G4OpenGLImmediateWin32Viewer.cc, G4OpenGLStoredWin32Viewer, G4OpenGLWin32Viewer
     29   ->  Replace WinSize by fWinSize and some improvments about size initialization
     30
     31 - G4OpenGLQtViewer.hh : Suppress WinSize private variable
    2232
    233324 October, Laurent Garnier

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

    r896 r897  
    5252public:
    5353  G4OpenGLImmediateQtViewer (G4OpenGLImmediateSceneHandler& scene,
    54                              const G4String& name = "",
    55                              G4int x=200,
    56                              G4int y=200,
    57                              unsigned int w=600,
    58                              unsigned int h=600);
     54                const G4String& name = "");
    5955  ~G4OpenGLImmediateQtViewer ();
    6056  void Initialise ();

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

    r877 r897  
    120120
    121121protected:
    122   G4int WinSize_x;
    123   G4int WinSize_y;
    124122  QGLWidget* fWindow;
    125123  QDialog* GLWindow;

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

    r850 r897  
    8484  G4OpenGLSceneHandler& fOpenGLSceneHandler;
    8585  G4Colour background;      //the OpenGL clear colour
    86   unsigned int WinSize_x, WinSize_y;
     86  unsigned int fWinSize_x, fWinSize_y;
     87  // size of the OpenGL frame
    8788  G4bool
    8889    transparency_enabled,   //is alpha blending enabled?

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

    r850 r897  
    9797                                    eventBase,
    9898                                    major,
    99                                     minor,
    100                                     x_origin,
    101                                     y_origin;
     99                                    minor;
    102100  XSizeHints                        *norm_hints;
    103101  XWMHints                          *wm_hints;

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

    r896 r897  
    4747                     G4VGraphicsSystem::threeD)
    4848{
    49 #ifdef G4DEBUG
    50   printf("G4OpenGLImmediateQt::Create \n");
    51 #endif
    5249  G4OpenGLViewerMessenger::GetInstance();
    5350}

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

    r896 r897  
    4040G4OpenGLImmediateQtViewer::G4OpenGLImmediateQtViewer
    4141(G4OpenGLImmediateSceneHandler& sceneHandler,
    42  const G4String&  name
    43 ,G4int x
    44 ,G4int y
    45 ,unsigned int w
    46 ,unsigned int h):
     42 const G4String&  name):
    4743  G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
    4844  G4OpenGLViewer (sceneHandler),
    … …  
    122118
    123119#ifdef G4DEBUG
    124   printf("G4OpenGLImmediateQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
     120  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",fWinSize_x, fWinSize_y);
    125121#endif
    126122  makeCurrent();
    … …  
    133129  //Make sure current viewer is attached and clean...
    134130  //Qt version needed
    135   //  glViewport (0, 0, WinSize_x, WinSize_y);
     131  //  glViewport (0, 0, fWinSize_x, fWinSize_y);
    136132
    137133  if(style!=G4ViewParameters::hlr &&
    … …  
    157153   
    158154#ifdef G4DEBUG
    159   printf("G4OpenGLImmediateQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
     155  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fWinSize_x, fWinSize_y);
    160156#endif
    161157  hasToRepaint = true;
    … …  
    197193  // DO NOT RESIZE IF SIZE HAS NOT CHANGE
    198194  if ( !hasToRepaint) {
    199     if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
     195    if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) {
    200196      return;
    201197    }
    … …  
    204200  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
    205201#endif
    206   WinSize_x = (G4int) width();
    207   WinSize_y = (G4int) height();
     202  fWinSize_x = (unsigned int) width();
     203  fWinSize_y = (unsigned int) height();
    208204
    209205  setupViewport(width(),height());

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

    r850 r897  
    8080  //Win32 version needed
    8181  //glXMakeCurrent (dpy, win, cx);
    82   glViewport (0, 0, WinSize_x, WinSize_y);
     82  glViewport (0, 0, fWinSize_x, fWinSize_y);
    8383
    8484  if(style!=G4ViewParameters::hlr &&

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

    r896 r897  
    4949{
    5050  G4OpenGLViewerMessenger::GetInstance();
    51 #ifdef G4DEBUG
    52   printf("G4OpenGLImmediateX::Create \n");
    53 #endif
    5451}
    5552

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

    r894 r897  
    6161
    6262void G4OpenGLImmediateXViewer::Initialise () {
    63 #ifdef G4DEBUG
    64     printf("G4OpenGLImmediateXViewer::Initialise\n");
    65 #endif
    6663
    6764  CreateGLXContext (vi_immediate);
    … …  
    8178  glDepthFunc (GL_LEQUAL);
    8279  glDepthMask (GL_TRUE);
    83 #ifdef G4DEBUG
    84     printf("G4OpenGLImmediateXViewer::Initialise END\n");
    85 #endif
    8680}
    8781
    … …  
    9286  //Make sure current viewer is attached and clean...
    9387  glXMakeCurrent (dpy, win, cx);
    94   glViewport (0, 0, WinSize_x, WinSize_y);
     88  glViewport (0, 0, fWinSize_x, fWinSize_y);
    9589
    9690  if(style!=G4ViewParameters::hlr &&

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

    r877 r897  
    9292  //Make sure current viewer is attached and clean...
    9393  glXMakeCurrent (dpy, win, cx);
    94   glViewport (0, 0, WinSize_x, WinSize_y);
     94  glViewport (0, 0, fWinSize_x, fWinSize_y);
    9595
    9696  if(style!=G4ViewParameters::hlr &&

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

    r891 r897  
    200200#endif
    201201
    202   WinSize_x = 400;
    203   WinSize_y = 400;
    204   if (WinSize_x < fVP.GetWindowSizeHintX ())
    205     WinSize_x = fVP.GetWindowSizeHintX ();
    206   if (WinSize_y < fVP.GetWindowSizeHintY ())
    207     WinSize_y = fVP.GetWindowSizeHintY ();
    208 
    209202  if(!fWindow) return;
    210203#ifdef G4DEBUG
    … …  
    799792  setupViewport(aWidth,aHeight);
    800793 
    801   if (((WinSize_x != (G4int)aWidth)) || (WinSize_y != (G4int) aHeight)) {
     794  if (((fWinSize_x != (unsigned int)aWidth)) || (fWinSize_y != (unsigned int) aHeight)) {
    802795    hasToRepaint =true;
    803796  }
    804   WinSize_x = (G4int) aWidth;
    805   WinSize_y = (G4int) aHeight;
     797  fWinSize_x = (unsigned int) aWidth;
     798  fWinSize_y = (unsigned int) aHeight;
    806799}
    807800
    … …  
    15981591  GLdouble coefDepth = 0;
    15991592  if(mouseMove) {
    1600     coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_x);
    1601     if (WinSize_y <WinSize_x) {
    1602       coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
     1593    coefTrans = ((G4double)getSceneNearWidth())/((G4double)fWinSize_x);
     1594    if (fWinSize_y <fWinSize_x) {
     1595      coefTrans = ((G4double)getSceneNearWidth())/((G4double)fWinSize_y);
    16031596    }
    16041597  } else {

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

    r877 r897  
    126126
    127127#ifdef G4DEBUG
    128   printf("G4OpenGLStoredQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
     128  printf("G4OpenGLStoredQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",fWinSize_x, fWinSize_y);
    129129#endif
    130130  makeCurrent();
    … …  
    195195
    196196#ifdef G4DEBUG
    197   printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
     197  printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fWinSize_x, fWinSize_y);
    198198#endif
    199199  hasToRepaint =true;
    … …  
    225225  //    EXECEPT WHEN MOUSE MOVE EVENT
    226226  if ( !hasToRepaint) {
    227     if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
     227    if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) {
    228228      return;
    229229    }
    … …  
    232232  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
    233233#endif
    234   WinSize_x = (G4int) width();
    235   WinSize_y = (G4int) height();
     234  fWinSize_x = (unsigned int) width();
     235  fWinSize_y = (unsigned int) height();
    236236
    237237  setupViewport(width(),height());

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

    r850 r897  
    7070  //Win32 version needed
    7171  //  glXMakeCurrent (dpy, win, cx);
    72   glViewport (0, 0, WinSize_x, WinSize_y);
     72  glViewport (0, 0, fWinSize_x, fWinSize_y);
    7373
    7474  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();

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

    r850 r897  
    7979  //Make sure current viewer is attached and clean...
    8080  glXMakeCurrent (dpy, win, cx);
    81   glViewport (0, 0, WinSize_x, WinSize_y);
     81  glViewport (0, 0, fWinSize_x, fWinSize_y);
    8282
    8383  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();

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

    r850 r897  
    8585  //Make sure current viewer is attached and clean...
    8686  glXMakeCurrent (dpy, win, cx);
    87   glViewport (0, 0, WinSize_x, WinSize_y);
     87  glViewport (0, 0, fWinSize_x, fWinSize_y);
    8888
    8989  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();

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

    r873 r897  
    112112  fVP.SetAutoRefresh(true);
    113113  fDefaultVP.SetAutoRefresh(true);
     114  fWinSize_x = fVP.GetWindowSizeHintX();
     115  fWinSize_y = fVP.GetWindowSizeHintY();
    114116
    115117  //  glClearColor (0.0, 0.0, 0.0, 0.0);

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

    r850 r897  
    117117  } 
    118118 
    119   WinSize_x = 400;
    120   WinSize_y = 400;
    121   if (WinSize_x < fVP.GetWindowSizeHintX ())
    122     WinSize_x = fVP.GetWindowSizeHintX ();
    123   if (WinSize_y < fVP.GetWindowSizeHintY ())
    124     WinSize_y = fVP.GetWindowSizeHintY ();
    125 
    126119  fWindow = ::CreateWindow(className,fName.c_str(),
    127120                           WS_OVERLAPPEDWINDOW,
    128121                           //WS_CHILD | WS_VISIBLE,
    129122                           0,0,
    130                            WinSize_x,WinSize_y,
     123                           fWinSize_x,fWinSize_y,
    131124                           NULL, NULL,
    132125                           ::GetModuleHandle(NULL),
    … …  
    211204
    212205    //FIXME : have to handle WM_RESIZE
    213     //pView->WinSize_x = (G4int) width;
    214     //pView->WinSize_y = (G4int) height;
     206    //pView->fWinSize_x = (G4int) width;
     207    //pView->fWinSize_y = (G4int) height;
    215208    G4OpenGLWin32Viewer* This =
    216209      (G4OpenGLWin32Viewer*)::GetWindowLong(aWindow,GWL_USERDATA);
    217210    if(This) {
    218211      This->SetView();
    219       glViewport(0,0,This->WinSize_x,This->WinSize_y);
     212      glViewport(0,0,This->fWinSize_x,This->fWinSize_y);
    220213      This->ClearView();
    221214      This->DrawView();

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

    r896 r897  
    214214
    215215  // Window size and position...
    216   unsigned int width, height;
    217   x_origin = 0;
    218   y_origin = 0;
     216  G4int x_origin = 0;
     217  G4int y_origin = 0;
    219218  size_hints = XAllocSizeHints();
    220 
    221   // already done in G4VViewer at creation
    222 
    223 //   const G4String& XGeometryString = fVP.GetXGeometryString();
    224 //   int screen_num = DefaultScreen(dpy);
    225 //   if (!XGeometryString.empty()) {
    226 //     G4int geometryResultMask = XParseGeometry
    227 //       ((char*)XGeometryString.c_str(),
    228 //        &x_origin, &y_origin, &width, &height);
    229 //     if (geometryResultMask & (WidthValue | HeightValue)) {
    230 //       if (geometryResultMask & XValue) {
    231 //      if (geometryResultMask & XNegative) {
    232 //        x_origin = DisplayWidth(dpy, screen_num) + x_origin - width;
    233 //      }
    234 //      size_hints->flags |= PPosition;
    235 //      size_hints->x = x_origin;
    236 //       }
    237 //       if (geometryResultMask & YValue) {
    238 //      if (geometryResultMask & YNegative) {
    239 //        y_origin = DisplayHeight(dpy, screen_num) + y_origin - height;
    240 //      }
    241 //      size_hints->flags |= PPosition;
    242 //      size_hints->y = y_origin;
    243 //       }
    244 //     } else {
    245 //       G4cout << "ERROR: Geometry string \""
    246 //           << XGeometryString
    247 //           << "\" invalid.  Using \"600x600\"."
    248 //           << G4endl;
    249 //       width = 600;
    250 //       height = 600;
    251 //     }
    252 //   }
    253 //  size_hints->width = width;
    254 //  size_hints->height = height;
    255 
    256 #ifdef G4DEBUG
    257   printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Mauvais Size:W:%d X:%d H:%d Y:%d \n",width,fVP.GetWindowSizeHintX(),height, fVP.GetWindowSizeHintY());
    258 #endif
    259 
    260219
    261220  Window root_return;
    … …  
    265224  unsigned int depth_return;
    266225 
    267 #ifdef G4DEBUG
    268   printf("G4OpenGLXViewer::CreateMainWindow 1\n");
    269 #endif
    270226  // get the parent window's geometry
    271227  XGetGeometry(dpy, XRootWindow (dpy, vi -> screen), &root_return, &x_return, &y_return,
    … …  
    273229               &depth_return);
    274230 
    275 #ifdef G4DEBUG
    276   printf("G4OpenGLXViewer::CreateMainWindow 2 root W :%d H :%d\n",width_return, height_return);
    277 #endif
    278 
    279   //  G4int                             WinSize_x;
    280   //  G4int                             WinSize_y;
    281   WinSize_x = fVP.GetWindowSizeHintX();
    282   WinSize_y = fVP.GetWindowSizeHintY();
     231  fWinSize_x = fVP.GetWindowSizeHintX();
     232  fWinSize_y = fVP.GetWindowSizeHintY();
    283233  x_origin = fVP.GetWindowAbsoluteLocationHintX(width_return);
    284234  y_origin = fVP.GetWindowAbsoluteLocationHintY(height_return);
    285 
    286   size_hints->base_width = WinSize_x;
    287   size_hints->base_height = WinSize_y;
     235  size_hints->base_width = fWinSize_x;
     236  size_hints->base_height = fWinSize_y;
    288237  size_hints->x = x_origin;
    289238  size_hints->y = y_origin;
    290239  size_hints->flags |= PSize | PPosition;
    291240#ifdef G4DEBUG
    292   printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Size:W:%d H:%d X:%d Y:%d \n",WinSize_x,WinSize_y,x_origin,y_origin);
     241  printf("G4OpenGLXViewer::CreateMainWindow CreateWindow Size:W:%d H:%d X:%d Y:%d \n",fWinSize_x,fWinSize_y,x_origin,y_origin);
    293242#endif
    294243
    … …  
    313262
    314263   win = XCreateWindow (dpy, XRootWindow (dpy, vi -> screen), x_origin,
    315                         y_origin, WinSize_x, WinSize_y, 0, vi -> depth,
     264                        y_origin, fWinSize_x, fWinSize_y, 0, vi -> depth,
    316265                        InputOutput, vi -> visual, 
    317266                        CWBorderPixel | CWColormap |
    … …  
    489438    Pixmap pmap = XCreatePixmap (dpy,
    490439                                 XRootWindow (dpy, pvi->screen),
    491                                  WinSize_x, WinSize_y,
     440                                 fWinSize_x, fWinSize_y,
    492441                                 pvi->depth);
    493442   
    … …  
    504453                    cx);
    505454   
    506     glViewport (0, 0, WinSize_x, WinSize_y);
     455    glViewport (0, 0, fWinSize_x, fWinSize_y);
    507456   
    508457    ClearView ();
    … …  
    512461    generateEPS (print_string,
    513462                 print_colour,
    514                  WinSize_x, WinSize_y);
     463                 fWinSize_x, fWinSize_y);
    515464   
    516465    win=tmp_win;

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

    r891 r897  
    596596  Dimension width, height;
    597597  XtVaGetValues (glxarea,XmNwidth,&width,XmNheight,&height,NULL);
    598 #ifdef G4DEBUG
    599   printf("CreateWindow Size:%d - %d \n",width,height);
    600 #endif
    601   WinSize_x = (G4int) width;
    602   WinSize_y = (G4int) height;
     598  fWinSize_x = (unsigned int) width;
     599  fWinSize_y = (unsigned int) height;
    603600
    604601  win = XtWindow (glxarea);
    … …  
    633630fpprint_top (0)
    634631{
    635   WinSize_x = 100;
    636   WinSize_y = 100;
    637  
    638632  GetXmConnection ();
    639633  if (fViewId < 0) return;

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

    r850 r897  
    5050                 NULL);
    5151 
    52   pView->WinSize_x = (G4int) width;
    53   pView->WinSize_y = (G4int) height;
     52  pView->fWinSize_x = (G4int) width;
     53  pView->fWinSize_y = (G4int) height;
    5454}
    5555
    … …  
    6868                 NULL);
    6969
    70   pView->WinSize_x = (G4int) width;
    71   pView->WinSize_y = (G4int) height;
     70  pView->fWinSize_x = (G4int) width;
     71  pView->fWinSize_y = (G4int) height;
    7272
    7373  glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx);
Note: See TracChangeset for help on using the changeset viewer.