max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

resorted renamed methods

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4413 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-18 04:35:20 +00:00
parent 67f49a29c0
commit c30ed6369a
6 changed files with 756 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1015
IPhreeqc.cpp
View File

File diff suppressed because it is too large Load Diff

176
IPhreeqcF.f
View File

@ -7,6 +7,8 @@
INTEGER(KIND=4) :: AccumulateLineF
AccumulateLine = AccumulateLineF(ID,LINE)
END FUNCTION AccumulateLine
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! AddError
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION ClearAccumulatedLines(ID)
IMPLICIT NONE
@ -48,6 +50,20 @@
INTEGER(KIND=4) :: GetComponentCountF
GetComponentCount = GetComponentCountF(ID)
END FUNCTION GetComponentCount
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetDumpFileOn(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: GetDumpFileOn
INTEGER(KIND=4) :: GetDumpFileOnF
IF (GetDumpFileOnF(ID).EQ.0) THEN
GetDumpFileOn = .FALSE.
ELSE
GetDumpFileOn = .TRUE.
ENDIF
END FUNCTION GetDumpFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! GetDumpString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetDumpStringLine(ID,N,LINE)
IMPLICIT NONE
@ -66,18 +82,6 @@
INTEGER(KIND=4) :: GetDumpStringLineCountF
GetDumpStringLineCount = GetDumpStringLineCountF(ID)
END FUNCTION GetDumpStringLineCount
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetDumpFileOn(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: GetDumpFileOn
INTEGER(KIND=4) :: GetDumpFileOnF
IF (GetDumpFileOnF(ID).EQ.0) THEN
GetDumpFileOn = .FALSE.
ELSE
GetDumpFileOn = .TRUE.
ENDIF
END FUNCTION GetDumpFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetDumpStringOn(ID)
IMPLICIT NONE
@ -90,6 +94,20 @@
GetDumpStringOn = .TRUE.
ENDIF
END FUNCTION GetDumpStringOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetErrorFileOn(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: GetErrorFileOn
INTEGER(KIND=4) :: GetErrorFileOnF
IF (GetErrorFileOnF(ID).EQ.0) THEN
GetErrorFileOn = .FALSE.
ELSE
GetErrorFileOn = .TRUE.
ENDIF
END FUNCTION GetErrorFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! GetErrorString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetErrorStringLine(ID,N,LINE)
IMPLICIT NONE
@ -108,18 +126,6 @@
INTEGER(KIND=4) :: GetErrorStringLineCountF
GetErrorStringLineCount = GetErrorStringLineCountF(ID)
END FUNCTION GetErrorStringLineCount
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetErrorFileOn(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: GetErrorFileOn
INTEGER(KIND=4) :: GetErrorFileOnF
IF (GetErrorFileOnF(ID).EQ.0) THEN
GetErrorFileOn = .FALSE.
ELSE
GetErrorFileOn = .TRUE.
ENDIF
END FUNCTION GetErrorFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetLogFileOn(ID)
IMPLICIT NONE
@ -186,6 +192,8 @@
GetSelectedOutputValue = GetSelectedOutputValueF(ID,ROW,
& COL,VTYPE,DVALUE,SVALUE)
END FUNCTION GetSelectedOutputValue
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! GetWarningString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION GetWarningStringLine(ID,N,LINE)
IMPLICIT NONE
@ -222,78 +230,24 @@
INTEGER(KIND=4) :: LoadDatabaseStringF
LoadDatabaseString = LoadDatabaseStringF(ID,INPUT)
END FUNCTION LoadDatabaseString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE OutputErrorString(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CALL OutputErrorStringF(ID)
END SUBROUTINE OutputErrorString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE OutputAccumulatedLines(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CALL OutputAccumulatedLinesF(ID)
END SUBROUTINE OutputAccumulatedLines
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE OutputErrorString(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CALL OutputErrorStringF(ID)
END SUBROUTINE OutputErrorString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
SUBROUTINE OutputWarningString(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
CALL OutputWarningStringF(ID)
END SUBROUTINE OutputWarningString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetSelectedOutputFileOn(ID,SELECTED_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: SELECTED_ON
INTEGER(KIND=4) :: SetSelectedOutputFileOn
INTEGER(KIND=4) :: SetSelOutFileOnF
SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON)
END FUNCTION SetSelectedOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetOutputFileOn(ID,OUTPUT_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: OUTPUT_ON
INTEGER(KIND=4) :: SetOutputFileOn
INTEGER(KIND=4) :: SetOutputFileOnF
SetOutputFileOn = SetOutputFileOnF(ID,OUTPUT_ON)
END FUNCTION SetOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetErrorFileOn(ID,ERROR_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: ERROR_ON
INTEGER(KIND=4) :: SetErrorFileOn
INTEGER(KIND=4) :: SetErrorFileOnF
SetErrorFileOn = SetErrorFileOnF(ID,ERROR_ON)
END FUNCTION SetErrorFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetLogFileOn(ID,LOG_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: LOG_ON
INTEGER(KIND=4) :: SetLogFileOn
INTEGER(KIND=4) :: SetLogFileOnF
SetLogFileOn = SetLogFileOnF(ID,LOG_ON)
END FUNCTION SetLogFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetDumpFileOn(ID,DUMP_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: DUMP_ON
INTEGER(KIND=4) :: SetDumpFileOn
INTEGER(KIND=4) :: SetDumpFileOnF
SetDumpFileOn = SetDumpFileOnF(ID,DUMP_ON)
END FUNCTION SetDumpFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetDumpStringOn(ID,DUMP_STRING_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: DUMP_STRING_ON
INTEGER(KIND=4) :: SetDumpStringOn
INTEGER(KIND=4) :: SetDumpStringOnF
SetDumpStringOn = SetDumpStringOnF(ID,DUMP_STRING_ON)
END FUNCTION SetDumpStringOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION RunAccumulated(ID)
IMPLICIT NONE
@ -320,6 +274,60 @@
INTEGER(KIND=4) :: RunStringF
RunString = RunStringF(ID,INPUT)
END FUNCTION RunString
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetDumpFileOn(ID,DUMP_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: DUMP_ON
INTEGER(KIND=4) :: SetDumpFileOn
INTEGER(KIND=4) :: SetDumpFileOnF
SetDumpFileOn = SetDumpFileOnF(ID,DUMP_ON)
END FUNCTION SetDumpFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetDumpStringOn(ID,DUMP_STRING_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: DUMP_STRING_ON
INTEGER(KIND=4) :: SetDumpStringOn
INTEGER(KIND=4) :: SetDumpStringOnF
SetDumpStringOn = SetDumpStringOnF(ID,DUMP_STRING_ON)
END FUNCTION SetDumpStringOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetErrorFileOn(ID,ERROR_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: ERROR_ON
INTEGER(KIND=4) :: SetErrorFileOn
INTEGER(KIND=4) :: SetErrorFileOnF
SetErrorFileOn = SetErrorFileOnF(ID,ERROR_ON)
END FUNCTION SetErrorFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetLogFileOn(ID,LOG_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: LOG_ON
INTEGER(KIND=4) :: SetLogFileOn
INTEGER(KIND=4) :: SetLogFileOnF
SetLogFileOn = SetLogFileOnF(ID,LOG_ON)
END FUNCTION SetLogFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetOutputFileOn(ID,OUTPUT_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: OUTPUT_ON
INTEGER(KIND=4) :: SetOutputFileOn
INTEGER(KIND=4) :: SetOutputFileOnF
SetOutputFileOn = SetOutputFileOnF(ID,OUTPUT_ON)
END FUNCTION SetOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION SetSelectedOutputFileOn(ID,SELECTED_ON)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
LOGICAL(KIND=4) :: SELECTED_ON
INTEGER(KIND=4) :: SetSelectedOutputFileOn
INTEGER(KIND=4) :: SetSelOutFileOnF
SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON)
END FUNCTION SetSelectedOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION UnLoadDatabase(ID)
IMPLICIT NONE

154
IPhreeqcLib.cpp
View File

@ -49,12 +49,6 @@ AddError(int id, const char* error_msg)
// TODO AddWarning
int
CreateIPhreeqc(void)
{
return IPhreeqcLib::CreateIPhreeqc();
}
IPQ_RESULT
ClearAccumulatedLines(int id)
{
@ -67,6 +61,12 @@ ClearAccumulatedLines(int id)
return IPQ_BADINSTANCE;
}
int
CreateIPhreeqc(void)
{
return IPhreeqcLib::CreateIPhreeqc();
}
IPQ_RESULT
DestroyIPhreeqc(int id)
{
@ -112,29 +112,6 @@ GetComponentCount(int id)
return IPQ_BADINSTANCE;
}
const char*
GetDumpStringLine(int id, int n)
{
static const char err_msg[] = "GetDumpStringLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetDumpStringLine(n);
}
return err_msg;
}
int
GetDumpStringLineCount(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetDumpStringLineCount();
}
return 0;
}
int
GetDumpFileOn(int id)
{
@ -165,6 +142,29 @@ GetDumpString(int id)
return empty;
}
const char*
GetDumpStringLine(int id, int n)
{
static const char err_msg[] = "GetDumpStringLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetDumpStringLine(n);
}
return err_msg;
}
int
GetDumpStringLineCount(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetDumpStringLineCount();
}
return 0;
}
int
GetDumpStringOn(int id)
{
@ -183,29 +183,6 @@ GetDumpStringOn(int id)
return IPQ_BADINSTANCE;
}
const char*
GetErrorStringLine(int id, int n)
{
static const char err_msg[] = "GetErrorStringLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetErrorStringLine(n);
}
return err_msg;
}
int
GetErrorStringLineCount(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return (int)IPhreeqcPtr->GetErrorStringLineCount();
}
return IPQ_BADINSTANCE;
}
int
GetErrorFileOn(int id)
{
@ -236,6 +213,29 @@ GetErrorString(int id)
return err_msg;
}
const char*
GetErrorStringLine(int id, int n)
{
static const char err_msg[] = "GetErrorStringLine: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetErrorStringLine(n);
}
return err_msg;
}
int
GetErrorStringLineCount(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return (int)IPhreeqcPtr->GetErrorStringLineCount();
}
return IPQ_BADINSTANCE;
}
int
GetLogFileOn(int id)
{
@ -333,6 +333,18 @@ GetSelectedOutputValue(int id, int row, int col, VAR* pVAR)
return IPQ_BADINSTANCE;
}
const char*
GetWarningString(int id)
{
static const char err_msg[] = "GetWarningString: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetWarningString();
}
return err_msg;
}
const char*
GetWarningStringLine(int id, int n)
{
@ -356,18 +368,6 @@ GetWarningStringLineCount(int id)
return IPQ_BADINSTANCE;
}
const char*
GetWarningString(int id)
{
static const char err_msg[] = "GetWarningString: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return IPhreeqcPtr->GetWarningString();
}
return err_msg;
}
int
LoadDatabase(int id, const char* filename)
{
@ -390,19 +390,6 @@ LoadDatabaseString(int id, const char* input)
return IPQ_BADINSTANCE;
}
void
OutputErrorString(int id)
{
static const char err_msg[] = "OutputErrorString: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
IPhreeqcPtr->OutputErrorString();
return;
}
std::cout << err_msg << std::endl;
}
void
OutputAccumulatedLines(int id)
{
@ -416,6 +403,19 @@ OutputAccumulatedLines(int id)
std::cout << err_msg << std::endl;
}
void
OutputErrorString(int id)
{
static const char err_msg[] = "OutputErrorString: Invalid instance id.\n";
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
IPhreeqcPtr->OutputErrorString();
return;
}
std::cout << err_msg << std::endl;
}
void
OutputWarningString(int id)
{

80
fwrap.cpp
View File

@ -54,6 +54,10 @@ AccumulateLineF(int *id, char *line, unsigned int line_length)
return n;
}
/*
AddErrorF
*/
IPQ_RESULT
ClearAccumulatedLinesF(int *id)
{
@ -84,6 +88,16 @@ GetComponentF(int *id, int *n, char* comp, unsigned int line_length)
padfstring(comp, ::GetComponent(*id, (*n) - 1), line_length);
}
int
GetDumpFileOnF(int *id)
{
return ::GetDumpFileOn(*id);
}
/*
GetDumpStringF
*/
int
GetDumpStringLineCountF(int *id)
{
@ -96,18 +110,22 @@ GetDumpStringLineF(int *id, int* n, char* line, unsigned int line_length)
padfstring(line, ::GetDumpStringLine(*id, (*n) - 1), line_length);
}
int
GetDumpFileOnF(int *id)
{
return ::GetDumpFileOn(*id);
}
int
GetDumpStringOnF(int *id)
{
return ::GetDumpStringOn(*id);
}
int
GetErrorFileOnF(int *id)
{
return ::GetErrorFileOn(*id);
}
/*
GetErrorStringF
*/
int
GetErrorStringLineCountF(int *id)
{
@ -120,12 +138,6 @@ GetErrorStringLineF(int *id, int* n, char* line, unsigned int line_length)
padfstring(line, ::GetErrorStringLine(*id, (*n) - 1), line_length);
}
int
GetErrorFileOnF(int *id)
{
return ::GetErrorFileOn(*id);
}
int
GetLogFileOnF(int *id)
{
@ -203,6 +215,10 @@ GetSelectedOutputValueF(int *id, int *row, int *col, int *vtype, double* dvalue,
return result;
}
/*
GetWarningStringF
*/
int
GetWarningStringLineCountF(int *id)
{
@ -249,18 +265,18 @@ LoadDatabaseStringF(int *id, char* input, unsigned int input_length)
return n;
}
void
OutputErrorStringF(int *id)
{
::OutputErrorString(*id);
}
void
OutputAccumulatedLinesF(int *id)
{
::OutputAccumulatedLines(*id);
}
void
OutputErrorStringF(int *id)
{
::OutputErrorString(*id);
}
void
OutputWarningStringF(int *id)
{
@ -363,6 +379,7 @@ DLL_EXPORT int __stdcall ACCUMULATELINE(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
// AddError
DLL_EXPORT int __stdcall CLEARACCUMULATEDLINES(int *id)
{
return ClearAccumulatedLinesF(id);
@ -383,6 +400,11 @@ DLL_EXPORT int __stdcall GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT int __stdcall GETDUMPFILEON(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
DLL_EXPORT void __stdcall GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
@ -391,14 +413,15 @@ DLL_EXPORT int __stdcall GETDUMPSTRINGLINECOUNT(int *id)
{
return GetDumpStringLineCountF(id);
}
DLL_EXPORT int __stdcall GETDUMPFILEON(int *id)
{
return GetDumpFileOnF(id);
}
DLL_EXPORT int __stdcall GETDUMPSTRINGON(int *id)
{
return GetDumpStringOnF(id);
}
DLL_EXPORT int __stdcall GETERRORFILEON(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
DLL_EXPORT void __stdcall GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
@ -407,10 +430,6 @@ DLL_EXPORT int __stdcall GETERRORSTRINGLINECOUNT(int *id)
{
return GetErrorStringLineCountF(id);
}
DLL_EXPORT int __stdcall GETERRORFILEON(int *id)
{
return GetErrorFileOnF(id);
}
DLL_EXPORT int __stdcall GETLOGFILEON(int *id)
{
return GetLogFileOnF(id);
@ -435,6 +454,7 @@ DLL_EXPORT int __stdcall GETSELECTEDOUTPUTVALUE(int *id, int *row, int *col, in
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
}
// GetWarningString
DLL_EXPORT void __stdcall GETWARNINGSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
@ -451,14 +471,14 @@ DLL_EXPORT int __stdcall LOADDATABASESTRING(int *id, char *input, unsigned int
{
return LoadDatabaseStringF(id, input, len);
}
DLL_EXPORT void __stdcall OUTPUTERRORSTRING(int *id)
{
OutputErrorStringF(id);
}
DLL_EXPORT void __stdcall OUTPUTACCUMULATEDLINES(int *id)
{
OutputAccumulatedLinesF(id);
}
DLL_EXPORT void __stdcall OUTPUTERRORSTRING(int *id)
{
OutputErrorStringF(id);
}
DLL_EXPORT void __stdcall OUTPUTWARNINGSTRING(int *id)
{
OutputWarningStringF(id);

26
fwrap2.cpp
View File

@ -15,6 +15,7 @@ DLL_EXPORT int ACCUMULATELINE(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
// AddError
DLL_EXPORT int CLEARACCUMULATEDLINES(int *id)
{
return ClearAccumulatedLinesF(id);
@ -35,6 +36,11 @@ DLL_EXPORT int GETCOMPONENTCOUNT(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT int GETDUMPFILEON(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
DLL_EXPORT void GETDUMPSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
@ -43,14 +49,14 @@ DLL_EXPORT int GETDUMPSTRINGLINECOUNT(int *id)
{
return GetDumpStringLineCountF(id);
}
DLL_EXPORT int GETDUMPFILEON(int *id)
{
return GetDumpFileOnF(id);
}
DLL_EXPORT int GETDUMPSTRINGON(int *id)
{
return GetDumpStringOnF(id);
}
DLL_EXPORT int GETERRORFILEON(int *id)
{
return GetErrorFileOnF(id);
}
DLL_EXPORT void GETERRORSTRINGLINE(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
@ -59,10 +65,6 @@ DLL_EXPORT int GETERRORSTRINGLINECOUNT(int *id)
{
return GetErrorStringLineCountF(id);
}
DLL_EXPORT int GETERRORFILEON(int *id)
{
return GetErrorFileOnF(id);
}
DLL_EXPORT int GETLOGFILEON(int *id)
{
return GetLogFileOnF(id);
@ -103,14 +105,14 @@ DLL_EXPORT int LOADDATABASESTRING(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
DLL_EXPORT void OUTPUTERRORSTRING(int *id)
{
OutputErrorStringF(id);
}
DLL_EXPORT void OUTPUTACCUMULATEDLINES(int *id)
{
OutputAccumulatedLinesF(id);
}
DLL_EXPORT void OUTPUTERRORSTRING(int *id)
{
OutputErrorStringF(id);
}
DLL_EXPORT void OUTPUTWARNINGSTRING(int *id)
{
OutputWarningStringF(id);

28
fwrap3.cpp
View File

@ -14,6 +14,7 @@ DLL_EXPORT int accumulateline_(int *id, char *line, unsigned int len)
{
return AccumulateLineF(id, line, len);
}
// AddError
DLL_EXPORT int clearaccumulatedlines_(int *id)
{
return ClearAccumulatedLinesF(id);
@ -34,6 +35,11 @@ DLL_EXPORT int getcomponentcount_(int *id)
{
return GetComponentCountF(id);
}
DLL_EXPORT int getdumpfileon_(int *id)
{
return GetDumpFileOnF(id);
}
// GetDumpString
DLL_EXPORT void getdumpstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetDumpStringLineF(id, n, line, line_length);
@ -42,14 +48,15 @@ DLL_EXPORT int getdumpstringlinecount_(int *id)
{
return GetDumpStringLineCountF(id);
}
DLL_EXPORT int getdumpfileon_(int *id)
{
return GetDumpFileOnF(id);
}
DLL_EXPORT int getdumpstringon_(int *id)
{
return GetDumpStringOnF(id);
}
DLL_EXPORT int geterrorfileon_(int *id)
{
return GetErrorFileOnF(id);
}
// GetErrorString
DLL_EXPORT void geterrorstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetErrorStringLineF(id, n, line, line_length);
@ -58,10 +65,6 @@ DLL_EXPORT int geterrorstringlinecount_(int *id)
{
return GetErrorStringLineCountF(id);
}
DLL_EXPORT int geterrorfileon_(int *id)
{
return GetErrorFileOnF(id);
}
DLL_EXPORT int getlogfileon_(int *id)
{
return GetLogFileOnF(id);
@ -86,6 +89,7 @@ DLL_EXPORT int getselectedoutputvalue_(int *id, int *row, int *col, int *vtype,
{
return GetSelectedOutputValueF(id, row, col, vtype, dvalue, svalue, svalue_length);
}
// GetWarningString
DLL_EXPORT void getwarningstringline_(int *id, int *n, char* line, unsigned int line_length)
{
GetWarningStringLineF(id, n, line, line_length);
@ -102,14 +106,14 @@ DLL_EXPORT int loaddatabasestring_(int *id, char *input, unsigned int len)
{
return LoadDatabaseStringF(id, input, len);
}
DLL_EXPORT void outputerrorstring_(int *id)
{
OutputErrorStringF(id);
}
DLL_EXPORT void outputaccumulatedlines_(int *id)
{
OutputAccumulatedLinesF(id);
}
DLL_EXPORT void outputerrorstring_(int *id)
{
OutputErrorStringF(id);
}
DLL_EXPORT void outputwarningstring_(int *id)
{
OutputWarningStringF(id);