csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/SimData/SimData Parse.py,1.5,1.6

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

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

Modified Files:
	Parse.py 
Log Message:
see CHANGES.current

Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Parse.py	2 May 2003 20:59:05 -0000	1.5
--- Parse.py	10 Jun 2003 23:31:31 -0000	1.6
***************
*** 209,213 ****
  		return name in ('List', 'Enum', 'Path', 'Int', 'Bool', 'Number', 'Float', 
  		                'String', 'Date', 'Vector', 'Matrix', 'External', 
! 		                'Object', 'Quat')
  
  	def end(self):
--- 209,213 ----
  		return name in ('List', 'Enum', 'Path', 'Int', 'Bool', 'Number', 'Float', 
  		                'String', 'Date', 'Vector', 'Matrix', 'External', 
! 		                'Object', 'Quat', 'LLA', "UTM", "ECEF")
  
  	def end(self):
***************
*** 312,315 ****
--- 312,341 ----
  		self._element.parseXML(self._c)
  
+ class ECEFHandler(SimpleHandler):
+ 
+ 	def __init__(self, id, base, name, attrs):
+ 		SimpleHandler.__init__(self, id, base, name, attrs)
+ 	
+ 	def end(self):
+ 		self._element = SimData.ECEF()
+ 		self._element.parseXML(self._c)
+ 
+ class LLAHandler(SimpleHandler):
+ 
+ 	def __init__(self, id, base, name, attrs):
+ 		SimpleHandler.__init__(self, id, base, name, attrs)
+ 	
+ 	def end(self):
+ 		self._element = SimData.LLA()
+ 		self._element.parseXML(self._c)
+ 
+ class UTMHandler(SimpleHandler):
+ 
+ 	def __init__(self, id, base, name, attrs):
+ 		SimpleHandler.__init__(self, id, base, name, attrs)
+ 	
+ 	def end(self):
+ 		self._element = SimData.UTM()
+ 		self._element.parseXML(self._c)
  
  class VectorHandler(SimpleHandler):

[Csp-commits] APPLICATIONS/SimData/Include/SimData GeoPos.h,1.4,1.5 GeoPos.i,1.1,1.2 Log.i,1.2,1.3 LogStream.h,1.6,1.7 Object.i,1.3,1.4 Pack.h,1.6,1.7 TypeAdapter.h,1.12,1.13

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

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

Modified Files:
	GeoPos.h GeoPos.i Log.i LogStream.h Object.i Pack.h 
	TypeAdapter.h 
Log Message:
see CHANGES.current

Index: GeoPos.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GeoPos.h	12 Apr 2003 08:56:37 -0000	1.4
--- GeoPos.h	10 Jun 2003 23:31:30 -0000	1.5
***************
*** 375,379 ****
  	 * String representation.
  	 */
! 	virtual std::string asString() { return Vector3::asString(); }
  	
  	/**
--- 375,379 ----
  	 * String representation.
  	 */
! 	virtual std::string asString() const { return Vector3::asString(); }
  	
  	/**
***************
*** 442,445 ****
--- 442,835 ----
  
  
+ class UTM;
+ class LLA;
+ class ECEF;
+ 
+ /**
+  * Convert from Earth centered, Earth fixed (ECEF) coondinates
+  * to latitude, longitude, and altitude (LLA).
+  *
+  * @param ecef the source coordinates in ECEF 
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return the coordinates in LLA
+  */
+ LLA ECEFtoLLA(ECEF const &ecef, ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ /**
+  * Convert from Earth centered, Earth fixed (ECEF) coondinates
+  * to Universal Transverse Mercator (UTM) coordinates.
+  *
+  * @param ecef the source coordinates in ECEF 
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return the coordinates in UTM
+  */
+ UTM ECEFtoUTM(ECEF const &ecef, ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ /**
+  * Convert from latitude, longitude, and altitude (LLA) to
+  * Earth centered, Earth fixed (ECEF) coondinates.
+  *
+  * @param lla the source coordinates in LLA 
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return the coordinates in ECEF 
+  */
+ ECEF LLAtoECEF(LLA const &lla, ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ /**
+  * Convert from Universal Transverse Mercator (UTM) coordinates to
+  * Earth centered, Earth fixed (ECEF) coondinates.
+  *
+  * @param utm the source coordinates in UTM
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return the coordinates in ECEF 
+  */
+ ECEF UTMtoECEF(UTM const &utm, ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ /**
+  * Convert from Universal Transverse Mercator (UTM) coordinates to
+  * latitude, longitude, and altitude (LLA).
+  *
+  * @param utm the source coordinates in UTM
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return the coordinates in LLA
+  */
+ LLA UTMtoLLA(UTM const &utm, ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ /**
+  * Convert from latitude, longitude, and altitude (LLA) to Universal 
+  * Transverse Mercator (UTM) coordinates.
+  *
+  * @param lla the source coordinates in LLA 
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @param _zone for a specific zone, independent of longitude
+  * @return the coordinates in UTM
+  */
+ UTM LLAtoUTM(LLA const &lla, ReferenceEllipsoid const &_ref = GeoRef::WGS84, char _zone=-1);
+ 
+ /**
+  * Get the distance between two points along the surface of the 
+  * reference ellipsoid.
+  *
+  * Both points are projected to altitude = 0, and the distance
+  * calculated along a geodesic path of the reference ellipsoid.
+  *
+  * @param p point 1
+  * @param q point 2
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return distance the geodesic distance
+  * @return bearing the bearing to the specified point (in radians relative to true north)
+  */
+ void SurfaceDistance(LLA const &p, 
+                      LLA const &q, 
+                      double &distance, 
+                      double &bearing, 
+                      ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ 
+ /**
+  * Get the distance between two points along the surface of the
+  * reference ellipsoid, including altitude.
+  *
+  * This method is very similar to SurfaceDistance, but includes the altitude
+  * difference between the two points in an approximate way that can be used both
+  * at close range and globally.
+  * 
+  * @param p point 1
+  * @param q point 2
+  * @param _ref the reference ellipsoid (the default is WGS-84)  
+  * @return distance a combined geodesic and altitude distance 
+  * @return bearing the bearing to the specified point (in radians relative to true north)
+  */
+ void ShellDistance(LLA const &p, 
+                    LLA const &q, 
+                    double &distance, 
+                    double &bearing, 
+                    ReferenceEllipsoid const &_ref = GeoRef::WGS84);
+ 
+ 
+ /**
+  * A geospatial coordinate class representing latitude, longitude, and
+  * altitude.
+  *
+  * There are two distinct XML formats for this type.  The first lists
+  * latitude and longitude in degrees, followed by altitude in meters.
+  * The second uses a degree-minute-second notation for the latitude and
+  * longitude.  The notation for the second format is slighly non-standard
+  * to avoid using the degree symbol.  Examples: 
+  *
+  *     @code <LLA>37.1 -122.43 100.0</LLA> @endcode
+  * and 
+  *     @code <LLA>37'6"0.0 -122'25"48.0 100.0</LLA> @endcode
+  */
+ class SIMDATA_EXPORT LLA: public BaseType {
+ 	double _lat, _lon, _alt;
+ public:
+ 	/**
+ 	 * Construct a default LLA.
+ 	 */
+ 	LLA(): _lat(0.0), _lon(0.0), _alt(0.0) {}
+ 
+ 	/**
+ 	 * Construct a new LLA.
+ 	 *
+ 	 * @param lat latitude in radians.
+ 	 * @param lon longitude in radians.
+ 	 * @param alt altitude in meters relative to the reference ellipsoid.
+ 	 */
+ 	LLA(double lat, double lon, double alt=0.0): _lat(lat), _lon(lon), _alt(alt) {}
+ 
+ 	/**
+ 	 * Copy constructor to convert from UTM
+ 	 */
+ 	LLA(UTM const &, ReferenceEllipsoid const & = GeoRef::WGS84);
+ 
+ 	/**
+ 	 * Copy constructor to convert from ECEF
+ 	 */
+ 	LLA(ECEF const &, ReferenceEllipsoid const & = GeoRef::WGS84);
+ 
+ 	/**
+ 	 * Convert from UTM to LLA (using WGS84)
+ 	 */
+ 	LLA const &operator = (UTM const &);
+ 
+ 	/**
+ 	 * Convert from ECEF to LLA (using WGS84)
+ 	 */
+ 	LLA const &operator = (ECEF const &);
+ 
+ 	virtual ~LLA() {}
+ 
+ 	/**
+ 	 * Set latitude, longitude, and altitude in radians
+ 	 */
+ 	void set(double lat, double lon, double alt=0.0) {
+ 		_lat = lat;
+ 		_lon = lon;
+ 		_alt = alt;
+ 	}
+ 
+ 	/**
+ 	 * Set latitude, longitude, and altitude in degrees
+ 	 */
+ 	void setDegrees(double lat, double lon, double alt=0.0);
+ 
+ 	/**
+ 	 * Get latitude in radians.
+ 	 */
+ 	inline double latitude() const { return _lat; }
+ 
+ 	/**
+ 	 * Get longitude in radians.
+ 	 */
+ 	inline double longitude() const { return _lon; }
+ 
+ 	/**
+ 	 * Get altitude in meters.
+ 	 */
+ 	inline double altitude() const { return _alt; }
+ 
+ 	/**
+ 	 * String representation.
+ 	 */
+ 	virtual std::string asString() const;
+ 	
+ 	/**
+ 	 * Set the current position from XML character data.
+ 	 *
+ 	 * LLA coordinate format (lat, lon, alt): 
+ 	 * 	x.x x.x x.x
+ 	 *
+ 	 * LLA coordinate format 2 (lat, lon, alt):
+ 	 * 	x'x"x.x x'x"x.x x.x
+ 	 */
+ 	void parseXML(const char *);
+ 
+ 	/**
+ 	 * Serialize to a data archive
+ 	 */
+ 	virtual void pack(Packer&) const; 
+ 	
+ 	/**
+ 	 * Deserialize from a data archive
+ 	 */
+ 	virtual void unpack(UnPacker&);
+ };
+ 
+ 
+ /**
+  * A geospatial coordinate class using Universal Transverse Mercator (UTM)
+  * coordinates plus altitude. 
+  *
+  * A sample XML tag for this type is @code<UTM>704300 3390210 13T 100.0</UTM>@endcode
+  * which represents 704300E 3390210N 13T, 100.0 m above the reference ellipsoid.
+  */
+ class SIMDATA_EXPORT UTM: public BaseType {
+ 	double _E, _N, _alt;
+ 	char _zone, _designator;
+ public:
+ 	/**
+ 	 * Get the designator character for a given latitude.
+ 	 */
+ 	static char getDesignator(double latitude);
+ 
+ 	/**
+ 	 * Construct a default (invalid) UTM
+ 	 */
+ 	UTM(): _E(0.0), _N(0.0), _alt(0.0), _zone(0), _designator('X') {}
+ 
+ 	/**
+ 	 * Construct a UTM.
+ 	 */
+ 	UTM(double easting, double northing, char zone, char designator, double alt=0.0) {
+ 		set(easting, northing, zone, designator, alt);
+ 	}
+ 
+ 	/**
+ 	 * Convert from LLA to UTM
+ 	 */
+ 	UTM(LLA const &, ReferenceEllipsoid const & = GeoRef::WGS84, char zone = -1);
+ 
+ 	/**
+ 	 * Convert from ECEF to UTM
+ 	 */
+ 	UTM(ECEF const &, ReferenceEllipsoid const & = GeoRef::WGS84);
+ 
+ 	/**
+ 	 * Convert from LLA to UTM (using WGS84)
+ 	 */
+ 	UTM const &operator = (LLA const &);
+ 
+ 	/**
+ 	 * Convert from ECEF to UTM (using WGS84)
+ 	 */
+ 	UTM const &operator = (ECEF const &);
+ 
+ 	virtual ~UTM() {}
+ 
+ 	/**
+ 	 * Set the current position from UTM coordinates.
+ 	 *
+ 	 * @param easting UTM easting
+ 	 * @param northing UTM northing
+ 	 * @param zone UTM zone
+ 	 * @param designator UTM zone letter
+ 	 * @param alt altitude above the reference ellipse (in meters)
+ 	 */
+ 	void set(double easting, double northing, char zone, char designator, double alt=0.0) {
+ 		_E = easting;
+ 		_N = northing;
+ 		_zone = zone;
+ 		_designator = designator;
+ 		_alt = alt;
+ 		// XXX check values
+ 	}
+ 	
+ 	/**
+ 	 * Set the current position from UTM coordinates.
+ 	 *
+ 	 * @param easting UTM easting
+ 	 * @param northing UTM northing
+ 	 * @param zone UTM zone (e.g. "10T")
+ 	 * @param alt altitude above the reference ellipse (in meters)
+ 	 */
+ 	void set(double easting, double northing, const char *zone, double alt = 0.0);
+ 
+ 	/**
+ 	 * Get the easting coordinate.
+ 	 */
+ 	inline double easting() const { return _E; }
+ 
+ 	/**
+ 	 * Get the northing coordinate.
+ 	 */
+ 	inline double northing() const { return _N; }
+ 
+ 	/**
+ 	 * Get the zone.
+ 	 */
+ 	inline char zone() const { return _zone; }
+ 
+ 	/**
+ 	 * Get the latitude designator letter.
+ 	 */
+ 	inline char designator() const { return _designator; }
+ 
+ 	/**
+ 	 * Get altitude in meters.
+ 	 */
+ 	inline double altitude() const { return _alt; }
+ 
+ 	/**
+ 	 * String representation.
+ 	 */
+ 	virtual std::string asString() const;
+ 	
+ 	/**
+ 	 * Set the current position from XML character data.
+ 	 *
+ 	 * UTM coordinate format (easting, northing, zone, alt):
+ 	 * 	x.x x.x zone x.x
+ 	 * where 'zone' is an integer followed by a UTM latitude designator,
+ 	 * such as "10T"
+ 	 */
+ 	void parseXML(const char *);
+ 
+ 	/**
+ 	 * Check that the UTM coordinates are valid.
+ 	 */
+ 	bool valid() const;
+ 
+ 	/**
+ 	 * Serialize to a data archive
+ 	 */
+ 	virtual void pack(Packer&) const; 
+ 	
+ 	/**
+ 	 * Deserialize from a data archive
+ 	 */
+ 	virtual void unpack(UnPacker&);
+ };
+ 
+ /**
+  * A geospatial coordinate class representing Earth Centered, Earth
+  * Fixed coordinates.
+  *
+  * The XML format for this type is @code <ECEF> X Y Z </ECEF> @endcode.
+  */
+ class SIMDATA_EXPORT ECEF: public Vector3 {
+ public:
+ 	/**
+ 	 * Construct a default ECEF (at the center of the Earth).
+ 	 */
+ 	ECEF(): Vector3(0.0, 0.0, 0.0) {}
+ 
+ 	/**
+ 	 * Construct a new ECEF
+ 	 */
+ 	ECEF(double x, double y, double z): Vector3(x, y, z) {}
+ 
+ 	/**
+ 	 * Copy constructor to convert from UTM
+ 	 */
+ 	ECEF(UTM const &, ReferenceEllipsoid const & = GeoRef::WGS84);
+ 
+ 	/**
+ 	 * Copy constructor to convert from LLA
+ 	 */
+ 	ECEF(LLA const &, ReferenceEllipsoid const & = GeoRef::WGS84);
+ 
+ 	/**
+ 	 * Convert from UTM to ECEF (using WGS84)
+ 	 */
+ 	ECEF const &operator = (UTM const &);
+ 
+ 	/**
+ 	 * Convert from UTM to ECEF (using WGS84)
+ 	 */
+ 	ECEF const &operator = (LLA const &);
+ 
+ 	virtual ~ECEF() {}
+ };
  
  NAMESPACE_END

Index: GeoPos.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeoPos.i	10 Feb 2003 05:11:41 -0000	1.1
--- GeoPos.i	10 Jun 2003 23:31:30 -0000	1.2
***************
*** 9,15 ****
--- 9,24 ----
  NAMESPACE_SIMDATA
  %rename(__repr__) GeoPos::asString() const;
+ %rename(__repr__) LLA::asString() const;
+ %rename(__repr__) UTM::asString() const;
+ %rename(__repr__) ECEF::asString() const;
  %ignore GeoPos::parseXML(const char*);
  %ignore GeoPos::operator=(Vector3 const &);
  %ignore GeoPos::operator=(GeoPos const &);
+ %ignore UTM::operator=(LLA const&);
+ %ignore UTM::operator=(ECEF const&);
+ %ignore LLA::operator=(UTM const&);
+ %ignore LLA::operator=(ECEF const&);
+ %ignore ECEF::operator=(UTM const&);
+ %ignore ECEF::operator=(LLA const&);
  NAMESPACE_END
  

Index: Log.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Log.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Log.i	4 May 2003 09:43:58 -0000	1.2
--- Log.i	10 Jun 2003 23:31:30 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
  	void setOutput(std::string const &fn);
  	void setLogLevels(int c, int p);
+ 	void setLogClasses(int c);
  };
  

Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LogStream.h	4 May 2003 07:23:23 -0000	1.6
--- LogStream.h	10 Jun 2003 23:31:30 -0000	1.7
***************
*** 264,267 ****
--- 264,273 ----
  
  	/**
+ 	* Set the global log class.
+ 	* @param c debug class
+ 	*/
+ 	void setLogClasses(int c);
+ 
+ 	/**
  	* Output operator to capture the debug level and priority of a message.
  	* @param l log level

Index: Object.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Object.i	23 Apr 2003 09:14:21 -0000	1.3
--- Object.i	10 Jun 2003 23:31:30 -0000	1.4
***************
*** 12,15 ****
--- 12,20 ----
  %rename(__repr__) SIMDATA(Object)::asString() const;
  
+ NAMESPACE_SIMDATA
+ 	%ignore Referenced;
+ 	class Referenced {};
+ NAMESPACE_END
+ 
  %include "SimData/Object.h"
  

Index: Pack.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Pack.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Pack.h	2 May 2003 20:59:04 -0000	1.6
--- Pack.h	10 Jun 2003 23:31:30 -0000	1.7
***************
*** 223,229 ****
  		int n;
  		unpack(n);
- 		y = (char*) malloc(sizeof(char)*(n+1));
  		_n -= n;
  		if (_n < 0) throw DataUnderflow();
  		memcpy(y, _d, sizeof(char)*n);
  		y[n] = 0;
--- 223,230 ----
  		int n;
  		unpack(n);
  		_n -= n;
  		if (_n < 0) throw DataUnderflow();
+ 		y = (char*) malloc(sizeof(char)*(n+1));
+ 		assert(y != 0); // XXX should throw a memory exception
  		memcpy(y, _d, sizeof(char)*n);
  		y[n] = 0;

Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TypeAdapter.h	2 May 2003 20:59:04 -0000	1.12
--- TypeAdapter.h	10 Jun 2003 23:31:31 -0000	1.13
***************
*** 57,60 ****
--- 57,63 ----
  class ListBase;
  class GeoPos;
+ class LLA;
+ class UTM;
+ class ECEF;
  class Object;
  
***************
*** 145,148 ****
--- 148,169 ----
  	}
  
+ 	template <typename T>
+ 	void setCoordinate(T & x) const {
+ 		BaseCheck();
+ 		LLA const *lla = dynamic_cast<LLA const *>(var.o);
+ 		if (lla != 0) {
+ 			x = *lla;
+ 			return;
+ 		}
+ 		UTM const *utm = dynamic_cast<UTM const *>(var.o);
+ 		if (utm != 0) {
+ 			x = *utm;
+ 			return;
+ 		}
+ 		ECEF const *ecef = dynamic_cast<ECEF const *>(var.o);
+ 		TypeCheck(ecef!=NULL, "dynamic cast of BaseType* failed");
+ 		x = *ecef;
+ 	}
+ 
  	/*
  	template <typename T> 
***************
*** 150,162 ****
  	*/
  
! 	void set(SimDate & x) const { setBase(x); }
! 	void set(GeoPos & x) const { setBase(x); }
! 	void set(Vector3 & x) const { setBase(x); }
! 	void set(Matrix3 & x) const { setBase(x); }
! 	void set(Real & x) const { setBase(x); }
! 	void set(Curve & x) const { setBase(x); }
! 	void set(Table & x) const { setBase(x); }
! 	void set(External & x) const { setBase(x); }
! 	void set(Path & x) const { setBase(x); }
  	// list
  
--- 171,189 ----
  	*/
  
! 	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); }
! 	inline void set(External & x) const { setBase(x); }
! 	inline void set(Path & x) const { setBase(x); }
  	// list
  

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.37,1.38

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

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

Modified Files:
	CHANGES.current 
Log Message:
see CHANGES.current

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** CHANGES.current	10 Jun 2003 22:31:21 -0000	1.37
--- CHANGES.current	10 Jun 2003 23:31:29 -0000	1.38
***************
*** 6,9 ****
--- 6,23 ----
  	    in math.h.
  
+ 2003-05-14: onsight
+             Added LLA, UTM, and ECEF classes.  This some functionality is 
+ 	    inclueded in GeoPos, but that class is a bit bloated.  Eventually
+ 	    GeoPos will be rewritten as an ECEF derived class that contains
+ 	    LLA and UTM members with lazy evaluation.
+ 
+ 	    Added <LLA>, <UTM>, and <ECEF> XML tags to the parser.  These
+ 	    can be used interchangeably with variables of any of the three
+ 	    corresponding types.
+ 
+             Finally fixed the SWIG warning about Referenced.
+ 
+ 	    Added setLogClasses method to LogStream.
+ 
  2003-05-13: onsight
              Added exception handling to file copying in setup.py.  Copy errors

[Csp-commits] THIRDPARTYLIBS/demeter DemeterVisualC6.vcproj,1.2,1.3 DemeterVisualC6.sln,1.1,1.2 DemeterVisualC6.dsp,1.1.1.1,1.2 CHANGES.current,1.6,1.7

[<de...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv13468

Modified Files:
	DemeterVisualC6.vcproj DemeterVisualC6.sln DemeterVisualC6.dsp 
	CHANGES.current 
Log Message:
see CHANGES.current

Index: DemeterVisualC6.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DemeterVisualC6.vcproj	18 Apr 2003 11:26:17 -0000	1.2
--- DemeterVisualC6.vcproj	10 Jun 2003 22:48:37 -0000	1.3
***************
*** 41,45 ****
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib"
! 				OutputFile="Debug/DemeterVisualC6d.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
--- 41,45 ----
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib"
! 				OutputFile="../../APPLICATIONS/CSPSim/Bin/DemeterVisualC6d.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
***************
*** 48,52 ****
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Debug/DemeterVisualC6d.pdb"
! 				ImportLibrary=".\Debug/DemeterVisualC6d.lib"/>
  			<Tool
  				Name="VCMIDLTool"
--- 48,52 ----
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Debug/DemeterVisualC6d.pdb"
! 				ImportLibrary="../lib/DemeterVisualC6d.lib"/>
  			<Tool
  				Name="VCMIDLTool"
***************
*** 101,110 ****
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib"
! 				OutputFile=".\Release/DemeterVisualC6.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\lib"
  				ProgramDatabaseFile=".\Release/DemeterVisualC6.pdb"
! 				ImportLibrary=".\Release/DemeterVisualC6.lib"/>
  			<Tool
  				Name="VCMIDLTool"
--- 101,110 ----
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib"
! 				OutputFile="../../APPLICATIONS/CSPSim/Bin/DemeterVisualC6.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\lib"
  				ProgramDatabaseFile=".\Release/DemeterVisualC6.pdb"
! 				ImportLibrary="../lib/DemeterVisualC6.lib"/>
  			<Tool
  				Name="VCMIDLTool"

Index: DemeterVisualC6.sln
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DemeterVisualC6.sln	6 Apr 2003 10:39:18 -0000	1.1
--- DemeterVisualC6.sln	10 Jun 2003 22:48:37 -0000	1.2
***************
*** 10,15 ****
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.ActiveCfg = Release|Win32
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.Build.0 = Release|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.ActiveCfg = Release|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.Build.0 = Release|Win32
--- 10,15 ----
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.ActiveCfg = Debug|Win32
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.Build.0 = Debug|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.ActiveCfg = Release|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.Build.0 = Release|Win32

Index: DemeterVisualC6.dsp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DemeterVisualC6.dsp	5 Dec 2002 03:33:40 -0000	1.1.1.1
--- DemeterVisualC6.dsp	10 Jun 2003 22:48:37 -0000	1.2
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /D "TERRAIN_EXPORTS" /D "_USE_GDAL_" /D "_PROTECT_ACCESS_" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /D "TERRAIN_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 55,59 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
! # ADD LINK32 gdal_i.lib osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib /nologo /dll /machine:I386 /libpath:"..\lib"
  
  !ELSEIF  "$(CFG)" == "DemeterVisualC6 - Win32 Debug"
--- 55,59 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
! # ADD LINK32 osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib /nologo /dll /machine:I386 /libpath:"..\lib"
  
  !ELSEIF  "$(CFG)" == "DemeterVisualC6 - Win32 Debug"
***************
*** 82,86 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 SDL_imaged.lib SDLd.lib osgd.lib gdal_i.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Debug/DemeterVisualC6d.dll" /pdbtype:sept /libpath:"..\lib"
  
  !ENDIF 
--- 82,86 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Debug/DemeterVisualC6d.dll" /pdbtype:sept /libpath:"..\lib"
  
  !ENDIF 

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CHANGES.current	10 Jun 2003 22:34:26 -0000	1.6
--- CHANGES.current	10 Jun 2003 22:48:37 -0000	1.7
***************
*** 6,11 ****
  	    its own thread.
  
  2003-04-18: delta
! 	    Checked Onsight changes. got ride of some vc++ warnings.
  	    Updated .NET project.
  
--- 6,16 ----
  	    its own thread.
  
+ 2003-05-15: delta
+ 	    Updated .net project such that dlls are now sent to 
+ 	    ../../APPLICATIONS/CSPSim/Bin and libs to ../lib.
+ 
  2003-04-18: delta
! 	    Checked Onsight changes. 
! 	    Got ride of some vc++ warnings.
  	    Updated .NET project.
  

[Csp-commits] THIRDPARTYLIBS/demeter Terrain.cpp,1.7,1.8 TerrainTextureFactory.cpp,1.4,1.5

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv10228

Modified Files:
	Terrain.cpp TerrainTextureFactory.cpp 
Log Message:


Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Terrain.cpp	10 Jun 2003 22:34:26 -0000	1.7
--- Terrain.cpp	10 Jun 2003 22:43:21 -0000	1.8
***************
*** 716,720 ****
  	m_LatticePositionY = 0;
  
! 	std::cout << "SetAllElevations " << szElevationsFilename << "\n";
  	SetAllElevations(szElevationsFilename,vertexSpacing,elevationScale);
  
--- 716,720 ----
  	m_LatticePositionY = 0;
  
! 	//std::cout << "SetAllElevations " << szElevationsFilename << "\n";
  	SetAllElevations(szElevationsFilename,vertexSpacing,elevationScale);
  
***************
*** 829,834 ****
  void Terrain::SetAllElevations(const char* szElevationsFilename,float vertexSpacing,float elevationScale)
  {
! 	std::cout << "SetAllElevations()\n";
! 	std::cout << "efilename = " << szElevationsFilename << "\n";
  	bool useRaw = (strstr(szElevationsFilename, ".raw") || strstr(szElevationsFilename, ".RAW") );
  
--- 829,834 ----
  void Terrain::SetAllElevations(const char* szElevationsFilename,float vertexSpacing,float elevationScale)
  {
! 	//std::cout << "SetAllElevations()\n";
! 	//std::cout << "efilename = " << szElevationsFilename << "\n";
  	bool useRaw = (strstr(szElevationsFilename, ".raw") || strstr(szElevationsFilename, ".RAW") );
  

Index: TerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TerrainTextureFactory.cpp	10 Jun 2003 22:34:26 -0000	1.4
--- TerrainTextureFactory.cpp	10 Jun 2003 22:43:21 -0000	1.5
***************
*** 206,210 ****
  
  			//std::cout << "Generating Texture" << latticeX << ":" << latticeY << endl;
! 			std::cout << originX << "," << originY << "  " << width << "," << height << "  " << textureSize << "\n";
  
  			Uint8* pImage = new Uint8[(int)((textureSize + 1.0f) * (textureSize + 1.0f)) * 3];
--- 206,210 ----
  
  			//std::cout << "Generating Texture" << latticeX << ":" << latticeY << endl;
! 			//std::cout << originX << "," << originY << "  " << width << "," << height << "  " << textureSize << "\n";
  
  			Uint8* pImage = new Uint8[(int)((textureSize + 1.0f) * (textureSize + 1.0f)) * 3];

[Csp-commits] THIRDPARTYLIBS/demeter CHANGES.current,1.5,1.6 Terrain.cpp,1.6,1.7 TerrainTextureFactory.cpp,1.3,1.4

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

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv4635

Modified Files:
	CHANGES.current Terrain.cpp TerrainTextureFactory.cpp 
Log Message:
see CHANGES.current

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CHANGES.current	18 Apr 2003 11:26:17 -0000	1.5
--- CHANGES.current	10 Jun 2003 22:34:26 -0000	1.6
***************
*** 2,5 ****
--- 2,9 ----
  ===========================
  
+ 2003-05-XX: onsight
+             Minor optimizations in texture generation.  Still needs
+ 	    its own thread.
+ 
  2003-04-18: delta
  	    Checked Onsight changes. got ride of some vc++ warnings.

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Terrain.cpp	18 Apr 2003 11:26:17 -0000	1.6
--- Terrain.cpp	10 Jun 2003 22:34:26 -0000	1.7
***************
*** 694,697 ****
--- 694,701 ----
  Terrain::Terrain(const char* szElevationsFilename,const char* szTextureFilename,const char* szDetailTextureFilename,float vertexSpacing,float elevationScale,int maxNumTriangles,bool bUseBorders,float offsetX,float offsetY,int numTexturesX,int numTexturesY)
  {
+     if (numTexturesY == 3) {
+     	char *c = 0;
+ 	*c++ = 0;
+    }
      m_pCommonTexture = NULL;
      m_pTriangleStrips = NULL;
***************
*** 712,715 ****
--- 716,720 ----
  	m_LatticePositionY = 0;
  
+ 	std::cout << "SetAllElevations " << szElevationsFilename << "\n";
  	SetAllElevations(szElevationsFilename,vertexSpacing,elevationScale);
  
***************
*** 824,827 ****
--- 829,834 ----
  void Terrain::SetAllElevations(const char* szElevationsFilename,float vertexSpacing,float elevationScale)
  {
+ 	std::cout << "SetAllElevations()\n";
+ 	std::cout << "efilename = " << szElevationsFilename << "\n";
  	bool useRaw = (strstr(szElevationsFilename, ".raw") || strstr(szElevationsFilename, ".RAW") );
  
***************
*** 3095,3098 ****
--- 3102,3107 ----
      delete pTerrain;
      m_pTextureFactory = NULL;
+     m_FactoryTilesWidth = 1;
+     m_FactoryTilesHeight = 1;
  
  	m_OffsetIndexX[Terrain::DIR_CENTER] = 0;
***************
*** 3153,3157 ****
      m_FactoryTilesWidth = tilesWidth;
      m_FactoryTilesHeight = tilesHeight;
- 
  }
  
--- 3162,3165 ----
***************
*** 3184,3187 ****
--- 3192,3198 ----
  void TerrainLattice::AddTerrain(Terrain* pTerrain,int positionX,int positionY)
  {
+ 	//std::cout << "ADDING TERRAIN " << positionX << " " << positionY << std::endl;
+ 	//char *c = 0;
+ 	//*c++ = 0;
      m_pTerrains[positionY * m_WidthTerrains + positionX] = pTerrain;
      pTerrain->SetLatticePosition(positionX,positionY);

Index: TerrainTextureFactory.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TerrainTextureFactory.cpp	15 Feb 2003 20:56:19 -0000	1.3
--- TerrainTextureFactory.cpp	10 Jun 2003 22:34:26 -0000	1.4
***************
*** 35,39 ****
  const float textureSize = 256.0f;
  
! float limit255(float a)		//Check for invalid values
  {
  	if(a < 0.0f) {
--- 35,39 ----
  const float textureSize = 256.0f;
  
! inline float limit255(float a)		//Check for invalid values
  {
  	if(a < 0.0f) {
***************
*** 48,52 ****
  }
  
! float texture_factor_low( float h1, float h2, float f)
  {
  	if (f < h1)
--- 48,52 ----
  }
  
! inline float texture_factor_low( float h1, float h2, float f)
  {
  	if (f < h1)
***************
*** 59,63 ****
  }
  
! float texture_factor_high( float h1, float h2, float f)
  {
  	if (f < h1)
--- 59,63 ----
  }
  
! inline float texture_factor_high( float h1, float h2, float f)
  {
  	if (f < h1)
***************
*** 69,73 ****
  }
  
! float texture_factor_mid2( float h1, float h2, float h3, float h4, float f)
  {
  	if (f < h1)
--- 69,73 ----
  }
  
! inline float texture_factor_mid2( float h1, float h2, float h3, float h4, float f)
  {
  	if (f < h1)
***************
*** 86,90 ****
  }
  
! float texture_factor_mid(float h1, float h2, float h3, float f)		//Check for percentage of color
  {
  	//float t;
--- 86,90 ----
  }
  
! inline float texture_factor_mid(float h1, float h2, float h3, float f)		//Check for percentage of color
  {
  	//float t;
***************
*** 184,188 ****
  		if (Settings::GetInstance()->IsVerbose())
  		{
! 			m_Logfile << "Generating Texture" << endl;
  		}
  
--- 184,188 ----
  		if (Settings::GetInstance()->IsVerbose())
  		{
! 			m_Logfile << "Generating Texture" << latticeX << ":" << latticeY << endl;
  		}
  
***************
*** 205,213 ****
  			Uint8* pTex6 = m_BaseTextures[5];
  
  			Uint8* pImage = new Uint8[(int)((textureSize + 1.0f) * (textureSize + 1.0f)) * 3];
! 			int imageIndex = 0;
  			for (float y = originY; y < originY + height; y += texelSpacing)
  			{
! 				for (float x = originX; x < originX + width; x += texelSpacing,imageIndex += 3)
  				{
  					float f0, f1, f2, f3, f4, f5;
--- 205,216 ----
  			Uint8* pTex6 = m_BaseTextures[5];
  
+ 			//std::cout << "Generating Texture" << latticeX << ":" << latticeY << endl;
+ 			std::cout << originX << "," << originY << "  " << width << "," << height << "  " << textureSize << "\n";
+ 
  			Uint8* pImage = new Uint8[(int)((textureSize + 1.0f) * (textureSize + 1.0f)) * 3];
! 			Uint8* Idx = pImage;
  			for (float y = originY; y < originY + height; y += texelSpacing)
  			{
! 				for (float x = originX; x < originX + width; x += texelSpacing)
  				{
  					float f0, f1, f2, f3, f4, f5;
***************
*** 222,256 ****
  
  					Uint8 red     = static_cast<unsigned char>(
! 						            limit255(f0*pTex1[imageIndex] +
! 									f1*pTex2[imageIndex] +
! 									f2*pTex3[imageIndex] +
! 									f3*pTex4[imageIndex] +
! 									f4*pTex5[imageIndex] +
! 									f5*pTex6[imageIndex] )
  									);
  
  					Uint8 green   = static_cast<unsigned char>(
! 						            limit255(f0*pTex1[imageIndex + 1] +
! 									f1*pTex2[imageIndex + 1] +
! 									f2*pTex3[imageIndex + 1] +
! 									f3*pTex4[imageIndex + 1] +
! 									f4*pTex5[imageIndex + 1] +
! 									f5*pTex6[imageIndex + 1] )
  									);
  							
  					Uint8 blue    = static_cast<unsigned char>(
! 						            limit255(f0*pTex1[imageIndex + 2] +
! 									f1*pTex2[imageIndex + 2] +
! 									f2*pTex3[imageIndex + 2] +
! 									f3*pTex4[imageIndex + 2] +
! 									f4*pTex5[imageIndex + 2] +
! 									f5*pTex6[imageIndex + 2] )
  									);
  
  
  
! 					pImage[imageIndex]     = red;
! 					pImage[imageIndex + 1] = green;
! 					pImage[imageIndex + 2] = blue;
  				}
  			}
--- 225,259 ----
  
  					Uint8 red     = static_cast<unsigned char>(
! 						              limit255( f0 * *pTex1++ +
! 									f1 * *pTex2++ +
! 									f2 * *pTex3++ +
! 									f3 * *pTex4++ +
! 									f4 * *pTex5++ +
! 									f5 * *pTex6++ )
  									);
  
  					Uint8 green   = static_cast<unsigned char>(
! 						               limit255(f0 * *pTex1++ +
! 									f1 * *pTex2++ +
! 									f2 * *pTex3++ +
! 									f3 * *pTex4++ +
! 									f4 * *pTex5++ +
! 									f5 * *pTex6++ )
  									);
  							
  					Uint8 blue    = static_cast<unsigned char>(
! 						               limit255(f0 * *pTex1++ +
! 									f1 * *pTex2++ +
! 									f2 * *pTex3++ +
! 									f3 * *pTex4++ +
! 									f4 * *pTex5++ +
! 									f5 * *pTex6++ )
  									);
  
  
  
! 					*Idx++ = red;
! 					*Idx++ = green;
! 					*Idx++ = blue;
  				}
  			}

[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.36,1.37

[<de...@us...>]

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

Modified Files:
	CHANGES.current 
Log Message:
no message

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** CHANGES.current	13 May 2003 18:24:45 -0000	1.36
--- CHANGES.current	10 Jun 2003 22:31:21 -0000	1.37
***************
*** 2,5 ****
--- 2,9 ----
  ===========================
  
+ 2003-05-24: delta
+ 	    Added help methods to convert feet to meters and pounds to newtons
+ 	    in math.h.
+ 
  2003-05-13: onsight
              Added exception handling to file copying in setup.py.  Copy errors

[Csp-commits] APPLICATIONS/SimData/Include/SimData Math.h,1.4,1.5

[<de...@us...>]

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

Modified Files:
	Math.h 
Log Message:
see CHANGES.curent

Index: Math.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Math.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Math.h	12 Apr 2003 08:56:37 -0000	1.4
--- Math.h	10 Jun 2003 22:31:00 -0000	1.5
***************
*** 52,55 ****
--- 52,78 ----
  
  
+ double const FtInM = 0.3048;
+ double const MInFt = 3.2808;
+ 
+ inline double FeetToMeters(double feet) {
+ 	return FtInM * feet;
+ }
+ 
+ inline double MetersToFeet(double meters) {
+ 	return MInFt * meters;
+ }
+ 
+ double const PdsToN = 4.44822;
+ 
+ double const NToPds = 0.22481;
+ 
+ inline double PoundsToNewtons(double pds) {
+ 	return PdsToN * pds;
+ }
+ 
+ inline double NewtonsToPounds(double newtonw) {
+ 	return NToPds * newtonw;
+ }
+ 
  NAMESPACE_END // namespace simdata
  

[Csp-commits] APPLICATIONS/Networking/NetworkingServer/Release ccgnu2.dll,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/Release
In directory sc8-pr-cvs1:/tmp/cvs-serv1770

Modified Files:
	ccgnu2.dll 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: ccgnu2.dll
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/Release/ccgnu2.dll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvspCxD30 and /tmp/cvsi3zrkT differ

[Csp-commits] APPLICATIONS/Networking/NetworkingServer Main.cpp,1.1,1.2 NetworkingServer.suo,1.1,1.2 NetworkingServer.vcproj,1.1,1.2 ccgnu2.lib,1.1,1.2 ccgnu2d.lib,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer
In directory sc8-pr-cvs1:/tmp/cvs-serv1341

Modified Files:
	Main.cpp NetworkingServer.suo NetworkingServer.vcproj 
	ccgnu2.lib ccgnu2d.lib 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: Main.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/Main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main.cpp	31 May 2003 14:25:20 -0000	1.1
--- Main.cpp	5 Jun 2003 20:45:31 -0000	1.2
***************
*** 38,49 ****
      }
  
      if(stricmp(inputchars, "/d") == 0)
      {
!       Server->Disconnect(0, 0, 0);
      }
  
      if(stricmp(inputchars, "/s") == 0)
      {
!       Server->Send(0, true, "Blah", 5);
      }
  
--- 38,77 ----
      }
  
+     if(stricmp(inputchars, "/l") == 0)
+     {
+ 
+ 	    cout << "Now listening";
+ 
+       Server->Listen(true);
+     }
+ 
+     if(stricmp(inputchars, "/loff") == 0)
+     {
+ 
+ 	    cout << "No longer listening";
+ 
+       Server->Listen(false);
+     }
+ 
      if(stricmp(inputchars, "/d") == 0)
      {
!       Server->Disconnect(0);
      }
  
      if(stricmp(inputchars, "/s") == 0)
      {
! 
!       char tempbuffer[1000];
! 
!       for(int x=0;x<1000;x++)
!       {
!         tempbuffer[x] = x;
!       }
! 
!       string message;
! 
!       message.append(tempbuffer, tempbuffer + 1000);
! 
!       Server->Send(0, true, message);
      }
  
***************
*** 52,56 ****
        for(unsigned char x=0;x<100;x++)
        {
!         Server->Send(0, true, "Blah", 5);
        }
      }
--- 80,84 ----
        for(unsigned char x=0;x<100;x++)
        {
!         Server->Send(0, true, "Blah");
        }
      }
***************
*** 64,68 ****
        cout << "RecvBuffer   - " << Server->GetRecvBufferCount(0) << endl;
        cout << "SendBuffer   - " << Server->GetSendBufferCount(0) << endl;
-       cout << "Messages     - " << Server->GetRecvMessages(0) << endl;
        cout << "RecvDataRate - " << Server->GetRecvDataRate(0) << endl;
        cout << "SendDataRate - " << Server->GetSendDataRate(0);
--- 92,95 ----
***************
*** 73,76 ****
--- 100,105 ----
  			cout << endl;
  			cout << "/q - quit" << endl;
+       cout << "/l - listen" << endl;
+       cout << "/loff - stop listening" << endl;
  			cout << "/c - connect" << endl;
  			cout << "/d - disconnect" << endl;
***************
*** 95,104 ****
  	cout << "---------------------------------------------";
  
!   NET_TYPE   Type;
!   void      *Data = 0;
!   short      Length;
!   long       Counter;
! 	char tempType[256];
!   char inputchars[256];
  
  	cout << endl << "Enter IP address or DNS name to listen on" << endl;
--- 124,131 ----
  	cout << "---------------------------------------------";
  
!   NET_TYPE      Type;
!   string        Data;
!   short         Counter;
!   char          inputchars[256];
  
  	cout << endl << "Enter IP address or DNS name to listen on" << endl;
***************
*** 114,118 ****
  	strcpy(port, inputchars);
  
! 	cout << "Now Listening on " << ipaddress << " " << port;
  
    Server = new NetworkingClass(ipaddress, port);
--- 141,147 ----
  	strcpy(port, inputchars);
  
! 	cout << "Now bound on " << ipaddress << " " << port;
! 
! 	// -----------------------------------------------------------
  
    Server = new NetworkingClass(ipaddress, port);
***************
*** 127,191 ****
    while(InputThread->isRunning() == true)
    {
!     for(Counter = 0; Counter < 255; Counter++)
!     {
! 
!       if(Server->GetActive(Counter) == true)
        {
!         while(Server->Recv(Counter, &Type, Data, &Length) != NET_NO_MORE_DATA)
!         {
!           if(Type & CONNECT)
            {
!             Server->Accept(Counter, 0, 0);
            }
  
! 					memset(tempType, 0, sizeof(tempType));
! 
! 					if(Type & CONNECT)
! 					{
! 					 strcat(tempType, " CONNECT");
! 					}
! 
! 					if(Type & DISCONNECT)
! 					{
! 						strcat(tempType, " DISCONNECT");
! 					}
  
! 					if(Type & LAG)
! 					{
! 						strcat(tempType, " LAG");
! 					}
  
! 					if(Type & LAG_RECOVERED)
! 					{
! 						strcat(tempType, " LAG RECOVERED");
! 					}
  
! 					if(Type & PACKETLOSS)
! 					{
! 						strcat(tempType, " PACKETLOSS");
! 					}
  
! 					if(Type & DATA)
! 					{
! 						strcat(tempType, " DATA");
! 					}
  
! 					if(Type & TIMEOUT)
! 					{
! 						strcat(tempType, " TIMEOUT");
! 					}
  
! 					cout << endl << "<PACKET RECEIVED> Conn: " << Counter << " "
! 						              "Type: " << Type << tempType << endl <<
! 												  "                  Stats " <<
! 							"L: " << Server->GetLatency(Counter) << " " <<
! 							"P: " << Server->GetPing(Counter) << " " <<
! 							"RBC: " << Server->GetRecvBufferCount(Counter) << " " <<
! 							"SBC: " << Server->GetSendBufferCount(Counter) << " " <<
! 							"RDR: " << Server->GetRecvDataRate(Counter) << " " <<
! 							"SDR: " << Server->GetSendDataRate(Counter) << ">";
  
!         }
!       }
      }
  
--- 156,217 ----
    while(InputThread->isRunning() == true)
    {
!       while(Server->Recv(&Counter, &Type, &Data) != NET_NO_MORE_DATA)
        {
! 
! 				if(Type & CONNECT)
! 				{
! 				  if(Type & ACK)
! 				  {
!             cout << "C";
! 				  }
!           else if(Type & REJECT)
! 			    {
!             cout << "R";
! 			    }
!           else
            {
!             cout << "A";
!             Server->Accept(0);
            }
+ 				}
  
! 				if(Type & DISCONNECT)
! 				{
  
! 				  if(Type & ACK)
! 				  {
!             cout << "D";
! 				  }
!           else
!           {
!             cout << "d";
!           }
  
! 				}
  
! 				if(Type & LAG)
! 				{
!           cout << "L";
! 				}
  
! 				if(Type & LAG_RECOVERED)
! 				{
!           cout << "l";
! 				}
  
! 				if(Type & PACKETLOSS)
! 				{
!           cout << "P";
! 				}
  
! 				if(Type & DATA)
! 				{
!           cout << ".";
! 				}
  
! 				if(Type & TIMEOUT)
! 				{
!           cout << "T";
! 				}
      }
  

Index: NetworkingServer.suo
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/NetworkingServer.suo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsgeaJ9x and /tmp/cvsWQmm2V differ

Index: NetworkingServer.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/NetworkingServer.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetworkingServer.vcproj	31 May 2003 14:25:20 -0000	1.1
--- NetworkingServer.vcproj	5 Jun 2003 20:45:31 -0000	1.2
***************
*** 92,96 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="ccgnu2.lib odbc32.lib odbccp32.lib"
  				ShowProgress="0"
  				OutputFile=".\Release/NetworkingServer.exe"
--- 92,96 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="ws2_32.lib ccgnu2.lib odbc32.lib odbccp32.lib"
  				ShowProgress="0"
  				OutputFile=".\Release/NetworkingServer.exe"
***************
*** 123,130 ****
  			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
  			<File
! 				RelativePath=".\Main.cpp">
  			</File>
  			<File
! 				RelativePath=".\NetworkingClass.cpp">
  			</File>
  		</Filter>
--- 123,130 ----
  			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
  			<File
! 				RelativePath="Main.cpp">
  			</File>
  			<File
! 				RelativePath="..\NetworkingClass.cpp">
  			</File>
  		</Filter>
***************
*** 133,137 ****
  			Filter="h;hpp;hxx;hm;inl">
  			<File
! 				RelativePath=".\NetworkingClass.h">
  			</File>
  		</Filter>
--- 133,137 ----
  			Filter="h;hpp;hxx;hm;inl">
  			<File
! 				RelativePath="..\NetworkingClass.h">
  			</File>
  		</Filter>

Index: ccgnu2.lib
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/ccgnu2.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs9GHTgD and /tmp/cvsk0KCci differ

Index: ccgnu2d.lib
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/ccgnu2d.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsqVgUU5 and /tmp/cvsU3HuH4 differ

[Csp-commits] APPLICATIONS/Networking NetworkingClass.cpp,1.2,1.3

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking
In directory sc8-pr-cvs1:/tmp/cvs-serv3708

Modified Files:
	NetworkingClass.cpp 
Log Message:
The destructor was sending out packets to the other side with the disconnect message, but it was using the 2 parameter disconnect function (using 0 as the message) which is incorrect. Changed it over to the 1 parameter disconnect function.

Index: NetworkingClass.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClass.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NetworkingClass.cpp	5 Jun 2003 20:43:22 -0000	1.2
--- NetworkingClass.cpp	5 Jun 2003 20:50:58 -0000	1.3
***************
*** 32,36 ****
    for(Counter = 0; Counter < p_Connect.size(); Counter++)
    {
!     Disconnect(p_Connect[Counter].connectionid, 0);
    }
  
--- 32,36 ----
    for(Counter = 0; Counter < p_Connect.size(); Counter++)
    {
!     Disconnect(p_Connect[Counter].connectionid);
    }
  

[Csp-commits] APPLICATIONS/Networking/NetworkingClient/Debug ccgnu2d.dll,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/Debug
In directory sc8-pr-cvs1:/tmp/cvs-serv2040/Debug

Modified Files:
	ccgnu2d.dll 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: ccgnu2d.dll
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/Debug/ccgnu2d.dll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsVGsZvq and /tmp/cvsG3PNsH differ

[Csp-commits] APPLICATIONS/Networking/NetworkingClient/Release ccgnu2.dll,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/Release
In directory sc8-pr-cvs1:/tmp/cvs-serv2040/Release

Modified Files:
	ccgnu2.dll 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: ccgnu2.dll
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/Release/ccgnu2.dll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs4s8wZP and /tmp/cvsaeG4lx differ

[Csp-commits] APPLICATIONS/Networking/NetworkingClient Main.cpp,1.1,1.2 NetworkingClient.suo,1.1,1.2 NetworkingClient.vcproj,1.1,1.2 ccgnu2.lib,1.1,1.2 ccgnu2d.lib,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient
In directory sc8-pr-cvs1:/tmp/cvs-serv2040

Modified Files:
	Main.cpp NetworkingClient.suo NetworkingClient.vcproj 
	ccgnu2.lib ccgnu2d.lib 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: Main.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/Main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main.cpp	31 May 2003 14:23:24 -0000	1.1
--- Main.cpp	5 Jun 2003 20:47:02 -0000	1.2
***************
*** 12,17 ****
    void            final();
  
- public:
- 
  };
  
--- 12,15 ----
***************
*** 24,28 ****
  
    char inputchars[256];
! 
    // Thread can gracefully shutdown.
    setCancel(Thread::cancelDeferred);
--- 22,26 ----
  
    char inputchars[256];
! 	
    // Thread can gracefully shutdown.
    setCancel(Thread::cancelDeferred);
***************
*** 38,41 ****
--- 36,53 ----
      }
  
+     if(stricmp(inputchars, "/l") == 0)
+     {
+ 	    cout << "Now listening";
+ 
+       Client->Listen(true);
+     }
+ 
+     if(stricmp(inputchars, "/loff") == 0)
+     {
+ 	    cout << "No longer listening";
+ 
+       Client->Listen(false);
+     }
+ 
      if(stricmp(inputchars, "/c") == 0)
      {
***************
*** 53,67 ****
  
  			cout << "Now Connecting to " << ipaddress << " " << port;
!       Client->Connect(0, ipaddress, port, 0, 0);
      }
  
      if(stricmp(inputchars, "/d") == 0)
      {
!       Client->Disconnect(0, 0, 0);
      }
  
      if(stricmp(inputchars, "/s") == 0)
      {
!       Client->Send(0, true, "Blah", 5);
      }
  
--- 65,79 ----
  
  			cout << "Now Connecting to " << ipaddress << " " << port;
!       Client->Connect(0, ipaddress, port);
      }
  
      if(stricmp(inputchars, "/d") == 0)
      {
!       Client->Disconnect(0);
      }
  
      if(stricmp(inputchars, "/s") == 0)
      {
!       Client->Send(0, true, "Blah");
      }
  
***************
*** 69,74 ****
      {
        for(unsigned char x=0;x<100;x++)
!       {
!         Client->Send(0, true, "Blah", 5);
        }
      }
--- 81,86 ----
      {
        for(unsigned char x=0;x<100;x++)
!       {         
!         Client->Send(0, true, "Blah");
        }
      }
***************
*** 82,86 ****
        cout << "RecvBuffer   - " << Client->GetRecvBufferCount(0) << endl;
        cout << "SendBuffer   - " << Client->GetSendBufferCount(0) << endl;
-       cout << "Messages     - " << Client->GetRecvMessages(0) << endl;
        cout << "RecvDataRate - " << Client->GetRecvDataRate(0) << endl;
        cout << "SendDataRate - " << Client->GetSendDataRate(0);
--- 94,97 ----
***************
*** 91,94 ****
--- 102,107 ----
  			cout << endl;
  			cout << "/q - quit" << endl;
+       cout << "/l - listen" << endl;
+       cout << "/loff - stop listening" << endl;
  			cout << "/c - connect" << endl;
  			cout << "/d - disconnect" << endl;
***************
*** 113,123 ****
  	cout << "---------------------------------------------";
    
!   NET_TYPE   Type;
! 	char tempType[256];
! 
!   void      *Data = 0;
!   short      Length;
!   long       Counter;
!   char inputchars[256];
  
  	cout << endl << "Enter IP address or DNS name to listen on" << endl;
--- 126,133 ----
  	cout << "---------------------------------------------";
    
!   NET_TYPE      Type;
!   string        Data;
!   short         Counter;
!   char			    inputchars[256];
  
  	cout << endl << "Enter IP address or DNS name to listen on" << endl;
***************
*** 133,137 ****
  	strcpy(port, inputchars);
  
! 	cout << "Now Listening on " << ipaddress << " " << port;
  
    Client = new NetworkingClass(ipaddress, port);
--- 143,147 ----
  	strcpy(port, inputchars);
  
! 	cout << "Now bound on " << ipaddress << " " << port;
  
    Client = new NetworkingClass(ipaddress, port);
***************
*** 146,205 ****
    while(InputThread->isRunning() == true)
    {
-     for(Counter = 0; Counter <= 255; Counter++)
-     {
-       if(Client->GetActive(Counter) == true)
-       {
-         while(Client->Recv(Counter, &Type, Data, &Length) != NET_NO_MORE_DATA)
-         {
  
! 					memset(tempType, 0, sizeof(tempType));
  
! 					if(Type & CONNECT)
! 					{
! 					 strcat(tempType, " CONNECT");
! 					}
  
! 					if(Type & DISCONNECT)
! 					{
! 						strcat(tempType, " DISCONNECT");
! 					}
  
! 					if(Type & LAG)
! 					{
! 						strcat(tempType, " LAG");
! 					}
  
! 					if(Type & LAG_RECOVERED)
! 					{
! 						strcat(tempType, " LAG RECOVERED");
! 					}
  
! 					if(Type & PACKETLOSS)
! 					{
! 						strcat(tempType, " PACKETLOSS");
! 					}
  
! 					if(Type & DATA)
! 					{
! 						strcat(tempType, " DATA");
! 					}
  
! 					if(Type & TIMEOUT)
! 					{
! 						strcat(tempType, " TIMEOUT");
! 					}
  
! 					cout << endl << "<PACKET RECEIVED> Conn: " << Counter << " "
! 						              "Type: " << Type << tempType << endl <<
! 												  "                  Stats " <<
! 							"L: " << Client->GetLatency(Counter) << " " <<
! 							"P: " << Client->GetPing(Counter) << " " <<
! 							"RBC: " << Client->GetRecvBufferCount(Counter) << " " <<
! 							"SBC: " << Client->GetSendBufferCount(Counter) << " " <<
! 							"RDR: " << Client->GetRecvDataRate(Counter) << " " <<
! 							"SDR: " << Client->GetSendDataRate(Counter) << ">";
  
!         }
!       }
  
      }
--- 156,218 ----
    while(InputThread->isRunning() == true)
    {
  
!     while(Client->Recv(&Counter, &Type, &Data) != NET_NO_MORE_DATA)
!     {
  
! 				if(Type & CONNECT)
! 				{
! 				  if(Type & ACK)
! 				  {
!             cout << "C";
! 				  }
!           else if(Type & REJECT)
! 			    {
!             cout << "R";
! 			    }
!           else
!           {
!             cout << "A";
!             Client->Accept(0);
!           }
! 				}
  
! 				if(Type & DISCONNECT)
! 				{
  
! 				  if(Type & ACK)
! 				  {
!             cout << "D";
! 				  }
!           else
!           {
!             cout << "d";
!           }
  
! 				}
  
! 				if(Type & LAG)
! 				{
!           cout << "L";
! 				}
  
! 				if(Type & LAG_RECOVERED)
! 				{
!           cout << "l";
! 				}
  
! 				if(Type & PACKETLOSS)
! 				{
!           cout << "P";
! 				}
  
! 				if(Type & DATA)
! 				{
!           cout << ".";
! 				}
  
! 				if(Type & TIMEOUT)
! 				{
!           cout << "T";
! 				}
  
      }

Index: NetworkingClient.suo
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/NetworkingClient.suo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs7ToFzr and /tmp/cvscm03UI differ

Index: NetworkingClient.vcproj
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/NetworkingClient.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetworkingClient.vcproj	31 May 2003 14:23:24 -0000	1.1
--- NetworkingClient.vcproj	5 Jun 2003 20:47:02 -0000	1.2
***************
*** 91,95 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="ccgnu2.lib odbc32.lib odbccp32.lib"
  				OutputFile=".\Release/NetworkingClient.exe"
  				LinkIncremental="1"
--- 91,95 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/MACHINE:I386"
! 				AdditionalDependencies="ws2_32.lib ccgnu2.lib odbc32.lib odbccp32.lib"
  				OutputFile=".\Release/NetworkingClient.exe"
  				LinkIncremental="1"
***************
*** 124,128 ****
  			</File>
  			<File
! 				RelativePath=".\NetworkingClass.cpp">
  			</File>
  		</Filter>
--- 124,128 ----
  			</File>
  			<File
! 				RelativePath="..\NetworkingClass.cpp">
  			</File>
  		</Filter>
***************
*** 131,135 ****
  			Filter="h;hpp;hxx;hm;inl">
  			<File
! 				RelativePath=".\NetworkingClass.h">
  			</File>
  		</Filter>
--- 131,135 ----
  			Filter="h;hpp;hxx;hm;inl">
  			<File
! 				RelativePath="..\NetworkingClass.h">
  			</File>
  		</Filter>

Index: ccgnu2.lib
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/ccgnu2.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs86RaqH and /tmp/cvs44Uv5i differ

Index: ccgnu2d.lib
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClient/ccgnu2d.lib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs5CxBLW and /tmp/cvsIcNkIL differ

[Csp-commits] commoncpp2-1.0.12/tests Makefile.am,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE README,1.1.1.1,NONE bug1.cpp,1.1.1.1,NONE bug2.cpp,1.1.1.1,NONE digest.cpp,1.1.1.1,NONE dotests.sh,1.1.1.1,NONE output.txt,1.1.1.1,NONE tcpstr1.cpp,1.1.1.1,NONE test.sh,1.1.1.1,NONE thread1.cpp,1.1.1.1,NONE thread2.cpp,1.1.1.1,NONE unixio.cpp,1.1.1.1,NONE url1.cpp,1.1.1.1,NONE vc6.mak,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29573

Removed Files:
	Makefile.am Makefile.in README bug1.cpp bug2.cpp digest.cpp 
	dotests.sh output.txt tcpstr1.cpp test.sh thread1.cpp 
	thread2.cpp unixio.cpp url1.cpp vc6.mak 
Log Message:
no message

--- Makefile.am DELETED ---

--- Makefile.in DELETED ---

--- README DELETED ---

--- bug1.cpp DELETED ---

--- bug2.cpp DELETED ---

--- digest.cpp DELETED ---

--- dotests.sh DELETED ---

--- output.txt DELETED ---

--- tcpstr1.cpp DELETED ---

--- test.sh DELETED ---

--- thread1.cpp DELETED ---

--- thread2.cpp DELETED ---

--- unixio.cpp DELETED ---

--- url1.cpp DELETED ---

--- vc6.mak DELETED ---

[Csp-commits] APPLICATIONS/Networking/NetworkingServer/Debug ccgnu2d.dll,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/Debug
In directory sc8-pr-cvs1:/tmp/cvs-serv1884

Modified Files:
	ccgnu2d.dll 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: ccgnu2d.dll
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingServer/Debug/ccgnu2d.dll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsfk3UTd and /tmp/cvsh3Ufhe differ

[Csp-commits] APPLICATIONS/Networking NetworkingClass.h,1.1,1.2 NetworkingClass.cpp,1.1,1.2

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/Networking
In directory sc8-pr-cvs1:/tmp/cvs-serv466

Modified Files:
	NetworkingClass.h NetworkingClass.cpp 
Log Message:
Updated to use STL strings/vectors and fixed the 5 issues listed on webpage.

Index: NetworkingClass.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClass.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetworkingClass.h	31 May 2003 14:21:16 -0000	1.1
--- NetworkingClass.h	5 Jun 2003 20:43:22 -0000	1.2
***************
*** 5,8 ****
--- 5,12 ----
  #include <time.h>
  
+ #include <vector>
+ #include <deque>
+ #include <algorithm>
+ 
  #ifdef  CCXX_NAMESPACES
  using namespace std;
***************
*** 13,16 ****
--- 17,22 ----
  typedef short NET_ERROR;
  
+ const NET_ERROR NET_INVALID_PACKET          = -5;
+ const NET_ERROR NET_EXCEPTION               = -4;
  const NET_ERROR NET_NO_MORE_DATA            = -3;
  const NET_ERROR NET_INVALID_STATE           = -2;
***************
*** 42,46 ****
  const short PACKET_IDENTIFIER           = 0x5E10;
  const short DATARATE_TIMEOUT						= 1000;
! const short DROPPED_TIMEOUT             = 2500;
  const short KEEPALIVE_TIMEOUT           = 5000;
  const short KEEPALIVE_COUNTER           = 6;
--- 48,52 ----
  const short PACKET_IDENTIFIER           = 0x5E10;
  const short DATARATE_TIMEOUT						= 1000;
! const short DROPPED_TIMEOUT             = 500;
  const short KEEPALIVE_TIMEOUT           = 5000;
  const short KEEPALIVE_COUNTER           = 6;
***************
*** 55,71 ****
  private:
  
!   // buffer struct
!   struct NetBuffer
    {
!     bool      processed;
!     NET_TYPE  type;
! 
!     short     packetseqnbr;
!     short     packetlength;
!     void     *packet;
!     
!     short     dataoffset;
!     short     datalength;
! 
    };
  
--- 61,70 ----
  private:
  
!   // Recv struct
!   struct NetRecv
    {
!     short         ConnectionId;
!     NET_TYPE      Type;
!     string        Data;
    };
  
***************
*** 75,83 ****
      short StartFiller;
      NET_TYPE Type;
!     unsigned char SeqNbr;
!     unsigned char AckSeqNbr;
      short Time;
    };
  
    // Internal Struct to hold information.
    struct NetConnections
--- 74,90 ----
      short StartFiller;
      NET_TYPE Type;
!     short SeqNbr;
!     short AckSeqNbr;
      short Time;
    };
  
+   // Packet
+   struct NetBuffer
+   {
+     bool          processed;
+     NetHeader     header;
+     string        data;
+   };
+ 
    // Internal Struct to hold information.
    struct NetConnections
***************
*** 85,97 ****
  
      // Connection
-     bool              inuse;          // if we have open connection this is true
-     bool              pendingclose;   // if we get a disconnect we need to still Recv
-                                       //    the message so we need to pending close
-                                       //    to keep the inuse open until all messages
-                                       //    are read from buffer.
- 
      InetHostAddress   addr;           //  address of connection
      tpport_t          port;           //  port of connection
  
      short             todo;						// what shall we do next send packet?
  
--- 92,100 ----
  
      // Connection
      InetHostAddress   addr;           //  address of connection
      tpport_t          port;           //  port of connection
  
+ 		short							connectionid;		// Connection ID for app.
+ 
      short             todo;						// what shall we do next send packet?
  
***************
*** 117,134 ****
      // Buffer
  		unsigned long			recvdatarate;
!     unsigned char     recvcount;
!     unsigned char     recvseqnbr;
!     unsigned char     recvwritepointer;
!     unsigned char     recvreadpointer;
!     NetBuffer         recvbuffer[256];
  
  		unsigned long			senddatarate;
!     unsigned char     sendcount;
!     unsigned char     sendwritepointer;
!     unsigned char     sendreadpointer;
!     NetBuffer         sendbuffer[256];
  
    };
  
    // Thread functions
    void            initial();
--- 120,141 ----
      // Buffer
  		unsigned long			recvdatarate;
!     short             recvseqnbr;
!     vector<NetBuffer> recvbuffer;
  
  		unsigned long			senddatarate;
!     short             sendseqnbr;
!     vector<NetBuffer> sendbuffer;
  
    };
  
+   // Class variables
+   bool                    p_bListen;
+ 
+   UDPSocket              *p_Socket;
+   Mutex                  *p_MutexShared;
+ 
+   vector<NetConnections>  p_Connect;
+   deque<NetRecv>          p_Recv;
+ 
    // Thread functions
    void            initial();
***************
*** 136,151 ****
    void            final();
  
!   // Class variables
!   unsigned char   p_sConnectionCount;
!   bool            p_bShutdown;
  
!   UDPSocket      *p_Socket;
!   Mutex          *p_MutexShared;
  
!   NetConnections  p_Connect[256];
  
-   short Resend(short ConnectionId, NetBuffer *Packet);
-   short Reject(InetHostAddress Addr, tpport_t Port, void *Data, short Length);
    short ReportLocalMessage(short ConnectionId, NET_TYPE Type);
  
  public:
--- 143,166 ----
    void            final();
  
!   // Private functions
  
!   short LowLevelRecv();
  
!   short InternalSend(short ArrayEntry, bool Guaranteed);
!   short InternalSend(short ArrayEntry, bool Guaranteed, string Data);
! 
!   short LowLevelSend(InetHostAddress Addr,
!                      tpport_t Port,
!                      short Type,
!                      short SeqNbr,
!                      short AckSeqNbr,
!                      short Time,
!                      string *Data,
!                      short *Length);
! 
! 	short ConnectionIdToArrayEntry(short ConnectionId);
  
    short ReportLocalMessage(short ConnectionId, NET_TYPE Type);
+   short ReportLocalMessage(short ConnectionId, NET_TYPE Type, string *Data);
  
  public:
***************
*** 157,177 ****
  
    // Operations
!   short Connect(short ConnectionId, char *IP, char *Port, void*Data, short Length);
!   short Send(short ConnectionId, bool Guaranteed, void *Data, short Length);
!   short Recv(short ConnectionId, NET_TYPE *Type, void *Data, short *Length);
!   short Accept(short ConnectionId, void *Data, short Length);
!   short Reject(short ConnectionId, void *Data, short Length);
!   short Disconnect(short ConnectionId, void *Data, short Length);
  
    // Query Performance
    short GetConnections(); // How many others we're connected to.
-   bool  GetActive(short ConnectionId); // See if this connection is active.
    short GetPing(short ConnectionId); // Time to go over internet.
    short GetLatency(short ConnectionId); // Time the server takes to ack.
-   short GetRecvMessages(short ConnectionId); // How many messages are waiting to be recv'd.
    short GetSendBufferCount(short ConnectionId); // How many packets are in the sendbuffer yet to be acknowledged from server.
    short GetRecvBufferCount(short ConnectionId); // How many packets are in the recvbuffer waiting to be acknowledged from us.
!   unsigned long GetSendDataRate(short ConnectionId); // How many bytes per second are being sent.
!   unsigned long GetRecvDataRate(short ConnectionId); // How many bytes per second are being recv.
  
    // FlipFlop functions, used to convert Endians.
--- 172,200 ----
  
    // Operations
!   short Connect(short ConnectionId, char *IP, char *Port, string Data);
!   short Connect(short ConnectionId, char *IP, char *Port);
! 
!   short Send(short ConnectionId, bool Guaranteed, string Data);
!   short Recv(short *ConnectionId, NET_TYPE *Type, string *Data);
! 
!   short Listen(bool On);
! 
!   short Accept(short ConnectionId, string Data);
!   short Accept(short ConnectionId);
! 
!   short Reject(short ConnectionId, string Data);
!   short Reject(short ConnectionId);
! 
!   short Disconnect(short ConnectionId, string Data);
!   short Disconnect(short ConnectionId);
  
    // Query Performance
    short GetConnections(); // How many others we're connected to.
    short GetPing(short ConnectionId); // Time to go over internet.
    short GetLatency(short ConnectionId); // Time the server takes to ack.
    short GetSendBufferCount(short ConnectionId); // How many packets are in the sendbuffer yet to be acknowledged from server.
    short GetRecvBufferCount(short ConnectionId); // How many packets are in the recvbuffer waiting to be acknowledged from us.
!   short GetSendDataRate(short ConnectionId); // How many bytes per second are being sent.
!   short GetRecvDataRate(short ConnectionId); // How many bytes per second are being recv.
  
    // FlipFlop functions, used to convert Endians.

Index: NetworkingClass.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/Networking/NetworkingClass.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetworkingClass.cpp	31 May 2003 14:21:16 -0000	1.1
--- NetworkingClass.cpp	5 Jun 2003 20:43:22 -0000	1.2
***************
*** 4,11 ****
  {
  
!   p_bShutdown = true;
!   p_sConnectionCount = 0;
! 
!   memset(p_Connect, 0, sizeof(p_Connect));
  
    // Setup variables
--- 4,8 ----
  {
[...2928 lines suppressed...]
!   }
! 
!   // ------------------------------------
! 
!   return (short)p_Connect[ArrayEntry].senddatarate;
  }
  
+ 
  void NetworkingClass::FlipFlop(unsigned short &number) 
  {
***************
*** 1787,1789 ****
  
    return;
! }
\ No newline at end of file
--- 1416,1418 ----
  
    return;
! }

[Csp-commits] commoncpp2-1.0.12 TODO,1.1.1.1,NONE THANKS,1.1.1.1,NONE reconfig,1.1.1.1,NONE README,1.1.1.1,NONE pkginfo.in,1.1.1.1,NONE NEWS,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE Makefile.bcc,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE INSTALL.win32,1.1.1.1,NONE INSTALL,1.1.1.1,NONE COPYING.addendum,1.1.1.1,NONE COPYING,1.1.1.1,NONE configure.in,1.1.1.1,NONE configure,1.1.1.1,NONE commoncpp2.spec.in,1.1.1.1,NONE commoncpp2.spec,1.1.1.1,NONE commoncpp2.proto.in,1.1.1.1,NONE commoncpp2.lsm.in,1.1.1.1,NONE commoncpp2.kdevprj,1.1.1.1,NONE ChangeLog,1.1.1.1,NONE AUTHORS,1.1.1.1,NONE aclocal.m4,1.1.1.1,NONE acconfig.h,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12
In directory sc8-pr-cvs1:/tmp/cvs-serv31378

Removed Files:
	TODO THANKS reconfig README pkginfo.in NEWS Makefile.in 
	Makefile.bcc Makefile.am INSTALL.win32 INSTALL 
	COPYING.addendum COPYING configure.in configure 
	commoncpp2.spec.in commoncpp2.spec commoncpp2.proto.in 
	commoncpp2.lsm.in commoncpp2.kdevprj ChangeLog AUTHORS 
	aclocal.m4 acconfig.h 
Log Message:
no message

--- TODO DELETED ---

--- THANKS DELETED ---

--- reconfig DELETED ---

--- README DELETED ---

--- pkginfo.in DELETED ---

--- NEWS DELETED ---

--- Makefile.in DELETED ---

--- Makefile.bcc DELETED ---

--- Makefile.am DELETED ---

--- INSTALL.win32 DELETED ---

--- INSTALL DELETED ---

--- COPYING.addendum DELETED ---

--- COPYING DELETED ---

--- configure.in DELETED ---

--- configure DELETED ---

--- commoncpp2.spec.in DELETED ---

--- commoncpp2.spec DELETED ---

--- commoncpp2.proto.in DELETED ---

--- commoncpp2.lsm.in DELETED ---

--- commoncpp2.kdevprj DELETED ---

--- ChangeLog DELETED ---

--- AUTHORS DELETED ---

--- aclocal.m4 DELETED ---

--- acconfig.h DELETED ---

[Csp-commits] commoncpp2-1.0.12/config texinfo.tex,1.1.1.1,NONE mkinstalldirs,1.1.1.1,NONE missing,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE ltmain.sh,1.1.1.1,NONE install-sh,1.1.1.1,NONE depcomp,1.1.1.1,NONE config.sub,1.1.1.1,NONE config.guess,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/config
In directory sc8-pr-cvs1:/tmp/cvs-serv31251

Removed Files:
	texinfo.tex mkinstalldirs missing Makefile.in Makefile.am 
	ltmain.sh install-sh depcomp config.sub config.guess 
Log Message:
no message

--- texinfo.tex DELETED ---

--- mkinstalldirs DELETED ---

--- missing DELETED ---

--- Makefile.in DELETED ---

--- Makefile.am DELETED ---

--- ltmain.sh DELETED ---

--- install-sh DELETED ---

--- depcomp DELETED ---

--- config.sub DELETED ---

--- config.guess DELETED ---

[Csp-commits] commoncpp2-1.0.12/demo xmlfetch.cpp,1.1.1.1,NONE urlfetch.cpp,1.1.1.1,NONE test.xml,1.1.1.1,NONE tcpthread.cpp,1.1.1.1,NONE tcpservice.cpp,1.1.1.1,NONE tcp.cpp,1.1.1.1,NONE slogTest.cpp,1.1.1.1,NONE shadigest.cpp,1.1.1.1,NONE serialmain.cpp,1.1.1.1,NONE serialecho.h,1.1.1.1,NONE serialecho.cpp,1.1.1.1,NONE SampleSocketPort.h,1.1.1.1,NONE SampleSocketPort.cpp,1.1.1.1,NONE README,1.1.1.1,NONE netdevices.cpp,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE Makefile.bcc,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE crc32.cpp,1.1.1.1,NONE cmdlineopt.cpp,1.1.1.1,NONE apesock.dsw,1.1.1.1,NONE apesock.dsp,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/demo
In directory sc8-pr-cvs1:/tmp/cvs-serv31144

Removed Files:
	xmlfetch.cpp urlfetch.cpp test.xml tcpthread.cpp 
	tcpservice.cpp tcp.cpp slogTest.cpp shadigest.cpp 
	serialmain.cpp serialecho.h serialecho.cpp SampleSocketPort.h 
	SampleSocketPort.cpp README netdevices.cpp Makefile.in 
	Makefile.bcc Makefile.am crc32.cpp cmdlineopt.cpp apesock.dsw 
	apesock.dsp 
Log Message:
no message

--- xmlfetch.cpp DELETED ---

--- urlfetch.cpp DELETED ---

--- test.xml DELETED ---

--- tcpthread.cpp DELETED ---

--- tcpservice.cpp DELETED ---

--- tcp.cpp DELETED ---

--- slogTest.cpp DELETED ---

--- shadigest.cpp DELETED ---

--- serialmain.cpp DELETED ---

--- serialecho.h DELETED ---

--- serialecho.cpp DELETED ---

--- SampleSocketPort.h DELETED ---

--- SampleSocketPort.cpp DELETED ---

--- README DELETED ---

--- netdevices.cpp DELETED ---

--- Makefile.in DELETED ---

--- Makefile.bcc DELETED ---

--- Makefile.am DELETED ---

--- crc32.cpp DELETED ---

--- cmdlineopt.cpp DELETED ---

--- apesock.dsw DELETED ---

--- apesock.dsp DELETED ---

[Csp-commits] commoncpp2-1.0.12/doc Makefile.in,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE gpl.texi,1.1.1.1,NONE fdlnotice.texi,1.1.1.1,NONE fdl.texi,1.1.1.1,NONE Doxyman,1.1.1.1,NONE Doxyfile,1.1.1.1,NONE commoncpp2.texi,1.1.1.1,NONE commoncpp2.info-3,1.1.1.1,NONE commoncpp2.info-2,1.1.1.1,NONE commoncpp2.info-1,1.1.1.1,NONE commoncpp2.info,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv30912

Removed Files:
	Makefile.in Makefile.am gpl.texi fdlnotice.texi fdl.texi 
	Doxyman Doxyfile commoncpp2.texi commoncpp2.info-3 
	commoncpp2.info-2 commoncpp2.info-1 commoncpp2.info 
Log Message:
no message

--- Makefile.in DELETED ---

--- Makefile.am DELETED ---

--- gpl.texi DELETED ---

--- fdlnotice.texi DELETED ---

--- fdl.texi DELETED ---

--- Doxyman DELETED ---

--- Doxyfile DELETED ---

--- commoncpp2.texi DELETED ---

--- commoncpp2.info-3 DELETED ---

--- commoncpp2.info-2 DELETED ---

--- commoncpp2.info-1 DELETED ---

--- commoncpp2.info DELETED ---

[Csp-commits] commoncpp2-1.0.12/freebsd pkg-plist.in,1.1.1.1,NONE pkg-plist,1.1.1.1,NONE pkg-descr,1.1.1.1,NONE pkg-comment,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/freebsd
In directory sc8-pr-cvs1:/tmp/cvs-serv30793

Removed Files:
	pkg-plist.in pkg-plist pkg-descr pkg-comment Makefile.in 
Log Message:
no message

--- pkg-plist.in DELETED ---

--- pkg-plist DELETED ---

--- pkg-descr DELETED ---

--- pkg-comment DELETED ---

--- Makefile.in DELETED ---

[Csp-commits] commoncpp2-1.0.12/include Makefile.in,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE config.h.in,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/include
In directory sc8-pr-cvs1:/tmp/cvs-serv30619

Removed Files:
	Makefile.in Makefile.am config.h.in 
Log Message:
no message

--- Makefile.in DELETED ---

--- Makefile.am DELETED ---

--- config.h.in DELETED ---

[Csp-commits] commoncpp2-1.0.12/m4 Makefile.am,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE ost_cxx.m4,1.1.1.1,NONE ost_debug.m4,1.1.1.1,NONE ost_dynamic.m4,1.1.1.1,NONE ost_endian.m4,1.1.1.1,NONE ost_getopt.m4,1.1.1.1,NONE ost_maint.m4,1.1.1.1,NONE ost_misc.m4,1.1.1.1,NONE ost_poll.m4,1.1.1.1,NONE ost_posix.m4,1.1.1.1,NONE ost_prog.m4,1.1.1.1,NONE ost_pthread.m4,1.1.1.1,NONE ost_reentrant.m4,1.1.1.1,NONE ost_signal.m4,1.1.1.1,NONE ost_socket.m4,1.1.1.1,NONE ost_stlport.m4,1.1.1.1,NONE ost_string.m4,1.1.1.1,NONE ost_systime.m4,1.1.1.1,NONE ost_types.m4,1.1.1.1,NONE ost_win32.m4,1.1.1.1,NONE ost_xml.m4,1.1.1.1,NONE win32msc.m4,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/m4
In directory sc8-pr-cvs1:/tmp/cvs-serv30457

Removed Files:
	Makefile.am Makefile.in ost_cxx.m4 ost_debug.m4 ost_dynamic.m4 
	ost_endian.m4 ost_getopt.m4 ost_maint.m4 ost_misc.m4 
	ost_poll.m4 ost_posix.m4 ost_prog.m4 ost_pthread.m4 
	ost_reentrant.m4 ost_signal.m4 ost_socket.m4 ost_stlport.m4 
	ost_string.m4 ost_systime.m4 ost_types.m4 ost_win32.m4 
	ost_xml.m4 win32msc.m4 
Log Message:
no message

--- Makefile.am DELETED ---

--- Makefile.in DELETED ---

--- ost_cxx.m4 DELETED ---

--- ost_debug.m4 DELETED ---

--- ost_dynamic.m4 DELETED ---

--- ost_endian.m4 DELETED ---

--- ost_getopt.m4 DELETED ---

--- ost_maint.m4 DELETED ---

--- ost_misc.m4 DELETED ---

--- ost_poll.m4 DELETED ---

--- ost_posix.m4 DELETED ---

--- ost_prog.m4 DELETED ---

--- ost_pthread.m4 DELETED ---

--- ost_reentrant.m4 DELETED ---

--- ost_signal.m4 DELETED ---

--- ost_socket.m4 DELETED ---

--- ost_stlport.m4 DELETED ---

--- ost_string.m4 DELETED ---

--- ost_systime.m4 DELETED ---

--- ost_types.m4 DELETED ---

--- ost_win32.m4 DELETED ---

--- ost_xml.m4 DELETED ---

--- win32msc.m4 DELETED ---

[Csp-commits] commoncpp2-1.0.12/src xml.cpp,1.1.1.1,NONE urlstring.cpp,1.1.1.1,NONE url.cpp,1.1.1.1,NONE unix.cpp,1.1.1.1,NONE threadkey.cpp,1.1.1.1,NONE thread.cpp,1.1.1.1,NONE socket.cpp,1.1.1.1,NONE slog.cpp,1.1.1.1,NONE sha.cpp,1.1.1.1,NONE serial.cpp,1.1.1.1,NONE semaphore.cpp,1.1.1.1,NONE process.cpp,1.1.1.1,NONE private.h,1.1.1.1,NONE port.cpp,1.1.1.1,NONE pipe.cpp,1.1.1.1,NONE persist.cpp,1.1.1.1,NONE peer.cpp,1.1.1.1,NONE ost_check2.m4,1.1.1.1,NONE numbers.cpp,1.1.1.1,NONE network.cpp,1.1.1.1,NONE mutex.cpp,1.1.1.1,NONE mempager.cpp,1.1.1.1,NONE md5.cpp,1.1.1.1,NONE Makefile.in,1.1.1.1,NONE Makefile.bcc,1.1.1.1,NONE Makefile.am,1.1.1.1,NONE keydata.cpp,1.1.1.1,NONE inaddr.cpp,1.1.1.1,NONE groups.cpp,1.1.1.1,NONE getopt1.c,1.1.1.1,NONE getopt.h,1.1.1.1,NONE getopt.c,1.1.1.1,NONE ftp.cpp,1.1.1.1,NONE friends.cpp,1.1.1.1,NONE file.cpp,1.1.1.1,NONE fifo.cpp,1.1.1.1,NONE exception.cpp,1.1.1.1,NONE event.cpp,1.1.1.1,NONE engine.cpp,1.1.1.1,NONE dso.cpp,1.1.1.1,NONE dir.cpp,1.1.1.1,NONE digest.cpp,1.1.1.1,NONE date.cpp,1.1.1.1,NONE cmdoptns.cpp,1.1.1.1,NONE ccgnu2-config.in,1.1.1.1,NONE ccgnu2-config,1.1.1.1,NONE buffer.cpp,1.1.1.1,NONE

[<bra...@us...>]

Update of /cvsroot/csp/commoncpp2-1.0.12/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30243

Removed Files:
	xml.cpp urlstring.cpp url.cpp unix.cpp threadkey.cpp 
	thread.cpp socket.cpp slog.cpp sha.cpp serial.cpp 
	semaphore.cpp process.cpp private.h port.cpp pipe.cpp 
	persist.cpp peer.cpp ost_check2.m4 numbers.cpp network.cpp 
	mutex.cpp mempager.cpp md5.cpp Makefile.in Makefile.bcc 
	Makefile.am keydata.cpp inaddr.cpp groups.cpp getopt1.c 
	getopt.h getopt.c ftp.cpp friends.cpp file.cpp fifo.cpp 
	exception.cpp event.cpp engine.cpp dso.cpp dir.cpp digest.cpp 
	date.cpp cmdoptns.cpp ccgnu2-config.in ccgnu2-config 
	buffer.cpp 
Log Message:
no message

--- xml.cpp DELETED ---

--- urlstring.cpp DELETED ---

--- url.cpp DELETED ---

--- unix.cpp DELETED ---

--- threadkey.cpp DELETED ---

--- thread.cpp DELETED ---

--- socket.cpp DELETED ---

--- slog.cpp DELETED ---

--- sha.cpp DELETED ---

--- serial.cpp DELETED ---

--- semaphore.cpp DELETED ---

--- process.cpp DELETED ---

--- private.h DELETED ---

--- port.cpp DELETED ---

--- pipe.cpp DELETED ---

--- persist.cpp DELETED ---

--- peer.cpp DELETED ---

--- ost_check2.m4 DELETED ---

--- numbers.cpp DELETED ---

--- network.cpp DELETED ---

--- mutex.cpp DELETED ---

--- mempager.cpp DELETED ---

--- md5.cpp DELETED ---

--- Makefile.in DELETED ---

--- Makefile.bcc DELETED ---

--- Makefile.am DELETED ---

--- keydata.cpp DELETED ---

--- inaddr.cpp DELETED ---

--- groups.cpp DELETED ---

--- getopt1.c DELETED ---

--- getopt.h DELETED ---

--- getopt.c DELETED ---

--- ftp.cpp DELETED ---

--- friends.cpp DELETED ---

--- file.cpp DELETED ---

--- fifo.cpp DELETED ---

--- exception.cpp DELETED ---

--- event.cpp DELETED ---

--- engine.cpp DELETED ---

--- dso.cpp DELETED ---

--- dir.cpp DELETED ---

--- digest.cpp DELETED ---

--- date.cpp DELETED ---

--- cmdoptns.cpp DELETED ---

--- ccgnu2-config.in DELETED ---

--- ccgnu2-config DELETED ---

--- buffer.cpp DELETED ---