Changeset 632 for trunk/geant4
- Timestamp:
- Nov 30, 2007, 3:49:44 PM (17 years ago)
- Location:
- trunk/geant4
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/interfaces/GAG/GNUmakefile
r610 r632 1 # $Id: GNUmakefile,v 1. 2 2005/01/26 08:50:58 gcosmoExp $1 # $Id: GNUmakefile,v 1.3 2007/11/30 14:28:50 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for interfaces/GAG library. John Allison, 6/7/98. … … 10 10 11 11 include $(G4INSTALL)/config/architecture.gmk 12 #include $(G4INSTALL)/config/G4UI_BUILD.gmk13 12 include $(G4INSTALL)/config/interactivity.gmk 14 13 -
trunk/geant4/interfaces/History
r631 r632 1 $Id: History,v 1.9 0 2007/11/16 15:03:17 kmuraExp $1 $Id: History,v 1.91 2007/11/30 14:28:49 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 30 November 2007, Laurent Garnier 21 - G4UIQt : Some improvements for Qt3, corrections of some bugs 22 - G4UIQt_moc.cc : Adding other versions for QT_MOC_REVISION 28,58 and 23 59, but this is not the right solution.. 24 - GAG/Makefile : Suppression of linking on a unuseful library 25 20 26 16 November 2007, Koichi Murakami (interfaces-V09-00-03) 21 27 - G4UIGainServer.cc: cleared a compilation warning. -
trunk/geant4/interfaces/basic/include/G4UIQt.hh
r619 r632 25 25 // 26 26 // 27 // $Id: G4UIQt.hh,v 1. 7 2007/11/15 18:53:59lgarnier Exp $27 // $Id: G4UIQt.hh,v 1.9 2007/11/30 13:32:47 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 152 152 void HelpTreeDoubleClicCallback( QListViewItem*); 153 153 #else 154 void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);154 void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int); 155 155 #endif 156 156 void ShowHelpCallback(); -
trunk/geant4/interfaces/basic/src/G4UIQt.cc
r630 r632 25 25 // 26 26 // 27 // $Id: G4UIQt.cc,v 1.1 2 2007/11/15 18:24:27lgarnier Exp $27 // $Id: G4UIQt.cc,v 1.13 2007/11/30 14:28:50 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // L. Garnier 31 31 32 #define GEANT4_QT_DEBUG32 //#define DEBUG 33 33 34 34 #ifdef G4UI_BUILD_QT_SESSION … … 175 175 connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback())); 176 176 #endif 177 178 177 fCommandHistoryArea->installEventFilter(this); 179 178 fCommandLabel = new QLabel("",bottomWidget); … … 181 180 fCommandArea = new QLineEdit(bottomWidget); 182 181 fCommandArea->installEventFilter(this); 183 #ifdef GEANT4_QT_DEBUG184 printf("G4UIQt:: 1\n");185 #endif186 182 #if QT_VERSION < 0x040000 187 183 fCommandArea->setActiveWindow(); … … 190 186 #endif 191 187 connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback())); 192 #ifdef GEANT4_QT_DEBUG193 printf("G4UIQt:: 1 connect returnPressed\n");194 #endif195 188 #if QT_VERSION < 0x040000 196 189 fCommandArea->setFocusPolicy ( QWidget::StrongFocus ); … … 207 200 #endif 208 201 209 #ifdef GEANT4_QT_DEBUG210 printf("G4UIQt:: 3\n");211 #endif212 202 213 203 … … 219 209 #endif 220 210 221 #ifdef GEANT4_QT_DEBUG222 printf("G4UIQt:: 4\n");223 #endif224 211 layoutBottom->addWidget(fCommandHistoryArea); 225 212 layoutBottom->addWidget(fCommandLabel); … … 233 220 234 221 235 #ifdef GEANT4_QT_DEBUG236 printf("G4UIQt:: 5\n");237 #endif238 222 fMainWindow->setCentralWidget(splitter); 239 223 … … 250 234 fMainWindow->menuBar()->insertItem( QString("&Help"), helpMenu ); 251 235 252 #ifdef GEANT4_QT_DEBUG253 printf("G4UIQt:: 6\n");254 #endif255 236 256 237 #else … … 263 244 QMenu *helpMenu = fMainWindow->menuBar()->addMenu("Help"); 264 245 helpMenu->addAction("Show Help", this, SLOT(ShowHelpCallback())); 265 #endif266 #ifdef GEANT4_QT_DEBUG267 printf("G4UIQt:: 7\n");268 246 #endif 269 247 … … 279 257 splitter->setSizes(vals); 280 258 } 281 #ifdef GEANT4_QT_DEBUG282 printf("G4UIQt:: 8\n");283 #endif284 259 285 260 if(UI!=NULL) UI->SetCoutDestination(this); // TO KEEP … … 448 423 fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum()); 449 424 #endif 450 // Slow down everything : disababled451 425 interactorManager->FlushAndWaitExecution(); 452 426 return 0; … … 609 583 610 584 #if QT_VERSION < 0x040000 611 #ifdef GEANT4_QT_DEBUG612 printf("G4UIQt::QTextEdit 1\n");613 #endif614 585 fHelpArea = new QTextEdit(splitter); 615 #ifdef GEANT4_QT_DEBUG 616 printf("G4UIQt::end 1\n"); 617 #endif 618 #else 619 #ifdef GEANT4_QT_DEBUG 620 printf("G4UIQt::QTextEdit 2\n"); 621 #endif 586 #else 622 587 fHelpArea = new QTextEdit(); 623 #ifdef GEANT4_QT_DEBUG624 printf("G4UIQt::end 2\n");625 #endif626 588 #endif 627 589 fHelpArea->setReadOnly(true); … … 1212 1174 ) 1213 1175 { 1214 1215 1176 #if QT_VERSION < 0x040000 1216 1177 G4String ss = G4String(aCommand.ascii()); … … 1316 1277 if (!fCommandHistoryArea) 1317 1278 return ; 1279 1318 1280 1319 1281 #if QT_VERSION < 0x040000 -
trunk/geant4/interfaces/basic/src/G4UIQt_moc.cc
r624 r632 3 3 ** 4 4 ** Created: Tue Nov 13 18:13:09 2007 5 ** by: The Qt MOC ($Id: G4UIQt_moc.cc,v 1. 8 2007/11/15 18:24:28lgarnier Exp $)5 ** by: The Qt MOC ($Id: G4UIQt_moc.cc,v 1.9 2007/11/30 14:28:50 lgarnier Exp $) 6 6 ** 7 7 ** WARNING! All changes made in this file will be lost! -
trunk/geant4/interfaces/common/src/G4Qt.cc
r617 r632 32 32 #if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT) 33 33 34 #define GEANT4_QT_DEBUG35 36 34 #include <stdlib.h> 37 35 #include <string.h> … … 42 40 43 41 #include <qapplication.h> 44 #include <qpushbutton.h> // EN TEST45 42 46 43 -
trunk/geant4/visualization/OpenGL/History
r631 r632 1 $Id: History,v 1.10 3 2007/11/19 19:45:39 perlExp $1 $Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/OpenGL 21 21 ------------------------------------- 22 23 30th November 2007 Laurent Garnier 24 - Improvements for Qt3 25 - moc files : Adding other versions for QT_MOC_REVISION 28,58 and 26 59, but this is not the right solution.. 22 27 23 28 19th November 2007 Joseph Perl (for Laurent Garnier) (opengl-V09-00-04) -
trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r612 r632 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.hh,v 1. 4 2007/11/13 17:48:51lgarnier Exp $27 // $Id: G4OpenGLQtViewer.hh,v 1.5 2007/11/30 14:47:30 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog_moc.cc
r612 r632 3 3 ** 4 4 ** Created: Mon Nov 12 10:36:59 2007 5 ** by: The Qt MOC ($Id: G4OpenGLQtExportDialog_moc.cc,v 1. 5 2007/11/14 11:49:00 lgarnier Exp $)5 ** by: The Qt MOC ($Id: G4OpenGLQtExportDialog_moc.cc,v 1.6 2007/11/30 14:47:30 lgarnier Exp $) 6 6 ** 7 7 ** WARNING! All changes made in this file will be lost! -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r631 r632 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1. 7 2007/11/15 18:24:28lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.8 2007/11/30 14:47:30 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 36 36 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 37 37 38 #define GEANT4_QT_DEBUG38 //#define GEANT4_QT_DEBUG 39 39 40 40 #include "G4OpenGLQtViewer.hh" … … 228 228 GLWindow->resize(300, 300); 229 229 GLWindow->move(900,300); 230 #ifdef GEANT4_QT_DEBUG231 printf("G4OpenGLQtViewer::Should show glWidget\n");232 #endif233 230 GLWindow->show(); 234 231 … … 363 360 364 361 QMenu *mRepresentation = mStyle->addMenu("&Representation"); 365 QAction *polyhedron = mRepresentation->addAction("Polyhedron");362 QAction *polyhedron = mRepresentation->addAction("Polyhedron"); 366 363 QAction *nurbs = mRepresentation->addAction("NURBS"); 367 364 #endif … … 385 382 fDrawingWireframe = new QPopupMenu(mDrawing); 386 383 mDrawing->insertItem("&Wireframe",fDrawingWireframe); 387 #ifdef GEANT4_QT_DEBUG388 printf("G4OpenGLQtViewer:: fDrawingWireframe creation\n");389 #endif390 384 391 385 mDrawing->setCheckable(true); -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer_moc.cc
r612 r632 3 3 ** 4 4 ** Created: Mon Nov 12 10:34:24 2007 5 ** by: The Qt MOC ($Id: G4OpenGLQtViewer_moc.cc,v 1. 5 2007/11/14 11:49:00 lgarnier Exp $)5 ** by: The Qt MOC ($Id: G4OpenGLQtViewer_moc.cc,v 1.6 2007/11/30 14:47:30 lgarnier Exp $) 6 6 ** 7 7 ** WARNING! All changes made in this file will be lost! -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQt.cc
r616 r632 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQt.cc,v 1. 3 2007/11/15 18:24:28lgarnier Exp $27 // $Id: G4OpenGLStoredQt.cc,v 1.4 2007/11/30 14:47:30 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 33 33 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 34 34 35 #define GEANT4_QT_DEBUG35 //#define GEANT4_QT_DEBUG 36 36 37 37 #include "G4VisFeaturesOfOpenGL.hh" -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r621 r632 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1. 6 2007/11/15 18:24:28lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.7 2007/11/30 14:47:30 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 34 34 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 35 35 36 #define GEANT4_QT_DEBUG36 //#define GEANT4_QT_DEBUG 37 37 38 38 #include "G4OpenGLStoredQtViewer.hh" -
trunk/geant4/visualization/OpenGL/src/G4OpenGLViewer.cc
r631 r632 26 26 // 27 27 // $Id: G4OpenGLViewer.cc,v 1.34 2007/05/24 18:27:13 allison Exp $ 28 // GEANT4 tag $Name: HEAD$28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/geant4/visualization/management/History
r631 r632 1 $Id: History,v 1.10 3 2007/11/16 20:34:17 perlExp $1 $Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $ 2 2 3 3 ------------------------------------------------------------------- … … 26 26 History file for visualization management sub-category 27 27 ------------------------------------------------------ 28 29 30th November 2007 Laurent Garnier 30 - G4VisExecutive.icc : Add a #ifdef G4VIS_USE_DAWN directive in order 31 not to add a 'new G4DAWNFILE' if G4VIS_USE_DAWN is not set 32 #endif 28 33 29 34 16th November 2007 Joseph Perl (visman-V09-00-02) -
trunk/geant4/visualization/management/include/G4VisExecutive.icc
r612 r632 25 25 // 26 26 // 27 // $Id: G4VisExecutive.icc,v 1.1 7 2007/11/09 15:03:22lgarnier Exp $27 // $Id: G4VisExecutive.icc,v 1.18 2007/11/30 14:47:30 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/management/src/G4VisManager.cc
r610 r632 561 561 562 562 void G4VisManager::CreateSceneHandler (G4String name) { 563 printf("G4VisManager::Initialise OK\n");564 563 if (!fInitialised) Initialise (); 565 printf("G4VisManager::Initialise OK END\n");566 564 if (fpGraphicsSystem) { 567 565 G4VSceneHandler* pSceneHandler = … … 585 583 void G4VisManager::CreateViewer (G4String name) { 586 584 587 printf("G4VisManager::Initialise OK\n");588 585 if (!fInitialised) Initialise (); 589 590 if (fpSceneHandler)591 printf("G4VisManager::CreateViewer OK\n");592 else593 printf("G4VisManager::CreateViewer NO SCENE HANDLER\n");594 586 595 587 if (fpSceneHandler) {
Note: See TracChangeset
for help on using the changeset viewer.