csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/SimData/SimData/Tests Makefile,1.2,1.3 TODO,1.2,1.3 test_Object.cpp,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv2659/SimData/Tests

Modified Files:
	Makefile TODO test_Object.cpp 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	25 Oct 2003 00:24:03 -0000	1.2
--- Makefile	1 Nov 2003 16:08:40 -0000	1.3
***************
*** 47,51 ****
  	@echo -n "Building $@..."
  	@for foo in a; do \
! 		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData 2>.testlog 1>/dev/null; \
  		if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; exit 1; fi; \
  	done
--- 47,51 ----
  	@echo -n "Building $@..."
  	@for foo in a; do \
! 		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData 2>.buildlog 1>/dev/null; \
  		if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; exit 1; fi; \
  	done
***************
*** 55,60 ****
  	@for test in $(TESTS); do \
  	   echo -n "Running  $$test..."; \
! 	   ./$$test 2>.testlog 1>/dev/null; \
! 	   if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; fi; \
  	done
  
--- 55,60 ----
  	@for test in $(TESTS); do \
  	   echo -n "Running  $$test..."; \
! 	   ./$$test 2>$$test.log 1>/dev/null; \
! 	   if [ $$? = "0" ]; then echo "ok"; rm $$test.log; else echo "failed!"; fi; \
  	done
  

Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TODO	19 Oct 2003 23:53:56 -0000	1.2
--- TODO	1 Nov 2003 16:08:40 -0000	1.3
***************
*** 4,9 ****
    * Archive test with objects and links
    * Logging facility
!   * Conversions
!   * Object declarations and macros (C++)
    * Object interfaces and interface registry
  
--- 4,10 ----
    * Archive test with objects and links
    * Logging facility
!   * Conversions [DONE]
!   * Object declarations and macros (C++) [PARTIALLY DONE]
    * Object interfaces and interface registry
+   * Data compiler and xml parsing
  

Index: test_Object.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/test_Object.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_Object.cpp	25 Oct 2003 00:24:03 -0000	1.2
--- test_Object.cpp	1 Nov 2003 16:08:40 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  
  #include <cstdlib>
+ #include <cassert>
  
  

[Csp-commits] APPLICATIONS/SimData/Include/SimData Conversions.h,1.7,1.8

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv2659/Include/SimData

Modified Files:
	Conversions.h 
Log Message:


Index: Conversions.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Conversions.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Conversions.h	19 Oct 2003 23:53:56 -0000	1.7
--- Conversions.h	1 Nov 2003 16:08:40 -0000	1.8
***************
*** 68,72 ****
  /// meters per second to knots
  template <typename T>
! T mps_kts(T x) { return x * 1.94385; }
  SIMDATA_CVT(mps_kts)
  
--- 68,72 ----
  /// meters per second to knots
  template <typename T>
! T mps_kts(T x) { return x * 1.943846; }
  SIMDATA_CVT(mps_kts)
  
***************
*** 88,92 ****
  /// pounds to kilograms
  template <typename T>
! T lb_kg(T x) { return x * 0.45360; }
  SIMDATA_CVT(lb_kg)
  
--- 88,92 ----
  /// pounds to kilograms
  template <typename T>
! T lb_kg(T x) { return x * 0.453597; }
  SIMDATA_CVT(lb_kg)
  
***************
*** 103,112 ****
  /// pascals to millimeters of mercury
  template <typename T>
! T pa_mmhg(T x) { return x * 0.00752; }
  SIMDATA_CVT(pa_mmhg)
  
  /// millimeters of mercury to pascals
  template <typename T>
! T mmhg_pa(T x) { return x * 133.0; }
  SIMDATA_CVT(mmhg_pa)
  
--- 103,112 ----
  /// pascals to millimeters of mercury
  template <typename T>
! T pa_mmhg(T x) { return x * 0.00750062; }
  SIMDATA_CVT(pa_mmhg)
  
  /// millimeters of mercury to pascals
  template <typename T>
! T mmhg_pa(T x) { return x * 133.3224; }
  SIMDATA_CVT(mmhg_pa)
  
***************
*** 118,122 ****
  /// newtons to pounds
  template <typename T>
! T n_lb(T x) { return x * 0.22481; }
  SIMDATA_CVT(n_lb)
  
--- 118,122 ----
  /// newtons to pounds
  template <typename T>
! T n_lb(T x) { return x * 0.224809; }
  SIMDATA_CVT(n_lb)
  

[Csp-commits] APPLICATIONS/SimData/Source SConscript,1.2,1.3 cSimData.i,1.6,1.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv2659/Source

Modified Files:
	SConscript cSimData.i 
Log Message:


Index: SConscript
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/SConscript,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SConscript	6 Aug 2003 06:36:25 -0000	1.2
--- SConscript	1 Nov 2003 16:08:40 -0000	1.3
***************
*** 23,32 ****
  
  import os.path
  
! Import('env', 'construct', 'Package')
  
! headers = construct.Prefix("#/Include/SimData",
  	"""
  	BaseType.h
  	Conversions.h
  	DataArchive.h
--- 23,35 ----
  
  import os.path
+ from build_support import *
  
! Import('env')
  
! headers = Prefix("#/Include/SimData",
  	"""
+ 	Archive.h
  	BaseType.h
+ 	Composite.h
  	Conversions.h
  	DataArchive.h
***************
*** 39,43 ****
  	FileUtility.h
  	GeoPos.h
- 	GlibCsp.h
  	hash_map.h
  	HashUtility.h
--- 42,45 ----
***************
*** 58,62 ****
  	ObjectInterface.h
  	osg.h
- 	Pack.h
  	Path.h
  	PTS.h
--- 60,63 ----
***************
*** 65,79 ****
  	Real.h
  	Ref.h
  	String.h
  	TypeAdapter.h
  	Types.h
  	Vector3.h
- 	Vector3.inl
  	Version.h
  	""")
  
! interfaces = construct.Prefix("#/Include/SimData",
  	"""
  	cSimData.i
  	BaseType.i
  	Conversions.i
--- 66,87 ----
  	Real.h
  	Ref.h
+ 	Singleton.h
  	String.h
+ 	Trace.h
  	TypeAdapter.h
  	Types.h
+ 	Uniform.h
  	Vector3.h
  	Version.h
  	""")
  
! top_interfaces = Prefix("#/Source/",
  	"""
  	cSimData.i
+ 	""")
+ 
+ sub_interfaces = Prefix("#/Include/SimData",
+ 	"""
+ 	Archive.i
  	BaseType.i
  	Conversions.i
***************
*** 94,102 ****
  	Log.i
  	LUT.i
- 	Math.i
  	Matrix3.i
  	Noise.i
  	Object.i
- 	Pack.i
  	Path.i
  	Quat.i
--- 102,108 ----
***************
*** 131,135 ****
  	Noise.cpp
  	Object.cpp
- 	Pack.cpp
  	Path.cpp
  	Quat.cpp
--- 137,140 ----
***************
*** 141,145 ****
  	""".split()
  
! package = construct.Prefix("#/SimData", 
  	"""
  	__init__.py
--- 146,150 ----
  	""".split()
  
! package_files = Prefix("#/SimData", 
  	"""
  	__init__.py
***************
*** 150,154 ****
  	""")
  
! extra = construct.Prefix("#",
  	"""
  	README
--- 155,159 ----
  	""")
  
! extra_files = Prefix("#",
  	"""
  	README
***************
*** 162,186 ****
  	""")
  
! # swig module
! 
! env.SwigBuild(['cSimData_wrap.cpp', 'cSimData.py'], 'cSimData')
  wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
- sources.append('cSimData_wrap.cpp')
  
  # main libraries
  
- shared_library = env.SharedLibrary('#/SimData/_cSimData', sources, SHLIBPREFIX = '', LIBS = env["SWLIBS"])
  static_library = env.StaticLibrary('#/SimData/libSimData', sources)
  libraries = [shared_library, static_library]
  
  # installation
! 
! Package.installTarget(package + libraries, headers + interfaces)
! Package.add(sources, 'source')
! Package.add(libraries, 'binary')
! Package.add(package + headers + interfaces + extra, 'both')
  
  # default target(s)
! 
! Default(shared_library, wrapper)
  
--- 167,192 ----
  	""")
  
! # swig wrappers
  wrapper = env.CopyFile('#/SimData/cSimData.py', 'cSimData.py')
  
  # main libraries
+ shared_library = env.SharedLibrary('#/SimData/_cSimData', 
+                                    sources + top_interfaces, 
+ 				   SHLIBPREFIX = '', 
+ 				   LIBS=env.get('LIBS',[])+env.get('SHLINKLIBS',[]))
  
  static_library = env.StaticLibrary('#/SimData/libSimData', sources)
+ 
  libraries = [shared_library, static_library]
+ package_targets = libraries + [wrapper]
  
  # installation
! package = env['PACKAGE']
! package.installTarget(package_files + libraries, headers + sub_interfaces)
! package.add(sources, 'source')
! package.add(libraries, 'binary')
! package.add(package_files + headers + sub_interfaces + extra_files, 'both')
  
  # default target(s)
! Default(package_targets)
  

Index: cSimData.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/cSimData.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cSimData.i	20 Mar 2003 17:53:44 -0000	1.6
--- cSimData.i	1 Nov 2003 16:08:40 -0000	1.7
***************
*** 3,4 ****
--- 3,5 ----
  %include "SimData/cSimData.i"
  
+ 

[Csp-commits] APPLICATIONS/SimData/Doc Makefile,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Doc
In directory sc8-pr-cvs1:/tmp/cvs-serv2659/Doc

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Doc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	15 Aug 2003 01:17:06 -0000	1.2
--- Makefile	1 Nov 2003 16:08:40 -0000	1.3
***************
*** 1,3 ****
--- 1,6 ----
  DATESTR := $(shell date +'%Y%m%d')
+ 
+ default: all
+ 
  all:
  	doxygen Doxyfile
***************
*** 7,8 ****
--- 10,12 ----
  	tar vczhf simdata-docs-$(DATESTR).tgz simdata-docs-$(DATESTR)
  	rm -f simdata-docs-$(DATESTR)
+ 

[Csp-commits] APPLICATIONS/CSPSim/Include/Systems AircraftFlightSensors.h,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems
In directory sc8-pr-cvs1:/tmp/cvs-serv3641/Include/Systems

Modified Files:
	AircraftFlightSensors.h 
Log Message:


Index: AircraftFlightSensors.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems/AircraftFlightSensors.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AircraftFlightSensors.h	20 Oct 2003 01:27:10 -0000	1.3
--- AircraftFlightSensors.h	24 Oct 2003 15:40:13 -0000	1.4
***************
*** 28,31 ****
--- 28,32 ----
  
  #include <System.h>
+ #include <SimData/Vector3.h>
  
  class AircraftFlightSensors: public System {

[Csp-commits] APPLICATIONS/CSPSim/Data CSPSim.ini,1.15,1.16

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv3641/Data

Modified Files:
	CSPSim.ini 
Log Message:


Index: CSPSim.ini
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CSPSim.ini	20 Oct 2003 00:23:22 -0000	1.15
--- CSPSim.ini	24 Oct 2003 15:40:13 -0000	1.16
***************
*** 14,18 ****
  CachePath = ../Data
  InputMapPath = Input
! DataPath = ../../../../data
  FontPath = Fonts
  ModelPath = Models
--- 14,18 ----
  CachePath = ../Data
  InputMapPath = Input
! DataPath = ../Data
  FontPath = Fonts
  ModelPath = Models
***************
*** 20,24 ****
  SoundPath = Sounds
  TerrainPath = Terrain
! ConfigPath = ../Data/
  
  [View]
--- 20,24 ----
  SoundPath = Sounds
  TerrainPath = Terrain
! ConfigPath = ../Data
  
  [View]

[Csp-commits] APPLICATIONS/CSPSim/Bin CSPSim.py,1.12,1.13

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Bin
In directory sc8-pr-cvs1:/tmp/cvs-serv3641/Bin

Modified Files:
	CSPSim.py 
Log Message:


Index: CSPSim.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Bin/CSPSim.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CSPSim.py	20 Oct 2003 00:23:22 -0000	1.12
--- CSPSim.py	24 Oct 2003 15:40:13 -0000	1.13
***************
*** 61,64 ****
--- 61,65 ----
  	CSP.csplog().setLogClasses(flags)
  
+ 
  def runCSPSim(args):
  	if len(args):
***************
*** 109,113 ****
  	cachepath = CSP.getCachePath()
  	dar = os.path.join(cachepath, "sim.dar")
! 	XML = os.path.join(cachepath, "XML")
  	CSP.csplog().setLogLevels(CSP.CSP_ALL, SimData.LOG_ALERT)
  	#print "compile %s %s" % (XML, dar)
--- 110,114 ----
  	cachepath = CSP.getCachePath()
  	dar = os.path.join(cachepath, "sim.dar")
! 	XML = os.path.join(datapath, "XML")
  	CSP.csplog().setLogLevels(CSP.CSP_ALL, SimData.LOG_ALERT)
  	#print "compile %s %s" % (XML, dar)
***************
*** 226,229 ****
--- 227,231 ----
  	log_classes = []
  	other_args = []
+ 	pause = 0
  	simdata_loglevel = "ALERT"
  
***************
*** 238,241 ****
--- 240,245 ----
  			action = dumpData
  			other_args.append(arg)
+ 		elif arg == '--pause':
+ 			pause = 1
  		elif arg in ("--help", "-h", "-help"):
  			if action == None:
***************
*** 276,279 ****
--- 280,288 ----
  		print "Unable to open primary configuration file (%s)" % config
  		sys.exit(0)
+ 
+ 	if pause:
+ 		print "Hit <ctrl-break> to temporarily exit and set breakpoints."
+ 		print "When you are done, continue execution and hit <enter>."
+ 		sys.stdin.readline()
  
  	action(other_args)

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.89,1.90 Makefile,1.21,1.22

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv4783

Modified Files:
	CHANGES.current Makefile 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** CHANGES.current	24 Oct 2003 06:44:12 -0000	1.89
--- CHANGES.current	24 Oct 2003 15:45:43 -0000	1.90
***************
*** 1,4 ****
--- 1,15 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-10-24: onsight
+   * Moved some inline set() methods out of TypeAdapter.h to avoid
+     including all the data type headers.  Code using SimData that
+     implicitly relies on these data type headers will now need to
+     exclicitly include the required types.
+ 
+   * Added a C++ testing framework under SimData/Tests.  Any file
+     named test_*.cpp is treated as a test, and can be built and
+     run from a toplevel 'make tests'.  Failed tests should exit
+     with a non-zero status code.
+     
  2003-10-23: onsight
    * Separated Singleton class into Singleton.h (was InterfaceRegistry.h).

Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile	19 Oct 2003 23:53:55 -0000	1.21
--- Makefile	24 Oct 2003 15:45:43 -0000	1.22
***************
*** 30,31 ****
--- 30,37 ----
  	@python setup.py check_version
  	@python setup.py make_install --verbose
+ 
+ tests:
+ 	@$(MAKE) --no-print-directory -C SimData/Tests all
+ 
+ tests-clean:
+ 	@$(MAKE) --no-print-directory -C SimData/Tests clean

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.76,1.77 configure.win.py,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv3641

Modified Files:
	CHANGES.current configure.win.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** CHANGES.current	21 Oct 2003 22:45:34 -0000	1.76
--- CHANGES.current	24 Oct 2003 15:40:13 -0000	1.77
***************
*** 1,4 ****
--- 1,14 ----
   Version 0.4.0 (in progress)
  ===========================
+ 2003-10-24: onsight
+   * Added some SimData header includes that were included
+     implicitly before via SimData/TypeAdapter.h.
+ 
+ 2003-10-23: onsight
+   * Changed XML path to come under CachePath in CSPSim.py
+     (submitted by VI).
+ 
+   * Fixed errant data path in CSPSim.ini.
+ 
  2003-10-21: onsight
    * Cleaned up the code that initializes the test sound.  The

Index: configure.win.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.win.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.win.py	22 Mar 2003 08:39:55 -0000	1.1
--- configure.win.py	24 Oct 2003 15:40:13 -0000	1.2
***************
*** 13,17 ****
  
  min_python_version = "2.2.0"
! min_simdata_version = "0.3.1"
  
  if len(sys.argv) == 2:
--- 13,17 ----
  
  min_python_version = "2.2.0"
! min_simdata_version = "0.4.0"
  
  if len(sys.argv) == 2:
***************
*** 28,32 ****
  try:
  	import SimData
! 	if SimData.getVersion() < "0.3.1":
  		print
  		print "SimData version %s or greater is required, but version %s is installed." % (min_simdata_version, SimData.getVersion())
--- 28,32 ----
  try:
  	import SimData
! 	if SimData.getVersion() < min_simdata_version:
  		print
  		print "SimData version %s or greater is required, but version %s is installed." % (min_simdata_version, SimData.getVersion())

[Csp-commits] APPLICATIONS/SimData/SimData/Tests Makefile,1.1,1.2 test_Object.cpp,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv5796

Modified Files:
	Makefile test_Object.cpp 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	24 Oct 2003 15:45:43 -0000	1.1
--- Makefile	25 Oct 2003 00:24:03 -0000	1.2
***************
*** 17,21 ****
  SWDEP = $(SWIG) -M $(SWOPTS)
  DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(TESTS)))
! DEPFILTER =
  DEPS_MAGIC := $(shell mkdir $(DEPDIR) > /dev/null 2>&1 || :)
  
--- 17,21 ----
  SWDEP = $(SWIG) -M $(SWOPTS)
  DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(TESTS)))
! DEPFILTER = | sed 's/\.o:/:/'
  DEPS_MAGIC := $(shell mkdir $(DEPDIR) > /dev/null 2>&1 || :)
  
***************
*** 37,55 ****
  endif
  
  $(DEPDIR)/%.d : %
- 	@echo "Computing dependencies for $<..."
  	@$(MKDEP) $<.cpp $(DEPFILTER) > $@
  	
  %: %.cpp 
  	@echo -n "Building $@..."
  	@for foo in a; do \
! 		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData 2>/dev/null 1>/dev/null; \
! 		if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; fi; \
  	done
  
  run:
  	@for test in $(TESTS); do \
  	   echo -n "Running  $$test..."; \
! 	   ./$$test 2>/dev/null 1>/dev/null; \
  	   if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; fi; \
  	done
--- 37,59 ----
  endif
  
+ FAILURES = 0
+ 
  $(DEPDIR)/%.d : %
  	@$(MKDEP) $<.cpp $(DEPFILTER) > $@
  	
+ #@echo "Computing dependencies for $<..."
+ 
  %: %.cpp 
  	@echo -n "Building $@..."
  	@for foo in a; do \
! 		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData 2>.testlog 1>/dev/null; \
! 		if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; exit 1; fi; \
  	done
+ 	$
  
  run:
  	@for test in $(TESTS); do \
  	   echo -n "Running  $$test..."; \
! 	   ./$$test 2>.testlog 1>/dev/null; \
  	   if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; fi; \
  	done

Index: test_Object.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/test_Object.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_Object.cpp	24 Oct 2003 15:45:43 -0000	1.1
--- test_Object.cpp	25 Oct 2003 00:24:03 -0000	1.2
***************
*** 60,66 ****
  public:
  
! 	SIMDATA_OBJECT(SubObject,0,0)
  	EXTEND_SIMDATA_XML_INTERFACE(SubObject, TestObject)
! 		SIMDATA_XML("link1", SubObject::_link1, true)
  		SIMDATA_XML("link2", SubObject::_link2, true)
  	END_SIMDATA_XML_INTERFACE
--- 60,66 ----
  public:
  
! 	SIMDATA_STATIC_OBJECT(SubObject,0,0)
  	EXTEND_SIMDATA_XML_INTERFACE(SubObject, TestObject)
! 		SIMDATA_XML("link1", SubObject::_link1, false)
  		SIMDATA_XML("link2", SubObject::_link2, true)
  	END_SIMDATA_XML_INTERFACE
***************
*** 78,87 ****
  SIMDATA_REGISTER_INTERFACE(SubObject);
  
  void test() {
  	// TODO 
- 	// 	* get object interfaces from the registry
  	// 	* set and retrieve values
! 	// 	* test introspection
! 	// 	* split Object class declarations into a header
  	::exit(0);
  }
--- 78,126 ----
  SIMDATA_REGISTER_INTERFACE(SubObject);
  
+ void testTestObjectInterface(simdata::InterfaceProxy *i) {
+ 	assert(i != 0);
+ 	assert(i->variableExists("vector"));
+ 	assert(i->variableExists("link"));
+ 	assert(i->variableExists("bool"));
+ 	assert(i->variableRequired("vector"));
+ 	assert(i->variableRequired("link"));
+ 	assert(!i->variableRequired("bool"));
+ 	assert(i->variableType("vector") == "type::Vector3");
+ 	assert(i->variableType("bool") == "builtin::bool");
+ }
+ 
+ void testSubObjectInterface(simdata::InterfaceProxy *i) {
+ 	assert(i != 0);
+ 	assert(i->variableExists("link1"));
+ 	assert(i->variableExists("link2"));
+ 	assert(!i->variableRequired("link1"));
+ 	assert(i->variableRequired("link2"));
+ 	assert(i->isSubclass(TestObject::_getClassName()));
+ 	assert(i->isSubclass(TestObject::_getClassHash()));
+ }
+ 
  void test() {
  	// TODO 
  	// 	* set and retrieve values
! 	// 	* split Object class declarations into a header?
! 	simdata::InterfaceRegistry &reg = simdata::InterfaceRegistry::getInterfaceRegistry();
! 	assert(reg.hasInterface("TestObject"));
! 	assert(reg.hasInterface("SubObject"));
! 	assert(reg.hasInterface(TestObject::_getClassHash()));
! 	assert(reg.hasInterface(SubObject::_getClassHash()));
! 	assert(reg.hasInterface(TestObject::_getClassName()));
! 	assert(reg.hasInterface(SubObject::_getClassName()));
! 	simdata::InterfaceProxy *i;
! 	i = reg.getInterface("TestObject");
! 	assert(i->getClassHash() == TestObject::_getClassHash());
! 	assert(i->getClassName() == TestObject::_getClassName());
! 	assert(!i->isStatic());
! 	testTestObjectInterface(i);
! 	i = reg.getInterface("SubObject");
! 	assert(i->getClassHash() == SubObject::_getClassHash());
! 	assert(i->getClassName() == SubObject::_getClassName());
! 	assert(i->isStatic());
! 	testTestObjectInterface(i);
! 	testSubObjectInterface(i);
  	::exit(0);
  }

[Csp-commits] APPLICATIONS/SimData/Include/SimData Vector3.h,1.17,1.18

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv5869/Include/SimData

Modified Files:
	Vector3.h 
Log Message:


Index: Vector3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Vector3.h	19 Oct 2003 23:53:56 -0000	1.17
--- Vector3.h	25 Oct 2003 00:25:00 -0000	1.18
***************
*** 319,323 ****
  
  	/// Type representation.
! 	virtual std::string typeString() const { return "Vector3"; }
  
  	/// Serialize to or from a data archive.
--- 319,323 ----
  
  	/// Type representation.
! 	virtual std::string typeString() const { return "type::Vector3"; }
  
  	/// Serialize to or from a data archive.

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.90,1.91

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv5869

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** CHANGES.current	24 Oct 2003 15:45:43 -0000	1.90
--- CHANGES.current	25 Oct 2003 00:25:00 -0000	1.91
***************
*** 11,14 ****
--- 11,17 ----
      run from a toplevel 'make tests'.  Failed tests should exit
      with a non-zero status code.
+ 
+   * Expanded test_Objects.cpp test to check the interface
+     registry and object introspection.
      
  2003-10-23: onsight

[Csp-commits] APPLICATIONS/CSPSim/Include Animation.h,1.2,1.3 BaseDynamics.h,1.4,1.5 LandingGear.h,1.11,1.12

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv3641/Include

Modified Files:
	Animation.h BaseDynamics.h LandingGear.h 
Log Message:


Index: Animation.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Animation.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Animation.h	20 Oct 2003 00:23:22 -0000	1.2
--- Animation.h	24 Oct 2003 15:40:13 -0000	1.3
***************
*** 34,37 ****
--- 34,38 ----
  #include <SimData/Vector3.h>
  #include <SimData/Matrix3.h>
+ #include <SimData/Key.h>
  #include <SimData/InterfaceRegistry.h>
  #include <SimData/osg.h>

Index: BaseDynamics.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/BaseDynamics.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BaseDynamics.h	20 Oct 2003 00:23:22 -0000	1.4
--- BaseDynamics.h	24 Oct 2003 15:40:13 -0000	1.5
***************
*** 25,28 ****
--- 25,29 ----
  #define __BASEDYNAMICS_H__
  
+ #include <SimData/Quat.h>
  #include <SimData/Vector3.h>
  

Index: LandingGear.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/LandingGear.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LandingGear.h	20 Oct 2003 00:23:22 -0000	1.11
--- LandingGear.h	24 Oct 2003 15:40:13 -0000	1.12
***************
*** 33,36 ****
--- 33,37 ----
  #include <SimData/Vector3.h>
  #include <SimData/Quat.h>
+ #include <SimData/Real.h>
  #include <SimData/Link.h>
  

[Csp-commits] APPLICATIONS/SimData/Source TypeAdapter.cpp,1.6,1.7

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv4783/Source

Modified Files:
	TypeAdapter.cpp 
Log Message:


Index: TypeAdapter.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/TypeAdapter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TypeAdapter.cpp	6 Aug 2003 06:36:25 -0000	1.6
--- TypeAdapter.cpp	24 Oct 2003 15:45:43 -0000	1.7
***************
*** 34,40 ****
  const char *TypeAdapter::TypeNames[] = {"NONE", "Integer", "Double", "String", "Base"};
  
  
! /**
!  * Convenience function for dumping object member variables.
   */
  std::ostream &operator <<(std::ostream &o, TypeAdapter const &t) {
--- 34,77 ----
  const char *TypeAdapter::TypeNames[] = {"NONE", "Integer", "Double", "String", "Base"};
  
+ void TypeAdapter::set(SimDate & x) const { setBase(x); }
  
! void TypeAdapter::set(GeoPos & x) const { setBase(x); }
! 
! void TypeAdapter::set(LLA & x) const { setCoordinate(x); }
! void TypeAdapter::set(UTM & x) const { setCoordinate(x); }
! void TypeAdapter::set(ECEF & x) const { setCoordinate(x); }
! 
! void TypeAdapter::set(Vector3 & x) const { setBase(x); }
! void TypeAdapter::set(Matrix3 & x) const { setBase(x); }
! void TypeAdapter::set(Real & x) const { setBase(x); }
! void TypeAdapter::set(Curve & x) const { setBase(x); }
! void TypeAdapter::set(Table & x) const { setBase(x); }
! #ifndef __PTS_SIM__
! void TypeAdapter::set(Table1 & x) const { setBase(x); }
! void TypeAdapter::set(Table2 & x) const { setBase(x); }
! void TypeAdapter::set(Table3 & x) const { setBase(x); }
! #endif // __PTS_SIM__
! void TypeAdapter::set(External & x) const { setBase(x); }
! void TypeAdapter::set(Key & x) const { setBase(x); }
! void TypeAdapter::set(Path & x) const { setBase(x); }
! 
! void TypeAdapter::set(EnumLink &x) const { if (isType(STRING)) x = s; else setBase(x); }
! 
! // slightly fancier handling required for path pointers
! void TypeAdapter::set(LinkBase &x) const {
! 	BaseCheck();
! 	// are we assigning to a pointerbase?
! 	LinkBase const *p = dynamic_cast<LinkBase const *>(var.o);
! 	if (p != 0) {
! 		x = *(const_cast<LinkBase *>(p));
! 	} else {
! 		// last chance, is it a path?
! 		Path const *path = dynamic_cast<Path const *>(var.o);
! 		TypeCheck(path!=NULL, "dynamic cast of BaseType* to LinkBase failed");
! 		x = LinkBase(*(const_cast<Path *>(path)), 0);
! 	}
! }
! 
! /** Convenience function for dumping object member variables.
   */
  std::ostream &operator <<(std::ostream &o, TypeAdapter const &t) {

[Csp-commits] APPLICATIONS/SimData/Include/SimData TypeAdapter.h,1.23,1.24

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv4783/Include/SimData

Modified Files:
	TypeAdapter.h 
Log Message:


Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TypeAdapter.h	19 Oct 2003 23:53:56 -0000	1.23
--- TypeAdapter.h	24 Oct 2003 15:45:43 -0000	1.24
***************
*** 38,42 ****
  #include <SimData/Path.h>
  
! #include <SimData/Types.h>
  #include <SimData/PTS.h>
  
--- 38,43 ----
  #include <SimData/Path.h>
  
! //#include <SimData/Types.h>
! #include <SimData/Link.h>
  #include <SimData/PTS.h>
  
***************
*** 76,91 ****
  
  	
! /**
!  * @brief Dynamically typed wrapper for basic types and objects.
   * 
!  * For internal use only.  This class is used to pass typed data as
!  * parameters to virtual member functions (which are not compatible
!  * with templates).  It works for a number of basic types, and for
!  * objects derived from the Object base class. 
   *
!  * @author Mark Rose <mr...@st...>
!  * @internal
   */
-  
  class SIMDATA_EXPORT TypeAdapter 
  {
--- 77,90 ----
  
  	
! /** Dynamically typed wrapper for basic types and objects.
   * 
!  *  For internal use only.  This class is used to pass typed data as
!  *  parameters to virtual member functions (which are not compatible
!  *  with templates).  It works for a number of basic types, and for
!  *  objects derived from the Object base class. 
   *
!  *  @author Mark Rose <mr...@st...>
!  *  @internal
   */
  class SIMDATA_EXPORT TypeAdapter 
  {
***************
*** 170,199 ****
  	*/
  
! 	inline void set(SimDate & x) const { setBase(x); }
  
! 	inline void set(GeoPos & x) const { setBase(x); }
  
! 	inline void set(LLA & x) const { setCoordinate(x); }
! 	inline void set(UTM & x) const { setCoordinate(x); }
! 	inline void set(ECEF & x) const { setCoordinate(x); }
  
! 	inline void set(Vector3 & x) const { setBase(x); }
! 	inline void set(Matrix3 & x) const { setBase(x); }
! 	inline void set(Real & x) const { setBase(x); }
! 	inline void set(Curve & x) const { setBase(x); }
! 	inline void set(Table & x) const { setBase(x); }
  #ifndef __PTS_SIM__
! 	inline void set(Table1 & x) const { setBase(x); }
! 	inline void set(Table2 & x) const { setBase(x); }
! 	inline void set(Table3 & x) const { setBase(x); }
  #endif // __PTS_SIM__
! 	inline void set(External & x) const { setBase(x); }
! 	inline void set(Key & x) const { setBase(x); }
! 	inline void set(Path & x) const { setBase(x); }
! 	// list
  
  	void set(short &x) const { IntCheck(); x = static_cast<short>(var.i); }
  	void set(char &x) const { IntCheck(); x = static_cast<char>(var.i); }
- 
  	void set(int &x) const { IntCheck(); x = static_cast<int>(var.i); }
  	void set(bool &x) const { IntCheck(); x = (var.i != 0); }
--- 169,199 ----
  	*/
  
! 	void set(SimDate & x) const;
  
! 	void set(GeoPos & x) const;
  
! 	void set(LLA & x) const;
! 	void set(UTM & x) const;
! 	void set(ECEF & x) const;
  
! 	void set(Vector3 & x) const;
! 	void set(Matrix3 & x) const;
! 	void set(Real & x) const;
! 	void set(Curve & x) const;
! 	void set(Table & x) const;
  #ifndef __PTS_SIM__
! 	void set(Table1 & x) const;
! 	void set(Table2 & x) const;
! 	void set(Table3 & x) const;
  #endif // __PTS_SIM__
! 	void set(External & x) const;
! 	void set(Key & x) const;
! 	void set(Path & x) const;
! 
! 	void set(EnumLink &x) const;
! 	void set(LinkBase &x) const;
  
  	void set(short &x) const { IntCheck(); x = static_cast<short>(var.i); }
  	void set(char &x) const { IntCheck(); x = static_cast<char>(var.i); }
  	void set(int &x) const { IntCheck(); x = static_cast<int>(var.i); }
  	void set(bool &x) const { IntCheck(); x = (var.i != 0); }
***************
*** 202,220 ****
  	void set(unsigned int &x) const { IntCheck(); x = static_cast<unsigned int>(var.i); }
  	void set(std::string &x) const { StringCheck(); x = s; }
! 	void set(EnumLink &x) const { if (isType(STRING)) x = s; else setBase(x); }
! 	// slightly fancier handling required for path pointers
! 	void set(LinkBase &x) const {
! 		BaseCheck();
! 		// are we assigning to a pointerbase?
! 		LinkBase const *p = dynamic_cast<LinkBase const *>(var.o);
! 		if (p != 0) {
! 			x = *(const_cast<LinkBase *>(p));
! 		} else {
! 			// last chance, is it a path?
! 			Path const *path = dynamic_cast<Path const *>(var.o);
! 			TypeCheck(path!=NULL, "dynamic cast of BaseType* to LinkBase failed");
! 			x = LinkBase(*(const_cast<Path *>(path)), 0);
! 		}
! 	}
  	template <typename Q>
  	void set(Link<Q> &x) const {
--- 202,206 ----
  	void set(unsigned int &x) const { IntCheck(); x = static_cast<unsigned int>(var.i); }
  	void set(std::string &x) const { StringCheck(); x = s; }
! 
  	template <typename Q>
  	void set(Link<Q> &x) const {

[Csp-commits] APPLICATIONS/SimData/SimData/Tests Makefile,NONE,1.1 test_Object.cpp,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv4783/SimData/Tests

Added Files:
	Makefile test_Object.cpp 
Log Message:


--- NEW FILE: Makefile ---
TOPDIR = ../..
INCLUDE = -I$(TOPDIR)/Include -I$(PYTHON_INCLUDE)

CFLAGS = $(GCFLAGS) $(INCLUDE) $(GDEBUGF)
SWCXXF = $(GCFLAGS) $(INCLUDE)
LDOPTS = $(GLDOPTS)
SWOPTS = $(GSWOPTS) $(INCLUDE)

TESTS_SOURCE = $(wildcard test_*.cpp)
TESTS = $(TESTS_SOURCE:%.cpp=%)

SOURCES = $(MODULES:%=%.cpp)
OBJECTS = $(MODULES:%=%.o) 

DEPDIR = .deps
MKDEP = $(CXX) -M $(CFLAGS)
SWDEP = $(SWIG) -M $(SWOPTS)
DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(TESTS)))
DEPFILTER =
DEPS_MAGIC := $(shell mkdir $(DEPDIR) > /dev/null 2>&1 || :)

.PHONY: clean-deps clean all default

default:
	@echo "run make from top-level directory only"
	
clean: clean-deps
	rm -f $(TESTS)

clean-deps:
	rm -f $(DEPDIR)/*.d

ifeq ($(findstring clean,$(MAKECMDGOALS)),)
ifneq ($(strip $(DEPFILES)),)
-include $(DEPFILES)
endif
endif

$(DEPDIR)/%.d : %
	@echo "Computing dependencies for $<..."
	@$(MKDEP) $<.cpp $(DEPFILTER) > $@
	
%: %.cpp 
	@echo -n "Building $@..."
	@for foo in a; do \
		$(CXX) -o $@ $(CFLAGS) $(@:=.cpp) -L$(TOPDIR)/SimData -lSimData 2>/dev/null 1>/dev/null; \
		if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; fi; \
	done

run:
	@for test in $(TESTS); do \
	   echo -n "Running  $$test..."; \
	   ./$$test 2>/dev/null 1>/dev/null; \
	   if [ $$? = "0" ]; then echo "ok"; else echo "failed!"; fi; \
	done

all: $(TESTS) run


--- NEW FILE: test_Object.cpp ---
/* SimData: Data Infrastructure for Simulations
 * Copyright (C) 2003 Mark Rose <tm...@st...>
 * 
 * This file is part of SimData.
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 * 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */


/**
 * @file test_Object.h
 * @brief Test basic Object and ObjectInterface functionality.
 */


#include <SimData/Object.h>
#include <SimData/Vector3.h>
#include <SimData/Link.h>
#include <SimData/InterfaceRegistry.h>

#include <cstdlib>


class TestObject: public simdata::Object
{
public:

	SIMDATA_OBJECT(TestObject,0,0)
	BEGIN_SIMDATA_XML_INTERFACE(TestObject)
		SIMDATA_XML("vector", TestObject::_vector, true)
		SIMDATA_XML("link", TestObject::_link, true)
		SIMDATA_XML("bool", TestObject::_bool, false)
	END_SIMDATA_XML_INTERFACE

	TestObject() {}
	virtual ~TestObject() {}

private:

	simdata::Vector3 _vector;
	simdata::Link<TestObject> _link;
	bool _bool;
};


class SubObject: public TestObject
{
public:

	SIMDATA_OBJECT(SubObject,0,0)
	EXTEND_SIMDATA_XML_INTERFACE(SubObject, TestObject)
		SIMDATA_XML("link1", SubObject::_link1, true)
		SIMDATA_XML("link2", SubObject::_link2, true)
	END_SIMDATA_XML_INTERFACE

	SubObject() {}
	virtual ~SubObject() {}

private:

	simdata::Link<SubObject> _link1;
	simdata::Link<TestObject> _link2;
};

SIMDATA_REGISTER_INTERFACE(TestObject);
SIMDATA_REGISTER_INTERFACE(SubObject);

void test() {
	// TODO 
	// 	* get object interfaces from the registry
	// 	* set and retrieve values
	// 	* test introspection
	// 	* split Object class declarations into a header
	::exit(0);
}

int main() { 
	test();
	return 0; 
};

[Csp-commits] APPLICATIONS/CSPSim/Include/Theater FeatureQuad.h,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater
In directory sc8-pr-cvs1:/tmp/cvs-serv3641/Include/Theater

Modified Files:
	FeatureQuad.h 
Log Message:


Index: FeatureQuad.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureQuad.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FeatureQuad.h	20 Oct 2003 00:23:23 -0000	1.2
--- FeatureQuad.h	24 Oct 2003 15:40:14 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  #include <SimData/Object.h>
  #include <SimData/Vector3.h>
+ #include <SimData/External.h>
  #include <SimData/InterfaceRegistry.h>
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.88,1.89 setup.py,1.31,1.32

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7755

Modified Files:
	CHANGES.current setup.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** CHANGES.current	22 Oct 2003 01:20:58 -0000	1.88
--- CHANGES.current	24 Oct 2003 06:44:12 -0000	1.89
***************
*** 1,4 ****
--- 1,12 ----
  Version 0.4.0 (in progress)
  ===========================
+ 2003-10-23: onsight
+   * Separated Singleton class into Singleton.h (was InterfaceRegistry.h).
+ 
+   * Added Trace.h for generating callstack back traces on error.
+ 
+ 2003-10-22: onsight
+   * Fixed a few of the (many) warnings generated by msvc 7.1 /W4.
+ 
  2003-10-21: onsight
    * Fixed InterfaceRegistry ctor to properly initialize the registry

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** setup.py	19 Oct 2003 23:53:55 -0000	1.31
--- setup.py	24 Oct 2003 06:44:13 -0000	1.32
***************
*** 224,301 ****
  
  sources = [
!     "BaseType",
!     "DataArchive",
!     "DataManager",
!     "Date",
!     "Enum",
!     "Exception",
!     "External",
!     "FileUtility",
!     "GeoPos",
!     "HashUtility",
!     "InterfaceRegistry",
!     "Interpolate",
!     "Key",
  	"Link",
!     "List",
!     "LogStream",
  	"LUT",
!     "Math",
!     "Matrix3",
!     "Object",
!     "Noise",
!     "Path",
!     "Quat",
!     "Random",
!     "Real",
!     "TypeAdapter",
!     "Vector3",
!     "Version",
  ]
  
  headers = [
!     "Archive.h",
!     "BaseType.h",
  	"Composite.h",
!     "Conversions.h",
!     "DataArchive.h",
!     "DataManager.h",
!     "Date.h",
!     "Enum.h",
!     "Exception.h",
!     "Export.h",
!     "External.h",
!     "FileUtility.h",
!     "GeoPos.h",
!     "hash_map.h",
!     "HashUtility.h",
!     "Integer.h",
!     "InterfaceRegistry.h",
!     "Interpolate.h",
  	"Key.h",
!     "Link.h",
!     "List.h",
!     "LUT.h",
!     "Log.h",
!     "LogStream.h",
!     "Math.h",
!     "Matrix3.h",
!     "Noise.h",
!     "Namespace.h",
!     "Object.h",
!     "ObjectInterface.h",
  	"osg.h",
!     "Path.h",
  	"PTS.h",
!     "Quat.h",
!     "Random.h",
!     "Real.h",
  	"Ref.h",
!     "String.h",
!     "TypeAdapter.h",
!     "Types.h",
!     "Uniform.h",
!     "Vector3.h",
!     "Version.h",
  ]
  
--- 224,303 ----
  
  sources = [
! 	"BaseType",
! 	"DataArchive",
! 	"DataManager",
! 	"Date",
! 	"Enum",
! 	"Exception",
! 	"External",
! 	"FileUtility",
! 	"GeoPos",
! 	"HashUtility",
! 	"InterfaceRegistry",
! 	"Interpolate",
! 	"Key",
  	"Link",
! 	"List",
! 	"LogStream",
  	"LUT",
! 	"Math",
! 	"Matrix3",
! 	"Object",
! 	"Noise",
! 	"Path",
! 	"Quat",
! 	"Random",
! 	"Real",
! 	"TypeAdapter",
! 	"Vector3",
! 	"Version",
  ]
  
  headers = [
! 	"Archive.h",
! 	"BaseType.h",
  	"Composite.h",
! 	"Conversions.h",
! 	"DataArchive.h",
! 	"DataManager.h",
! 	"Date.h",
! 	"Enum.h",
! 	"Exception.h",
! 	"Export.h",
! 	"External.h",
! 	"FileUtility.h",
! 	"GeoPos.h",
! 	"hash_map.h",
! 	"HashUtility.h",
! 	"Integer.h",
! 	"InterfaceRegistry.h",
! 	"Interpolate.h",
  	"Key.h",
! 	"Link.h",
! 	"List.h",
! 	"LUT.h",
! 	"Log.h",
! 	"LogStream.h",
! 	"Math.h",
! 	"Matrix3.h",
! 	"Noise.h",
! 	"Namespace.h",
! 	"Object.h",
! 	"ObjectInterface.h",
  	"osg.h",
! 	"Path.h",
  	"PTS.h",
! 	"Quat.h",
! 	"Random.h",
! 	"Real.h",
  	"Ref.h",
! 	"Singleton.h",
! 	"String.h",
! 	"Trace.h",
! 	"TypeAdapter.h",
! 	"Types.h",
! 	"Uniform.h",
! 	"Vector3.h",
! 	"Version.h",
  ]
  

[Csp-commits] APPLICATIONS/SimData/Source InterfaceRegistry.cpp,1.13,1.14

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7755/Source

Modified Files:
	InterfaceRegistry.cpp 
Log Message:


Index: InterfaceRegistry.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/InterfaceRegistry.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** InterfaceRegistry.cpp	22 Oct 2003 01:19:47 -0000	1.13
--- InterfaceRegistry.cpp	24 Oct 2003 06:44:13 -0000	1.14
***************
*** 135,141 ****
  void InterfaceRegistry::__cleanup() {
  	SIMDATA_LOG(LOG_REGISTRY, LOG_DEBUG, "Destroying the interface registry.");
! 	if (__map) delete __map;
! 	if (__id_map) delete __id_map;
! 	if (__list) delete __list;
  }
  
--- 135,141 ----
  void InterfaceRegistry::__cleanup() {
  	SIMDATA_LOG(LOG_REGISTRY, LOG_DEBUG, "Destroying the interface registry.");
! 	if (__map) delete __map; __map = 0;
! 	if (__id_map) delete __id_map; __id_map = 0;
! 	if (__list) delete __list; __list = 0;
  }
  

[Csp-commits] APPLICATIONS/SimData/Include/SimData Singleton.h,NONE,1.1 Trace.h,NONE,1.1 Date.h,1.17,1.18 Enum.h,1.17,1.18 HashUtility.h,1.19,1.20 InterfaceRegistry.h,1.23,1.24 LogStream.h,1.11,1.12 ObjectInterface.h,1.27,1.28 hash_map.h,1.10,1.11

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7755/Include/SimData

Modified Files:
	Date.h Enum.h HashUtility.h InterfaceRegistry.h LogStream.h 
	ObjectInterface.h hash_map.h 
Added Files:
	Singleton.h Trace.h 
Log Message:


--- NEW FILE: Singleton.h ---
/* SimData: Data Infrastructure for Simulations
 * Copyright (C) 2003 Mark Rose <tm...@st...>
 * 
 * This file is part of SimData.
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 * 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */


/**
 * @file Singleton.h
 * @brief Pattern for creating single global instances.
 */


#ifndef __SIMDATA_SINGLETON_H__
#define __SIMDATA_SINGLETON_H__

#include <SimData/Namespace.h>

NAMESPACE_SIMDATA

/** Creates a single, static instance of the templated class.
 */
template <class C>
class Singleton {
public:
	/** Get the one instance of the template class.
	 */
	static C& getInstance() {
		static C __instance;
		return __instance;
	}
private:
	Singleton() {}
	~Singleton() {}
};

NAMESPACE_SIMDATA_END

#endif // __SIMDATA_SINGLETON_H__


--- NEW FILE: Trace.h ---
/* SimData: Data Infrastructure for Simulations
 * Copyright (C) 2003 Mark Rose <tm...@st...>
 * 
 * This file is part of SimData.
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 * 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */


/**
 * @file Trace.h
 * @brief Automatic callstack traces reporting on error.
 */


#ifndef __SIMDATA_TRACE_H__
#define __SIMDATA_TRACE_H__

#include <SimData/Namespace.h>
#include <SimData/Log.h>
#include <SimData/Singleton.h>

#ifdef __GNUC__
# include <csignal>
# include <execinfo.h>
# include <exception> 
# include <cstdlib>
#endif // __GNUC__


NAMESPACE_SIMDATA

class TraceBase {
	typedef void (*Callback)();
	logstream *_log;
	bool _traced;
	Callback _precallback, _postcallback;
protected:
	TraceBase(): _precallback(0), _postcallback(0), _log(0), _traced(false) { }
	void setCallbacks_impl(Callback precallback, Callback postcallback) {
		_precallback = precallback;
		_postcallback = postcallback;
	}
	void setLog_impl(logstream &log) {
		_log = &log;
	}
	std::ostream &log() {
		if (_log) {
			return (*_log) << loglevel(LOG_ALL, LOG_ERROR);
		} else {
			return simdata::log() << loglevel(LOG_ALL, LOG_ERROR);
		}
	}
	void _preCallback() {
		if (_precallback != 0) _precallback();
	}
	void _postCallback() {
		if (_postcallback != 0) _postcallback();
	}
	void error(int skip, bool segv=false) {
		if (_traced) return;
		_traced = true;
		if (segv) {
			log() << "FATAL ERROR: segmentation fault." << std::endl;
		}
		_preCallback();
		_backtrace(skip, segv);
		_postCallback();
	}
	virtual void _backtrace(int skip, bool segv) {}
};



/** Singleton callstack trace error handler.
 *
 */
class Trace: public TraceBase {

#ifdef __GNUC__
	virtual void _backtrace(int skip, bool segv=false) {
		void *trace[64];
		char **messages = (char **)NULL;
		int i, trace_size = 0;

		trace_size = backtrace(trace, 64);
		log() << "backtrace:" << std::endl;
		if (0 && segv) { // XXX needed?
			backtrace_symbols_fd(trace, trace_size, fileno(stderr));
			return;
		}
		messages = backtrace_symbols(trace, trace_size);
		if (messages) {
			for (i=skip; i<trace_size; ++i) {
				log() << "  " << messages[i] << std::endl;
			}
			free(messages);
		} else {
			log() << "  unavailable!" << std::endl;
		}
	}

	static void __sigsegv(int sign) {
		getTrace().error(3, true);
		abort();
	}

	static void __sigabort(int sign) {
		getTrace().error(3);
	}
#endif // __GNUC__

	friend class Singleton<Trace>;
	static Trace &getTrace() {
		return Singleton<Trace>::getInstance();
	}

	Trace(): TraceBase() {}
	~Trace() {}

public:


	/** Install a new backtrace error handler.
	 *
	 *  @returns true if succesful.
	 */
	static bool install() {
#ifdef __GNUC__
		signal(SIGABRT, __sigabort);
		signal(SIGSEGV, __sigsegv);
		return true;
#else // __GNUC__
		return false;
#endif
	}

	/** Set custom callbacks before and after the stacktrace.
	 */
	static void setCallbacks(void (*precallback)(), void (postcallback)()) {
		getTrace().setCallbacks_impl(precallback, postcallback);
	}

	/** Set the active log (defaults to the simdata log).
	 */
	static void setLog(logstream &log) {
		getTrace().setLog_impl(log);
	}

};


NAMESPACE_SIMDATA_END


#endif // __TRACE_H__


Index: Date.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Date.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Date.h	19 Oct 2003 23:53:56 -0000	1.17
--- Date.h	24 Oct 2003 06:44:13 -0000	1.18
***************
*** 221,225 ****
  	 */
  	weekday_t getWeekday() const {
! 		return ((m_julian) % 7) + 1;
  	}
  
--- 221,225 ----
  	 */
  	weekday_t getWeekday() const {
! 		return static_cast<weekday_t>((m_julian % 7) + 1);
  	}
  

Index: Enum.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Enum.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Enum.h	19 Oct 2003 23:53:56 -0000	1.17
--- Enum.h	24 Oct 2003 06:44:13 -0000	1.18
***************
*** 146,150 ****
  		int value = 0;
  		for (int idx = 0; ss >> token; idx++) {
! 			std::size_t eq = token.find("=");
  			if (eq != std::string::npos) {
  				value = atoi(std::string(token, eq+1, std::string::npos).c_str());
--- 146,150 ----
  		int value = 0;
  		for (int idx = 0; ss >> token; idx++) {
! 			std::string::size_type eq = token.find("=");
  			if (eq != std::string::npos) {
  				value = atoi(std::string(token, eq+1, std::string::npos).c_str());

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** HashUtility.h	19 Oct 2003 23:53:56 -0000	1.19
--- HashUtility.h	24 Oct 2003 06:44:13 -0000	1.20
***************
*** 170,176 ****
   */
  #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
! 	struct eqint: public std::hash_compare<int const> {
  		size_t operator ()(int const& i) const {
! 			return i;
  		}
  		bool operator()(int const& i1, int const& i2) const {
--- 170,176 ----
   */
  #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
! 	struct eqint: public HASH<int const> {
  		size_t operator ()(int const& i) const {
! 			return static_cast<size_t>(i);
  		}
  		bool operator()(int const& i1, int const& i2) const {
***************
*** 189,194 ****
   */
  struct hashint {
! 	int operator()(int i) const {
! 		return i;
  	}
  };
--- 189,194 ----
   */
  struct hashint {
! 	size_t operator()(int i) const {
! 		return static_cast<size_t>(i);
  	}
  };
***************
*** 198,210 ****
   */
  #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
! 	struct eqstr: public std::hash_compare<char const*>
! 		{
! 			size_t operator()(char const* s ) const {
! 				return newhash4_cstring(s);
! 			}
! 			bool operator()(char const* s1, char const* s2) const {
! 				return (strcmp(s1, s2) < 0);
! 			}
! 		};
  #else
  	struct eqstr {
--- 198,210 ----
   */
  #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
! 	struct eqstr: public HASH<char const*>
! 	{
! 		size_t operator()(char const* s) const {
! 			return static_cast<size_t>(newhash4_cstring(s));
! 		}
! 		bool operator()(char const* s1, char const* s2) const {
! 			return (strcmp(s1, s2) < 0);
! 		}
! 	};
  #else
  	struct eqstr {
***************
*** 212,216 ****
  			return (strcmp(s1, s2) == 0);
  		}
- 	
  	};
  #endif
--- 212,215 ----
***************
*** 219,224 ****
   */
  struct hasht_hash {
! 	uint32 operator()(hasht i1) const {
! 		return i1.a;
  	}
  };
--- 218,223 ----
   */
  struct hasht_hash {
! 	size_t operator()(hasht i1) const {
! 		return static_cast<size_t>(i1.a);
  	}
  };
***************
*** 226,234 ****
  /** hasht equality functor for hash_map.
   */
! #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
! 	struct hasht_eq: public std::hash_compare<hasht const> {
! 		size_t operator()( hasht const& i1 ) const {
! 		return i1.a;
! 			}
  		bool operator()(hasht const& i1, hasht const& i2) const {
  			return (i1.a < i2.a || (i1.a == i2.a && i1.b < i2.b));
--- 225,233 ----
  /** hasht equality functor for hash_map.
   */
! #if defined(_MSC_VER) && (_MSC_VER >= 1300)
! 	struct hasht_eq: public HASH<hasht const> {
! 		size_t operator()(hasht const& i1) const {
! 			return static_cast<size_t>(i1.a);
! 		}
  		bool operator()(hasht const& i1, hasht const& i2) const {
  			return (i1.a < i2.a || (i1.a == i2.a && i1.b < i2.b));
***************
*** 248,253 ****
  struct SIMDATA_EXPORT hashstring {
  	static HASH<const char*> h;
! 	int operator()(const std::string &s) const {
! 		return h(s.c_str());
  	}
  };
--- 247,252 ----
  struct SIMDATA_EXPORT hashstring {
  	static HASH<const char*> h;
! 	size_t operator()(const std::string &s) const {
! 		return static_cast<size_t>(h(s.c_str()));
  	}
  };
***************
*** 255,261 ****
  /** String equality functor for hash_map.
   */
! #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
! 	struct eqstring: public std::hash_compare<std::string const> {
! 		size_t operator()( std::string const& a ) const {
  			return eqstr()(a.c_str());
  		}
--- 254,260 ----
  /** String equality functor for hash_map.
   */
! #if defined(_MSC_VER) && (_MSC_VER >= 1300)
! 	struct eqstring: public HASH<std::string const> {
! 		size_t operator()(std::string const& a) const {
  			return eqstr()(a.c_str());
  		}

Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** InterfaceRegistry.h	19 Oct 2003 23:53:56 -0000	1.23
--- InterfaceRegistry.h	24 Oct 2003 06:44:13 -0000	1.24
***************
*** 37,40 ****
--- 37,41 ----
  #include <SimData/TypeAdapter.h>
  #include <SimData/ObjectInterface.h>
+ #include <SimData/Singleton.h>
  #include <SimData/Namespace.h>
  #include <SimData/Exception.h>
***************
*** 336,354 ****
  
  
- /** Creates a single, static instance of the templated class.
-  */
- template <class C>
- class Singleton {
- public:
- 	/** Get the one instance of the template class.
- 	 */
- 	static C& getInstance() {
- 		static C __instance;
- 		return __instance;
- 	}
- private:
- 	Singleton() {}
- 	~Singleton() {}
- };
  
  /** Singleton class to store and access all ObjectInterfaces in the application.
--- 337,340 ----

Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LogStream.h	22 Oct 2003 01:19:46 -0000	1.11
--- LogStream.h	24 Oct 2003 06:44:13 -0000	1.12
***************
*** 138,142 ****
  
  	/** overflow */
! 	int overflow( int ch );
  
  private:
--- 138,142 ----
  
  	/** overflow */
! 	int overflow(int ch);
  
  private:
***************
*** 171,177 ****
  //inline logbuf::int_type
  inline int
! logbuf::overflow( int c )
  {
! 	return logging_enabled ? sbuf->sputc(c) : (EOF == 0 ? 1: 0);
  }
  
--- 171,177 ----
  //inline logbuf::int_type
  inline int
! logbuf::overflow(int c)
  {
! 	return logging_enabled ? sbuf->sputc(static_cast<char>(c)) : (EOF == 0 ? 1: 0);
  }
  

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ObjectInterface.h	19 Oct 2003 23:53:56 -0000	1.27
--- ObjectInterface.h	24 Oct 2003 06:44:13 -0000	1.28
***************
*** 94,107 ****
  protected:
  	void setType(BaseType &x) { type = x.typeString(); }
! 	void setType(double &x) { type = "builtin::double"; }
! 	void setType(float &x) { type = "builtin::float"; }
! 	void setType(unsigned int &x) { type = "builtin::uint"; }
! 	void setType(int &x) { type = "builtin::int"; }
! 	void setType(unsigned char &x) { type = "builtin::uint8"; }
! 	void setType(char &x) { type = "builtin::int8"; }
! 	void setType(unsigned short &x) { type = "builtin::uint16"; }
! 	void setType(short &x) { type = "builtin::int16"; }
! 	void setType(bool &x) { type = "builtin::bool"; }
! 	void setType(std::string const &x) { type = "builtin::string"; }
  	MemberAccessorBase(): type("none") {}
  	std::string name;
--- 94,107 ----
  protected:
  	void setType(BaseType &x) { type = x.typeString(); }
! 	void setType(double &) { type = "builtin::double"; }
! 	void setType(float &) { type = "builtin::float"; }
! 	void setType(unsigned int &) { type = "builtin::uint"; }
! 	void setType(int &) { type = "builtin::int"; }
! 	void setType(unsigned char &) { type = "builtin::uint8"; }
! 	void setType(char &) { type = "builtin::int8"; }
! 	void setType(unsigned short &) { type = "builtin::uint16"; }
! 	void setType(short &) { type = "builtin::int16"; }
! 	void setType(bool &) { type = "builtin::bool"; }
! 	void setType(std::string const &) { type = "builtin::string"; }
  	MemberAccessorBase(): type("none") {}
  	std::string name;

Index: hash_map.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/hash_map.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hash_map.h	19 Oct 2003 23:53:56 -0000	1.10
--- hash_map.h	24 Oct 2003 06:44:13 -0000	1.11
***************
*** 28,32 ****
  #define __SIMDATA_HASH_MAP_H__
  
! #if defined(__GNUC__) || defined(__INTEL_COMPILER)
    #if __GNUC__ >= 3
      #include <ext/hash_map>
--- 28,32 ----
  #define __SIMDATA_HASH_MAP_H__
  
! #if defined(__GNUC__) //|| defined(__INTEL_COMPILER)
    #if __GNUC__ >= 3
      #include <ext/hash_map>
***************
*** 45,49 ****
  #else
    #ifdef _MSC_VER 
!    #if (_MSC_VER <= 1200) && defined(_STLP_WIN32)
      #include <hash_map>
      #define HASH_MAP std::hash_map
--- 45,53 ----
  #else
    #ifdef _MSC_VER 
!    #if defined(_STLPORT)
!     #include <hash_map>
!     #define HASH_MAP std::hash_map
!     #define HASH std::hash
!    #elif ((_MSC_VER <= 1200) && defined(_STLP_WIN32))
      #include <hash_map>
      #define HASH_MAP std::hash_map

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.cpp,1.37,1.38

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv21918

Modified Files:
	CSPSim.cpp 
Log Message:


Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** CSPSim.cpp	20 Oct 2003 00:23:23 -0000	1.37
--- CSPSim.cpp	21 Oct 2003 21:13:01 -0000	1.38
***************
*** 664,668 ****
  
  	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) != 0) {
! 		printf("Unable to initialize SDL: %s\n", SDL_GetError());
  		CSP_LOG(APP, ERROR, "ERROR! Unable to initialize SDL: " << SDL_GetError());
  		return 1;
--- 664,668 ----
  
  	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) != 0) {
! 		std::cerr << "Unable to initialize SDL: " << SDL_GetError() << "\n";
  		CSP_LOG(APP, ERROR, "ERROR! Unable to initialize SDL: " << SDL_GetError());
  		return 1;
***************
*** 688,692 ****
  
  	if (m_SDLScreen == NULL) {
! 		printf("Unable to set video mode: %s\n", SDL_GetError());
  		CSP_LOG(APP, ERROR, "ERROR! Unable to initialize SDL: " << SDL_GetError());
  		return 1;
--- 688,692 ----
  
  	if (m_SDLScreen == NULL) {
! 		std::cerr << "Unable to set video mode: " << SDL_GetError() << "\n";
  		CSP_LOG(APP, ERROR, "ERROR! Unable to initialize SDL: " << SDL_GetError());
  		return 1;
***************
*** 702,719 ****
  	SDL_EnableUNICODE(1);
  
! 
  	std::string sound_path = getDataPath("SoundPath");
! 	if ( SDL_LoadWAV(simdata::ospath::join(sound_path, "avionturbine5.wav").c_str(),
! 		&m_audioWave.spec, &m_audioWave.sound, &m_audioWave.soundlen) == NULL ) {
! 		CSP_LOG(APP, ERROR,  "Couldn't load " << sound_path << "/avionturbine5.wav: " << SDL_GetError());
! 		::exit(1);
! 	}
! 	m_audioWave.spec.callback = fillerup;
  
! 	/* Initialize fillerup() variables */
! 	if ( SDL_OpenAudio(&m_audioWave.spec, NULL) < 0 ) {
! 		fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
! 		SDL_FreeWAV(m_audioWave.sound);
! 		::exit(2);
  	}
  	bool mute = g_Config.getBool("Testing", "Mute", false, true);
--- 702,719 ----
  	SDL_EnableUNICODE(1);
  
! 	// some simple sdl sound testing
  	std::string sound_path = getDataPath("SoundPath");
! 	std::string test_sound = simdata::ospath::join(sound_path, "avionturbine5.wav");
! 	if (SDL_LoadWAV(test_sound.c_str(), &m_audioWave.spec, &m_audioWave.sound, 
! 	                &m_audioWave.soundlen) == NULL) {
! 		CSP_LOG(APP, WARNING,  "Couldn't load '" << test_sound << "': " << SDL_GetError());
! 	} else {
! 		m_audioWave.spec.callback = fillerup;
  
! 		/* Initialize fillerup() variables */
! 		if (SDL_OpenAudio(&m_audioWave.spec, NULL) < 0)  {
! 			CSP_LOG(APP, ERROR, "Couldn't open audio: " << SDL_GetError());
! 			SDL_FreeWAV(m_audioWave.sound);
! 		}
  	}
  	bool mute = g_Config.getBool("Testing", "Mute", false, true);

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.85,1.86

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv26467

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** CHANGES.current	21 Oct 2003 04:53:58 -0000	1.85
--- CHANGES.current	21 Oct 2003 13:45:07 -0000	1.86
***************
*** 4,7 ****
--- 4,15 ----
    * Removed Pack.cpp from the vcproj file.
  
+   * Removed the __NO_LUT__ define from swig command line in the vcproj
+     file.  This flag was used to prevent errors with older versions of 
+     MSVC during testing of the new lookup table code.
+ 
+   * Changed the default path to swig to c:\Program Files\swig-1.3.17
+     in vcproj.  The previous path was to swig-1.3.19, but this version
+     of swig has a bug that causes problems with simdata.
+ 
    * Started a new test suite for data type functionality
  

[Csp-commits] APPLICATIONS/SimData/VisualStudio2003 SimData.vcproj,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003
In directory sc8-pr-cvs1:/tmp/cvs-serv26467/VisualStudio2003

Modified Files:
	SimData.vcproj 
Log Message:


Index: SimData.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimData.vcproj	21 Oct 2003 03:22:41 -0000	1.4
--- SimData.vcproj	21 Oct 2003 13:45:07 -0000	1.5
***************
*** 377,381 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
  "
  					Outputs="..\Source\$(InputName)_wrap.cpp"/>
--- 377,381 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
  "
  					Outputs="..\Source\$(InputName)_wrap.cpp"/>
***************
*** 385,389 ****
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
  "
  					Outputs="..\Source\$(InputName)_wrap.cpp"/>
--- 385,389 ----
  				<Tool
  					Name="VCCustomBuildTool"
! 					CommandLine="C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
  "
  					Outputs="..\Source\$(InputName)_wrap.cpp"/>

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k model.xml,1.14,1.15

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv30146/XML/vehicles/aircraft/m2k

Modified Files:
	model.xml 
Log Message:


Index: model.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** model.xml	20 Oct 2003 05:13:51 -0000	1.14
--- model.xml	21 Oct 2003 21:34:51 -0000	1.15
***************
*** 2,8 ****
  
  <Object class="ObjectModel">
! 	<!--External name="model_path">f35.3DS</External-->
! 	<External name="model_path">s.osg</External>
! 	<!--External name="model_path">m2k2g.3ds</External-->
  	<Vector name="axis_0">1 0 0</Vector>
  	<Vector name="axis_1">0 1 0</Vector>
--- 2,6 ----
  
  <Object class="ObjectModel">
! 	<External name="model_path">Mirage2000/model.osg</External>
  	<Vector name="axis_0">1 0 0</Vector>
  	<Vector name="axis_1">0 1 0</Vector>

[Csp-commits] APPLICATIONS/CSPSim CHANGES.current,1.75,1.76

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv12059

Modified Files:
	CHANGES.current 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** CHANGES.current	21 Oct 2003 21:55:39 -0000	1.75
--- CHANGES.current	21 Oct 2003 22:45:34 -0000	1.76
***************
*** 2,159 ****
  ===========================
  2003-10-21: onsight
!             Cleaned up the code that initializes the test sound.  The
! 	    sim won't abort if it can't find the sound file or open
! 	    an audio device, but a warning is written to the log.
  
! 	    Added a modified version of Lologramme's Mirage 2000
! 	    model and textures to CVS.  This version includes special
! 	    hooks for CSP animations.  The model and textures are
! 	    under Data/Models/Mirage2000, and the including COPYING
! 	    file lists copyright information.  The m2k/model.xml file
! 	    now points to this 3D model.
  
  2003-10-19: onsight
!             Updated configure script to check for osg 0.9.6.  Version
! 	    0.9.4 can still be used, if necessary.  To do so, change 
! 	    configure.in to check for 0.9.4, run autoconf, then 
! 	    ./configure.  Finally, edit Include/CSPSim.h and uncomment
! 	    the #define CSP_OSG_094 line.
  
  2003-10-19: onsight
!             Updated the xml files to remove the 'static' attribute (now
! 	    set in the class definition), and convert the engine thrust
! 	    tables to use simdata::Table2.  Added systems.xml to
! 	    vehicles/aircraft/m2k.
  
  2003-10-19: onsight
!             Tagged r0_3_5 and started branch b0_3.  Merged 'systems'
! 	    branch into the trunk to start version 0.4.0.
  
  2003-10-19: onsight
!             Modified class Thrust to use simdata::Table2 instead of the
! 	    deprecated simdata::Table class.  Note that the XML thrust
! 	    tables must be modified to use this new class, but that these
! 	    changes will not be checked into cvs (to prevent clashes with
! 	    the trunk).  The corrected files will be posted at 
! 	    http://csp.sourceforge.net/downloads (soon) until the systems
! 	    branch is merged to make v0.4.0.
  
! 	    SIMDATA_OBJECT(...) changed to SIMDATA_STATIC_OBJECT(...) for 
! 	    object classes that are static.  This was previously specified
! 	    per object in the associated xml file using the 'static' attr.
! 	    That use is deprecated in simdata 0.4; now object classes are 
! 	    either static or not.
  
  2003-10-14: onsight
!             Removed very old TerrainSymbol.h
  
  2003-10-11: onsight
!             Tracked down '#define min' from windows.h (no surprise), which
! 	    was included via Producer/RenderSurface.  Added #undef's there
! 	    as a temporary fix.
  
! 	    Changed the classes related to input events and hid mapping
! 	    to use reference counting.
  
! 	    Moved CSP_OSG_094 to CSPSim.h.  You must uncomment this line
! 	    to use OSG version 0.9.4 or older.
  
  ==========> VC users add System.cpp, SystemsModel.cpp, and Systems/*.cpp
!             to the project.
  
  2003-10-09: onsight
!             Fixed minor snprintf problem under msvc.
  
!             Split the SystemsModel class out of System.h/cpp into 
! 	    SystemsModel.h/cpp.  This seems to be a better arrangement,
! 	    and hopefully circumventns a problem with forward 
! 	    declarations + simdata::Link<> under msvc.
  
  2003-10-05: onsight
!             Changed HID to inherit from simdata::Referenced.  Minor
! 	    changes to BaseScreen, GameScreen, and CSPSim to support
! 	    this change.
  
  2003-09-25: onsight
!             Integrated VI's patches for OSG 096 support.  Changes
! 	    camera handling in near/far SceneView intances in
! 	    VirtualScene.cpp.
  
!             Various OSG 096 fixes:
! 	      * SceneView aspect ratio
! 	      * NearView projection matrix
! 	      * False horizon coloring
! 	      * Skydome (non-TEXDOME) coloring
  
! 	    To use OSG 094, uncomment the #define CSP_OSG_094 line
! 	    in VirtualScene.cpp
  
  2003-09-17: onsight
!             Major refactoring of the aircraft components in terms of
! 	    the System/SystemsModel architecture.  PhysicsModel is now
! 	    a System under the main SystemsModel for the vehicle.  The
! 	    BaseDynamics classes are also Systems, although they only
! 	    function as dynamics when placed directly underneath the
! 	    PhysicsModel node.  Almost all of the original inter-
! 	    component communications are now implemented through the
! 	    bus architecture.  A few hacks remain, such as the landing
! 	    gear sprites (which needs to be overhauled in terms of
! 	    standard animations once a suitable 3d model is available).
  
! 	    Significant changes to the DataRecorder interface.
  
! 	    Changed the stats display interface to allow each System
! 	    to add its own info lines to the display by extending
! 	    getInfo().
  
! 	    Changes to the XML data for the m2k to support the new
! 	    vehicle interfaces.
  
  2003-09-15: onsight
!             Added SynchronousUpdate.h and SynchronousUpdate.cpp as the
! 	    basis for a new update callback infrastructure.
  
  2003-09-13: onsight
!             Renamed Model to SystemsModel
  
!             Removed F16Model from the build.
  
! 	    Added m_SystemsModel to DynamicObject to reference the
! 	    current systems model.  The setHuman() and setLocal()
! 	    methods now handle updates of the model, using two new
! 	    simdata::Path member variables: m_AgentModel and m_HumanModel.
  
! 	    SystemModel updates are now hooked into DynamicObject updates.
  
! 	    Input events are chained to the systems model if the dynamic
! 	    object doesn't handle them.
  
! 	    Changed the mapped input event interface.  The onCommand, 
! 	    onAxis, and onMotion methods of InputInterface are now
! 	    private, and all mapped events are passed via the onMapEvent
! 	    method.  Overriding these methods was generally used to pass 
! 	    events to subobjects, so it is easier now that only one method 
! 	    needs to be extended.  The raw event handlers were excluded 
! 	    from this interface, since raw events are more often handled 
! 	    by top-level objects.  MapEvent is a wrapper type that 
! 	    encompasses the three original types of events. 
  
  2003-09-07: onsight
!             Added Include/System.h and Include/Bus.h, which provide
! 	    infrastructure for constructing detailed vehicle models.
! 	    Several existing components such as the data recorder and
! 	    flight model need to be refactored to use this new
! 	    interface.
  
! <<<<<<< CHANGES.current
! 2003-10-19: onsight
!             Tagged version r0_3_5, branched to b0_3 to start version 
! 	    0.3.6.  The 'systems' branch will be merged into the trunk
! 	    to create version 0.4.0.
! =======
! 	    Minor warning cleanups in System.h and Bus.h.
  
  2003-08-20: onsight
!             Tagged version r0_3_4, starting version 0.3.5
! >>>>>>> 1.69.2.5
  
--- 2,155 ----
  ===========================
  2003-10-21: onsight
!   * Cleaned up the code that initializes the test sound.  The
!     sim won't abort if it can't find the sound file or open
!     an audio device, but a warning is written to the log.
  
!   * Added a modified version of Lologramme's Mirage 2000
!     model and textures to CVS.  This version includes special
!     hooks for CSP animations.  The model and textures are
!     under Data/Models/Mirage2000, and the including COPYING
!     file lists copyright information.  The m2k/model.xml file
!     now points to this 3D model.
! 
!   * Changed the CHANGES.current format to be clearer and more
!     space-efficient.
  
  2003-10-19: onsight
!   * Updated configure script to check for osg 0.9.6.  Version
!     0.9.4 can still be used, if necessary.  To do so, change 
!     configure.in to check for 0.9.4, run autoconf, then 
!     ./configure.  Finally, edit Include/CSPSim.h and uncomment
!     the #define CSP_OSG_094 line.
  
  2003-10-19: onsight
!   * Updated the xml files to remove the 'static' attribute (now
!     set in the class definition), and convert the engine thrust
!     tables to use simdata::Table2.  Added systems.xml to
!     vehicles/aircraft/m2k.
  
  2003-10-19: onsight
!   * Tagged r0_3_5 and started branch b0_3.  Merged 'systems'
!     branch into the trunk to start version 0.4.0.
  
  2003-10-19: onsight
!   * Modified class Thrust to use simdata::Table2 instead of the
!     deprecated simdata::Table class.  Note that the XML thrust
!     tables must be modified to use this new class, but that these
!     changes will not be checked into cvs (to prevent clashes with
!     the trunk).  The corrected files will be posted at 
!     http://csp.sourceforge.net/downloads (soon) until the systems
!     branch is merged to make v0.4.0.
  
!   * SIMDATA_OBJECT(...) changed to SIMDATA_STATIC_OBJECT(...) for 
!     object classes that are static.  This was previously specified
!     per object in the associated xml file using the 'static' attr.
!     That use is deprecated in simdata 0.4; now object classes are 
!     either static or not.
  
  2003-10-14: onsight
!   * Removed very old TerrainSymbol.h
  
  2003-10-11: onsight
!   * Tracked down '#define min' from windows.h (no surprise), which
!     was included via Producer/RenderSurface.  Added #undef's there
!     as a temporary fix.
  
!   * Changed the classes related to input events and hid mapping
!     to use reference counting.
  
!   * Moved CSP_OSG_094 to CSPSim.h.  You must uncomment this line
!     to use OSG version 0.9.4 or older.
  
  ==========> VC users add System.cpp, SystemsModel.cpp, and Systems/*.cpp
!     to the project.
  
  2003-10-09: onsight
!   * Fixed minor snprintf problem under msvc.
  
!   * Split the SystemsModel class out of System.h/cpp into 
!     SystemsModel.h/cpp.  This seems to be a better arrangement,
!     and hopefully circumventns a problem with forward 
!     declarations + simdata::Link<> under msvc.
  
  2003-10-05: onsight
!   * Changed HID to inherit from simdata::Referenced.  Minor
!     changes to BaseScreen, GameScreen, and CSPSim to support
!     this change.
  
  2003-09-25: onsight
!   * Integrated VI's patches for OSG 096 support.  Changes
!     camera handling in near/far SceneView intances in
!     VirtualScene.cpp.
  
!   * Various OSG 096 fixes:
!       + SceneView aspect ratio
!       + NearView projection matrix
!       + False horizon coloring
!       + Skydome (non-TEXDOME) coloring
  
!   * To use OSG 094, uncomment the #define CSP_OSG_094 line
!     in VirtualScene.cpp
  
  2003-09-17: onsight
!   * Major refactoring of the aircraft components in terms of
!     the System/SystemsModel architecture.  PhysicsModel is now
!     a System under the main SystemsModel for the vehicle.  The
!     BaseDynamics classes are also Systems, although they only
!     function as dynamics when placed directly underneath the
!     PhysicsModel node.  Almost all of the original inter-
!     component communications are now implemented through the
!     bus architecture.  A few hacks remain, such as the landing
!     gear sprites (which needs to be overhauled in terms of
!     standard animations once a suitable 3d model is available).
  
!   * Significant changes to the DataRecorder interface.
  
!   * Changed the stats display interface to allow each System
!     to add its own info lines to the display by extending
!     getInfo().
  
!   * Changes to the XML data for the m2k to support the new
!     vehicle interfaces.
  
  2003-09-15: onsight
!   * Added SynchronousUpdate.h and SynchronousUpdate.cpp as the
!     basis for a new update callback infrastructure.
  
  2003-09-13: onsight
!   * Renamed Model to SystemsModel
  
!   * Removed F16Model from the build.
  
!   * Added m_SystemsModel to DynamicObject to reference the
!     current systems model.  The setHuman() and setLocal()
!     methods now handle updates of the model, using two new
!     simdata::Path member variables: m_AgentModel and m_HumanModel.
  
!   * SystemModel updates are now hooked into DynamicObject updates.
  
!   * Input events are chained to the systems model if the dynamic
!     object doesn't handle them.
  
!   * Changed the mapped input event interface.  The onCommand, 
!     onAxis, and onMotion methods of InputInterface are now
!     private, and all mapped events are passed via the onMapEvent
!     method.  Overriding these methods was generally used to pass 
!     events to subobjects, so it is easier now that only one method 
!     needs to be extended.  The raw event handlers were excluded 
!     from this interface, since raw events are more often handled 
!     by top-level objects.  MapEvent is a wrapper type that 
!     encompasses the three original types of events. 
  
  2003-09-07: onsight
!   * Added Include/System.h and Include/Bus.h, which provide
!     infrastructure for constructing detailed vehicle models.
!     Several existing components such as the data recorder and
!     flight model need to be refactored to use this new
!     interface.
  
!   * Minor warning cleanups in System.h and Bus.h.
  
  2003-08-20: onsight
!   * Tagged version r0_3_4, starting version 0.3.5