Changeset 579 for trunk/geant4


Ignore:
Timestamp:
Sep 18, 2007, 6:39:37 PM (17 years ago)
Author:
garnier
Message:

r599@mac-90108: laurentgarnier | 2007-09-18 18:43:19 +0200
correction du ticket #72 et la suppresion de la fenetre OpenGL entraine desormais un message d erreur lors du prochain BeamOn

Location:
trunk/geant4
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/interfaces/G4History.macro

    r578 r579  
    5959/gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
    6060/N03/event/printModulo 100
    61 /gun/energy 10 GeV
     61/gun/energy 50 MeV
    6262/run/beamOn 1
    63 /run/beamOn
    64 /run/beamOn
     63/control/execute visTutor/exN03Vis12.mac
     64/vis/scene/create
     65/vis/sceneHandler/create OGLIQT
     66/vis/sceneHandler/attach
     67/vis/viewer/create
     68/vis/viewer/refresh
     69/vis/scene/notifyHandlers
     70/vis/scene/add/volume
     71/tracking/storeTrajectory 1
     72/vis/viewer/reset
     73/vis/viewer/refresh
     74/vis/viewer/set/viewpointThetaPhi   45 45
     75/vis/viewer/refresh
     76/vis/scene/notifyHandlers
     77/control/verbose 2
     78/vis/viewer/update
     79/run/beamOn 1
     80/control/execute visTutor/exN03Vis14.mac
     81/vis/open OGLSQT
     82/vis/sceneHandler/create OGLSQT
     83/vis/sceneHandler/attach
     84/vis/viewer/create ! ! 600
     85/vis/viewer/refresh
     86/vis/viewer/reset
     87/vis/viewer/refresh
     88/vis/viewer/set/viewpointThetaPhi  20 70
     89/vis/viewer/refresh
     90/vis/viewer/zoom               0.8
     91/vis/viewer/refresh
     92/vis/drawVolume
     93/vis/scene/create
     94/vis/scene/add/volume world
     95/vis/scene/notifyHandlers
     96/vis/sceneHandler/attach
     97/vis/viewer/flush
     98/vis/viewer/refresh viewer-3
     99/vis/viewer/update viewer-3
     100/vis/open DAWNFILE
     101/vis/sceneHandler/create DAWNFILE
     102/vis/sceneHandler/attach
     103/vis/viewer/create ! ! 600
     104/vis/viewer/reset
     105/vis/viewer/zoom               1.1
     106/vis/viewer/set/viewpointThetaPhi  35 35
     107/vis/drawVolume           Absorber
     108/vis/scene/create
     109/vis/scene/add/volume Absorber
     110/vis/sceneHandler/attach
     111/vis/scene/add/axes      0 0 0 500 mm
     112/vis/scene/notifyHandlers
     113/vis/scene/add/text      0 0 0 mm  40 -100 -140   Absorber
     114/vis/scene/notifyHandlers
     115/vis/scene/add/scale     10 cm z 1 0 0 manual -2.5 -5 0  cm
     116/vis/scene/notifyHandlers
     117/vis/scene/notifyHandlers
     118/vis/viewer/update
     119/vis/viewer/reset
     120/vis/viewer/zoom               1.1
     121/vis/viewer/set/viewpointThetaPhi  35 35
     122/vis/drawVolume                Gap
     123/vis/scene/create
     124/vis/scene/add/volume Gap
     125/vis/sceneHandler/attach
     126/vis/scene/add/axes       0 0 0 500 mm
     127/vis/scene/notifyHandlers
     128/vis/scene/add/text       0 0 0 mm  50 -100 -140   Gap
     129/vis/scene/notifyHandlers
     130/vis/scene/add/scale      10 cm z 1 0 0 manual -2.5 -5  0 cm
     131/vis/scene/notifyHandlers
     132/vis/scene/notifyHandlers
     133/vis/viewer/update
     134/vis/viewer/reset
     135/vis/viewer/zoom               1.1
     136/vis/viewer/set/viewpointThetaPhi  35 35
     137/vis/viewer/set/culling         global false
     138/vis/drawVolume
     139/vis/scene/create
     140/vis/scene/add/volume world
     141/vis/scene/notifyHandlers
     142/vis/sceneHandler/attach
     143/vis/scene/add/axes      0 0 0 500 mm
     144/vis/scene/notifyHandlers
     145/vis/scene/add/text      0 0 0 mm 50 -100 -240   World
     146/vis/scene/notifyHandlers
     147/vis/scene/add/scale     10 cm x 1 0 0
     148/vis/scene/notifyHandlers
     149/vis/scene/notifyHandlers
     150/vis/viewer/update
     151/vis/viewer/set/culling       global true
     152/run/beamOn 1

  • trunk/geant4/interfaces/basic/src/G4UIQt.cc

    r578 r579  
    298298  if (!interactorManager) return 0;
    299299 
    300   printf(" **************** G4 Cout : %s ---***---%d\n",(char*)aString.data(),fTextArea->isVisible ());
     300  //  printf(" **************** G4 Cout : %s\n",(char*)aString.data());
    301301  fTextArea->append(QString((char*)aString.data()).trimmed());
    302302  fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
    … …  
    390390  // Create the help dialog
    391391  if (!fHelpDialog) {
    392     fHelpDialog = new QDialog(fMainWindow);
    393 
     392    fHelpDialog = new QDialog(fMainWindow,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
    394393    QSplitter *splitter = new QSplitter(Qt::Horizontal);
    395394    fHelpArea = new QTextEdit();

  • trunk/geant4/interfaces/currentEvent.rndm

    r578 r579  
    221878463799
    330
    4 2080926437
    5 1745300735
     4730380194
     51954227679

  • trunk/geant4/interfaces/currentRun.rndm

    r578 r579  
    221878463799
    330
    4 2080926437
    5 1745300735
     4730380194
     51954227679

  • trunk/geant4/visualization/G4History.macro

    r578 r579  
    5959/gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
    6060/N03/event/printModulo 100
    61 /gun/energy 10 GeV
    62 /run/beamOn
     61/run/beamOn 1
     62/control/execute visTutor/exN03Vis14.mac
     63/vis/open OGLSQT
     64/vis/sceneHandler/create OGLSQT
     65/vis/sceneHandler/attach
     66/vis/viewer/create ! ! 600
     67/vis/viewer/refresh
     68/vis/viewer/reset
     69/vis/viewer/refresh
     70/vis/viewer/set/viewpointThetaPhi  20 70
     71/vis/viewer/refresh
     72/vis/viewer/zoom               0.8
     73/vis/viewer/refresh
     74/vis/drawVolume
     75/vis/scene/create
     76/vis/scene/add/volume world
     77/vis/scene/notifyHandlers
     78/vis/sceneHandler/attach
     79/vis/viewer/flush
     80/vis/viewer/refresh viewer-2
     81/vis/viewer/update viewer-2
     82/vis/open DAWNFILE
     83/vis/sceneHandler/create DAWNFILE
     84/vis/sceneHandler/attach
     85/vis/viewer/create ! ! 600
     86/vis/viewer/reset
     87/vis/viewer/zoom               1.1
     88/vis/viewer/set/viewpointThetaPhi  35 35
     89/vis/drawVolume           Absorber
     90/vis/scene/create
     91/vis/scene/add/volume Absorber
     92/vis/sceneHandler/attach
     93/vis/scene/add/axes      0 0 0 500 mm
     94/vis/scene/notifyHandlers
     95/vis/scene/add/text      0 0 0 mm  40 -100 -140   Absorber
     96/vis/scene/notifyHandlers
     97/vis/scene/add/scale     10 cm z 1 0 0 manual -2.5 -5 0  cm
     98/vis/scene/notifyHandlers
     99/vis/scene/notifyHandlers
     100/vis/viewer/update
     101/vis/viewer/reset
     102/vis/viewer/zoom               1.1
     103/vis/viewer/set/viewpointThetaPhi  35 35
     104/vis/drawVolume                Gap
     105/vis/scene/create
     106/vis/scene/add/volume Gap
     107/vis/sceneHandler/attach
     108/vis/scene/add/axes       0 0 0 500 mm
     109/vis/scene/notifyHandlers
     110/vis/scene/add/text       0 0 0 mm  50 -100 -140   Gap
     111/vis/scene/notifyHandlers
     112/vis/scene/add/scale      10 cm z 1 0 0 manual -2.5 -5  0 cm
     113/vis/scene/notifyHandlers
     114/vis/scene/notifyHandlers
     115/vis/viewer/update
     116/vis/viewer/reset
     117/vis/viewer/zoom               1.1
     118/vis/viewer/set/viewpointThetaPhi  35 35
     119/vis/viewer/set/culling         global false
     120/vis/drawVolume
     121/vis/scene/create
     122/vis/scene/add/volume world
     123/vis/scene/notifyHandlers
     124/vis/sceneHandler/attach
     125/vis/scene/add/axes      0 0 0 500 mm
     126/vis/scene/notifyHandlers
     127/vis/scene/add/text      0 0 0 mm 50 -100 -240   World
     128/vis/scene/notifyHandlers
     129/vis/scene/add/scale     10 cm x 1 0 0
     130/vis/scene/notifyHandlers
     131/vis/scene/notifyHandlers
     132/vis/viewer/update
     133/vis/viewer/set/culling       global true
     134/run/beamOn 1

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

    r566 r579  
    7878  void createPopupMenu();
    7979  void createRadioAction(QAction *,QAction *, const std::string&,unsigned int a=1);
     80 
    8081  QMenu *fContextMenu;
    8182  bool fMouseAction; // 1: rotate 0:move
    … …  
    104105  void toggleAux(bool);
    105106  void toggleFullScreen(bool);
     107
     108  void dialogClosed();
    106109};
    107110

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

    r571 r579  
    6868  //   ::wglMakeCurrent(fHDC,fHGLRC);
    6969  //  fWindow->makeCurrent();
    70   G4OpenGLViewer::SetView (); 
     70  G4OpenGLViewer::SetView ();
    7171  printf("G4OpenGLQtViewer::SetView --------------------\n");
    7272}
    … …  
    8585  printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
    8686  glFlush ();
    87   GLWindow->activateWindow();
    88   printf("G4OpenGLQtViewer::ShowView -----------------------\n");
    89 
     87  if (!GLWindow) {
     88    G4cerr << "Visualization window not defined, please choose one before" << G4endl;
     89  } else {
     90    GLWindow->activateWindow();
     91    printf("G4OpenGLQtViewer::ShowView -----------------------\n");
     92  }
    9093  //   // Empty the Windows message queue :
    9194  //   MSG event;
    … …  
    132135    foreach (QWidget *widget, QApplication::allWidgets()) {
    133136      if ((found== false) && (widget->inherits("QMainWindow"))) {
    134         GLWindow = new QDialog(widget);
     137        printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
     138        GLWindow = new QDialog(widget,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
    135139        found = true;
    136140      }
    137141    }
    138142    if (found==false) {
     143      printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
    139144      GLWindow = new QDialog();
    140145    }
    141146  } else {
     147    printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
    142148    GLWindow = new QDialog();
    143149  }
    … …  
    152158  GLWindow->show();
    153159 
     160  // delete the pointer if close this
     161  //  GLWindow->setAttribute(Qt::WA_DeleteOnClose);
     162
     163  QObject ::connect(GLWindow,
     164                    SIGNAL(rejected()),
     165                    this,
     166                    SLOT(dialogClosed()));
     167
    154168  WinSize_x = 400;
    155169  WinSize_y = 400;
    … …  
    166180
    167181}
     182
     183/**  Close the dialog and set the pointer to NULL
     184 */
     185void G4OpenGLQtViewer::dialogClosed() {
     186  GLWindow = NULL;
     187}
     188
    168189
    169190//////////////////////////////////////////////////////////////////////////////
    … …  
    187208{
    188209  printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
    189   delete fContextMenu;   
     210  delete fContextMenu;
    190211}
    191212
    … …  
    357378void G4OpenGLQtViewer::manageContextMenuEvent(QContextMenuEvent *e)
    358379{
    359   if (!GLWindow) return;
     380  if (!GLWindow) {
     381    G4cerr << "Visualization window not defined, please choose one before" << G4endl;
     382  } else {
    360383 
    361   if (!fContextMenu)
    362     createPopupMenu();
    363 
    364   // launch menu
    365   if ( fContextMenu ) {
    366     fContextMenu->exec( e->globalPos() );
    367     //    delete fContextMenu;
     384    if (!fContextMenu)
     385      createPopupMenu();
     386   
     387    // launch menu
     388    if ( fContextMenu ) {
     389      fContextMenu->exec( e->globalPos() );
     390      //    delete fContextMenu;
     391    }
    368392  }
    369393  e->accept();

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

    r565 r579  
    5555G4OpenGLStoredQtViewer::~G4OpenGLStoredQtViewer() {
    5656   printf("GLWidget::~GLWidget \n");
    57      makeCurrent();
     57   makeCurrent();
     58   // this is connect to the Dialog for deleting it properly
     59   // when close event.
     60   //   ((QDialog*)window())->reject();
    5861   printf("GLWidget::~GLWidget END\n");
    5962}
    … …  
    104107
    105108  printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
    106 
     109  printf("G4OpenGLStoredQtViewer::DrawView Dialog adress : %d\n",GLWindow);
    107110   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
    108111
    … …  
    116119   // if necessary...
    117120   if (!fNeedKernelVisit)
    118      printf("***************************  CASE 0 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
    119121
    120122   if (!fNeedKernelVisit) KernelVisitDecision ();
    121    printf("***************************  kernelVisit:%d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fNeedKernelVisit);
    122123   
    123124   G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
    … …  
    209210 {
    210211   if (!readyToPaint) {
    211      printf("\n\nG4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
     212     printf("G4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
    212213     readyToPaint= true;
    213214     return;
    … …  
    218219   if ( !hasToRepaint) {
    219220     if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
    220        printf("\n\nG4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
     221       printf("G4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
    221222       return;
    222223     }
    223224   }
    224225   nbPaint++;
    225    printf("\n\nG4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
     226   printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
    226227   WinSize_x = (G4int) width();
    227228   WinSize_y = (G4int) height();
    … …  
    241242   hasToRepaint =false;
    242243
    243    printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n\n\n",nbPaint,readyToPaint);
     244   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n",nbPaint,readyToPaint);
    244245 }
    245246

  • trunk/geant4/visualization/currentEvent.rndm

    r578 r579  
    221878463799
    330
    4 9876
    5 54321
     41180857998
     5122938492

  • trunk/geant4/visualization/currentRun.rndm

    r573 r579  
    221878463799
    330
    4 414412625
    5 1248522651
     41180857998
     5122938492
Note: See TracChangeset for help on using the changeset viewer.