[Csp-commits] APPLICATIONS/SimData/Include/SimData Composite.h,1.1.2.7,1.1.2.8 GeoPos.h,1.10.2.2,1.1

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: b0_4_0
	Composite.h GeoPos.h InterfaceRegistry.h LogStream.h 
Log Message:

Index: Composite.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/Composite.h,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** Composite.h	10 Oct 2003 01:54:26 -0000	1.1.2.7
--- Composite.h	17 Oct 2003 21:33:54 -0000	1.1.2.8
***************
*** 441,444 ****
--- 441,446 ----

+ /** Base class for nodes that accept visitors.
+  */
  template <class V>
  class Visitable: public virtual Referenced {

Index: GeoPos.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.h,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -C2 -d -r1.10.2.2 -r1.10.2.3
*** GeoPos.h	18 Sep 2003 02:09:48 -0000	1.10.2.2
--- GeoPos.h	17 Oct 2003 21:33:54 -0000	1.10.2.3
***************
*** 649,653 ****
  	 *  @param zone_ UTM zone
  	 *  @param designator_ UTM zone letter
! 	 *  @param alt_ altitude above the reference ellipse (in meters)
  	 */
  	void set(double easting_, double northing_, 
--- 649,653 ----
  	 *  @param zone_ UTM zone
  	 *  @param designator_ UTM zone letter
! 	 *  @param alt altitude above the reference ellipse (in meters)
  	 */
  	void set(double easting_, double northing_, 
***************
*** 666,670 ****
  	 *  @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);
--- 666,670 ----
  	 *  @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);

Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -C2 -d -r1.22.2.3 -r1.22.2.4
*** InterfaceRegistry.h	14 Oct 2003 18:51:23 -0000	1.22.2.3
--- InterfaceRegistry.h	17 Oct 2003 21:33:54 -0000	1.22.2.4
***************
*** 137,140 ****
--- 137,141 ----
  	 *  @param classname The name of the Object subclass corresponding
  	 *                   to the interface being added.
+ 	 *  @param classhash The hash of the Object subclass.
  	 */
  	void addInterface(ObjectInterfaceBase* objectinterface, 
***************
*** 287,291 ****
  	 *  but takes an object class hash instead of the class name.
  	 *
! 	 *  @param cname The class hash of an object class.
  	 *  @returns True if the object class is a superclass.
  	 */
--- 288,292 ----
  	 *  but takes an object class hash instead of the class name.
  	 *
! 	 *  @param chash The class hash of an object class.
  	 *  @returns True if the object class is a superclass.
  	 */
***************
*** 386,390 ****
  	/** Test if an object interface is registered.
  	 *
! 	 *  @param name The object class hash.
  	 */
  	bool hasInterface(hasht key);
--- 387,391 ----
  	/** Test if an object interface is registered.
  	 *
! 	 *  @param key The object class hash.
  	 */
  	bool hasInterface(hasht key);

Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** LogStream.h	18 Sep 2003 02:09:48 -0000	1.9.2.1
--- LogStream.h	17 Oct 2003 21:33:54 -0000	1.9.2.2
***************
*** 22,25 ****
--- 22,26 ----
  /**
   * @file LogStream.h
+  * @brief Stream based logging mechanism.
   *
   * Stream based logging mechanism.
***************
*** 57,66 ****
  //

! /**
!  * @brief An output-only, category-based log stream.
   *
!  * logbuf is an output-only streambuf with the ability to disable sets of
!  * messages at runtime. Only messages with priority >= logbuf::logPriority
!  * and debugClass == logbuf::logClass are output.
   */
  class SIMDATA_EXPORT logbuf : public std::streambuf
--- 58,66 ----
  //

! /** An output-only, category-based log stream.
   *
!  *  logbuf is an output-only streambuf with the ability to disable sets of
!  *  messages at runtime. Only messages with priority >= logbuf::logPriority
!  *  and debugClass == logbuf::logClass are output.
   */
  class SIMDATA_EXPORT logbuf : public std::streambuf
***************
*** 74,129 ****
  	~logbuf();

! 	/**
! 	* Is logging enabled?
! 	* @return true or false*/
  	bool enabled() { return logging_enabled; }

! 	/**
! 	* Set the logging level of subsequent messages.
! 	* @param c debug class
! 	* @param p priority
! 	*/
  	void set_log_state(int c, int p);

! 	/**
! 	* Set the global logging level.
! 	* @param c debug class
! 	* @param p priority
! 	*/
  	void set_log_level(int c, int p);

! 	/**
! 	* Set the allowed logging classes.
! 	* @param c All enabled logging classes anded together.
! 	*/
  	void set_log_classes(int c);

! 	/**
! 	* Get the logging classes currently enabled.
! 	* @return All enabled debug logging anded together.
! 	*/
  	int get_log_classes ();

! 	/**
! 	* Set the logging priority.
! 	* @param p The priority cutoff for logging messages.
! 	*/
  	void set_log_priority(int p);

! 	/**
! 	* Get the current logging priority.
! 	* @return The priority cutoff for logging messages.
! 	*/
  	int get_log_priority ();

! 	/**
! 	* Set the stream buffer
! 	* @param sb stream buffer
! 	*/
  	void set_sb( std::streambuf* sb );

--- 74,129 ----
  	~logbuf();

! 	/** Is logging enabled?
! 	 *
! 	 * @return true or false
! 	 */
  	bool enabled() { return logging_enabled; }

! 	/** Set the logging level of subsequent messages.
! 	 *
! 	 *  @param c debug class
! 	 *  @param p priority
! 	 */
  	void set_log_state(int c, int p);

! 	/** Set the global logging level.
! 	 *
! 	 *  @param c debug class
! 	 *  @param p priority
! 	 */
  	void set_log_level(int c, int p);

! 	/** Set the allowed logging classes.
! 	 *
! 	 *  @param c All enabled logging classes anded together.
! 	 */
  	void set_log_classes(int c);

! 	/** Get the logging classes currently enabled.
! 	 *  @return All enabled debug logging anded together.
! 	 */
  	int get_log_classes ();

! 	/** Set the logging priority.
! 	 *
! 	 *  @param p The priority cutoff for logging messages.
! 	 */
  	void set_log_priority(int p);

! 	/** Get the current logging priority.
! 	 * 
! 	 *  @return The priority cutoff for logging messages.
! 	 */
  	int get_log_priority ();

! 	/** Set the stream buffer
! 	 *
! 	 *  @param sb stream buffer
! 	 */
  	void set_sb( std::streambuf* sb );

***************
*** 165,169 ****
  }

! ///inline logbuf::int_type
  inline int
  logbuf::overflow( int c )
--- 165,169 ----
  }

! //inline logbuf::int_type
  inline int
  logbuf::overflow( int c )
***************
*** 172,177 ****
  }

! /**
!  * @brief LogStream manipulator for setting the log level of a message.
   */
  struct loglevel
--- 172,176 ----
  }

! /** LogStream manipulator for setting the log level of a message.
   */
  struct loglevel
***************
*** 184,195 ****
  };

! /**
!  * @brief A helper class for logstream construction.
   *
!  * A helper class that ensures a streambuf and ostream are constructed and
!  * destroyed in the correct order.  The streambuf must be created before the
!  * ostream but bases are constructed before members.  Thus, making this class
!  * a private base of logstream, declared to the left of ostream, we ensure the
!  * correct order of construction and destruction.
   */
  struct SIMDATA_EXPORT logstream_base
--- 183,193 ----
  };

! /** A helper class for logstream construction.
   *
!  *  A helper class that ensures a streambuf and ostream are constructed and
!  *  destroyed in the correct order.  The streambuf must be created before the
!  *  ostream but bases are constructed before members.  Thus, making this class
!  *  a private base of logstream, declared to the left of ostream, we ensure the
!  *  correct order of construction and destruction.
   */
  struct SIMDATA_EXPORT logstream_base
***************
*** 199,204 ****
  };

! /**
!  * @brief Class to manage the debug logging stream.
   */
  class SIMDATA_EXPORT logstream : private logstream_base, public std::ostream
--- 197,201 ----
  };

! /** Class to manage the debug logging stream.
   */
  class SIMDATA_EXPORT logstream : private logstream_base, public std::ostream
***************
*** 206,213 ****
  	std::ofstream *m_out;
  public:
! 	/**
! 	* The default is to send messages to cerr.
! 	* @param out output stream
! 	*/
  	logstream(std::ostream& out_)
  		: logstream_base(),
--- 203,210 ----
  	std::ofstream *m_out;
  public:
! 	/** The default is to send messages to cerr.
! 	 * 
! 	 *  @param out_ output stream
! 	 */
  	logstream(std::ostream& out_)
  		: logstream_base(),
***************
*** 230,237 ****
  	}

! 	/**
! 	* Set the output stream
! 	* @param out output stream
! 	*/
  	void setOutput(std::ostream& out_) { 
  		_close();
--- 227,234 ----
  	}

! 	/** Set the output stream
! 	 *
! 	 *  @param out_ output stream
! 	 */
  	void setOutput(std::ostream& out_) { 
  		_close();
***************
*** 239,247 ****
  	}

! 	/**
! 	* Set the output stream
! 	* @param fn output file path
! 	*/
! 	void setOutput( std::string const &fn ) { 
  		_close();
  		m_out = new std::ofstream(fn.c_str());
--- 236,244 ----
  	}

! 	/** Set the output stream
! 	 *
! 	 *  @param fn output file path
! 	 */
! 	void setOutput(std::string const &fn) { 
  		_close();
  		m_out = new std::ofstream(fn.c_str());
***************
*** 249,269 ****
  	}

! 	/**
! 	* Set the global log class and priority level.
! 	* @param c debug class
! 	* @param p priority
! 	*/
  	void setLogLevels(int c, int p);

! 	/**
! 	* 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
! 	*/
  	inline std::ostream& operator<< ( const loglevel& l );
  };
--- 246,265 ----
  	}

! 	/** Set the global log class and priority level.
! 	 *
! 	 *  @param c debug class
! 	 *  @param p priority
! 	 */
  	void setLogLevels(int c, int p);

! 	/** 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
! 	 */
  	inline std::ostream& operator<< ( const loglevel& l );
  };

[Csp-commits] APPLICATIONS/SimData/Include/SimData Composite.h,1.1.2.7,1.1.2.8 GeoPos.h,1.10.2.2,1.1

[Csp-commits] APPLICATIONS/SimData/Include/SimData Composite.h,1.1.2.7,1.1.2.8 GeoPos.h,1.10.2.2,1.10.2.3 InterfaceRegistry.h,1.22.2.3,1.22.2.4 LogStream.h,1.9.2.1,1.9.2.2