added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8007 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-09-05 06:38:25 +00:00
parent c40ada60a7
commit ad321ba6e6
8 changed files with 192 additions and 39 deletions

View File

@ -120,6 +120,12 @@ GetComponentF(int *id, int *n, char* comp, unsigned int line_length)
padfstring(comp, ::GetComponent(*id, (*n) - 1), line_length);
}
int
GetCurrentSelectedOutputUserNumberF(int *id)
{
return ::GetCurrentSelectedOutputUserNumber(*id);
}
void
GetDumpFileNameF(int *id, char* fname, unsigned int fname_length)
{
@ -200,12 +206,6 @@ GetLogFileOnF(int *id)
return ::GetLogFileOn(*id);
}
int
GetLogStringOnF(int *id)
{
return ::GetLogStringOn(*id);
}
int
GetLogStringLineCountF(int *id)
{
@ -218,6 +218,18 @@ GetLogStringLineF(int *id, int* n, char* line, unsigned int line_length)
padfstring(line, ::GetLogStringLine(*id, (*n) - 1), line_length);
}
int
GetLogStringOnF(int *id)
{
return ::GetLogStringOn(*id);
}
int
GetNthSelectedOutputUserNumberF(int *id, int* n)
{
return ::GetNthSelectedOutputUserNumber(*id, (*n) - 1);
}
void
GetOutputFileNameF(int *id, char* fname, unsigned int fname_length)
{
@ -254,6 +266,12 @@ GetSelectedOutputColumnCountF(int *id)
return ::GetSelectedOutputColumnCount(*id);
}
int
GetSelectedOutputCountF(int *id)
{
return ::GetSelectedOutputCount(*id);
}
void
GetSelectedOutputFileNameF(int *id, char* fname, unsigned int fname_length)
{
@ -455,6 +473,12 @@ SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *st
return ::SetBasicFortranCallback(*id, fcn);
}
IPQ_RESULT
SetCurrentSelectedOutputUserNumberF(int *id, int *n)
{
return ::SetCurrentSelectedOutputUserNumber(*id, *n);
}
IPQ_RESULT
SetDumpFileNameF(int *id, char* fname, unsigned int fname_length)
{
@ -641,6 +665,10 @@ IPQ_DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall GETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -691,10 +719,6 @@ IPQ_DLL_EXPORT int __stdcall GETLOGFILEON(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGON(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall GETLOGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
@ -704,6 +728,14 @@ IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGLINECOUNT(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGON(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETNTHSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall GETOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -729,6 +761,10 @@ IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOUNT(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -799,10 +835,14 @@ IPQ_DLL_EXPORT int __stdcall RUNSTRING(int *id, char *input, unsigned int len)
{
return RunStringF(id, input, len);
}
IPQ_DLL_EXPORT int __stdcall SETBASICFORTRANCALBACK(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
IPQ_DLL_EXPORT int __stdcall SETBASICFORTRANCALLBACK(int *id, double (*fcn)(double *x1, double *x2, char *str, int l))
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall SETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -43,6 +43,10 @@ IPQ_DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int GETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void GETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -92,19 +96,23 @@ IPQ_DLL_EXPORT int GETLOGFILEON(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int GETLOGSTRINGON(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void GETLOGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetLogStringLineF(id, n, line, line_length);
}
IPQ_DLL_EXPORT int GETLOGSTRINGON(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int GETLOGSTRINGLINECOUNT(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETNTHSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void GETOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -130,6 +138,10 @@ IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOUNT(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void GETSELECTEDOUTPUTFILENAME(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -203,6 +215,10 @@ IPQ_DLL_EXPORT int SETBASICFORTRANCALLBACK(int *id, double (*fcn)(double *x1, d
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int SETCURRENTSELECTEDOUTPUTUSERNUMBER(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int SETDUMPFILENAME(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -42,6 +42,10 @@ IPQ_DLL_EXPORT int getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int getcurrentselectedoutputusernumber_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void getdumpfilename_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -92,10 +96,6 @@ IPQ_DLL_EXPORT int getlogfileon_(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int getlogstringon_(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void getlogstringline_(int *id, int *n, char* line, unsigned int line_length)
{
@ -105,6 +105,14 @@ IPQ_DLL_EXPORT int getlogstringlinecount_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int getlogstringon_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int getnthselectedoutputusernumber_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void getoutputfilename_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -130,6 +138,10 @@ IPQ_DLL_EXPORT int getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcount_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void getselectedoutputfilename_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -204,6 +216,10 @@ IPQ_DLL_EXPORT int setbasicfortrancallback_(int *id, double (*fcn)(double *x1,
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int setcurrentselectedoutputusernumber_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int setdumpfilename_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -42,6 +42,10 @@ IPQ_DLL_EXPORT int getcomponentcount(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int getcurrentselectedoutputusernumber(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void getdumpfilename(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -92,10 +96,6 @@ IPQ_DLL_EXPORT int getlogfileon(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int getlogstringon(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void getlogstringline(int *id, int *n, char* line, unsigned int line_length)
{
@ -105,6 +105,14 @@ IPQ_DLL_EXPORT int getlogstringlinecount(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int getlogstringon(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int getnthselectedoutputusernumber(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void getoutputfilename(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -130,6 +138,10 @@ IPQ_DLL_EXPORT int getselectedoutputcolumncount(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int getselectedoutputcount(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void getselectedoutputfilename(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -204,6 +216,10 @@ IPQ_DLL_EXPORT int setbasicfortrancallback(int *id, double (*fcn)(double *x1, d
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int setcurrentselectedoutputusernumber(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int setdumpfilename(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -7,6 +7,7 @@
extern "C" {
#endif
//
// Intel Fortran compiler 9.1 /iface:default /names:default /assume:underscore
//
@ -42,6 +43,10 @@ IPQ_DLL_EXPORT int GETCOMPONENTCOUNT_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int GETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void GETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -92,10 +97,6 @@ IPQ_DLL_EXPORT int GETLOGFILEON_(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int GETLOGSTRINGON_(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void GETLOGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
@ -105,6 +106,14 @@ IPQ_DLL_EXPORT int GETLOGSTRINGLINECOUNT_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int GETLOGSTRINGON_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int GETNTHSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void GETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -130,6 +139,10 @@ IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOLUMNCOUNT_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int GETSELECTEDOUTPUTCOUNT_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void GETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -204,6 +217,10 @@ IPQ_DLL_EXPORT int SETBASICFORTRANCALLBACK_(int *id, double (*fcn)(double *x1,
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int SETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -43,6 +43,10 @@ IPQ_DLL_EXPORT int __stdcall GETCOMPONENTCOUNT_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall GETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -93,10 +97,6 @@ IPQ_DLL_EXPORT int __stdcall GETLOGFILEON_(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGON_(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall GETLOGSTRINGLINE_(int *id, int *n, char* line, unsigned int line_length)
{
@ -106,6 +106,14 @@ IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGLINECOUNT_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETLOGSTRINGON_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall GETNTHSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall GETOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -131,6 +139,10 @@ IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOLUMNCOUNT_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall GETSELECTEDOUTPUTCOUNT_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall GETSELECTEDOUTPUTFILENAME_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -205,6 +217,10 @@ IPQ_DLL_EXPORT int __stdcall SETBASICFORTRANCALLBACK_(int *id, double (*fcn)(do
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall SETCURRENTSELECTEDOUTPUTUSERNUMBER_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -42,6 +42,10 @@ IPQ_DLL_EXPORT int __stdcall getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getcurrentselectedoutputusernumber_(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall getdumpfilename_(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -92,10 +96,6 @@ IPQ_DLL_EXPORT int __stdcall getlogfileon_(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getlogstringon_(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall getlogstringline_(int *id, int *n, char* line, unsigned int line_length)
{
@ -105,6 +105,14 @@ IPQ_DLL_EXPORT int __stdcall getlogstringlinecount_(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getlogstringon_(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getnthselectedoutputusernumber_(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall getoutputfilename_(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -130,6 +138,10 @@ IPQ_DLL_EXPORT int __stdcall getselectedoutputcolumncount_(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputcount_(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall getselectedoutputfilename_(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -204,6 +216,10 @@ IPQ_DLL_EXPORT int __stdcall setbasicfortrancallback_(int *id, double (*fcn)(do
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall setcurrentselectedoutputusernumber_(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall setdumpfilename_(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);

View File

@ -42,6 +42,10 @@ IPQ_DLL_EXPORT int __stdcall getcomponentcount(int *id)
{
return GetComponentCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getcurrentselectedoutputusernumber(int *id)
{
return GetCurrentSelectedOutputUserNumberF(id);
}
IPQ_DLL_EXPORT void __stdcall getdumpfilename(int *id, char *filename, unsigned int len)
{
GetDumpFileNameF(id, filename, len);
@ -92,10 +96,6 @@ IPQ_DLL_EXPORT int __stdcall getlogfileon(int *id)
{
return GetLogFileOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getlogstringon(int *id)
{
return GetLogStringOnF(id);
}
// GetLogString
IPQ_DLL_EXPORT void __stdcall getlogstringline(int *id, int *n, char* line, unsigned int line_length)
{
@ -105,6 +105,14 @@ IPQ_DLL_EXPORT int __stdcall getlogstringlinecount(int *id)
{
return GetLogStringLineCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getlogstringon(int *id)
{
return GetLogStringOnF(id);
}
IPQ_DLL_EXPORT int __stdcall getnthselectedoutputusernumber(int *id, int *n)
{
return GetNthSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT void __stdcall getoutputfilename(int *id, char *filename, unsigned int len)
{
GetOutputFileNameF(id, filename, len);
@ -130,6 +138,10 @@ IPQ_DLL_EXPORT int __stdcall getselectedoutputcolumncount(int *id)
{
return GetSelectedOutputColumnCountF(id);
}
IPQ_DLL_EXPORT int __stdcall getselectedoutputcount(int *id)
{
return GetSelectedOutputCountF(id);
}
IPQ_DLL_EXPORT void __stdcall getselectedoutputfilename(int *id, char *filename, unsigned int len)
{
GetSelectedOutputFileNameF(id, filename, len);
@ -204,6 +216,10 @@ IPQ_DLL_EXPORT int __stdcall setbasicfortrancallback(int *id, double (*fcn)(dou
{
return SetBasicFortranCallbackF(id, fcn);
}
IPQ_DLL_EXPORT int __stdcall setcurrentselectedoutputusernumber(int *id, int *n)
{
return SetCurrentSelectedOutputUserNumberF(id, n);
}
IPQ_DLL_EXPORT int __stdcall setdumpfilename(int *id, char *filename, unsigned int len)
{
return SetDumpFileNameF(id, filename, len);