1 added + 2 removed + 3 modified, total 6 files
slic
diff -u -r1.42 -r1.43
--- GNUmakefile 26 Jul 2010 19:43:10 -0000 1.42
+++ GNUmakefile 10 Sep 2010 20:59:10 -0000 1.43
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.42 2010/07/26 19:43:10 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.43 2010/09/10 20:59:10 jeremy Exp $
#
# Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
#
@@ -49,15 +49,12 @@
# LCIO
include $(MAKEINCLUDES)/lcio.gmk
-# LCPhys
-#include $(MAKEINCLUDES)/lcphys.gmk
-
-# G4 hadronic lists
-#include $(MAKEINCLUDES)/hadronic_lists.gmk
-
# Geant4 binmake and special settings
include $(MAKEINCLUDES)/geant4.gmk
+# Qt
+include $(MAKEINCLUDES)/qt.gmk
+
check_config: GNUmakefile.local
lib_copy:
slic/config/make
diff -N qt.gmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ qt.gmk 10 Sep 2010 20:59:10 -0000 1.1
@@ -0,0 +1,3 @@
+ifdef QTHOME
+ LDFLAGS += -L$(QTHOME)/lib
+endif
slic/include
diff -u -r1.36 -r1.37
--- SlicApplication.hh 8 Jan 2010 23:18:56 -0000 1.36
+++ SlicApplication.hh 10 Sep 2010 20:59:10 -0000 1.37
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.36 2010/01/08 23:18:56 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.37 2010/09/10 20:59:10 jeremy Exp $
#ifndef SLIC_SLICAPPLICATION_HH
#define SLIC_SLICAPPLICATION_HH 1
@@ -8,9 +8,9 @@
#include "Module.hh"
// geant4
-#ifdef G4VIS_USE
-#include "VisManager.hh"
-#endif
+//#ifdef G4VIS_USE
+//#include "VisManager.hh"
+//#endif
#include "G4UIsession.hh"
#include "G4ApplicationState.hh"
@@ -192,9 +192,9 @@
G4UIsession* m_session;
// vis manager
-#ifdef G4VIS_USE
- VisManager* m_visManager;
-#endif
+//#ifdef G4VIS_USE
+// VisManager* m_visManager;
+//#endif
// app messenger
SlicApplicationMessenger* m_appMessenger;
slic/include
diff -N VisManager.hh
--- VisManager.hh 5 Sep 2006 23:21:50 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-// $Header: /cvs/lcd/slic/include/Attic/VisManager.hh,v 1.7 2006/09/05 23:21:50 jeremy Exp $
-#ifndef SLIC_VISMANAGER_HH
-#define SLIC_VISMANAGER_HH 1
-
-#ifdef G4VIS_USE
-#include "G4VisManager.hh"
-
-// slic
-#include "Module.hh"
-
-namespace slic
-{
-
- /**
- @class VisManager
- @brief Implementation of G4VisManager.
- */
- class VisManager: public G4VisManager, public Module
- {
-
- public:
- VisManager();
-
- private:
- void RegisterGraphicsSystems();
- };
-}
-
-#endif // G4VIS_USE
-#endif
-
slic/src
diff -u -r1.49 -r1.50
--- SlicApplication.cc 8 Jan 2010 23:18:56 -0000 1.49
+++ SlicApplication.cc 10 Sep 2010 20:59:10 -0000 1.50
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.49 2010/01/08 23:18:56 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.50 2010/09/10 20:59:10 jeremy Exp $
#include "SlicApplication.hh"
@@ -32,6 +32,8 @@
#include "G4ApplicationState.hh"
#include "G4StateManager.hh"
+#include "G4VisExecutive.hh"
+
#ifndef G4UI_NONE
#include "G4UImanager.hh"
#include "G4UIterminal.hh"
@@ -59,9 +61,9 @@
SlicApplication::SlicApplication()
: Module("SlicApplication", false),
m_session(0),
-#ifdef G4VIS_USE
- m_visManager(0),
-#endif
+//#ifdef G4VIS_USE
+// m_visManager(0),
+//#endif
m_appMessenger(0),
m_runManager(0),
m_mode(SlicApplication::eBatch),
@@ -211,11 +213,11 @@
#ifdef G4VIS_USE
void SlicApplication::initializeVis()
{
- m_visManager = new VisManager();
- m_visManager->Initialize();
+ G4VisExecutive* vis = new G4VisExecutive();
+ vis->Initialize();
// VRML test
- new VRML2WriterMessenger();
+ //new VRML2WriterMessenger();
}
#endif
slic/src
diff -N VisManager.cc
--- VisManager.cc 29 Jun 2007 22:20:43 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,114 +0,0 @@
-// $Header: /cvs/lcd/slic/src/Attic/VisManager.cc,v 1.10 2007/06/29 22:20:43 jeremy Exp $
-#ifdef G4VIS_USE
-#include "VisManager.hh"
-
-/* Geant4 visualization libs with no external deps */
-#include "G4ASCIITree.hh"
-#include "G4DAWNFILE.hh"
-#include "G4HepRepFile.hh"
-#include "G4HepRep.hh"
-#include "G4RayTracer.hh"
-#include "G4VRML1File.hh"
-#include "G4VRML2File.hh"
-
-/* Libraries requiring external deps */
-
-#ifdef G4VIS_USE_DAWN
-#include "G4FukuiRenderer.hh"
-#endif
-
-#ifdef G4VIS_USE_OPACS
-#include "G4Wo.hh"
-#include "G4Xo.hh"
-#endif
-
-#ifdef G4VIS_USE_OPENGLX
-#include "G4OpenGLImmediateX.hh"
-#include "G4OpenGLStoredX.hh"
-#endif
-
-#ifdef G4VIS_USE_OPENGLWIN32
-#include "G4OpenGLImmediateWin32.hh"
-#include "G4OpenGLStoredWin32.hh"
-#endif
-
-#ifdef G4VIS_USE_OPENGLXM
-#include "G4OpenGLImmediateXm.hh"
-#include "G4OpenGLStoredXm.hh"
-#endif
-
-#ifdef G4VIS_USE_OIX
-#include "G4OpenInventorX.hh"
-#endif
-
-#ifdef G4VIS_USE_OIWIN32
-#include "G4OpenInventorWin32.hh"
-#endif
-
-#ifdef G4VIS_USE_VRML
-#include "G4VRML1.hh"
-#include "G4VRML2.hh"
-#endif
-
-namespace slic
-{
-
- VisManager::VisManager()
- : Module("VisManager", false)
- {}
-
- void VisManager::RegisterGraphicsSystems () {
-
- // Graphics Systems not needing external packages or libraries...
- RegisterGraphicsSystem(new G4ASCIITree);
- RegisterGraphicsSystem(new G4DAWNFILE);
- RegisterGraphicsSystem(new G4HepRepFile);
- RegisterGraphicsSystem(new G4HepRep);
- RegisterGraphicsSystem(new G4RayTracer);
- RegisterGraphicsSystem(new G4VRML1File);
- RegisterGraphicsSystem(new G4VRML2File);
-
- // Graphics systems needing external packages or libraries...
-
-#ifdef G4VIS_USE_DAWN
- RegisterGraphicsSystem(new G4FukuiRenderer);
-#endif
-
-#ifdef G4VIS_USE_OPENGLX
- RegisterGraphicsSystem(new G4OpenGLImmediateX);
- RegisterGraphicsSystem(new G4OpenGLStoredX);
-#endif
-
-#ifdef G4VIS_USE_OPENGLWIN32
- RegisterGraphicsSystem(new G4OpenGLImmediateWin32);
- RegisterGraphicsSystem(new G4OpenGLStoredWin32);
-#endif
-
-#ifdef G4VIS_USE_OPENGLXM
- RegisterGraphicsSystem(new G4OpenGLImmediateXm);
- RegisterGraphicsSystem(new G4OpenGLStoredXm);
-#endif
-
-#ifdef G4VIS_USE_OIX
- RegisterGraphicsSystem(new G4OpenInventorX);
-#endif
-
-#ifdef G4VIS_USE_OIWIN32
- RegisterGraphicsSystem(new G4OpenInventorWin32);
-#endif
-
-#ifdef G4VIS_USE_VRML
- RegisterGraphicsSystem(new G4VRML1);
- RegisterGraphicsSystem(new G4VRML2);
-#endif
-
-#ifdef SLIC_LOG
- log() << LOG::okay <<
- "\nRegistered Geant4 graphics systems."
- << LOG::endl;
- PrintAvailableGraphicsSystems ();
-#endif
- }
-}
-
-#endif
CVSspam 0.2.8