JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Allow API to get/set type of status report

Browse Source 
The existing EN_setstatusreport function only allows one to set the level of status reporting and not retrieve this value. A new EN_STATUS_REPORT constant was added, to be used with EN_setoption and EN_getoption, to provide read/write access to the level of status reporting.
This commit is contained in:
Lew Rossman
2023-07-19 09:15:25 -04:00
parent 2825f96120
commit 353ba4eb34
8 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/epanet.c
View File

@@ -1,13 +1,13 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Version: 2.3
Module: epanet.c
Description: implementation of EPANET's API functions
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 04/29/2023
Last Updated: 07/17/2023
******************************************************************************
*/
@@ -1211,6 +1211,9 @@ int DLLEXPORT EN_getoption(EN_Project p, int option, double *value)
case EN_PRESS_UNITS:
v = (double)p->parser.Pressflag;
break;
case EN_STATUS_REPORT:
v = (double)( p->report.Statflag);
break;
default:
return 251;
}
@@ -1401,6 +1404,12 @@ int DLLEXPORT EN_setoption(EN_Project p, int option, double value)
qcf = Ucf[FLOW] / qfactor;
updateruleunits(p, dcf, pcf, hcf, qcf);
break;
case EN_STATUS_REPORT:
i = ROUND(value);
if (i < EN_NO_REPORT || i > EN_FULL_REPORT) return 213;
p->report.Statflag = i;
break;
default:
return 251;

6
src/types.h
View File

@@ -1,13 +1,13 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Version: 2.3
Module: types.h
Description: symbolic constants and data types used throughout EPANET
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 04/29/2023
Last Updated: 07/17/2023
******************************************************************************
*/
@@ -31,7 +31,7 @@ typedef int INT4;
Various constants
----------------------------------------------
*/
#define CODEVERSION 20200
#define CODEVERSION 20300
#define MAGICNUMBER 516114521
#define ENGINE_VERSION 201 // Used for binary hydraulics file
#define EOFMARK 0x1A // Use 0x04 for UNIX systems