[complement-svn] SF.net SVN: complement: [1465] trunk/WWW/explore/Complement
Status: Pre-Alpha
Brought to you by:
complement
From: <com...@us...> - 2006-12-28 10:04:22
|
Revision: 1465 http://svn.sourceforge.net/complement/?rev=1465&view=rev Author: complement Date: 2006-12-28 02:04:20 -0800 (Thu, 28 Dec 2006) Log Message: ----------- make description; start Boiler sample Modified Paths: -------------- trunk/WWW/explore/Complement/ContentTech.shtml trunk/WWW/explore/Complement/MakeTags.shtml trunk/WWW/explore/Complement/main.css Added Paths: ----------- trunk/WWW/explore/Complement/Boiler1.shtml trunk/WWW/explore/Complement/MakeConfig.shtml trunk/WWW/explore/Complement/MakeMacros.shtml trunk/WWW/explore/Complement/MakeStart.shtml trunk/WWW/explore/Complement/img/fig/ trunk/WWW/explore/Complement/img/fig/boiler-comp.fig trunk/WWW/explore/Complement/img/fig/boiler-comp.png trunk/WWW/explore/Complement/img/fig/boiler-general.fig trunk/WWW/explore/Complement/img/fig/boiler-general.png trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.fig trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.png trunk/WWW/explore/Complement/img/fig/termo.fig trunk/WWW/explore/Complement/img/fig/termo.png trunk/WWW/explore/Complement/img/fig/valve-lifecycle.fig trunk/WWW/explore/Complement/img/fig/valve-lifecycle.png Added: trunk/WWW/explore/Complement/Boiler1.shtml =================================================================== --- trunk/WWW/explore/Complement/Boiler1.shtml (rev 0) +++ trunk/WWW/explore/Complement/Boiler1.shtml 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,82 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<!-- Time-stamp: <06/12/19 09:11:21 ptr> --> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <link rel="stylesheet" type="text/css" href="main.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="decor.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="float.css" media="screen" title="general"> + <title>Complement: System Design Sample (Boiler)</title> + </head> + + <body> +<!--#include file="head-tech.shtml" --> +<div class="toppic"> +<img src="img/jpg/apropos.jpg"> +</div> +<div class="main"> + <h2 class="lheader"></h2> + <p> + Let's consider design of model of boiler (design of software model). + </p> + <p> + When I want imagine system in whole, I start from drawing component + diagram like this: + </p> +<center> +<img src="img/fig/boiler-general.png"> +</center> +<pre class="ddisplay"> +</pre> + + <p> + On this figure I consider boiler as 'black box', and focused on + behavior of this device from external point of view. I try to answer + on question 'What I expect from this device?'. + </p> + + <p> + On the next step I should define components of the whole system + and expected interaction between ones. + This design stage leads to components point of view on boiler: + </p> +<center> +<img src="img/fig/boiler-comp.png"> +</center> + + <p> + Now, descending in abstraction layer, consider every component separately. + </p> + <p> + Valve life cycle, is here: + </p> +<center> +<img src="img/fig/valve-lifecycle.png"> +</center> + <p> + Valve is opened when power on and closed otherwise. + </p> + + <p> + Thermo elements may has step or continuous regulation of power: + </p> +<center> +<img src="img/fig/termo.png"> +</center> + + <p> + Sensors start work whith power on and take temperature, pressure, + water level, plus two kinds of alarms---low and high water. + </p> +<center> +<img src="img/fig/sensors-lifecycle.png"> +</center> + +</div> +<!--#include file="foot.shtml" --> +<!-- Created: Mon Oct 7 16:33:17 MSD 2002 --> + </body> +</html> + Modified: trunk/WWW/explore/Complement/ContentTech.shtml =================================================================== --- trunk/WWW/explore/Complement/ContentTech.shtml 2006-12-27 12:17:36 UTC (rev 1464) +++ trunk/WWW/explore/Complement/ContentTech.shtml 2006-12-28 10:04:20 UTC (rev 1465) @@ -1,9 +1,12 @@ -<!-- Time-stamp: <03/06/29 16:07:20 ptr> --> +<!-- Time-stamp: <06/12/08 00:48:21 ptr> --> <div class="nodecor"> <a href="index.shtml">Home</a><br> <a href="Anti-autotools.shtml">Anti-autotools</a><br> -<a href="MakeTags.shtml">Make system</a><br> -<a href="compare.pdf">Comparison of STL<br>Implementations (PDF)</a><br> +<a href="MakeStart.shtml">Make system: quick start</a><br> +<a href="MakeConfig.shtml">Make system: global customization</a><br> +<a href="MakeTags.shtml">Make system: tags</a><br> +<a href="MakeMacros.shtml">Make system: macros</a><br> +<a href="compare.pdf">Comparison of STL Implementations (PDF)</a><br> <br> <a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=63160&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo"></a><br> </div> Added: trunk/WWW/explore/Complement/MakeConfig.shtml =================================================================== --- trunk/WWW/explore/Complement/MakeConfig.shtml (rev 0) +++ trunk/WWW/explore/Complement/MakeConfig.shtml 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,29 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<!-- Time-stamp: <06/12/08 01:01:55 ptr> --> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <link rel="stylesheet" type="text/css" href="main.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="decor.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="float.css" media="screen" title="general"> + <title>Complement: Make global customization</title> + </head> + + <body> +<!--#include file="head-tech.shtml" --> +<div class="toppic"> +<img src="img/jpg/apropos.jpg"> +</div> +<div class="main"> + <h2 class="lheader">Global customization: configure again?</h2> +<pre class="ddisplay"> +</pre> + +</div> +<!--#include file="foot.shtml" --> +<!-- Created: Mon Oct 7 16:33:17 MSD 2002 --> + </body> +</html> + Added: trunk/WWW/explore/Complement/MakeMacros.shtml =================================================================== --- trunk/WWW/explore/Complement/MakeMacros.shtml (rev 0) +++ trunk/WWW/explore/Complement/MakeMacros.shtml 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,120 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<!-- Time-stamp: <06/12/12 09:45:03 ptr> --> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <link rel="stylesheet" type="text/css" href="main.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="decor.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="float.css" media="screen" title="general"> + <title>Complement: Make Macros</title> + </head> + + <body> +<!--#include file="head-tech.shtml" --> +<div class="toppic"> +<img src="img/jpg/apropos.jpg"> +</div> +<div class="main"> + <h2 class="lheader">Macros for general use</h2> + <dl> + <dt>COMPILER_NAME + <dd>kind of compiler; something like 'gcc', 'vc6', 'icc', 'aCC', ...; if not set assumed 'gcc'; note, that this isn't + compiler call string, it used as identifier for compiler 'family'</dd> + <dt>ALL_TAGS</dt> + <dd>tags, that should be build during 'all' tag</dd> + <dt>OUTPUT_DIR</dt> + <dd>catalog for object files, resulting programs or libraries for release build</dd> + <dt>OUTPUT_DIR_DBG</dt> + <dd>catalog for object files, resulting programs or libraries for debug build</dd> + <dt>OUTPUT_DIR_STLDBG</dt> + <dd>catalog for object files, resulting programs or libraries for STLport debug mode build</dd> + <dt>BASE_INSTALL_DIR</dt> + <dd>base path for install; ${SRCROOT}/build/$(TARGET_NAME), if not redefined (TARGET_NAME is identification of target OS in case of cross-compilation)</dd> + <dt>INCLUDES</dt> + <dd>include options for compiler (like -I/path/to/someware); if STLport assumed, already have -I${STLPORT_INCLUDE_DIR}</dd> + <dt>DEFS</dt> + <dd>define options for preprocessor (like -DMY_MACRO=1); if STLport assumed already have -DSTLPORT_DEBUG for STLport debug mode</dd> + <dt>OPT</dt> + <dd>optimization flags; already have -g for debug or STLport debug, -O2 for release (or appropriate options for other compilers)</dd> + <dt>LDFLAGS</dt> + <dd>options for linker</dd> + <dt>SRC_CC</dt> + <dd>C++ sources (*.cc)</dd> + <dt>SRC_CPP</dt> + <dd>C++ sources (*.cpp)</dd> + <dt>SRC_CXX</dt> + <dd>C++ sources (*.cxx)</dd> + <dt>SRC_C</dt> + <dd>C sources (*.c)</dd> + </dl> + <h2 class="lheader">Macros to build application</h2> + <dl> + <dt>PRGNAME</dt> + <dd>base name of application (i.e. without .exe on platforms where it used); presense of this macro is direction to build application</dd> + <dt>PRGNAMES</dt> + <dd>build few programs from same catalog</dd> + <dt>BASE_INSTALL_BIN_DIR</dt> + <dd>base path for application installation; BASE_INSTALL_DIR by default</dd> + <dt>INSTALL_BIN_DIR</dt> + <dd>path for release application installation; default BASE_INSTALL_BIN_DIR/bin</dd> + <dt>INSTALL_BIN_DIR_DBG</dt> + <dd>path for debug application installation; default $(INSTALL_BIN_DIR)_g</dd> + <dt>INSTALL_BIN_DIR_STLDBG</dt> + <dd>path for STLport debug mode application installation; default $(INSTALL_BIN_DIR)_stlg</dd> + </dl> + <h2 class="lheader">Macros to build library</h2> + <dl> + <dt>LIBNAME</dt> + <dd>base name of library (i.e. without 'lib' prefix, '.lib', '.so', '.a', '.dll', etc. suffixes)</dd> + <dt>LIBNAMES</dt> + <dd>build few libraries from same catalog</dd> + <dt>BASE_INSTALL_LIB_DIR</dt> + <dd>base path for libararies installation; BASE_INSTALL_DIR by default</dd> + <dt>INSTALL_LIB_DIR</dt> + <dd>path for release libraries installation; default BASE_INSTALL_LIB_DIR/lib</dd> + <dt>INSTALL_LIB_DIR_DBG</dt> + <dd>path for debug libraries installation; default BASE_INSTALL_LIB_DIR/lib</dd> + <dt>INSTALL_LIB_DIR_STLDBG</dt> + <dd>path for STLport debug mode libraries installation; default BASE_INSTALL_LIB_DIR/lib</dd> + </dl> + <h2 class="lheader">Macros for specific tasks</h2> + <dl> + <dt>WITHOUT_STLPORT</dt> + <dd>build without STLport, if defined</dd> + <dt>NOT_USE_NOSTDLIB</dt> + <dd>with STLport, I can avoid link with libstdc++ (only gcc-related); this is default, if it possible; to force link with libstdc++, define this as 1</dd> + <dt>RULESBASE</dt> + <dd>path where this make support system situated</dd> + <dt>_FORCE_CXX</dt> + <dd>use this name as C++ compiler, if defined; don't use it for cross!</dd> + <dt>_FORCE_CC</dt> + <dd>use this name as C compiler, if defined; don't use it for cross!</dd> + <dt>OSNAME</dt> + <dd>contain lower-case one-word OS name (linux, freebsd, hp-ux, sunos, windows, etc.); in case of cross-compilation this is for target OS</dd> + <dt>POST_INSTALL</dt> + <dd>command or group of command that will be made after release library or program installation; not defined</dd> + <dt>POST_INSTALL_DBG</dt> + <dd>command or group of command that will be made after debug library or program installation; not defined</dd> + <dt>POST_INSTALL_STLDBG</dt> + <dd>command or group of command that will be made after STLport debug mode library installation; not defined</dd> + <dt>EXTRA_PRE</dt> + <dd>tags that should be made before release-shared; not defined</dd> + <dt>EXTRA_PRE_DBG</dt> + <dd>tags that should be made before dbg-shared; not defined</dd> + <dt>EXTRA_PRE_STLDBG</dt> + <dd>tags that should be made before stldbg-shared; not defined</dd> + <dt>EXTRA_POST</dt> + <dd>tags that should be made after release-shared; not defined</dd> + <dt>EXTRA_POST_DBG</dt> + <dd>tags that should be made after dbg-shared; not defined</dd> + <dt>EXTRA_POST_STLDBG</dt> + <dd>tags that should be made after stldbg-shared; not defined</dd> + </dl> +</div> +<!--#include file="foot.shtml" --> +<!-- Created: Fri Dec 8 14:11:17 MSD 2006 --> + </body> +</html> + Added: trunk/WWW/explore/Complement/MakeStart.shtml =================================================================== --- trunk/WWW/explore/Complement/MakeStart.shtml (rev 0) +++ trunk/WWW/explore/Complement/MakeStart.shtml 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,178 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<!-- Time-stamp: <06/12/08 01:01:55 ptr> --> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <link rel="stylesheet" type="text/css" href="main.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="decor.css" media="screen" title="general"> + <link rel="stylesheet" type="text/css" href="float.css" media="screen" title="general"> + <title>Complement: Make Basic Use-cases</title> + </head> + + <body> +<!--#include file="head-tech.shtml" --> +<div class="toppic"> +<img src="img/jpg/apropos.jpg"> +</div> +<div class="main"> + <h2 class="lheader">Make versions</h2> + <p> + I stop on support on two make variants. Well, really on single + GNU Make + and one naive utility (nmake). + </p> + + <p> + GNU Make is everyware (or can be + everyware) in *NIX world. So I don't have stimulus to play with + another make incarnations (for example, BSD make is very nice, + but GNU Make more common). If GNU Make is present, I expect that + other POSIX utilities (sed, awk, sh, grep, cat, test, ... ) + present too. + </p> + + <p> + To play with compilers from one Redmond's company, you may + use nmake. The makefiles less attached to absolute paths, + and really may be moved from one box to another, in contrast + to MS's project files. Even more, VS's projects are castrated makefiles + that processed by nmake; this process screened by GUI from users. + Nmake is really restricted, and system based on it has less + features and power then GNU make-based. But it work too. + </p> + + <h2 class="lheader">Use-case: application</h2> + <p> + To build program you need compiler-specific (often + OS-specific) file like <tt>Makefile</tt>: + </p> +<pre class="ddisplay"> +# -*- Makefile -*- Time-stamp: <06/08/04 10:54:19 ptr> + +SRCROOT := ../../.. +COMPILER_NAME := gcc + +include Makefile.inc +include ${SRCROOT}/Makefiles/top.mak + + +INCLUDES += -I$(SRCROOT)/include -I$(BOOST_INCLUDE_DIR) + +release-shared : LDLIBS = -lxmt -lboost_test_utf +stldbg-shared : LDLIBS = -lxmtstlg -lboost_test_utfstlg +dbg-shared : LDLIBS = -lxmtg -lboost_test_utfg +</pre> + <p> + Here present reference to file with list of sources and program name + (<tt>Makefile.inc</tt>), and inclusion of build system (that + rules for common build use-cases, <tt>${SRCROOT}/Makefiles/top.mak</tt>). + The rest is custom options to this particular build: options for compiler + and linker. + </p> + <p> + Another part is shared by all compilers and all OS, + <tt>Makefile.inc</tt> contains name of program and list of sources: + </p> +<pre class="ddisplay"> +# -*- makefile -*- Time-stamp: <04/05/06 18:40:56 ptr> + +PRGNAME = mt_ut +SRC_CC = unit_test.cc timespec.cc mutex_test.cc spinlock_test.cc \ + recursive_mutex.cc join.cc signal-1.cc signal-2.cc flck.cc lfs.cc +</pre> + <p> + The result of + </p> +<pre class="ddisplay"> +make +</pre> + <p> + will be compilation and linking program mt_ut in three (in case of <a href="http://stlport.sourceforge.net">STLport</a> + as STL implementation) or two (<tt>libstdc++</tt>) modes---release, debug, and STLPORT_DEBUG. + Results will be in <tt>./obj/gcc/so/mt_ut</tt>, <tt>./obj/gcc/so_g/mt_ut</tt>, <tt>./obj/gcc/so_stlg/mt_ut</tt>. + </p> + <p> + Note, that if you use <a href="http://stlport.sourceforge.net">STLport</a>, the result not depends upon <tt>libstdc++</tt>. + </p> + <p> + As illustration I add here <tt>nmake-vc6.mak</tt> for VC6 compiler + and <tt>nmake</tt>: + </p> +<pre class="ddisplay"> +# -*- Makefile -*- Time-stamp: <03/10/17 19:42:29 ptr> + +SRCROOT=..\..\.. +COMPILER_NAME=vc6 + +!include Makefile.inc + +INCLUDES=$(INCLUDES) /I "$(SRCROOT)/include" /I "$(STLPORT_INCLUDE_DIR)" /I "$(BOOST_INCLUDE_DIR)" +DEFS = $(DEFS) /D_STLP_USE_DYNAMIC_LIB + +LDSEARCH=/LIBPATH:"$(CoMT_LIB_DIR)" +LDLIBS = xmt_vc6.lib boost_test_utf_vc6s.lib +!include $(SRCROOT)/Makefiles/nmake/top.mak +</pre> + + <h2 class="lheader">Use-case: library</h2> + <p> + The same structure is for libraries, <tt>Makefile</tt>: + </p> +<pre class="ddisplay"> +# -*- Makefile -*- Time-stamp: <06/11/10 16:23:01 ptr> + +SRCROOT := ../.. + +include Makefile.inc +include ${SRCROOT}/Makefiles/top.mak + +INCLUDES += -I$(SRCROOT)/include +</pre> + <p> + Compiler-independent part, that contain list of sources, + base name of library and it vertion (<tt>Makefile.inc</tt>): + </p> +<pre class="ddisplay"> +# -*- Makefile -*- Time-stamp: <06/11/29 01:59:50 ptr> + +LIBNAME = xmt +MAJOR = 1 +MINOR = 9 +PATCH = 3 +SRC_CC = xmt.cc thr_mgr.cc time.cc uid.cc +SRC_C = fl.c +</pre> + <p> + And again, as reference, file for <tt>VC6/nmake</tt> (<tt>nmake-vc6.mak</tt>): + </p> +<pre class="ddisplay"> +# -*- Makefile -*- Time-stamp: <03/09/28 19:14:05 ptr> + +SRCROOT=..\.. +COMPILER_NAME=vc6 + +!include Makefile.inc + +DEFS = /D_STLP_USE_DYNAMIC_LIB +INCLUDES=$(INCLUDES) /I "$(SRCROOT)/include" /I "$(STLPORT_INCLUDE_DIR)" +OPT_STLDBG = /Zm800 +LDSEARCH=$(LDSEARCH) /LIBPATH:$(STLPORT_LIB_DIR) + +!include $(SRCROOT)/Makefiles/nmake/top.mak +</pre> + + <h2 class="lheader">Global settings: configure again?</h2> +<pre class="ddisplay"> +</pre> + <center> + <a href="MakeConfig.shtml">Next >></a> + </center> + +</div> +<!--#include file="foot.shtml" --> +<!-- Created: Mon Oct 7 16:33:17 MSD 2002 --> + </body> +</html> + Modified: trunk/WWW/explore/Complement/MakeTags.shtml =================================================================== --- trunk/WWW/explore/Complement/MakeTags.shtml 2006-12-27 12:17:36 UTC (rev 1464) +++ trunk/WWW/explore/Complement/MakeTags.shtml 2006-12-28 10:04:20 UTC (rev 1465) @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<!-- Time-stamp: <03/10/07 15:50:35 ptr> --> +<!-- Time-stamp: <06/12/08 01:38:20 ptr> --> <html> <head> @@ -17,117 +17,63 @@ <img src="img/jpg/apropos.jpg"> </div> <div class="main"> - <h2 class="lheader">Make versions</h2> - <p> - I stop on support on two make variants. Well, really on single - GNU Make - and one naive utility (nmake). - </p> - - <p> - GNU Make is everyware (or can be - everyware) in *NIX world. So I don't have stimulus to play with - another make incarnations (for example, BSD make is very nice, - but GNU Make more common). If GNU Make is present, I expect that - other POSIX utilities (sed, awk, sh, grep, cat, test, ... ) - present too. - </p> - - <p> - To play with compilers from one Redmond's company, you may - use nmake. The makefiles less attached to absolute paths, - and really may be moved from one box to another, in contrast - to MS's project files. Even more, VS's projects are castrated makefiles - that processed by nmake; this process screened by GUI from users. - Nmake is really restricted, and system based on it has less - features and power then GNU make-based. But it work too. - </p> - - <h2 class="lheader">Use-case: application</h2> - -<pre class="ddisplay"> -# -*- Makefile -*- Time-stamp: <06/08/04 10:54:19 ptr> - -SRCROOT := ../../.. -COMPILER_NAME := gcc - -include Makefile.inc -include ${SRCROOT}/Makefiles/top.mak - - -INCLUDES += -I$(SRCROOT)/include -I$(BOOST_INCLUDE_DIR) - -release-shared : LDLIBS = -lxmt -lboost_test_utf -stldbg-shared : LDLIBS = -lxmtstlg -lboost_test_utfstlg -dbg-shared : LDLIBS = -lxmtg -lboost_test_utfg -</pre> - -<pre class="ddisplay"> -# -*- makefile -*- Time-stamp: <04/05/06 18:40:56 ptr> - -PRGNAME = mt_ut -SRC_CC = unit_test.cc timespec.cc mutex_test.cc spinlock_test.cc \ - recursive_mutex.cc join.cc signal-1.cc signal-2.cc flck.cc lfs.cc -</pre> - -<pre class="ddisplay"> -# -*- Makefile -*- Time-stamp: <03/10/17 19:42:29 ptr> - -SRCROOT=..\..\.. -COMPILER_NAME=vc6 - -!include Makefile.inc - -INCLUDES=$(INCLUDES) /I "$(SRCROOT)/include" /I "$(STLPORT_INCLUDE_DIR)" /I "$(BOOST_INCLUDE_DIR)" -DEFS = $(DEFS) /D_STLP_USE_DYNAMIC_LIB - -LDSEARCH=/LIBPATH:"$(CoMT_LIB_DIR)" -LDLIBS = xmt_vc6.lib boost_test_utf_vc6s.lib -!include $(SRCROOT)/Makefiles/nmake/top.mak -</pre> - - <h2 class="lheader">Use-case: library</h2> - -<pre class="ddisplay"> -# -*- Makefile -*- Time-stamp: <06/11/10 16:23:01 ptr> - -SRCROOT := ../.. - -include Makefile.inc -include ${SRCROOT}/Makefiles/top.mak - -INCLUDES += -I$(SRCROOT)/include -</pre> - -<pre class="ddisplay"> -# -*- Makefile -*- Time-stamp: <06/11/29 01:59:50 ptr> - -LIBNAME = xmt -MAJOR = 1 -MINOR = 9 -PATCH = 3 -SRC_CC = xmt.cc thr_mgr.cc time.cc uid.cc -SRC_C = fl.c -</pre> - -<pre class="ddisplay"> -# -*- Makefile -*- Time-stamp: <03/09/28 19:14:05 ptr> - -SRCROOT=..\.. -COMPILER_NAME=vc6 - -!include Makefile.inc - -DEFS = /D_STLP_USE_DYNAMIC_LIB -INCLUDES=$(INCLUDES) /I "$(SRCROOT)/include" /I "$(STLPORT_INCLUDE_DIR)" -OPT_STLDBG = /Zm800 -LDSEARCH=$(LDSEARCH) /LIBPATH:$(STLPORT_LIB_DIR) - -!include $(SRCROOT)/Makefiles/nmake/top.mak -</pre> - - <h2 class="lheader">Global settings: configure again?</h2> <h2 class="lheader">Build tags</h2> + <dl> + <dt>all</dt> + <dd>Deafult tag; build release-shared, dbg-shared, stlport-debug (if applicable) tags</dd> + <dt>install</dt> + <dd>install-release-shared, install-dbg-shared, install-stldbg-shared (if applicable) variants</dd> + <dt>release-shared</dt> + <dd>Build optimized application with (link with dynamic libraries) or dynamic library; no debug information. Result will be in OUTPUT_DIR (./obj/gcc/so for gcc compilers family, if not overridden)</dd> + <dt>dbg-shared</dt> + <dd>Build application with (link with dynamic libraries) or dynamic library without optimization, but with debug information. Result will be in OUTPUT_DIR_DBG (./obj/gcc/so_g for gcc compilers family, if not overridden)</dd> + <dt>stldbg-shared</dt> + <dd>Build application with (link with dynamic libraries) or dynamic library without optimization, but with debug information and with special STL debug mode turned on (<a href="http://stlport.sourceforge.net">STLport</a>). Result will be in OUTPUT_DIR_STLDBG (./obj/gcc/so_stlg for gcc compilers family, if not overridden)</dd> + <dt>release-static</dt> + <dd>Build optimized application with (link mostly with static libraries) or static library; no debug information. Result will be in OUTPUT_DIR_A (./obj/gcc/so for gcc compilers family, if not overridden)</dd> + <dt>dbg-static</dt> + <dd>Build application with (link mostly with static libraries) or static library without optimization, but with debug information. Result will be in OUTPUT_DIR_DBG_A (./obj/gcc/so_g for gcc compilers family, if not overridden)</dd> + <dt>stldbg-static</dt> + <dd>Build application with (link mostly with static libraries) or static library without optimization, but with debug information and with special STL debug mode turned on (<a href="http://stlport.sourceforge.net">STLport</a>). Result will be in OUTPUT_DIR_STLDBG_A (./obj/gcc/so_stlg for gcc compilers family, if not overridden)</dd> + <dt>install-release-shared</dt> + <dd>Build release-shared tag; install resulting program(s) or dynamic library(s) into place INSTALL_BIN_DIR or INSTALL_LIB_DIR</dd> + <dt>install-dbg-shared</dt> + <dd>Build dbg-shared tag; install resulting program(s) or dynamic library(s) into place INSTALL_BIN_DIR or INSTALL_LIB_DIR_DBG</dd> + <dt>install-stldbg-shared</dt> + <dd>Build stldbg-shared tag; install resulting program(s) or dynamic library(s) into place INSTALL_BIN_DIR or INSTALL_LIB_DIR_STLDBG</dd> + <dt>install-release-static</dt> + <dd>Build release-shared tag; install resulting program(s) or static library(s) into place INSTALL_BIN_DIR or INSTALL_LIB_DIR</dd> + <dt>install-dbg-static</dt> + <dd>Build dbg-shared tag; install resulting program(s) or static library(s) into place INSTALL_BIN_DIR or INSTALL_LIB_DIR_DBG</dd> + <dt>install-stldbg-static</dt> + <dd>Build stldbg-shared tag; install resulting program(s) or static library(s) into place INSTALL_BIN_DIR or INSTALL_LIB_DIR_STLDBG</dd> + <dt>depend</dt> + <dd>Calculate compilation dependences (C, C++, etc.) for release, dbg, stldbg modes; note, that dependencies calculated separately from compilation process, but use the same options and same compilers as regular compilation.</dd> + <dt>clean</dt> + <dd>Delete object files, intermediate depenedency files that are created by building the program. However, don't delete the files that record the configuration. Also preserve dependencies file, tags files and resulting program or library.</dd> + <dt>distclean</dt> + <dd>Same as 'clean' plus delete resulting program(s) or libraie(s) files, dependencies file and directories that used for compilation and linking (directories should be empty at this stage). `make distclean' should leave only the files that were in the distribution.</dd> + <dt>mostlyclean</dt> + <dd>Like `clean', but may refrain from deleting a few files that people normally don't want to recompile.</dd> + <dt>maintainer-clean</dt> + <dd>Delete almost everything that can be reconstructed with this Makefile. This includes everything deleted by distclean, plus more: C source files produced by Bison, tags tables, Info files, and so on.</dd> + <dt>uninstall</dt> + <dd></dd> + <dt>install-strip</dt> + <dd></dd> + <dt>TAGS</dt> + <dd></dd> + <dt>tags</dt> + <dd></dd> + <dt>dist</dt> + <dd></dd> + <dt>check</dt> + <dd></dd> + <dt>installcheck</dt> + <dd></dd> + <dt>installdirs</dt> + <dd></dd> + </dl> <pre class="ddisplay"> </pre> Added: trunk/WWW/explore/Complement/img/fig/boiler-comp.fig =================================================================== --- trunk/WWW/explore/Complement/img/fig/boiler-comp.fig (rev 0) +++ trunk/WWW/explore/Complement/img/fig/boiler-comp.fig 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,86 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +6 1875 600 3225 1200 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 2550 900 675 300 2550 900 3225 1200 +4 1 0 50 -1 20 12 0.0000 4 165 1080 2550 975 Power Supply\001 +-6 +6 150 1575 1650 2175 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 900 1875 750 300 900 1875 1650 2175 +4 1 0 50 -1 20 12 0.0000 4 135 1350 900 1950 Controller Unit\001 +-6 +6 1950 1650 2850 2250 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 2400 1950 450 300 2400 1950 2850 2250 +4 1 0 50 -1 20 12 0.0000 4 135 630 2400 2025 Sensors\001 +-6 +6 1800 3750 2850 4800 +1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 2325 4275 480 480 2325 4275 2700 4575 +4 1 0 50 -1 20 12 0.0000 4 135 360 2325 4350 Tank\001 +-6 +6 2700 2250 4200 2850 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 3450 2550 750 300 3450 2550 4200 2850 +4 1 0 50 -1 20 12 0.0000 4 135 1260 3450 2625 Termo Elements\001 +-6 +6 3225 4500 3975 4950 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 3600 4725 375 225 3600 4725 3975 4950 +4 1 0 50 -1 20 12 0.0000 4 135 450 3600 4800 Valve\001 +-6 +6 3375 3750 4125 4200 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 3750 3975 375 225 3750 3975 4125 4200 +4 1 0 50 -1 20 12 0.0000 4 135 450 3750 4050 Valve\001 +-6 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2700 4500 3225 4725 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 3375 3975 2775 4125 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2775 1200 3150 2250 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2400 1200 2400 1650 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 3975 4725 5100 4725 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1875 975 900 1575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1275 1650 2100 1125 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1950 1950 1650 1875 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2550 225 2550 600 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2400 2250 2325 3825 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 3075 2850 2475 3900 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5100 3975 4125 3975 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 3 + 0 0 1.00 60.00 120.00 + 3000 1125 4575 2325 3825 3750 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 4 + 0 0 1.00 60.00 120.00 + 3225 900 5400 2250 5400 4200 3825 4575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 825 2850 825 2175 +4 0 0 50 -1 20 12 0.0000 4 165 810 2625 375 Line (AC)\001 +4 0 0 50 -1 20 12 0.0000 4 135 900 4275 3750 Cold water\001 +4 0 0 50 -1 20 12 0.0000 4 135 810 4125 5025 Hot water\001 +4 0 0 50 -1 20 12 0.0000 4 135 1260 900 3075 Control Action\001 Added: trunk/WWW/explore/Complement/img/fig/boiler-comp.png =================================================================== (Binary files differ) Property changes on: trunk/WWW/explore/Complement/img/fig/boiler-comp.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/WWW/explore/Complement/img/fig/boiler-general.fig =================================================================== --- trunk/WWW/explore/Complement/img/fig/boiler-general.fig (rev 0) +++ trunk/WWW/explore/Complement/img/fig/boiler-general.fig 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,39 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +1 3 0 1 0 7 50 -1 -1 0.000 1 0.0000 2025 2100 855 855 2025 2100 2550 1425 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1950 525 1950 1275 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 3675 1125 2775 1650 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2700 2625 3750 3300 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 225 2175 1125 2175 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 450 3375 1350 2700 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 600 975 1350 1575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2025 3000 2025 3450 +4 1 0 50 -1 20 12 0.0000 4 135 540 2025 2175 Boiler\001 +4 0 0 50 -1 20 12 0.0000 4 165 810 2100 450 Line (AC)\001 +4 0 0 50 -1 20 12 0.0000 4 135 900 3825 1200 Cold water\001 +4 0 0 50 -1 20 12 0.0000 4 135 810 3825 3075 Hot water\001 +4 0 0 50 -1 20 12 0.0000 4 135 720 675 3375 Turn off\001 +4 0 0 50 -1 20 12 0.0000 4 135 630 150 2475 Turn on\001 +4 0 0 50 -1 20 12 0.0000 4 135 1260 2175 3375 Visual control\001 +4 0 0 50 -1 20 12 0.0000 4 165 1800 150 825 Operational settings\001 Added: trunk/WWW/explore/Complement/img/fig/boiler-general.png =================================================================== (Binary files differ) Property changes on: trunk/WWW/explore/Complement/img/fig/boiler-general.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.fig =================================================================== --- trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.fig (rev 0) +++ trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.fig 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,133 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1275 1200 825 450 1275 1200 2100 1650 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 4500 3675 825 450 4500 3675 5325 4125 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1050 3600 825 450 1050 3600 1875 4050 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 4425 1125 825 450 4425 1125 5250 1575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1200 300 1650 825 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5550 2850 5025 3375 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5100 3975 5550 4575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 4425 5100 4425 4125 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2100 2775 1575 3300 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1650 3900 2100 4500 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 675 5175 975 4050 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5475 300 4950 825 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5025 1425 5475 2025 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 4650 2175 4350 1575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 4725 4125 4950 4725 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1200 4050 1575 4725 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5250 1125 5775 1275 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5325 3750 5850 3975 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1800 3750 2250 3975 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5175 900 5850 675 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5250 3525 5925 3375 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1875 3675 2400 3525 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 1650 750 2925 525 4425 675 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 4425 1575 2925 1875 1800 1575 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 4425 4125 3375 4350 1500 1650 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 1650 750 3075 1200 4500 3225 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 1650 750 2625 1350 1350 3225 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 3900 1500 3525 2625 3675 3600 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 3750 1425 3075 2700 1875 3600 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 3900 3375 3825 2550 4050 1500 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 1875 3450 3000 2175 3675 1350 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 4 + 0 0 1.00 60.00 120.00 + 975 4050 375 4275 150 3075 1050 1650 + 0.000 -1.000 -1.000 0.000 +4 0 0 50 -1 20 12 0.0000 4 135 720 1425 300 Power On\001 +4 0 0 50 -1 20 12 0.0000 4 165 990 5625 4425 Temperature\001 +4 0 0 50 -1 20 12 0.0000 4 165 990 2175 4350 Temperature\001 +4 0 0 50 -1 20 12 0.0000 4 165 990 5550 1875 Temperature\001 +4 0 0 50 -1 20 12 0.0000 4 135 810 4500 2400 Power Off\001 +4 0 0 50 -1 20 12 0.0000 4 135 450 1950 2775 Power\001 +4 0 0 50 -1 20 12 0.0000 4 135 450 5475 2775 Power\001 +4 0 0 50 -1 20 12 0.0000 4 135 450 5400 225 Power\001 +4 0 0 50 -1 20 12 0.0000 4 135 630 2250 3825 Presure\001 +4 0 0 50 -1 20 12 0.0000 4 135 720 5925 3825 Pressure\001 +4 0 0 50 -1 20 12 0.0000 4 135 720 5775 1050 Pressure\001 +4 1 0 50 -1 20 12 0.0000 4 135 630 1275 1050 Sensors\001 +4 1 0 50 -1 20 12 0.0000 4 135 720 1275 1350 No Power\001 +4 1 0 50 -1 20 12 0.0000 4 135 630 4425 975 Sensors\001 +4 1 0 50 -1 20 12 0.0000 4 135 540 4425 1275 Normal\001 +4 1 0 50 -1 20 12 0.0000 4 135 630 4500 3525 Sensors\001 +4 1 0 50 -1 20 12 0.0000 4 135 1350 4500 3825 Low Water Alarm\001 +4 1 0 50 -1 20 12 0.0000 4 135 630 1050 3450 Sensors\001 +4 1 0 50 -1 20 12 0.0000 4 165 1440 1050 3750 High Water Alarm\001 +4 0 0 50 -1 20 12 0.0000 4 135 990 5700 3225 Water Level\001 +4 0 0 50 -1 20 12 0.0000 4 135 990 5625 525 Water Level\001 +4 0 0 50 -1 20 12 0.0000 4 135 990 2475 3450 Water Level\001 +4 0 0 50 -1 20 12 0.0000 4 165 1440 4950 4875 Low Water Signal\001 +4 0 0 50 -1 20 12 0.0000 4 135 810 4425 5325 Power Off\001 +4 0 0 50 -1 20 12 0.0000 4 135 810 750 5250 Power Off\001 +4 0 0 50 -1 20 12 0.0000 4 165 1530 1650 4800 High Water Signal\001 Added: trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.png =================================================================== (Binary files differ) Property changes on: trunk/WWW/explore/Complement/img/fig/sensors-lifecycle.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/WWW/explore/Complement/img/fig/termo.fig =================================================================== --- trunk/WWW/explore/Complement/img/fig/termo.fig (rev 0) +++ trunk/WWW/explore/Complement/img/fig/termo.fig 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,17 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1500 1350 1050 600 1500 1350 2550 1950 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 1 + 2700 1350 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1500 300 1500 750 +4 1 0 50 -1 20 12 0.0000 4 135 1260 1575 1425 Termo Elements\001 +4 0 0 50 -1 20 12 0.0000 4 150 1080 1650 450 Power 0..100\001 Added: trunk/WWW/explore/Complement/img/fig/termo.png =================================================================== (Binary files differ) Property changes on: trunk/WWW/explore/Complement/img/fig/termo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/WWW/explore/Complement/img/fig/valve-lifecycle.fig =================================================================== --- trunk/WWW/explore/Complement/img/fig/valve-lifecycle.fig (rev 0) +++ trunk/WWW/explore/Complement/img/fig/valve-lifecycle.fig 2006-12-28 10:04:20 UTC (rev 1465) @@ -0,0 +1,43 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +1200 2 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 2025 1425 675 300 2025 1425 2700 1725 +1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 4200 1425 675 300 4200 1425 4875 1725 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1350 600 2025 1125 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5025 2250 4125 1725 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 975 2400 1575 1650 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 1350 1425 450 1425 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 5100 525 4425 1125 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 2025 1125 3075 825 4125 1125 + 0.000 -1.000 0.000 +3 2 0 1 0 7 50 -1 -1 0.000 0 1 0 3 + 0 0 1.00 60.00 120.00 + 4125 1725 3075 2100 2025 1725 + 0.000 -1.000 0.000 +4 1 0 50 -1 20 12 0.0000 4 165 540 2025 1575 opened\001 +4 1 0 50 -1 20 12 0.0000 4 135 450 2025 1350 Valve\001 +4 1 0 50 -1 20 12 0.0000 4 135 540 4200 1575 closed\001 +4 1 0 50 -1 20 12 0.0000 4 135 450 4200 1350 Valve\001 +4 1 0 50 -1 20 12 0.0000 4 135 720 5100 2475 Power On\001 +4 1 0 50 -1 20 12 0.0000 4 135 810 1350 525 Power off\001 +4 1 0 50 -1 20 12 0.0000 4 135 720 975 2625 Water In\001 +4 1 0 50 -1 20 12 0.0000 4 135 720 5100 450 Water In\001 +4 0 0 50 -1 20 12 0.0000 4 135 810 375 1275 Water Out\001 Added: trunk/WWW/explore/Complement/img/fig/valve-lifecycle.png =================================================================== (Binary files differ) Property changes on: trunk/WWW/explore/Complement/img/fig/valve-lifecycle.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/WWW/explore/Complement/main.css =================================================================== --- trunk/WWW/explore/Complement/main.css 2006-12-27 12:17:36 UTC (rev 1464) +++ trunk/WWW/explore/Complement/main.css 2006-12-28 10:04:20 UTC (rev 1465) @@ -170,10 +170,10 @@ pre.ddisplay { font-family: Courier; font-size: 8pt; - background: grey90; - color: green; + background: gray90; + color: #070; padding-top: 10px; padding-left: 10px; padding-right: 10px; padding-bottom: 10px; -} \ No newline at end of file +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |