From 36972c2a608f03809b37a2e1d503c425e39ff9c6 Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Thu, 8 Nov 2018 10:09:35 +0200 Subject: [PATCH] Fix for VB header file --- include/epanet2.bas | 16 ++++++++-------- src/errors.dat | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/epanet2.bas b/include/epanet2.bas index 8483f9b..e5d442a 100644 --- a/include/epanet2.bas +++ b/include/epanet2.bas @@ -174,7 +174,7 @@ Public Const EN_H_CURVE = 3 ' head loss curve Public Const EN_G_CURVE = 4 ' General\default curve Public Const EN_UNCONDITIONAL = 0 ' Unconditional object deletion -Public Const EN_CONDITIONAL = 1 ' Conditional object deletion +Public Const EN_CONDITIONAL = 1 ' Conditional object deletion 'These are the external functions that comprise the DLL @@ -229,7 +229,7 @@ Public Const EN_CONDITIONAL = 1 ' Conditional object deletion 'Basic Node Functions Declare Function ENaddnode Lib "epanet2.dll" (ByVal id As String, ByVal nodeType As Long) As Long - Declare Function ENdeletenode Lib "epanet2.dll" (ByVal linkIndex As Long) As Long + Declare Function ENdeletenode Lib "epanet2.dll" (ByVal linkIndex As Long, ByVal actionCode As Long) As Long Declare Function ENgetnodeindex Lib "epanet2.dll" (ByVal id As String, index As Long) As Long Declare Function ENgetnodeid Lib "epanet2.dll" (ByVal index As Long, ByVal id As String) As Long Declare Function ENsetnodeid Lib "epanet2.dll" (ByVal index As Long, ByVal newid As String) As Long @@ -244,21 +244,21 @@ Public Const EN_CONDITIONAL = 1 ' Conditional object deletion Declare Function ENsetdemandmodel Lib "epanet2.dll" (ByVal mtype As Long, ByVal pmin As Single, ByVal preq As Single, ByVal pexp As Single) As Long Declare Function ENgetnumdemands Lib "epanet2.dll" (ByVal index As Long, numDemands As Long) As Long Declare Function ENgetbasedemand Lib "epanet2.dll" (ByVal index As Long, ByVal DemandIndex As Long, value As Single) As Long - Declare Function ENsetbasedemand Lib "epanet2.dll" (ByVal Index As Long, ByVal DemandIndex As Long, ByVal BaseDemand As Single) As Long + Declare Function ENsetbasedemand Lib "epanet2.dll" (ByVal index As Long, ByVal DemandIndex As Long, ByVal BaseDemand As Single) As Long Declare Function ENgetdemandpattern Lib "epanet2.dll" (ByVal index As Long, ByVal DemandIndex As Long, PatIndex As Long) As Long - Declare Function ENsetdemandpattern Lib "epanet2.dll" (ByVal Index As Long, ByVal DemandIndex As Long, ByVal PatIndex As Long) As Long + Declare Function ENsetdemandpattern Lib "epanet2.dll" (ByVal index As Long, ByVal DemandIndex As Long, ByVal PatIndex As Long) As Long Declare Function ENgetdemandname Lib "epanet2.dll" (ByVal index As Long, ByVal DemandIndex As Long, ByVal demandName As String) As Long Declare Function ENsetdemandname Lib "epanet2.dll" (ByVal nodeIndex As Long, ByVal DemandIndex As Long, ByVal demandName As String) As Long 'Basic Link Functions Declare Function ENaddlink Lib "epanet2.dll" (ByVal id As String, ByVal linkType As Long, ByVal fromNode As String, ByVal toNode As String) As Long - Declare Function ENdeletelink Lib "epanet2.dll" (ByVal nodeIndex As Long) As Long + Declare Function ENdeletelink Lib "epanet2.dll" (ByVal linkIndex As Long, ByVal actionCode As Long) As Long Declare Function ENgetlinkindex Lib "epanet2.dll" (ByVal id As String, index As Long) As Long Declare Function ENgetlinkid Lib "epanet2.dll" (ByVal index As Long, ByVal id As String) As Long Declare Function ENsetlinkid Lib "epanet2.dll" (ByVal index As Long, ByVal newid As String) As Long Declare Function ENgetlinktype Lib "epanet2.dll" (ByVal index As Long, code As Long) As Long Declare Function ENsetlinktype Lib "epanet2.dll" (index As Long, ByVal code As Long) As Long - Declare Function ENgetlinknodes Lib "epanet2.dll" (ByVal index As Long, Node1 As Long, Node2 As Long) As Long + Declare Function ENgetlinknodes Lib "epanet2.dll" (ByVal index As Long, node1 As Long, node2 As Long) As Long Declare Function ENsetlinknodes Lib "epanet2.dll" (ByVal index As Long, ByVal node1 As Long, ByVal node2 As Long) As Long Declare Function ENgetlinkvalue Lib "epanet2.dll" (ByVal index As Long, ByVal code As Long, value As Single) As Long Declare Function ENsetlinkvalue Lib "epanet2.dll" (ByVal index As Long, ByVal code As Long, ByVal value As Single) As Long @@ -289,9 +289,9 @@ Public Const EN_CONDITIONAL = 1 ' Conditional object deletion Declare Function ENgetcurve Lib "epanet2.dll" (ByVal curveIndex As Long, ByVal CurveID As String, nValues As Long, xValues As Any, yValues As Any) As Long Declare Function ENsetcurve Lib "epanet2.dll" (ByVal index As Long, X As Any, Y As Any, ByVal N As Long) As Long -'Simple Control Functions +'Simple Control Functions Declare Function ENaddcontrol Lib "epanet2.dll" (Cindex As Long, ByVal Ctype As Long, ByVal Lindex As Long, ByVal setting As Single, ByVal Nindex As Long, ByVal Level As Single) As Long - Declare Function ENdeletecontrol Lib "epanet2.dll" (ByVal Cindex as Long) As Long + Declare Function ENdeletecontrol Lib "epanet2.dll" (ByVal Cindex As Long) As Long Declare Function ENgetcontrol Lib "epanet2.dll" (ByVal Cindex As Long, Ctype As Long, Lindex As Long, setting As Single, Nindex As Long, Level As Single) As Long Declare Function ENsetcontrol Lib "epanet2.dll" (ByVal Cindex As Long, ByVal Ctype As Long, ByVal Lindex As Long, ByVal setting As Single, ByVal Nindex As Long, ByVal Level As Single) As Long diff --git a/src/errors.dat b/src/errors.dat index 0426003..3741904 100644 --- a/src/errors.dat +++ b/src/errors.dat @@ -57,7 +57,7 @@ DAT(257,ENERR_NO_RULE,"function applied to nonexistent rule") DAT(258,ENERR_NO_CONDITION_ACTION,"function applied to nonexistent rule clause") DAT(260,ENERR_DEL_TRACE_NODE,"cannot delete node assigned as a Trace Node") -DAT(261,ENERR_DEL_NODE_LINK, "cannot delete a node or link contained in a control") +DAT(261,ENERR_DEL_NODE_LINK, "cannot delete a node or link contained in a control or rule") DAT(301,ENERR_FILES_ARE_SAME,"identical file names") DAT(302,ENERR_CANT_OPEN_INP,"cannot open input file")