resurrected help message functionality

preparing RIP release
adapt to new flext version

svn path=/trunk/; revision=4185

7 files changed, 21 insertions, 2 deletions

diff --git a/externals/grill/vasp/changes.txt b/externals/grill/vasp/changes.txt
index 8a2a7dc1..8a8172eb 100644
--- a/externals/grill/vasp/changes.txt
+++ b/externals/grill/vasp/changes.txt
@@ -1,5 +1,8 @@
 Version history:
 
+0.1.4:
+- FIX: resurrect help message-functionality and add some missing help texts
+
 0.1.3:
 - CHANGE: exchanged #defines for templates in vector calculation loops
 - FIX: bug for binary operations of complex vasps
diff --git a/externals/grill/vasp/source/classes.cpp b/externals/grill/vasp/source/classes.cpp
index 1e15076f..195e9e25 100644
--- a/externals/grill/vasp/source/classes.cpp
+++ b/externals/grill/vasp/source/classes.cpp
@@ -34,6 +34,7 @@ V vasp_base::Setup(t_classid c)
 	sym_vector = MakeSymbol("vector");
 
 	FLEXT_CADDMETHOD_(c,0,"radio",m_radio);
+	FLEXT_CADDMETHOD_(c,0,"help",m_help);
 
 	FLEXT_CADDATTR_VAR1(c,"defer",deferred);
 
diff --git a/externals/grill/vasp/source/classes.h b/externals/grill/vasp/source/classes.h
index c0ecad32..f7ccc91b 100644
--- a/externals/grill/vasp/source/classes.h
+++ b/externals/grill/vasp/source/classes.h
@@ -39,6 +39,8 @@ protected:
 
 	virtual V m_radio(I argc,const t_atom *argv);  // commands for all
 
+    virtual V m_help() = 0;
+
 /*
 	V m_argchk(BL chk);  // precheck argument on arrival
 	V m_loglvl(I lvl);  // noise level of log messages
@@ -58,6 +60,7 @@ private:
 	static V Setup(t_classid);
 
 	FLEXT_CALLBACK_V(m_radio)
+	FLEXT_CALLBACK(m_help)
 
 	FLEXT_ATTRVAR_B(argchk)
 	FLEXT_ATTRVAR_B(deferred)
diff --git a/externals/grill/vasp/source/main.cpp b/externals/grill/vasp/source/main.cpp
index 83090263..a6588df7 100644
--- a/externals/grill/vasp/source/main.cpp
+++ b/externals/grill/vasp/source/main.cpp
@@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #include "classes.h"
 
 
-const C *VASP_VERSION = "0.1.3";
+const C *VASP_VERSION = "0.1.4pre";
 
 #include "opfuns.h"
 
diff --git a/externals/grill/vasp/source/ops_feature.cpp b/externals/grill/vasp/source/ops_feature.cpp
index 78eefaa8..299625c6 100644
--- a/externals/grill/vasp/source/ops_feature.cpp
+++ b/externals/grill/vasp/source/ops_feature.cpp
@@ -168,6 +168,8 @@ public:
 		ToOutFloat(1,p.peaks.density);
 		return ret;
 	}
+
+	virtual V m_help() { post("%s - Get non-zero values only for peaks",thisName()); }
 };																				
 FLEXT_LIB_V("vasp, vasp.peaks",vasp_peaks)
 
@@ -183,6 +185,8 @@ public:
 		CVasp cdst(dst),cref(ref);
 		return VaspOp::m_valleys(p,cref,&cdst); 
 	}
+
+	virtual V m_help() { post("%s - Get non-zero values only for values",thisName()); }
 };																				
 FLEXT_LIB_V("vasp, vasp.valleys",vasp_valleys)
 
@@ -198,6 +202,8 @@ public:
 		CVasp cdst(dst),cref(ref);
 		return VaspOp::m_rpeaks(p,cref,&cdst); 
 	}
+
+	virtual V m_help() { post("%s - Get non-zero values only for peaks of the complex radius",thisName()); }
 };																				
 FLEXT_LIB_V("vasp, vasp.rpeaks",vasp_rpeaks)
 
@@ -213,6 +219,8 @@ public:
 		CVasp cdst(dst),cref(ref);
 		return VaspOp::m_rvalleys(p,cref,&cdst); 
 	}
+
+	virtual V m_help() { post("%s - Get non-zero values only for valleys of the complex radius",thisName()); }
 };																				
 FLEXT_LIB_V("vasp, vasp.rvalleys",vasp_rvalleys)
 
diff --git a/externals/grill/vasp/source/ops_search.cpp b/externals/grill/vasp/source/ops_search.cpp
index 5793df6a..226e6466 100644
--- a/externals/grill/vasp/source/ops_search.cpp
+++ b/externals/grill/vasp/source/ops_search.cpp
@@ -188,6 +188,8 @@ public:
 		CVasp cdst(dst),cref(ref);
 		return VaspOp::m_soffset(p,cref,arg,&cdst); 
 	}
+
+	virtual V m_help() { post("%s - Define starting point by searching for given value",thisName()); }
 };																				
 FLEXT_LIB_V("vasp, vasp.offset= vasp.o=",vasp_soffset)
 
@@ -203,6 +205,8 @@ public:
 		CVasp cdst(dst),cref(ref);
 		return VaspOp::m_sframes(p,cref,arg,&cdst); 
 	}
+
+	virtual V m_help() { post("%s - Define vasp frame length by searching for given value",thisName()); }
 };																				
 FLEXT_LIB_V("vasp, vasp.frames= vasp.f=",vasp_sframes)
 
diff --git a/externals/grill/vasp/vasp.vcproj b/externals/grill/vasp/vasp.vcproj
index 0da4ea2e..e5182f86 100644
--- a/externals/grill/vasp/vasp.vcproj
+++ b/externals/grill/vasp/vasp.vcproj
@@ -83,7 +83,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source"
+				AdditionalIncludeDirectories="C:\data\prog\packs\pthreads\include;c:\programme\audio\pd\src;..\flext\source"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;VASP_COMPACT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"