Compare commits

...
Author SHA1 Message Date
michal 27ecc88c9d Add IntelliJ config and gitignore files for projects
Introduce `.idea` configuration files and `.gitignore` entries for `NfcS5_DLL` and `TBF` projects. These changes include settings for encodings, VCS mappings, and index layout configurations. Helps streamline project setup and improve tooling compatibility.
2024-12-22 12:32:35 +01:00
michal e06a9977c3 Fix project references and add new dependencies
Updated project references to use relative paths and added new dependency `VisualBasic.PowerPacks.Vs`. Corrected array usage in `ControlComWrap.cs` to avoid potential runtime errors. These changes enhance project structure and fix issues with component interactions.
2024-12-22 12:31:27 +01:00
Jan Augustin a92cd3efd1 New ControlComponent3U.dll 2024-10-10 09:29:59 +02:00
Jan Augustin 24f62c4546 Reconfigured for Fuzhou PT150 2024-06-13 09:36:03 +02:00
Jan Augustin c0872e7376 Rebase with master-2
Remove unmanaged oracle client
2024-06-13 09:35:10 +02:00
Jan Augustin 1815f962e7 Merge branch 'master-2' of 10.42.130.13:/srv/git/tbf into master-2 2024-06-07 09:47:01 +02:00
Jan Augustin 41978869d1 Update gitignore 2024-06-07 09:46:28 +02:00
Jan Augustin c77fd822a6 Bug fixes.
Oracle DB: In the vt_zaehler_pindex_pd.korrimprate should be new CalibFactor, not OrigCalibFactor (Joern Goegge)
2024-03-28 08:53:39 +01:00
Jan Augustin 60f30d65fd NFC communication debugging 2024-03-13 10:47:30 +01:00
Jan Augustin 704232d231 Splitted Q3 test (part 1,2) for Suez procedures causes problem with unique indexes in oracle tables vt_pruefdurchfluss_pd, vt_zaehler_pindex_pd 2024-03-12 09:17:07 +01:00
Jan Augustin 79c5c022ea NFC S5 support 2024-02-28 12:42:37 +01:00
Jan Augustin 5bea046c01 PowerUser name fix. 2024-02-28 12:18:25 +01:00
Milan Hanajik 6226a2812b 1. State.RunOperations() is try-catch protected (Event.Crashed), 2. Saving and printing results modified, ver. 2.33.2140 2024-01-04 12:50:02 +01:00
Milan Hanajik 4bff6f33de DataEntry.Uni.CycleBgEnForm : 1. autoSNButton --> multiPurposeButton, 2. Initial configuration : Order : Ac.HistoryLast, ver. 2.33.2138 2023-12-12 19:08:09 +01:00
Milan Hanajik e0d10bed71 Bug fixes : 1. UpgradeSelectionDlg (Counter1..5), 2. DataContainer component factories, ver. 2.33.2134 2023-12-01 10:59:15 +01:00
Milan Hanajik a1df68b888 1. PrinterStatus implemented, used by printers, shown in ModelessDlg, 2. 'Simulated' printers, 3. Label.Printer uses wm.PrintLabel. 2023-11-30 17:51:49 +01:00
Milan Hanajik a625e2dfdb bool WaterMeter.PrintLabel (initially set), DataEntry.Uni : 1. "Auto s/n" function, 2. common check box, 3. Ct.PrintLabel (yes/no) 2023-11-28 15:00:48 +01:00
Milan Hanajik 0181294872 ProcedureDlg supports 3 printers. 2023-11-28 14:38:29 +01:00
Milan Hanajik 401828d4c6 Common.Forms.ModelessForm modifications. 2023-11-28 14:27:21 +01:00
Milan Hanajik 2c6e5d3367 Bug fix in Printers.Enhanced.PrinterCfgCtrl. 2023-11-28 14:21:05 +01:00
Milan Hanajik 38983990c2 PL language (Uzytkownici), ver. 2.33.2127 2023-11-09 18:00:52 +01:00
Milan Hanajik e02411d180 ProcedureDlg changes : wider ComboBox-es, PL language, etc., ver. 2.33.2120 2023-11-08 10:06:38 +01:00
Milan Hanajik 69f729b713 ver. 2.33.2113 2023-10-25 11:36:27 +02:00
Milan Hanajik f773e26fa3 SensusOracle.Database.ReadStartInfoFromProcedure( ) bug fix for PT7, ver. 2.33.2112 2023-10-23 14:36:11 +02:00
Milan Hanajik 9fed5148b6 TestWizard improvements 2023-10-23 14:36:11 +02:00
Milan Hanajik ab3a16bdc5 ver. 2.33.2111 2023-10-20 08:53:15 +02:00
Milan Hanajik 6e3f0dad0e iPerlCommunication : simulate iperls 2023-10-19 12:57:21 +02:00
Milan Hanajik ed066a005f MoreWMResultsDlg fixes. 2023-10-19 12:57:21 +02:00
Milan Hanajik d3126bd9ea SendAgain function in PreviousResultsDlg made fool proof for iPERL production, PW protection, etc. 2023-10-19 12:57:20 +02:00
Milan Hanajik 1c638b3f87 Range of q2CorrRL and q2CorrLR limitted to -128 .. +127. 2023-10-19 12:57:20 +02:00
Milan Hanajik f0afcd57a2 Metrology contains links to certificates saved as PDF files, CalibCertificateCtrl, ver. 2.33.2110 2023-10-18 15:32:40 +02:00
Milan Hanajik 769cb230e3 Results.ItemID.cs synchronized with ver. 3 branch. 2023-10-05 12:38:54 +02:00
Milan Hanajik 3c52e54e02 ver. 2.33.2105 2023-09-26 11:04:37 +02:00
Milan Hanajik 068b7fb3a2 Possibility to bypass "production tracing check" for a selected number of cycles, ver. 2.33.2104 2023-09-26 09:31:57 +02:00
Milan Hanajik 2ba6586a0e ver. 2.33.2102 2023-09-25 10:06:36 +02:00
Milan Hanajik fa403a322a TURA_SPECIAL WMsCount = 6, ver. 2.33.2101 2023-09-25 08:54:53 +02:00
Milan Hanajik 30627abc6a iPerlCommunication.OpticalHeadTest rectified. 2023-09-25 08:54:53 +02:00
Milan Hanajik 78772df3a0 Previous results : Possibility to save tracing records into a tracing DB (similarly to saving to Oracle). 2023-08-16 12:13:55 +02:00
Milan Hanajik 426bb0cce9 ProductionTracing : 1. No alternative tracing DB, 2. SaveTracingRecords( ) is public 2023-08-16 12:11:06 +02:00
Milan Hanajik 3da6fcfe73 Q2 correction clean-up, etc. 2023-08-15 17:07:32 +02:00
Milan Hanajik 8f27d1a448 ver. 2.33.2085 2023-08-09 11:39:28 +02:00
Milan Hanajik c5752f21a9 Q2 correction factor calculation bug fix, case when the original factor was not zero and the error target is not zero, ver. 2.33.2084 2023-08-09 11:15:22 +02:00
Milan Hanajik 8c30cb21e2 ver. 2.33.2081 2023-08-08 12:13:39 +02:00
Milan Hanajik 5181f75217 Bug fix in Q2 correction factor calculation when volume = 0, ver. 2.33.2080 2023-08-08 12:08:23 +02:00
Milan Hanajik 7ee41afba2 ver. 2.33.2079 2023-08-08 09:31:44 +02:00
Milan Hanajik 5bb99bbf86 E15 implementation according to MID (for Chennai, Stara Tura) 2023-08-07 16:14:19 +02:00
Milan Hanajik 6fd67cdf08 Q2 correction for standard process and MakeQ2CorrectionFrom(...) modified to satisfy MID, Q2 correction done when OoR. 2023-08-07 12:47:35 +02:00
Milan Hanajik e1bfa71310 iPerlHead.ProcParams.CalibTargetQ2 and WMType_ID removed, clean-up. 2023-08-04 12:34:55 +02:00
Milan Hanajik 2476ed7681 Bug fixes : 1. TestProfileDlg.addButton_Click, 2. TestProfileSelection - conversion to float avoided. 2023-07-14 13:30:51 +02:00
Milan Hanajik e413b55c6a sluprimadev --> deluh1web03 2023-07-12 12:06:02 +02:00
Jan Augustin 7d2da63071 Merge branch 'master-2' of 10.42.130.13:/srv/git/tbf into master-2 2023-07-12 08:46:00 +02:00
Jan Augustin 9aad4a60ab Fixed method DewaRework, add more rfid logs. 2023-07-11 11:30:38 +02:00
Milan Hanajik 6ffbda6e96 ver. 2.33.2070 2023-07-10 13:08:31 +02:00
Milan Hanajik 72a8f1dac6 Correction curve for pressure meters extended for negative pressures, etc., ver. 2.33.2065 2023-06-27 17:52:51 +02:00
Milan Hanajik d2631c8c88 DataEntry.Uni component added, DEUni column items in summary results, ver. 2.33.2064 2023-06-26 15:17:18 +02:00
Milan Hanajik 66b463c468 MainWnd : Procedure selection with filters (profile, DN, Qn, ...) 2023-06-26 14:27:35 +02:00
Milan Hanajik af38dbe81b Clean-up 2023-06-26 14:27:35 +02:00
Milan Hanajik 42010a6c26 Last RFID change reverted. 2023-06-22 14:03:14 +02:00
Milan Hanajik 21d3f5e835 attempt to fix build errors 2023-06-22 14:02:37 +02:00
Milan Hanajik e93aa6a21e Roma200 : Hydraulical scheme updated, ELDE component dated 230613 2023-06-20 15:23:23 +02:00
Milan Hanajik 812ac96284 Bug in water meter chart fixed : Incorrect error limit lines 2023-06-16 15:32:25 +02:00
Milan Hanajik 363f42e75b 1. MainSeqUtils.CreateNewBatchResults( ) : WaterMeterData.ErrLimHi/LoQ initialized properly, 2. comments. 2023-06-16 13:36:15 +02:00
Milan Hanajik 2232c31451 DiverterTest : Delay TimeFlow2Mass (min. 5 s) between tests, UpgradeSlectionDlg changes, ver. 2.33.2061 2023-06-16 12:08:51 +02:00
Milan Hanajik 1c6e3c17fa Merge branch 'master-2' of gitserver:/srv/git/tbf into master-2 2023-06-15 12:03:26 +02:00
Milan Hanajik 4d0c34b544 UI.Procedures.ProceduresCtrl : MoreContent.DEAndSequences added, ver. 2.33.2059 2023-06-15 11:33:50 +02:00
Milan Hanajik 93c2338d6c ver. 2.33.2058 2023-06-13 10:30:36 +02:00
Jan Augustin a455d62e9e RfidCommunicationService.RfidRead method - return type changed to dynamic. 2023-06-09 09:29:57 +02:00
Milan Hanajik aed42818b5 Upgrade from 2.32 to 2.33 takes care for rounding of Volume and TestTime after a conversion to double. 2023-06-09 09:08:58 +02:00
Milan Hanajik 281aa93b4b Merge branch 'master-2-Clean-up-of-MySQL-DB-sessions' into master-2, ver. 2.33.2057
# Conflicts:
#	Config/FluentCommon.cs
#	TBF/Properties/AssemblyInfo.cs
#	TBF/Resources/Strings.resx
#	TBF/Rig/Output/DB/ProductionTracing/Tracing.cs
#	TBF/UI/Procedures/ProcedureDlg.cs
2023-06-07 16:21:54 +02:00
Milan Hanajik 3fee487c5d Access rights clean-up for PL 2023-05-30 11:23:29 +02:00
Milan Hanajik e50c636a34 ver. 2.32.2051 2023-05-22 13:02:59 +02:00
Milan Hanajik 1cbab1acd7 Timeout of all MySQL DB connections is 120 seconds, ver. 2.32.2050 2023-05-22 12:59:47 +02:00
Milan Hanajik 3bc8b55429 Access rights clean-up for PL 2023-05-22 12:59:36 +02:00
Milan Hanajik e6fc3c25d6 StateMachine bug fix : InitializeBoardEtc( ) session argument missing 2023-05-02 16:09:54 +02:00
Milan Hanajik b965541b1c TestWizard.VolumeAndErrorSelection fixed - conversion to float avoided. 2023-04-24 20:02:47 +02:00
Milan Hanajik 02fae9b11e Batch.SaveTime set at the end of a cycle, clean-up 2023-04-24 11:23:57 +02:00
Milan Hanajik 1eda22a391 (1) Initialization of components : Inner exception displayed, (2) Clean-up. 2023-04-24 10:36:51 +02:00
Milan Hanajik 15c916ae66 ver. 2.32.2039 2023-04-20 12:36:32 +02:00
Milan Hanajik 03fb87e6ed ver. 2.32.2038 2023-04-19 12:06:27 +02:00
Milan Hanajik bf67b4a4ec Events DB changes 2023-04-19 12:06:16 +02:00
Milan Hanajik 78d05fb1b9 TBF.DB with 4 static session factories, sessions in UI rewritten, TODO: keep session that loads components open, etc. 2023-04-19 12:06:04 +02:00
Milan Hanajik 0d47578441 Production tracing bug fix : Previous workstep result was not checked, mere existence of a record was sufficient for a WM to pass 2023-04-17 10:26:17 +02:00
Milan Hanajik 07d75b7d00 Bug fix in MakeSimulatedTrivial( ) 2023-04-17 10:26:17 +02:00
Milan Hanajik cc88308513 Production tracing bug fix II. 2023-04-14 12:34:08 +02:00
Milan Hanajik bdf3d155f4 Merge branch 'master-2' of gitserver:/srv/git/tbf into master-2 2023-04-14 09:38:16 +02:00
Jan Augustin fe4531ad4c libRfid1.dll removed 2023-04-14 09:29:56 +02:00
Milan Hanajik 23f9331460 Production tracing bug fix : Previous workstep result was not checked, mere existence of a record was sufficient for a WM to pass 2023-04-13 18:00:37 +02:00
Milan Hanajik 0d6875065c Clean-up 2023-04-12 12:25:36 +02:00
Milan Hanajik b56f712c71 Clean-up 2023-04-11 16:17:12 +02:00
Milan Hanajik 7cc20771fe Statistics.LocalSettings updated. 2023-04-11 16:15:57 +02:00
Milan Hanajik 3efb042d18 Statistics.LocalSettings updated. 2023-04-03 09:56:58 +02:00
Milan Hanajik fba8c52dfb 1. TestWizard.FlowSelection fixed: float avoided, 2. Rounding of test flows after conversion, ver. 2.33.2034 2023-04-02 12:27:38 +02:00
Milan Hanajik aa10ea5c04 float -> double : Qtg, Qfrom, Qto, Volume, TestTime, ver. 2.33.2033 2023-03-31 13:21:38 +02:00
Milan Hanajik f457278342 Batch.SaveTime set at the end of a cycle, clean-up 2023-03-30 16:55:13 +02:00
Milan Hanajik a0c45d2b39 UpgradeSelectionDlg changes : ver. 2.26 -> ver. 2.33 2023-03-29 11:57:50 +02:00
Milan Hanajik 799e5be919 All Output.Printers components : string PrinterName parameter specifies printer to be used. 2023-03-29 10:06:47 +02:00
Milan Hanajik 08c4541914 default_printer added to, Qmax,Qn,Qt,Qmin removed from TBF.Resources.Strings 2023-03-29 10:06:46 +02:00
Milan Hanajik 7b95f5f436 WMChart can plot error limits other then 2% and 5% and qp,qi style hyperbolic error limits, related DB and UI changes, ver. 2.33.2027 2023-03-29 10:06:46 +02:00
Milan Hanajik f0e57554f2 Printing from PreviousResultsDlg, ver. 2.32.2027 2023-03-13 10:14:54 +01:00
Milan Hanajik c8a5640ddc ver. 2.32.2026 2023-03-08 10:35:56 +01:00
Milan Hanajik 1a7a5661c4 iPerlCommunication : Activity 'Q2 corrected from <test> plus' supported, ver. 2.32.2025 2023-03-08 10:01:18 +01:00
Milan Hanajik 94e83ad63a ver. 2.32.2023 2023-03-02 10:42:43 +01:00
Milan Hanajik 5d2008a6dd DataEntry.S620 : Slovak keyboard check. 2023-03-02 10:36:24 +01:00
Milan Hanajik c315c8a42b TestMethods.Message added. 2023-03-02 10:25:33 +01:00
Milan Hanajik aaa78d60db Display batch end time estimate according to a sample batch, ver. 2.32.2022 2023-03-02 10:25:24 +01:00
Milan Hanajik 4b42b5ba7a Procedure number displayed in TBF.UI.ResultsMI.PreviousResultsCtrl, the form is wider, etc. 2023-03-01 11:04:09 +01:00
Milan Hanajik 6e04933eeb Refactorization : Common.Utils.GetParity( ) / GetStopBits( ) / GetHandshake( ) ... 2023-03-01 11:04:09 +01:00
Milan Hanajik f47e7670a3 BatchResultsDlg moved to TBF.UI.ResultsMI 2023-02-27 12:37:41 +01:00
Milan Hanajik 78575e4f6f iPerlCommunications : Modifications for Australia (plus), ver. 2.31.2018 2023-02-24 10:17:24 +01:00
Milan Hanajik b38ee92fe4 ver. 2.31.2017 2023-02-17 11:45:42 +01:00
Milan Hanajik 4ac72c6bbf IperlLogger handles more then 20 tests, previous results open on current screen, etc., ver. 2.31.2016 2023-02-17 09:22:00 +01:00
Milan Hanajik c0e7eab3b2 Order of saving results to MySql DB and to other destinations changed, try-catch for other destinations, ver. 2.31.2014 2023-02-02 11:08:12 +01:00
Milan Hanajik 5081969fdc DataEntry.iPerl.CycleBeginningForm supports up to 10 digit or letter purchase order, ver. 2.31. 2011 2023-01-25 12:11:14 +01:00
Milan Hanajik df386a14f8 SensusOracle.DB : Handling of a crash in transaction.Rollback(), ver. 2.31.2009 2023-01-23 13:10:13 +01:00
Milan Hanajik 2b0ee55901 SensusOracle.Database bug fix : No attempt to read bemerkung from vt_wztyp_sd, ver. 2.31.2007 2023-01-19 08:05:44 +01:00
Milan Hanajik 5b893d69b4 ver. 2.31.2006 2023-01-17 13:00:41 +01:00
Milan Hanajik a50c867b7e SensusOracle.Database uses LUTestData[] based complete test inof-s from test parameters OraId, OraDesignation, etc, ver. 2.31.2003 2023-01-17 12:57:52 +01:00
Milan Hanajik ebcbd47f91 PruefungsNr calculation that uses OraIdRepetMulti / RawDataIdRepetMulti modified, ver. 2.31.2002 2023-01-13 12:33:21 +01:00
Milan Hanajik 310ed6158a ver. 2.31.2001 2023-01-11 14:27:10 +01:00
Milan Hanajik c64e8e773f OraId, OraDesignation, RawDataId ... related : Fixed the case ORACLE_DB is not defined. 2023-01-04 09:03:08 +01:00
Milan Hanajik 56275063f7 Changes for Fuzhou PT300 done in version 2.26.1569 --> 2.26.1998. 2022-12-25 15:42:04 +01:00
Milan Hanajik d7401cfec4 Bug fix : DataEntry.StandardCamera.TestStartEndForm crashed when no RR was defined at certain position 2022-12-21 09:35:36 +01:00
Milan Hanajik 0849467857 IperlHead.DetermineExtraDataFileName( ) fixed, ver. 2.31.1996 2022-12-13 16:33:13 +01:00
Milan Hanajik d83762ddec Refactorization : Common.Utils.GetTestName(...) replaces Results.Utils.GetTestName(...) 2022-12-13 13:16:15 +01:00
Milan Hanajik 4640018e78 FileWriters.IperlLogger rewritten : uses OraId, OraIdRepetMulti, OraDesignation and LUTestData class, BatchResults bug fix 2022-12-13 13:15:33 +01:00
Milan Hanajik 67ebe0718a ProcedureDlg : 1. Qtg is displayed when ORACLE_DB defined, 2. Qtg can be changed when procedure is not protected. 2022-12-13 13:15:23 +01:00
Milan Hanajik b1bebbff50 ORACLE_DB : entities Test and TestData contain OraId, OraIdRepetMulti, OraDesignation, RawDataId, ... ver. 2.31.1994 2022-12-13 13:15:13 +01:00
Milan Hanajik 26126d380b Bug fix : Pruefindex / MaxTestIndex evaluated correctly now. 2022-12-06 10:54:55 +01:00
Milan Hanajik c6a2965faf iPerlCommunication : Milestones reset on start of the session. 2022-11-23 08:12:51 +01:00
Milan Hanajik 77c713425a ver. 2.31.1990 2022-11-21 12:08:48 +01:00
Milan Hanajik 604120e2b8 Test profile includes test method, ver. 2.31.1988 2022-11-18 13:35:43 +01:00
Milan Hanajik d29d8be81a FixedStartMassCollection : Flow adjustment during measurement, ver. 2.30.1987 2022-11-18 12:34:31 +01:00
Milan Hanajik 6a374c5af0 Approval by legalizator only when !string.IsNullOrEmpty(AltProcName), legalizator full name used in reports, ver. 2.30.1986 2022-11-18 11:55:23 +01:00
Milan Hanajik a14e21eb57 Profile import fixed. 2022-11-18 10:52:36 +01:00
Milan Hanajik 100a357fc1 MainSeq: Approval by legalizator, ver. 2.30.1984 2022-11-18 10:52:36 +01:00
Milan Hanajik 75fcffc9c3 Create from profile button in ProceduresDlg enabled again, etc, ver. 2.30.1983 2022-11-18 10:52:36 +01:00
Milan Hanajik 8d6d0c011b Procedures : Selection via profiles, More column can display profile, ver. 2.30.1982 2022-11-16 06:50:18 +01:00
Milan Hanajik be8f6814c8 Power user password changes. 2022-11-14 07:09:39 +01:00
Milan Hanajik 75766938be FixedStartMassCollection : Diverter to tank after start valve is closed, 'Winiki lub E' support MeterTestRslt, ver. 2.30.1980 2022-11-10 15:39:12 +01:00
Milan Hanajik 08b3ab45ba Browsing previous results : SerialNr can be used as search criterion, ver. 2.30.1978 2022-11-09 11:22:39 +01:00
Milan Hanajik 0539844d85 RegValvePosition class with RV/position pair, FeedingPath RV positions used in sequences, ver. 2.30.1976 2022-11-04 12:23:22 +01:00
Milan Hanajik da7ac83c75 Bug fix : Prevent crash in certain cases when using MakeSimulated( ). 2022-11-04 12:23:22 +01:00
Milan Hanajik 01f0c03f62 Bug fix : Prevent crash in certain cases when using MakeSimulated( ). 2022-11-02 08:57:57 +01:00
Milan Hanajik 9ac1b0b6fa Project dependencies fixed 2022-10-19 08:18:29 +02:00
Milan Hanajik 685d57db8b Clean-up 2022-10-10 08:12:49 +02:00
Milan Hanajik 7de5551c24 IperLogger.ProcParams (DesigMode, DesigType), etc. 2022-10-04 11:31:58 +02:00
Milan Hanajik 36c52e5d7e DataEntry.StandardCamera changes - OCR as for Hong Kong, ver. 2.30.1971 2022-10-04 11:29:45 +02:00
Milan Hanajik 9f6bfc6410 1 Common.Enums.Mounting.HV added, 2 iPerlCommunicationForm bug fix, ver. 2.30.1966 2022-09-26 17:09:30 +02:00
Milan Hanajik 81498a6db4 LiveStream : New default values for OverlayLeft/Top/Width/Height test parameters. 2022-09-26 09:47:58 +02:00
Milan Hanajik a595b6cd8d TURA_SPECIAL : WMsCount = LineSize = 8, ver. 2.30.1962 2022-09-19 09:25:45 +02:00
Milan Hanajik 668d68a80c ver. 2.30.1960 2022-09-14 08:34:27 +02:00
Milan Hanajik 61ea3ef86b Renaming transition sequences enhanced, ver. 2.30.1959 2022-09-08 12:46:03 +02:00
Milan Hanajik a7118935ca iPerlCommunication : Sequence conditions 2022-09-08 12:45:54 +02:00
Milan Hanajik b044b00571 Start/EndTestingSealedMeter activity for iPerlCommunicationForm. 2022-09-06 21:20:49 +02:00
Milan Hanajik 0e77a31a0f Remote database exception logging, ver. 2.30.1956 2022-09-06 13:44:48 +02:00
Milan Hanajik 2183d1c452 Components with proc. params. in 'More" tab in ProcedureDlg are determined automatically, ver. 2.30.1955 2022-09-04 21:01:39 +02:00
Milan Hanajik be97777159 1 CLP1611.Camera scp file upload disabled, 2 LiveStream method displays an overlay (test param.) in the image stream. 2022-08-30 14:58:27 +02:00
Milan Hanajik 4781acf3e2 Camera.CLP1611.GrabImagesOp does not delete and overwrite images in simulation mode. 2022-08-30 14:58:27 +02:00
Milan Hanajik 207d4be3d6 Batch nr. is displayed in MainWnd 2022-08-30 14:58:26 +02:00
Milan 92b2f55871 Clean-up 2022-08-30 14:58:26 +02:00
Milan Hanajik 0fd0c44c18 Better on-screen error message when a path is missing in a test. 2022-08-30 14:58:26 +02:00
Milan Hanajik 5629b94e47 All projects targer .Net Framework 4.7.2 2022-07-28 12:45:00 +02:00
Milan Hanajik 3bff80f64b Selectors are used in TestWizard in FlowSelection and TestProfileSelection, Map(x => x.selectors) in all paths, ver. 2.30.1930 2022-07-01 11:59:34 +02:00
Milan Hanajik b3df3307a0 When using 'Create from Profile' the generated tests can be renamed, order of profilesin ComboBox. 2022-06-30 17:48:17 +02:00
Milan Hanajik 1f12464218 TBF.UI.Procedures.Formulas static class, refactorization. 2022-06-28 12:26:01 +02:00
Milan Hanajik b17282f826 UI.Procedures.TestWizard.TestProfileSelection : Q1/2/3/4/min/t/n/max/p/i are not case sensitive, ver. 2.29.1929 2022-06-28 11:10:06 +02:00
Milan Hanajik ae348d13fd Custom units in MetrologyDlg tabs : Bug fixes : 1. Test after adding a value, 2. test of FlowMeter+rangeIx, ver. 2.29.1927 2022-06-23 15:30:51 +02:00
Milan Hanajik e7ab26669e Custom units in MetrologyDlg tabs Balance, FlowMeter, PressMeter and TempMeter, ver. 2.29.1926 2022-06-22 13:52:13 +02:00
Milan Hanajik c44202b0ce DataStream.Reader.ProcParams class added, ver. 2.28.1925 2022-06-14 13:53:27 +02:00
Milan Hanajik db0939ec0d ProcessTabPageCtrl24 English units support. 2022-06-08 13:47:55 +02:00
Milan Hanajik 3dc6f291bb Early loading of the 1st component implementing IBenchInfo to ProcessData.BenchInfo. 2022-06-08 13:47:46 +02:00
Milan Hanajik 38b8184dfb ErrorFlags and FlyingStartMassCollProlong : English units supported. 2022-06-03 12:29:38 +02:00
Milan Hanajik e12a3eecba TempControl.Novus : (1) fixes in sequence operations implementation, (2) N1040 support, ver. 2.28.1924 2022-06-03 12:29:13 +02:00
Milan Hanajik a7a7fbd403 Reservoir(s) in Elde component : T and SP display. 2022-06-01 12:09:39 +02:00
Milan Hanajik 0fa621bd6a Modbus.TempControl.Novus works OK, TODO: T and SP display on Elde component. 2022-06-01 12:09:39 +02:00
Milan Hanajik 1b14954a6d TBF.UI.Bench.Paths controls support imperial units for flow. 2022-06-01 12:09:39 +02:00
Milan Hanajik a70491d236 Clean-up 2022-06-01 12:09:31 +02:00
Milan Hanajik 071abc015b TURA_SPECIAL related fix. 2022-05-31 17:02:43 +02:00
Milan Hanajik 03e0120121 ProceduresDlg closing improvements : Double saving to DB and saving when the dialog is still locked prevented. 2022-05-30 11:45:04 +02:00
Milan Hanajik 87a60be61f OneWMResult...Ctrl caption with position, pruefindex, clean-up, more comments, ver. 2.28.1921 2022-05-30 11:44:49 +02:00
Milan Hanajik 420efb1ae0 Simulation of fixed start mass collection method with still camera images possible. 2022-05-27 14:20:21 +02:00
Milan Hanajik 23793d20da Bug fix (Test.TempControl related). 2022-05-27 09:54:09 +02:00
Milan Hanajik 0983270730 More Users.CurrentUser related changes (IPERL) 2022-05-27 09:54:09 +02:00
Milan Hanajik d8a6404e83 Users.CurrentUser static class with Stack<UserAndForm> userStack, Change() and Restore(). 2022-05-27 09:54:09 +02:00
Milan Hanajik 4197328be9 TBF.Rig.Dummy.TempControl added. 2022-05-27 09:54:09 +02:00
Milan Hanajik 7f3cc27138 Modbus.Novus --> Modbus.TempControl.Novus, Common.Modbus: string[] ComponentNames, etc. (builds OK) 2022-05-27 09:53:06 +02:00
Milan Hanajik 80d347ef54 Modbus.Easytherm --> Modbus.TempControl.Easytherm 2022-05-23 09:58:20 +02:00
Milan Hanajik 6d3ed2799b MainSeq uses string Test.TempControl to set temperature setpoint. 2022-05-23 09:58:20 +02:00
Milan Hanajik 72bf9135b5 UI.Procedures.ProcedureDlg Metrology 2 tab supports TempControl test parameter. 2022-05-19 16:31:57 +02:00
Milan Hanajik aa1d9e4b3b string Test.TempControl and string TestData.TempControl added and used in sequences. 2022-05-19 16:16:31 +02:00
Milan Hanajik dab575dc49 Clean-up after comparing DataEntry.S620 and SensusOracle with 1837 (iperlNew on WR19), ver. 2.27.1917 2022-05-18 10:28:11 +02:00
Milan Hanajik 2c91ded0db Safe wrappers in ProcessData, clean-up. 2022-05-16 15:18:42 +02:00
Milan Hanajik 8d640bb52a Bug fix in TBF.Rig.DataEntry.Double24.CycleBeginningForm 2022-05-04 12:50:11 +02:00
Milan Hanajik 1b4ac3451f Bug fix in TBF.Rig.Bench/Feeding/Meters/OutputPath 2022-04-15 13:30:58 +02:00
Milan Hanajik ef13de9874 LeakTest modified : 1. close valve+pump off 2. delay 3. start mass 4. leak test 5. end mass, ver. 2.27.1875 2022-04-08 11:10:01 +02:00
Milan Hanajik c2d5719d31 PMaxTest/LeakTest.TestMethodCfgCtrl removed, other minor changes. 2022-04-07 08:54:33 +02:00
Milan Hanajik 96a86a04da UserManagement fixed : DbType = DBType.MySql 2022-04-05 10:13:28 +02:00
Milan Hanajik 2a26da6337 IperlHead.CalculateQ2CorrectionFactor( ) bug fix for R400, etc, ver. 2.27.1873 2022-03-11 00:13:47 +01:00
Milan Hanajik 8ef21b3831 SensusTestInfo : LogType.JustA0_Q3Q2Q1 added, GetBestMatch( ) modified 2022-02-23 16:20:07 +01:00
Milan Hanajik 75c97d99e8 iPerlComm : Strict Q2 Error Check, Datastr.proc.started simult.after 'Set test mode', Input ser.buffers flushed, MT locking, Q2 corr.for all Rxyz, ver. 2.27.1870 2022-02-23 16:19:51 +01:00
Milan Hanajik d7fd270cd5 Clean-up, minor changes. 2022-01-28 10:40:08 +01:00
Milan Hanajik f6886a8fdc UI : ProcedureDlg : TempLo, TempHi, TempUnit, Uncertainty and Repeats in Metrology I and II swapped. 2022-01-28 10:40:07 +01:00
Milan Hanajik 947d0198c1 Some shared classes and interfaces moved to project Common, re-factorization. 2022-01-23 19:56:15 +01:00
Milan Hanajik a4a583c41a Everything uses Common.Forms.ListViewEx, other LIstViewEx-es removed. 2022-01-23 13:58:54 +01:00
Milan Hanajik 61add6be07 Common.Forms with ListViewE and ModelessForm as in ver. 3.1 2022-01-23 13:25:32 +01:00
Milan Hanajik 5a5f8493f2 IperlHead : Simultaneous serial port flushing after switching to the test mode. 2022-01-23 13:19:20 +01:00
Milan Hanajik cfaf8e6a59 FeatureVectorCalculatore bug fix : case when complete curve is below zero and fromZero == true 2022-01-20 13:16:33 +01:00
Milan Hanajik 5854a6e620 Water meter test results graph fixed, ver. 2.27.1851 2022-01-14 14:39:57 +01:00
Milan Hanajik 5623f27959 ELDE component for Luxemburg-40 upgraded, 13.01.2022. 2022-01-14 14:38:35 +01:00
Milan Hanajik 15e5d65ee9 Bug fixes : Ambient temperature, pressure, humidity calculation in Results. 2022-01-05 12:33:22 +01:00
Milan Hanajik 8e0417de9c MeterTestRslt.Passed set correctly in iPerlCommunicationSeq.MakeQ2CorrectedFrom( ) 2022-01-04 21:56:38 +01:00
Milan Hanajik ffb6401555 Clean-up 2022-01-04 18:15:49 +01:00
Milan Hanajik 7216ac321d Bug fixes : 1 Saving results cannot be stopped, 2 Processing statistics, 3 SensusTestInfo.AreCompatible( ) 2022-01-04 15:38:38 +01:00
Milan Hanajik 5fea1834bb Bug fix in Results.Output.SensusTestInfo, ver. 2.27.1844 2022-01-03 11:07:00 +01:00
Milan Hanajik 5c53929efe ResultsParser project added, ver. 1.0.0 2021-12-16 16:19:14 +01:00
Milan Hanajik 3812438e97 iPerlCommunication bug fix (OoR situation), Ora.Database bug fix (mech. meter update), ver. 2.27.1841 2021-12-15 17:00:51 +01:00
Milan Hanajik 3cb64b2684 TBF.Rig.Network.Comet.Ambient fixed : UpdateProcessData() was missing. 2021-12-15 17:00:44 +01:00
Milan Hanajik 7ea057dab4 S640CommForm cosmetical changes. 2021-12-07 12:05:28 +01:00
Milan Hanajik 0493f8fae5 Component for Gelsenwasser 2021-12-01 10:38:35 +01:00
Milan Hanajik ed606701c0 TestMethods.Evacuation added, ProcessData.FillState updated by SequenceBase.Transition(), ver. 2.27.1813, Statistics v. 2.27.1800 2021-11-22 15:22:01 +01:00
Milan Hanajik 1d152afd6c Output.FileWriters and Output.Printers changes, ver. 2.27.1807 2021-11-15 15:32:21 +01:00
Milan Hanajik 71517b6cdb TBF.Rig.DataEntry.Double24 2021-11-15 15:32:10 +01:00
Milan Hanajik 284feb73dc Bug fix : 6x try / catch to resolve crashes caused by GemCard, etc. 2021-11-11 06:32:47 +01:00
Milan Hanajik ce74b0a3bb Milwaukee component upgraded 2021-11-11 06:32:38 +01:00
Milan Hanajik 4de15b9a7c Clean-up / style changes. 2021-11-11 06:32:38 +01:00
Milan Hanajik 6fd7845d63 Unit selection in DataEntry.Standard24.TestStartEndForm, related changes in TestMethods, ver. 2.27.1802 2021-11-11 06:32:38 +01:00
Milan Hanajik 30c8433cb0 Results.Entities.WaterMeter bug fixes, style changes. 2021-11-11 06:32:38 +01:00
Milan Hanajik 7cf862410b Unit selection in UI.Procedures.TestWizard. 2021-11-09 12:12:52 +01:00
Milan Hanajik 766b52865a UI.Procedures.ProcedureDlg : Units selection in ProcedureDlg / Metrology1 Tab. 2021-11-09 12:12:44 +01:00
Milan Hanajik b9aebd8903 LeakTest : Delay when reading initial pressure, ver. 2.27.1800 2021-11-07 03:30:56 +01:00
Milan Hanajik 50494fccc9 Preferred units in all BenchInfo components and IBenchInfo, Units.ConvertFrom/To for float. 2021-11-04 08:53:12 +01:00
Milan Hanajik e0c2004f52 Milwaukee component update : Schematic drawing changes. 2021-11-02 18:04:49 +01:00
Milan Hanajik d86daefc81 bug fix in FlexFlow - SaveTestResult, ver. 2.27.1791 2021-11-02 12:23:51 +01:00
Milan Hanajik dd52b9d139 Bug fixes : Oracle in Chennai, ver. 2.27.1783 2021-10-26 19:38:39 +02:00
Milan Hanajik eec84351ac TBF.BenchControl... --> TBF.Rig... 2021-10-26 19:38:09 +02:00
Milan Hanajik 7b7b515154 More logging : List of component classes on program start-up, ver. 2.27.1783 2021-10-26 10:35:02 +02:00
Milan Hanajik 6c57f8c76a Output.DB.SensusOracle : New config. parameter TestBenchGroupId replaces constant 18000, ver. 2.27.1782 2021-10-25 12:44:54 +02:00
Milan Hanajik 3312dc40f8 S640 : Only 'passed' WMs are sealed at the end, counting pieces fixed, MeterTestRslt.Passed fixed. 2021-10-20 18:22:21 +02:00
Milan Hanajik 54cb6e4303 S640Communication : Skip bad meters feature added, file exchg timeouts up to 2000s, etc, ver. 2.27.1781 2021-10-20 17:37:15 +02:00
Milan Hanajik 4f2fb85372 SensusOracle.Database bug fix for mechanical meters. 2021-10-20 16:24:21 +02:00
Milan Hanajik a3f8902266 UI.ResultsMI.PreviousResultsDlg : Send again changes, interactive database and water meters selection, ver. 2.27.1781 2021-10-20 15:31:23 +02:00
Milan Hanajik 2e8b962d57 More S640 related changes. 2021-10-20 14:38:01 +02:00
Milan Hanajik ebad16b439 Bug fix in Output.FileWriters.IperlLogger.Writer, ver. 2.27.1780 2021-10-20 09:21:04 +02:00
Milan Hanajik 5b599c2ecd Various S640 related changes, ver. 2.27.1778 2021-10-19 14:43:54 +02:00
Milan Hanajik f3a889eed8 DataEntry.iPerl loads purchase order data from Oracle (if configured to do so). 2021-10-19 08:49:06 +02:00
Milan Hanajik 9aa41338ed S640Communication : Results.entities.WaterMeter.RadioAddress string -> long, optional scanning of serial numbers 2021-10-18 16:53:09 +02:00
Milan Hanajik 5797e97e0f SensusOracle.Database.ReadOrderDetails( ) reads from vt_auft_zaehlernr_pd 2021-10-18 16:53:09 +02:00
Milan Hanajik 352f2c1e28 Results.Entities.WaterMeter.RadioAddress added, ver. 2.27.1776 2021-10-14 14:02:41 +02:00
Milan Hanajik df63f4300a ver. 2.26.1775 2021-10-14 10:27:25 +02:00
Milan Hanajik 171aee4f1d SIRT component added, ver. 2.26.1774 2021-10-14 09:41:47 +02:00
Milan Hanajik e00e7556d6 Common.StatisticalMetrics, FeatureVectorCalculator: changes, SignalChart added, temporarily disabled in IperlHead, ver. 2.26.1771 2021-10-11 21:55:12 +02:00
Milan Hanajik 3f94318570 IperlHead.StartSession() starts datastream processing, IperlHead.TestIsGoingToStartSoon() saves raw-data, ISessionDataMngmnt. 2021-10-08 11:36:38 +02:00
Milan Hanajik 7356f45b93 Platform target AnyCPU whereever possible. 2021-10-07 11:26:02 +02:00
Milan Hanajik f725c2d2d8 FixedStartMassCollection fixes, ver. 2.26.1770 2021-10-05 15:56:36 +02:00
Milan Hanajik 4021ed1a7b S640CommForm supports 40 water meters, ver. 2.26.1769 2021-10-05 12:29:06 +02:00
Milan Hanajik 4a820af389 S640Comm.Start/End proc. params in More section, MainSeq invokes CommForm depending on RegReader type, ver. 2.26.1768 2021-10-05 11:03:11 +02:00
Milan Hanajik 0b8d51daba DEWA rework R-L / DEWA rework L-R, ver. 2.26.1767 2021-10-04 15:07:01 +02:00
Milan Hanajik 21408a962e RegReaders.S640Stream.*, TestMethods.S640Communication.*, IHasClearSessionData, ControlBoardDev.RefPulses added, ver. 2.26.1766 2021-10-04 11:24:20 +02:00
Milan Hanajik f854bf2277 Oracle.ManagedDataAccess package added, related changes, ver. 2.26.1765 2021-10-01 11:34:13 +02:00
Milan Hanajik e6d35e5178 FelxFlow : Changes related to Config.Entities.Enums --> Common.Enums, ver. 2.26.1764 2021-10-01 10:08:30 +02:00
Milan Hanajik a203885c16 Merge branch 'master-2-26-Flex' into master-2-26 2021-10-01 10:03:39 +02:00
Milan Hanajik 698e2dd6c4 Test.TstTime -> TestTime, Config.Ent.Enums + Events.Ent.Enums + Users.Ent.Enums -> Common.Enums, IRegulValve -> IRegValve, etc. 2021-10-01 09:58:06 +02:00
Milan Hanajik 5c55b2540a iPerlCommunicationForm: 40x libRfid.dll for each serial port, DewaRework( ) fixed, ver. 2.26.1751 2021-10-01 09:56:47 +02:00
Milan Hanajik 3d7ead8464 Output.FlexFlow : System.Net.WebRequest used, REST/SOAP support, etc, ver. 2.26.1763 2021-09-30 10:11:02 +02:00
Milan Hanajik 30845f4ca3 ver. 2.26.1742 2021-09-21 09:48:37 +02:00
Milan Hanajik f72457404b DB.SensusOracle.DatabaseCfg : database access passwords are not readable, ver. 2.26.1741 2021-09-20 17:09:57 +02:00
Milan Hanajik 7ab2930bf7 Output.DB.SensusOracle.Database : max_Pruefindex in VT_ZAEHLER_PD reverted, ver. 2.26.1738 2021-09-20 14:32:20 +02:00
Milan Hanajik 0cf2c442ec DB.SensusOracle.Database changes : DataSource / UserId / Password / AnbId can be configured now, ver. 2.26.1737 2021-09-20 14:29:02 +02:00
Milan Hanajik 756fa12456 Output.DB.SensusOracle.Database : max_Pruefindex in VT_ZAEHLER_PD 2021-09-20 14:29:02 +02:00
Milan Hanajik bb0361319d Config.Data --> TBF.Data and TBF.DB, etc. 2021-09-20 14:29:01 +02:00
Milan Hanajik 2cc92f3980 iPerlCommunicationForm : "DEWA rework" activity 2021-09-19 17:23:31 +02:00
Milan Hanajik abb2375500 IComponentCfg : GetControl( ) --> GetControl(IList<Component> cmpntEntities) 2021-09-16 14:21:18 +02:00
Milan Hanajik 64a5f7ceb8 ComponentParametersDlg moved from TBF.BenchControl to TBF.UI.Bench.Components. 2021-08-29 12:24:08 +02:00
Milan Hanajik adfb9ae8d5 iPerlCommunication cleanup. 2021-08-29 09:55:55 +02:00
Milan Hanajik 9e139279c7 Output.FlexFlow.Rest component added. 2021-08-26 13:24:03 +02:00
Milan Hanajik adf7a44a54 Bug fixes in MetrologyDlgDensityTab and MetrologyDlgBuoyancyTab. 2021-08-26 13:23:50 +02:00
Milan Hanajik c1860ab31c DEWA300 component upgraded, dated 25.8.2021 2021-08-26 12:08:50 +02:00
Milan Hanajik ba9d06ac3f ver. 2.26.1729 2021-08-20 15:42:00 +02:00
Milan Hanajik 8115ec4ac5 Effor flags do not stop a cycle in case test.Evaluate = false 2021-08-20 15:22:24 +02:00
Milan Hanajik f5e5d1fd0c iPerlCommunicationForm : wm.PassedFromTests() => q2adjResult/2/.Passed, limits for Q2 corr. from the iPerlComm test, ver. 2.26.1728 2021-08-20 15:21:55 +02:00
Milan Hanajik 9ecba98b4c Changes in iPerlCommunicationForm : CheckboxEditMode bug fixes, ver. 2.26.1725 2021-08-19 14:10:29 +02:00
Milan Hanajik 11ca2b7272 ver. 2.26.1724 2021-08-19 14:08:23 +02:00
Milan Hanajik df232cf508 SensusTestInfo : LogType.JustA0A4_Q3Q2Q1 added (ID_WZTYP=122), ver. 2.26.1723 2021-08-19 12:32:01 +02:00
Milan Hanajik 8c9643a8de SensusOracle.Database.Anbid_StaraTura --> Anbid_Producer, SensusOracle.Database.ReadOrderNumbersFromOracle( ). 2021-08-19 11:25:37 +02:00
Milan Hanajik 8a85458865 Minor DataStream.Reader and Elde.FlowMeter fixes 2021-08-18 13:06:37 +02:00
Milan Hanajik 848f9dff9d Initial values: CalibDate = Constants.MinDate, CalibValidDate = Constants.MaxDate, MaxDate = new DateTime(2039, 12, 31); 2021-08-18 10:40:51 +02:00
Milan Hanajik 5905d0850b DEWA300 Elde component upgraded - minor screen changes. 2021-08-18 09:35:41 +02:00
Milan Hanajik 5d144dfc24 FixedStart... methods use Math.Abs( ) of a difference of volumes to be able to cope with a reverse flow. 2021-08-18 09:35:40 +02:00
Milan Hanajik dcf746dc6b Color.DarkGoldenrod --> DarkGray in 59 forms (DataEntry, KPackE.DataEntryForRadio, Adjustment, ManualEntry, PulsesTest(Manual), ManualLevelMsrmnt). 2021-08-18 09:35:40 +02:00
Milan Hanajik 4e216c42de iPErlCommunicationForm bug fix : Test name is currentActivity.Substring(ConditnlUpdateQ2CorrRL/LRStr.Length).Trim() 2021-08-17 12:22:19 +02:00
Milan Hanajik 4f52093af6 SensusOracle.Database : Insert/update of VT_ZAEHLER_PD modified, ResultsMI.DeleteFromOracleForm, ver. 2.26.1719 2021-08-16 13:03:11 +02:00
Milan Hanajik c2826cbd27 iPerlCommunicationForm : Serious bug fix !!! ver. 2.26.1717 2021-08-03 18:27:10 +02:00
Milan Hanajik d3c62e353c Q2 correction uses q2AdjResult.Q2CorrRL / q2AdjResult.Q2CorrLR / q2AdjResult2.Q2CorrLR + iPerlCommunicationForm bug fixes 2021-08-03 13:07:13 +02:00
Milan Hanajik 1349c39d2d DataEntry.DataStream.EntryFormCfg clean-up 2021-08-03 12:20:17 +02:00
Milan Hanajik 7d1d9b1051 MeterTestRslt.CalibFactor / CalibFactorLNA / Q2CorrRL / Q2CorrLR / FlowDirection added and mapped to results database 2021-07-30 10:12:49 +02:00
Milan Hanajik c4ca299ce2 iPerlCommunication activity 'WriteDefaultQ2Corrections' modified. 2021-07-29 12:03:27 +02:00
Milan Hanajik 96a17b2d16 1. iPelrHead.MeterType.DN26 --> MeterType.DN25_Q3_10 2. TestMethodCfg.UseMuxBoards... removed 3. iPerlhead.ProcParams.InitQ2CorrRL/LR removed 4. Default Q2 corrections 2021-07-29 11:16:19 +02:00
Milan Hanajik 5b4ffd9327 Clean-up 2021-07-28 13:59:21 +02:00
Milan Hanajik 96abee384b IParamsProvider : IList<strig> ParamValues( ) --> ICollection<string> ParamValues( ) 2021-07-28 13:31:18 +02:00
Milan Hanajik 1e93a1e9ae iPerlCommunicationForm.cs changes (sync. .with 3.1 branch), ver. 2.26.1712 2021-07-28 12:42:03 +02:00
Milan Hanajik dfd6399d6c GraphsTabPageCtrl : 1. Unlimited history, 2. Dynamic subnodes. 2021-07-27 16:02:28 +02:00
Milan Hanajik 7bdf6efd9d ELDE komponent Badger-stredna-trat pre 4 vodomery. 2021-07-26 12:58:05 +02:00
Milan Hanajik 0e78f40cca DataStream.CycleBeginnigForm : Safer okButton_Click( ) 2021-07-26 10:06:08 +02:00
Milan Hanajik 56fc3b6380 MefImport : Wrappers for DatastreamInterface.StartMeasurement() / StopMeasurement() - connected meters only, ver. 2.26.1708 2021-07-20 09:24:41 +02:00
Milan Hanajik a1e73be9cb (1) MainSeq allows showCycleEndFormOp==null now, (2) iPerlCommunicationForm edit mode fixes, ver. 2.26.1707 2021-07-16 18:13:12 +02:00
Milan Hanajik bb4b1a1998 MefImport : IsConnected(), OpenConnection() and CloseAllConnections() wrappers, DataStream.EntryForm calls CloseAllConnections(). 2021-07-16 18:13:03 +02:00
Milan Hanajik c4afaf739a DataEntry.DataStream.CycleBeginningForm completed, ver. 2.26.1706 2021-07-16 16:54:50 +02:00
Milan Hanajik 2e8c5fa6f6 DataEntry.DataStream.CheckBoxImage added. 2021-07-16 14:26:24 +02:00
Milan Hanajik e46b64bd29 iPerlCommunicationForm changes. 2021-07-16 14:26:24 +02:00
Milan Hanajik 61ecb23294 LS.iPerlCommunicationsFormCheckBoxes -> OptoHeadsEnabled, MainWnd.optoHeadsToolStripMenuItem (+ visibility) 2021-07-15 10:31:32 +02:00
Milan Hanajik 674dde8d74 Changes for Milwaukee: DataStream.Reader bug fix, MefImport.MinSamplesCount =10. 2021-07-15 09:37:55 +02:00
Milan Hanajik 186bbdcc25 DataEntry.DataStream component added. 2021-07-15 09:36:28 +02:00
Milan Hanajik 2a82fbf2ca Component upgraded : VBB1+VBB2, etc. 2021-07-13 13:37:01 +02:00
Milan Hanajik 678fefb725 iPERL clean-up. 2021-07-13 13:37:01 +02:00
Milan Hanajik 58a57ba215 ver. 2.26.1698 2021-07-09 07:50:47 +02:00
Milan Hanajik 4d77926a9e iPERL : Q_WZ, KorrErrQ in VT_PRUEFREIHE_IST_PD, see email Joachim 12.1.2021, mtr.LastError not mapped to DB anymore, ver. 2.26.1697 2021-07-08 17:27:09 +02:00
Milan Hanajik a7e2947de7 Feature vector calculator - initial version of the offline tool. 2021-07-07 15:45:26 +02:00
Milan Hanajik 4a33339c63 OptoTelegramRaw class omved to Common.Iperl namespace, ver. 2.26.1694 2021-07-06 13:11:42 +02:00
Milan Hanajik 7b780d72a0 ver. 2.26.1693 2021-07-06 08:54:30 +02:00
Milan Hanajik 7a60055413 iPERL : X1 .. X9 added to result items, ver. 2.26.1692 2021-07-02 17:12:52 +02:00
Milan Hanajik c6f3751746 IPERL : Results.Entities.MeterTestRslt.X1..X9 added, X1 = flow st. dev., etc., ver. 2.26.1691 2021-07-02 11:26:48 +02:00
Milan Hanajik 300dabc800 TestMethods.PMaxTest bug fix : when pump reached 100% PMaxTest started regardless of the pressure. 2021-07-02 10:56:27 +02:00
Milan Hanajik d51ff414ca OptoTelegramRaw improvements 2021-07-02 10:56:14 +02:00
Milan Hanajik 6f65f0085e Milwaukee: TempCalibData = new float[16, 5], Diverters count bug fix, ver. 3.1.1688 2021-06-30 12:33:42 +02:00
Milan Hanajik 319cf0b8d4 New RR.DataStream.MefImport and RR.DataStream.Reader components. 2021-06-30 12:33:16 +02:00
Milan Hanajik c1daf13411 ver. 2.26.1682 2021-06-28 12:34:11 +02:00
Milan Hanajik 4fd107678d SensusOracle.Database bug fix: q_wz in VT_PRUEFREIHE_IST_PD 2021-06-28 12:22:18 +02:00
Milan Hanajik e1d3be7e56 (1) Stopping a cycle after ErrorFlags STOP, (2) Bug fix in R.Entities.MeterTestRslt, ver. 2.26.1681 2021-06-28 12:09:42 +02:00
Milan Hanajik 4f9b07ba20 RegulValve.SetFlowOp : RqrdFlowRangeRatio = 0.5, requiredFlowLo/HI -= Config.Formulas.GetCorrection(...), ver. 2.26.1679 2021-06-28 12:09:42 +02:00
Milan Hanajik 8e25fa6232 string Results.entities.MeterTestRslt.ExtraDataPath and related changes, supported by FlyingStart, FlStMassCollection and FlStMassCollProlonged. 2021-06-28 12:09:42 +02:00
Milan Hanajik 760ec598ca Event viewer changes in progress. 2021-06-02 13:52:18 +02:00
Milan Hanajik fd77380315 ver. 2.26.1675 2021-06-02 13:51:07 +02:00
Milan Hanajik bf91dc0aa6 ErrorFlagsMode.Stop added, can be used in UI, ver. 2.26.1674 2021-06-02 13:48:57 +02:00
Milan Hanajik 14a3d63f1f Small bug fixes in Results.FormsBatchResultsDlg.OneWMResults... 2021-06-01 07:58:05 +02:00
Milan Hanajik 0a60f9c64d ver. 2.26.1652 2021-05-21 11:24:53 +02:00
Milan Hanajik 258fd2579f IperlHead : Bug fix, case when there is no start or no end sample, ver. 2.26.1651 2021-05-21 11:20:17 +02:00
Milan Hanajik 4ec2dee3a2 ver. 2.26.1650 2021-05-19 15:01:31 +02:00
Milan Hanajik 723bf3fdeb ver. 2.26.1649 2021-05-19 14:13:08 +02:00
Milan Hanajik 315cccf74c iPerlHead : TimeFromSamples( ), VolumeFromSamples( ), StartEndFilterSamplesCount2 = 20, ver. 2.26.1648 2021-05-19 13:17:50 +02:00
Milan Hanajik 1b68ea8ab9 TBF.UI.Procedures.ProcedureDlg : 5-th file writer, ver. 2.26.1647 2021-05-17 11:54:07 +02:00
Milan Hanajik 9111bd7346 ResultsBrowser changes 2021-05-13 17:12:00 +02:00
Milan Hanajik cfdd59abce 10.42.128.16 --> 10.42.128.24 2021-04-30 12:22:12 +02:00
Milan Hanajik 4972347605 MettlerToledo.Standard scales robust against USB serial port drop-out. 2021-04-30 11:17:06 +02:00
Milan Hanajik 3459a5eac5 'Scale', 'Diverter' and 'RegValve' results items added. 2021-04-28 14:37:59 +02:00
Milan Hanajik 0553caac89 Bug fix in TBF.Utils.GetRegulVallvesPositions( ), TBF crashed when fn. was called from OutputPath from UI. 2021-04-28 10:44:59 +02:00
Milan Hanajik 4464a2025b Changes in binding between KPackE.Radio and KPackE.RegisterReader (Register(), Unregister(), ver. 2.26.1636 2021-04-28 08:45:19 +02:00
Milan Hanajik 03197dc8f3 FixedStartMassCollection cleanup. 2021-04-26 06:42:59 +02:00
Milan Hanajik e74c8692ce Paths : Selector : UI changes, Selector not mapped to the config DB yet. 2021-04-16 12:34:15 +02:00
Milan Hanajik cda8359623 ver. 2.26.1623 2021-04-16 12:32:57 +02:00
Milan Hanajik 508315a43f Output.SensusTestInfo : (1) S620_Kiwa, (2) CreateFromProcedure() fixed, ver. 2.26.1622 2021-04-16 12:12:24 +02:00
Milan Hanajik 9a8c9205d3 Izrael-50 component upgraded. 2021-04-15 12:06:19 +02:00
Milan Hanajik d7728d304a ver. 2.26.1617 2021-04-14 11:51:07 +02:00
Milan Hanajik fd0d7dcf7b A better bug fix in LeakTest, ver. 2.26.1616 2021-04-14 11:33:15 +02:00
Milan Hanajik 997e0d2a6b ver. 2.26.1609 2021-04-13 15:20:38 +02:00
Milan Hanajik 51e1e5721c Bug fix : Results.BatchResults.NewFromProcedure( ) uses GetTestInstances( ). 2021-04-13 14:40:38 +02:00
Milan Hanajik 34c3fa26c9 Trivial simulation mode for some test methods. 2021-04-13 13:57:28 +02:00
Milan Hanajik 5e3e70f43a Australia 169 MHz SensusTestInfo modified, first100 pieces with Q2ac, ver. 2.26.1608 2021-04-13 08:48:47 +02:00
Milan Hanajik 18880dc04d Assignment of drain valves to scales and tanks fixed. ver. 2.26.1607 2021-04-12 12:00:23 +02:00
Milan Hanajik 2673584113 MergeResultsDBs console application added to solution. 2021-04-12 05:59:37 +02:00
Milan Hanajik e90967b6ed Results.Entities bug fixes and copy constructors. 2021-04-12 05:19:47 +02:00
Milan Hanajik 46489224cf MainSeqUtils : Prevent crash when draining tanks at the end. 2021-04-08 13:52:05 +02:00
Milan Hanajik d8fc4a4c36 UI.Procedures.ProceduresCtrl can display procedure properties of Sensus-Oracle-DB component. 2021-04-08 12:03:25 +02:00
Milan Hanajik ae18e15fba Order of RunDeviceAfter( ), StopDevice( ) and StopDevice2( ) calls reversed, ver. 2.26.1599 2021-04-08 12:03:25 +02:00
Milan Hanajik 352ed581c2 Getting rid of warnings. 2021-04-08 12:03:25 +02:00
Milan Hanajik b5572c20e3 Factories are without ResetStaticProperties( ). 2021-04-08 12:03:25 +02:00
Milan Hanajik 1d50b7206d Components Initialize() rewritten, double StartChangeHandler() calls avoided, ToString() methods are equl, use ClassName. 2021-04-08 12:03:18 +02:00
Milan Hanajik 331803e51d MeterTestRslt.WriteBinary( ) hot fix. 2021-04-07 12:05:09 +02:00
Milan Hanajik ed25f1a360 Cosmetic changes in evaluation of tests. 2021-04-04 14:49:35 +02:00
Milan Hanajik 111fd8d96c ver. 2.26.1597 2021-03-31 11:10:56 +02:00
Milan Hanajik c86bafd779 UpgradeSelectionDlg/Custom, more logging in Output.DB.SensusOracle.ProcedureParams. 2021-03-31 09:21:43 +02:00
Milan Hanajik c472bfc99d iPerlCommmunication : New Q2 correction for Australia. 2021-03-30 11:36:01 +02:00
Milan Hanajik b8eaaeb64c ProcedureDlg bug fix : Copy button visible for all benches, ver. 2.26.1596 2021-03-30 11:35:40 +02:00
Milan Hanajik b09a057b02 ver. 2.26.1595 2021-03-30 00:08:47 +02:00
Milan Hanajik 9f19df7f3f Support for Statistics off-line mode: change LocalSettings.cs line 244. 2021-03-12 10:01:27 +01:00
Milan Hanajik db9506290a SerialStream simulation : Reads characters from a file instead of a serial port. 2021-03-08 18:01:48 +01:00
Milan Hanajik 4505759115 DataEntry.iPerl : No CycleEndForm, does not implement IHasCycleEndForm. 2021-03-08 13:12:40 +01:00
Milan Hanajik d15497f2b0 InfoFlagsStr in Results as an item in WMeterRsltItemSpec. 2021-02-19 11:18:11 +01:00
Milan Hanajik ec9edbf04c DataEntry.Standard24.CycleBeginningForm : Auto s/n feature. 2021-02-16 15:55:26 +01:00
Milan Hanajik 31b167cd62 MettlerToledo.Standard.BalanceDev/Old/NewDev clean-up, units (oz), 1st after draining, etc. 2021-02-16 11:34:46 +01:00
Milan Hanajik 1d33b9651b Milwaukee : Elde component upgraded, 09.02.2021 2021-02-11 08:51:13 +01:00
Milan Hanajik 3bf8b4fe54 DataEntry.S620 supports production tracing, S/Ns from OraDB + disp., flash and beep, ver. 2.26.1592 2021-02-10 13:58:54 +01:00
Milan Hanajik 2e75d91adc Bug fix in MetrologyDlgFlowMeterTab, etc. when ranges are enabled, ver. 2.26.1588 2021-02-08 10:12:12 +01:00
Milan Hanajik 55d9d58978 BenchControlPanel : Four main buttons are disabled on TBF start. 2021-02-04 15:04:19 +01:00
Milan Hanajik 241bb3aff1 TestTimeCorrection and MassOfEvapWater are stored in SummaryResults columns BK resp. BB 2021-01-29 10:46:45 +01:00
Milan Hanajik 0fa8057324 RealDensity, AtTemperature, Buoyancy are stored in Results DB in Batch table. 2021-01-28 13:55:27 +01:00
Milan Hanajik 4609abe6ea SensusOracle.Database SQL style changes, ver. 2.26.1586 2021-01-28 13:53:06 +01:00
Milan Hanajik cb6d9538c8 ver. 2.26.1585 2021-01-26 16:48:30 +01:00
Milan Hanajik 8ec062b165 DataEntry.S620 changes, ver. 2.26.1584 2021-01-26 14:54:51 +01:00
Milan Hanajik b2df02dd1b Changes in MainSeq, Procedure, BenchControlPanel, TestProgressControls, etc., ver. 2.26.1583 2021-01-25 13:01:59 +01:00
Milan Hanajik c403f9345f (1) FlyingStartMassCollProlonged fixed, more logging, (2) Password of day, ver. 2.26.1579 2021-01-25 13:01:16 +01:00
Milan Hanajik b97b795c93 ResultsBrowser supports 9 test benches, ver. 2.26.1577 2021-01-25 13:01:16 +01:00
Milan Hanajik 4a1c6ef031 Units : Ft3/h and US gal/min added. 2021-01-19 10:50:29 +01:00
Milan Hanajik 40f3aacd32 Milwaukee component updated (18.1.2021, imperial units) 2021-01-19 10:50:29 +01:00
Milan Hanajik 8e9344cc47 1. ResultsBrowserWnd custom query : GetListOfUsedProcedures, DEWA 2. SensusOracle.DB comments 2021-01-19 10:50:29 +01:00
Milan Hanajik b3160799c8 (1) PreviousResultsDlg with filters, (2) Procedure history can be inspected, ver. 2.26.1577 2021-01-19 10:50:10 +01:00
Milan Hanajik 66852682bf Elde.RegulValveMilwaukee, Modbus.Novus added, Elde component updated (18.12.2020), ver. 2.26.1571 2021-01-15 14:15:15 +01:00
Milan Hanajik 3399b07fc0 MainSeqUtils.CreateNewBatchResults( ) bug fix. 2021-01-08 09:16:20 +01:00
Milan Hanajik 844f5573dc Merge branch 'm2' into master-2.26, ver. 2.26.1569 2021-01-07 14:42:07 +01:00
Milan Hanajik e9cc77a2d5 Merge branch 'master-2.26' into m3 2021-01-07 10:09:18 +01:00
Milan Hanajik 2981ab2a5f Milwaukee : ADC-s for diverters can be calibrated, ver. 2.26.1568 2021-01-05 14:06:15 +01:00
Milan Hanajik a3227f356f DataEntry.WMStates restored - has been used in Fuzhou PT300 2021-01-05 09:45:43 +01:00
Milan Hanajik 0d8210614d EtPulsesK and DivSamples() fixed for all Fuzhou test benches, ver. 2.26.1567 2021-01-05 09:45:34 +01:00
Milan Hanajik 97df1250dc DataEntry.S620 added, Results.Entities.WaterMeter.AssignedSerialNr/Prefix/Suffix/CompleteSerialNr/WMTypeRevision mapped to DB. 2020-12-18 08:39:28 +01:00
Milan Hanajik 11eff5c962 EtPulsesK fixed for all Fuzhou test benches, ver. 2.26.1563 2020-12-18 08:39:28 +01:00
Milan Hanajik f95f961a5d Output.FileWriters.Enhanced with formatted WM subtitles 2020-12-18 08:38:16 +01:00
Milan Hanajik 4db2f475cd DataEntry.S620 added, Results.Entities.WaterMeter.AssignedSerialNr/Prefix/Suffix/CompleteSerialNr/WMTypeRevision mapped to DB. 2020-12-17 10:12:05 +01:00
Milan Hanajik 9dbbf03acd Output.FileWriters.Enhanced with formatted WM subtitles 2020-12-17 10:11:56 +01:00
Milan Hanajik d8ed144dee TracingDB synchronized with Production-Monitoring project, ver. 2.26.1562 2020-12-17 09:05:03 +01:00
Milan Hanajik 99cd84fb2a Changes for MILWAUKEE, component dated 16.12.2020, ver. 2.26.1561 2020-12-16 14:46:53 +01:00
Milan Hanajik de0b84076f UpgradeSelectionDlg : Cutom button with an action that is commented out, ver. 2.26.1555 2020-12-10 12:50:19 +01:00
Milan Hanajik 18506390fa Procedure.ProcedureParamsMixedCtrl added. 2020-12-10 12:50:07 +01:00
Milan Hanajik fd9a08406f IperlHead cleanup : No side effect on ProcessData.CompleteTestInfos 2020-12-10 11:20:56 +01:00
Milan Hanajik 6226fbedfc Merge branch 'Australia-169MHz' into master-2.26 2020-12-07 13:22:56 +01:00
Milan Hanajik 86fb107e73 WMPosition saved to SummaryResults, AllResults, column CQ ... 2020-12-07 13:06:46 +01:00
Milan Hanajik b32329cdf7 DiverterTest changes reverted back (Luxemburg: root cause of the isssue was in CB firmware), ver. 2.26.1554 2020-12-07 12:42:22 +01:00
Milan Hanajik 38c7d43a8a DiverterTest changes reverted back (Luxemburg: root cause of the isssue was in CB firmware). 2020-12-07 12:31:24 +01:00
Milan Hanajik c72fb29f36 Constructors of components : Logging level increased to WARN. 2020-12-04 11:59:26 +01:00
Milan Hanajik 0dd5c469f5 Spelling fixed, ver. 2.26.1553 2020-12-03 13:51:52 +01:00
Milan Hanajik df1b4527ba ValveCategory.All removed, cleanup, SequenceBase improvement. 2020-12-03 13:51:43 +01:00
Milan Hanajik 6da5bd92ec Positions of reg. valves are defined in output path 2020-12-02 15:45:59 +01:00
Milan Hanajik d4ac2453b8 Refactorization. 2020-12-02 13:44:59 +01:00
Milan Hanajik 59c1cb76f0 Gelsenwasser component updated (1.12.2020), ver. 2.26.1552 2020-12-02 13:44:42 +01:00
Milan Hanajik 89b47860a5 WARSAW_50 symbol, Warsaw-50 component. 2020-12-02 09:34:09 +01:00
Milan Hanajik 646cebe877 Q2 corr.: Correction inside range -0.5 .. 0.5 %, ver. 2.26.1549 2020-12-02 09:32:55 +01:00
Milan Hanajik f8b8c3bfec ver. 2.26.1551 2020-12-01 16:50:57 +01:00
Milan Hanajik 723c077c64 Q2 corr.: Correction inside range -0.5 .. 0.5 %, ver. 2.26.1550 2020-12-01 16:44:43 +01:00
Milan Hanajik 7e64c9299c WMPosition saved to SummaryResults, AllResults, column CQ ... 2020-11-30 13:32:29 +01:00
Milan Hanajik ea9c0615ee iPerlCommunicationForm bug fix, ver. 2.26.1542 2020-11-27 16:27:29 +01:00
Milan Hanajik 428d100f6c UI.Procedures.ProceduresCtrl : More column content is optional. 2020-11-27 16:27:14 +01:00
Milan Hanajik 8846f16546 ver. 2.26.1545 2020-11-20 11:24:38 +01:00
Milan Hanajik 37ec839807 ver. 2.26.1544 2020-11-18 14:58:52 +01:00
Milan Hanajik 5f44fd4bdb Saving events to Events DB : Fixed bugs when connection string was not defined, ver. 2.26.1543 2020-11-18 10:46:00 +01:00
Milan Hanajik 5f5063663c iPerlCommunicationForm bug fix, ver. 2.26.1542 2020-11-13 08:40:41 +01:00
Milan Hanajik 75f0cb2930 UI.Procedures.ProceduresCtrl : More column content is optional. 2020-11-09 09:18:51 +01:00
Milan Hanajik 1f581a72c1 Register readers cleanup, IRegReaderPulses added. 2020-11-06 14:33:32 +01:00
Milan Hanajik 705f4de0b0 DB.SensusOracle.Database : (1) Procedure params., (2) S620 support, (3) SensusTestInfo for 620. 2020-11-06 14:33:32 +01:00
Milan Hanajik 6ec3b7b287 UI.Procedures.ProcedureDlg 'Copy' a test feature added 2020-11-06 14:33:31 +01:00
Milan Hanajik 9758411519 Statistics : IP addresses updated, export in CSV format implemented. 2020-11-06 14:33:31 +01:00
Milan Hanajik e1a185efdf MettlerToledo.Standard (1) Always reads imm.mass when idle (2) Changes in logging 2020-11-06 14:33:31 +01:00
Milan Hanajik a2556bec35 TBF/CameraBinaryFiles2 folder with synchronization for SD v.2.x (!!! file upload NOK). 2020-11-06 14:33:31 +01:00
Milan Hanajik 483e2b4eb7 DataEntry.Camera (1) loads next image after 'Enter' key, (2) dealing with test parts fixed. 2020-11-06 14:33:31 +01:00
Milan Hanajik f1d46782d3 Luxemburg component, LUXEMBURG_40 symbol incl. StatusP, TestMethods.DiverterTest fixed. 2020-11-06 14:33:23 +01:00
Milan Hanajik d1adde9b63 Changes in FlyingStartMassCollProlong in v 2.26.1522 (Gelsenwasser) reverted back. 2020-11-06 14:31:36 +01:00
Milan Hanajik 95c7257d6f Defined symbols in expressions are sorted. 2020-10-22 10:26:27 +02:00
Milan Hanajik 91392f9452 Camera binary files are only synchronized for SD v.1.x, ver. 2.26.1528 2020-10-16 14:07:57 +02:00
Milan Hanajik b145c71ee3 Improved file name formatting for Output.FileWrites.Basic/Enhanced/Xml/XmlBatch components. 2020-10-14 14:12:00 +02:00
Milan Hanajik 1cf2eb8e06 TODO, ver. 2.26.1527 2020-10-14 14:09:22 +02:00
Milan Hanajik 037a5be3b3 SyncRoute( ) called in RunDeviceBefore( ), this should fix FixedStartMassCollection. 2020-10-09 09:41:03 +02:00
Milan Hanajik 0fc7d831b0 1. Login to camera v.2.x with user 'pi', 2. DeviceTest shutdown fix, ver. 2.26.1525 2020-10-08 12:55:38 +02:00
Milan Hanajik abf54f765f SummaryResults : try/catch and more logging, ver. 2.26.1524 2020-10-08 09:00:50 +02:00
Milan Hanajik 0e7ba933d8 ResultsBrowser : Custom query : Batch numbers and test bench 2020-09-28 13:56:21 +02:00
Milan Hanajik fa03c09f09 DataStreamInterface: (1) supports multiple meters, (2) Shutdown() added 2020-09-25 12:20:56 +02:00
Milan Hanajik 3ac90ee622 TURA_SPECIAL : MaxOptoDataCount = 250000 2020-09-23 11:04:56 +02:00
Milan Hanajik 774f561fcf Gelsenwasser component upgraded, ver. 2.26.1523 2020-09-18 08:52:13 +02:00
Milan Hanajik 3a626740c7 !!! Bug fix in FlyStMassCollProlonged test method, ver. 2.26.1521 2020-09-17 11:19:51 +02:00
Milan Hanajik 97ce601d31 DataStreamInterfaceTest and DataStreamMeter projects added 2020-09-09 10:00:23 +02:00
Milan Hanajik 49d4cf1ac0 HONGKONG_50 symbol added, HongKong component added, ver. 2.26.1519 2020-09-09 09:58:58 +02:00
Milan Hanajik dcb0ee680c ver. 2.26.1518 2020-09-08 09:10:17 +02:00
Milan Hanajik e94eb83c1d ver. 2.26.1517 2020-09-08 09:01:39 +02:00
Milan Hanajik ff3de55593 TracingDB/Enums.cs updated, Output/DB/ProductionTracing/Enums.cs removed 2020-09-03 14:45:51 +02:00
Milan Hanajik 1e50cc6fb7 ver. 2.26.1516 2020-09-03 14:45:51 +02:00
Milan Hanajik 7b31c6b2b6 Modbus.WaterAnalyzer2 : Conductivity comm. and conversion from 4-20 mA 2020-09-03 14:45:07 +02:00
Milan Hanajik 38ee1cc067 English and US units added. 2020-08-28 09:06:27 +02:00
Milan Hanajik e27dfe570d Genesis component updated (21.8.2020). 2020-08-27 16:40:06 +02:00
Milan Hanajik b2f2f595e5 Output.EventTriggers.Standard bug fix (E13 cannot be changed). 2020-08-27 16:40:06 +02:00
Milan Hanajik 67f4683026 FixedStart methods : order of operations fixed (1. open start valve, 2. start measurement) 2020-08-12 10:10:49 +02:00
Milan Hanajik 42f8d02a68 (1) Heat Meters related fixes, (2) SLM50 component upgraded (7.8.2020), ver. 2.26.1513 2020-08-07 14:24:57 +02:00
Milan Hanajik 14717d5d46 ver. 2.26.1512 2020-08-07 12:14:04 +02:00
Milan Hanajik 450530a707 In FIxedStart methods there is a delay after start of a test before the flow regulation starts. 2020-08-07 12:14:04 +02:00
Milan Hanajik adf30d615b (1) MettlerToledo: Zero instead of Taring, (2) RegValveCalib array size fixed for ADC#8..11, ver. 2.26.1511 2020-08-07 11:11:44 +02:00
Milan Hanajik 610387e071 (1) Compound WM results are displayed correctly, ver. 2.26.1510 2020-08-05 10:27:34 +02:00
Milan Hanajik 114e628305 (1) Diverter.flowMtrNr4Cmd for SLM_150, (2) Config.Data cleanup 2020-08-05 09:36:00 +02:00
Milan Hanajik 68d01aab14 Bug fix in CombinedWithDetectionSeq related to test.Part, ver. 2.26.1509 2020-07-31 11:58:30 +02:00
Milan Hanajik eaf0e2cf22 Barcode printing in Output.Printers.Enhanced and Output.Printers.OnePerMeter, ver. 2.26.1508 2020-07-29 10:06:43 +02:00
Milan Hanajik 02ec8d8124 Camera.CLP1611 : More comments, TODO list, ver. 2.26.1505 2020-07-17 14:13:57 +02:00
Milan Hanajik 1dc328746d Gelsenwasser component upgraded. 2020-07-15 10:31:46 +02:00
Milan Hanajik 5bb94666a4 (1) Diverter.nextIdx not incremented when DebugMode.Off, (2) VR1 accepts number entry, ver. 2.26.1499 2020-07-09 13:31:24 +02:00
Milan Hanajik c1f23b8481 ResultsBrowser with a custom query for SUEZ, ver. 2.26.1498 2020-07-09 13:22:52 +02:00
Milan Hanajik 70c11ad6d9 German resources, ver. 2.26.1498 2020-07-08 10:16:33 +02:00
Milan Hanajik 3a8c6b4d3e ResultsBrowser : DEWA custom queries. 2020-07-07 12:57:45 +02:00
Milan Hanajik b8f1b9293a (1) Units : Quantity.Enumerated added, (2) LoginDlgWithBenchSelection : List of benches is alphabetically sorted. 2020-06-25 12:10:55 +02:00
Milan Hanajik 6558951857 ver. 2.26.1497 2020-06-25 09:53:48 +02:00
Milan Hanajik 54e964ffde Flow calculation : TestRslt.FlowVolume is always the most accurate CTV flow (calculated from the measured mass in case of mass collection methods) 2020-06-25 09:35:10 +02:00
Milan Hanajik a5b270eec8 Two documents added. 2020-06-24 14:08:36 +02:00
Milan Hanajik 6f9c6596d5 ResultsBrowser: 1 WR13 IP addr.updated, 2 default DbType=MySql, 3 changes in progress, ver. 2.26.1496 2020-06-24 12:01:37 +02:00
Milan Hanajik d99c53bc8e (1) psi unit, (2) Transition seq. fixed (ISequenceCondition seqCondition null after renaming a component). 2020-06-08 14:34:51 +02:00
Milan Hanajik 3496fcbbba Critical bug fixes in sequences - STOP not working !!! 2020-05-21 16:37:09 +02:00
Milan Hanajik 77a29dadfc ResetBatchNr console application added to solution. 2020-05-18 12:59:17 +02:00
Milan Hanajik 6df9261697 ver. 2.26.1463 2020-05-12 11:46:38 +02:00
Milan Hanajik 1b81aaf752 One minute is added to start time when restoring or fixing a batch. 2020-05-12 11:41:31 +02:00
Milan Hanajik 78ec06fe5d Events are triggered when results are NOT saved to Oracle / Tracing DB / LU log files, ver. 2.26.1462 2020-05-12 11:41:22 +02:00
Milan Hanajik db286ba721 ver. 2.26.1461 2020-05-11 15:43:08 +02:00
Milan Hanajik c1b9bf0c5f Database upgrade bug fixes, ver. 2.26.1460 2020-05-11 14:31:54 +02:00
Milan Hanajik 435261831a Conductivity bug fixes, DB import/export works OK with root user password. 2020-05-11 14:31:54 +02:00
Milan Hanajik 3cbc845183 Support for certificates, calib. expiration dates and calendar in many components and in TBF.UI.Bench.Metrology 2020-05-11 14:31:37 +02:00
Milan Hanajik bc2804d0b9 iPerl head failure rate is monitored by Various.StatisticsMonitoring component, ver. 2.26.1458 2020-05-05 17:23:09 +02:00
Milan Hanajik 05f72bc9f7 Conductivity is monitored. 2020-05-04 15:15:43 +02:00
Milan Hanajik e7431ce6e2 DataStreamInterface added. 2020-05-04 09:16:12 +02:00
Milan Hanajik 0ea7b9b6d3 Clean-up 2020-05-04 09:16:04 +02:00
Milan Hanajik c4b3100057 ver. 2.26.1457 2020-04-29 11:22:52 +02:00
Milan Hanajik 8cffe8328f iPerlCommunicationSeq/Form: 'Get default Q2 corrections' and 'Write default Q2 corrections' activities, ver. 2.26.1456 2020-04-29 11:05:52 +02:00
Milan Hanajik f16f5f9544 ver. 2.26.1453 2020-04-23 08:21:30 +02:00
Milan Hanajik 8cd3e7585c Output.Printers.OnePerBatch does not print empty auto-test protocols. 2020-04-22 17:54:44 +02:00
Milan Hanajik 663a74fbdb ver. 2.26.1451 2020-04-21 13:39:12 +02:00
Milan Hanajik cafb59c9b0 Bug fix : Serving events from components, FlowMeter a BalanceDev calibration due date, ver. 2.26.1450 2020-04-21 13:34:18 +02:00
Milan Hanajik 267236a177 AutoTests are skipped in all outputs, RegularTestRslts(), AutoTestRslts()... in entities and Output.XY, Output.Printers.OnePerBatch 2020-04-21 10:46:50 +02:00
Milan Hanajik a20c9eb2bd Changes in MainSeq and StateMachine : AutoActions invocation. 2020-04-21 10:46:50 +02:00
Milan Hanajik b1d692230e Events, EventViewer, Common prjs, UI.EventLogs, UI.Calendar, EventTriggers, GetCalendarEvents() in WT/I. 2020-04-21 10:46:42 +02:00
Milan Hanajik 66631855bb UpgradeSelectionDlg : 2.25 --> 2.26 2020-04-21 10:46:32 +02:00
Milan Hanajik e21464f24e Modbus.WaterAnalyzer added, ver.2.26.1447 2020-04-21 09:12:56 +02:00
Milan Hanajik 1dfcd24e34 LoginDlg improvements, read only property UserName. 2020-04-03 10:47:14 +02:00
Milan Hanajik f00196c4a8 (1) Adjustment.WMErrorsForm48, (2) MeretRS485Address = new byte[6] for IZRAEL_50 2020-03-31 11:28:42 +02:00
Milan Hanajik 68ce0578e2 ResultsBrowser CustomQuery changes, ver. 2.25.1440 2020-03-31 11:12:19 +02:00
Milan Hanajik c77779b8c7 ".Single" appendix removed from default names of test methods. 2020-03-20 08:55:36 +01:00
Milan Hanajik e071ae3cc0 ThreeState water meter result printing (Algeria PT25), ver. 2.25.1440 2020-03-18 08:41:14 +01:00
Milan Hanajik dffaa1d3a8 Earlier mass measurement and tank draining in FlyingStartMassCollProlonged, ver. 2.25.1437 2020-03-10 15:39:39 +01:00
Milan Hanajik c4b643aac7 SensusTetsInfo.CreateFromProcedure() fixed, does not contain tests with Evaluate==false, ver. 2.25.1434 2020-03-10 09:01:52 +01:00
Milan Hanajik 18e95105f9 ver. 2.25.1430 2020-03-06 12:28:32 +01:00
Milan Hanajik 9f1960b679 Output.Printers.MultiLabel added, ver. 2.25.1429 2020-03-06 08:21:24 +01:00
Milan Hanajik e1ca118671 Output.Printers.Label clean-up : SupressPrinting removed, Template may be empty. 2020-03-06 08:21:24 +01:00
Milan Hanajik 482269209e ResultsBrowser Custom query bug fix, ver. 2.25.1428 2020-03-06 08:21:24 +01:00
Milan Hanajik 7f56fa0aa3 Gelsenwasser : Flowmeter number with diverter info. 2020-03-06 08:21:24 +01:00
Milan Hanajik bd15d3bd83 GEWLSENWASSER: symbol, component, RV.adcChannel and Div.flowMtrNr4Cmd, ROMA_200: route bit 80 fixed.
RegulValve.adcChannel and Diverter.flowMtrNr4Cmd for GELSENWASSER
2020-03-02 12:01:23 +01:00
Milan Hanajik 329ffeca8f 1. DB creation and import via Settings/Profiles menu item fixed, 2. Each scale must have a drain valve. 2020-03-02 10:43:24 +01:00
Milan Hanajik ee69631d38 Bug fixes in Results.Entities.XY.Equals( ), Solution updated (Code128). 2020-02-29 07:24:06 +01:00
Milan Hanajik fa38af65e6 IP addresses in Statistics modified, ver. 2.25.1427 2020-02-27 08:19:47 +01:00
Milan Hanajik 54a28aa8bf Generate CompleteTestInfos from Procedure in case Oracle DB is off, ver. 2.25.1427 2020-02-26 13:47:53 +01:00
Milan Hanajik f10be22c0b 1. ToFirstMonitor and ToSecondMonitor console app.added, 2. GenCode128 project added. 2020-02-26 13:27:23 +01:00
Milan Hanajik 630f7d1e54 Printer.Label supports printing s/n as Code 128 barcode. 2020-02-26 13:27:23 +01:00
Milan Hanajik 85c0003a45 RegisterReaders simulation in FlyingStartMassCollection test method. 2020-02-24 15:12:31 +01:00
Milan Hanajik fe758348ba 'Custom query' added to ResultsBrowser, default settings updated (IP addr.), ver. 2.25.1422 2020-02-24 15:07:06 +01:00
Milan Hanajik 860e369e35 PTest defaults for Krakov, ver. 2.25.1420 2020-02-14 16:27:57 +01:00
Milan Hanajik 658f5d2e27 Database upgrade 2.22 -> 2.24 fixed. 2020-02-14 08:56:11 +01:00
Milan Hanajik 3b1ab9fdca ver. 2.25.1417 2020-02-12 09:55:05 +01:00
Milan Hanajik 98aa74a0d4 Displaying production tracing records fixed. 2020-02-12 09:46:37 +01:00
Milan Hanajik e28b94c367 iPERL comm. (Set Active Mode) after saving results and deleting disabled WMs from the Batch fixed, ver. 2.25.1416 2020-02-12 09:15:52 +01:00
Milan Hanajik 09ccc282a5 Output.Printers.Label with water meter s/n printed as a QR code. 2020-02-12 08:38:08 +01:00
Milan Hanajik 3d3cac81b9 ver. 2.25.1414 2020-02-11 09:31:37 +01:00
Milan Hanajik a7965a7ffc (1) Publish.Internal&Never tests not saved to rslts.DB, (2) Publish.Never tests are in TestRslts, (3) bool Batch.IsRemoteProcedure field, etc. ver. 2.25.1410 2020-02-07 12:40:20 +01:00
Milan Hanajik 7dcb5ba6ce (1) Store/restore RawTestInfos & CompleteTestInfos as well, (2) TestRslt.TestDone = true after RFID, ver. 2.25.1409 2020-02-07 10:08:42 +01:00
Milan Hanajik 14a96ea3e8 (1) PData serialization of strings copes with nulls (2) Correct links MeterTestRslt->TestRslts restored, ver. 2.25.1408 2020-02-07 10:08:42 +01:00
Milan Hanajik a138e1117c Bug fixes in FlyingStartMassCollectionSeq.Simulate1(..) & Simulate2(..) 2020-02-07 10:08:42 +01:00
Milan Hanajik c73f6a857a (1) Save process data after each completed test, (2) Restore process data of an interrupted session via 'Abort' button. 2020-02-05 13:04:00 +01:00
Milan Hanajik 12c9e72d0c ProcessData (aka BatchResults) serialization part 2 2020-02-05 13:03:52 +01:00
Milan Hanajik 61747166ae UpdateTestResults(..) function abandoned from DataEntry components, WMStates component deleted 2020-02-05 10:33:42 +01:00
Milan Hanajik dc31e833ee BatchResults.WaterMeters eliminated, Batch.WaterMeters are used instead ... many changes 2020-02-05 10:33:32 +01:00
Milan Hanajik 51523ea577 BatchResults serialization (WriteBinary/ReadBinary methods) 2020-02-05 10:23:30 +01:00
Milan Hanajik ef75c30af9 Bug fix - more robust. 2020-02-05 10:23:30 +01:00
Milan Hanajik cf236d94b8 DEWA300 component upgraded (29.01.2020) : Zmena zapojenia vyhrevnych okruhov, grafika 2020-02-05 10:23:30 +01:00
Milan Hanajik 65ede62c1f DataEntry windows : StartPosition = CenterParent 2020-02-05 10:23:30 +01:00
Milan Hanajik 08c94aacce Database export/import in progress. 2020-02-05 10:23:30 +01:00
Milan Hanajik 9b11602ab8 TEST_MODE removed from code, ver. 2.25.1407 2020-02-05 10:23:09 +01:00
Milan Hanajik 6ec2852581 DEWA PT300 : Bit 80 / VI11 issue fixed, ver. 2.25.1405 2020-01-27 14:21:00 +01:00
Milan Hanajik 51c24f8c4c Filters in ProceduresDlg : ProceduresCtrl with SplitContainer: 1 UI for filters and 2 ListViewEx, BaseWithListViewEx is not used, ver. 2.25.1404 2020-01-24 08:37:27 +01:00
Milan Hanajik 8b1e0af207 ver. 2.25.1403 2020-01-23 14:54:09 +01:00
Milan Hanajik c448c18a42 Changes in counters, part 2. 2020-01-22 13:51:47 +01:00
Milan Hanajik d8927a9052 Changes in counters, part 1. 2020-01-22 13:51:26 +01:00
Milan Hanajik 073ee3bf30 Name of the exported file is set to the exported procedure name, ver. 2.25.1402 2020-01-22 09:58:31 +01:00
Milan Hanajik 445a16dc6f Qtg added to Test table in Config DB. 2020-01-22 09:06:01 +01:00
Milan Hanajik 2155790ffb (1) MainWnd.UpdateMenuItemsVisibility() called after a user change, (2) TBF depends on RestClient project. 2020-01-21 17:40:31 +01:00
Milan Hanajik 2ad50a9708 Command.Stop enqueued after Emergency stop in similar way as before. 2020-01-21 17:40:31 +01:00
Milan Hanajik 670de424c2 UpgradeSelectionDlg : v.2.22 -> v.2.24 and v.2.24 -> v.2.25 2020-01-21 17:40:23 +01:00
2931 changed files with 333949 additions and 185403 deletions
+50 -3
View File
@@ -1,5 +1,13 @@
Common/bin/
Common/obj/
Config/bin/
Config/obj/
DataStreamInterface/bin/
DataStreamInterface/obj/
DataStreamInterfaceTest/bin/
DataStreamInterfaceTest/obj/
DataStreamMeter/bin/
DataStreamMeter/obj/
Decrypt/bin/
Decrypt/obj/
DeviceTest/bin/
@@ -8,29 +16,68 @@ Dirichlet.Numerics/bin
Dirichlet.Numerics/obj
Encrypt/bin/
Encrypt/obj/
EventViewer/bin/
EventViewer/obj/
Events/bin/
Events/obj/
FeatureVectorCalculator/bin/
FeatureVectorCalculator/obj/
GemCard/bin
GemCard/obj
GenCode128/bin
GenCode128/obj
GraphLib/bin
GraphLib/obj
MergeResultsDBs/bin
MergeResultsDBs/obj
TracingDB/bin
TracingDB/obj
ResetBatchNr/bin
ResetBatchNr/obj
RestClient/bin
RestClient/obj
Results/bin/
Results/obj/
ResultsBrowser/bin/
ResultsBrowser/obj/
ResultsParser/bin/
ResultsParser/obj/
Statistics/bin/
Statistics/obj/
TBF/bin/
TBF/obj/
TBFSetup/Debug/
TBFSetup/Release/
ToFirstMonitor/bin/
ToFirstMonitor/obj/
ToSecondMonitor/bin/
ToSecondMonitor/obj/
Users/bin/
Users/obj/
UserManagement/bin/
UserManagement/obj/
Doc/
DataMatrix4Net/bin/
DataMatrix4Net/obj/
GenericTest/bin/
GenericTest/obj/
LabelPrinting/bin/
LabelPrinting/obj/
OrderManagement/bin/
OrderManagement/obj/
ProductionTracing/bin/
ProductionTracing/obj/
RecordProcessing/bin/
RecordProcessing/obj/
S640TestApp/bin/
S640TestApp/obj/
SchematicDrawing/bin/
SchematicDrawing/obj/
SharedDatabase/bin/
SharedDatabase/obj/
WorkflowConfigurator/bin/
WorkflowConfigurator/obj/
Workplace/bin/
Workplace/obj/
MonitoringDB/bin/
MonitoringDB/obj/
.vs/
*.suo
*.bak
+13
View File
@@ -0,0 +1,13 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/modules.xml
/projectSettingsUpdater.xml
/contentModel.xml
/.idea.TBF.iml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
+1
View File
@@ -0,0 +1 @@
TBF
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../NfcS5_DLL" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
+37
View File
@@ -0,0 +1,37 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
using System.Threading;
namespace Common
{
public class BackgroundBeep
{
static Thread beepThread;
static AutoResetEvent signalBeep;
static BackgroundBeep()
{
signalBeep = new AutoResetEvent(false);
beepThread = new Thread(() =>
{
while (true)
{
signalBeep.WaitOne(); /// waits for an event
Console.Beep(500, 400); /// frequency (Hz), duration (ms)
}
}, 1);
beepThread.IsBackground = true;
beepThread.Start();
}
/// <summary>
/// Invokes one beep in a separate thread (non-blocking function)
/// </summary>
public static void Beep()
{
signalBeep.Set();
}
}
}
+105
View File
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C8939821-BA5C-4988-A3D0-BF53B74865C7}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Common</RootNamespace>
<AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BackgroundBeep.cs" />
<Compile Include="Const.cs" />
<Compile Include="DatabaseSettings.cs" />
<Compile Include="DBSettings.cs" />
<Compile Include="Enums.cs" />
<Compile Include="Forms\ListViewEx.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Forms\ListViewExtensions.cs" />
<Compile Include="Forms\LviDateTimeColumnComparer.cs" />
<Compile Include="Forms\LviIntColumnComparer.cs" />
<Compile Include="Forms\LviNameSurnameColumnComparer.cs" />
<Compile Include="Forms\LviTextColumnComparer.cs" />
<Compile Include="Forms\MessageEventArgs.cs" />
<Compile Include="Forms\ModelessForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\ModelessForm.designer.cs">
<DependentUpon>ModelessForm.cs</DependentUpon>
</Compile>
<Compile Include="IMeasurementCorrection.cs" />
<Compile Include="IOrderInfo.cs" />
<Compile Include="IParamsProvider.cs" />
<Compile Include="IUncertainty.cs" />
<Compile Include="IUser.cs" />
<Compile Include="Printers\PrintersCommon.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="QuitAppException.cs" />
<Compile Include="StatisticalMetrics.cs" />
<Compile Include="Iperl\OptoTelegramRaw.cs" />
<Compile Include="SerializableDictionary.cs" />
<Compile Include="Telegram.cs" />
<Compile Include="UIControls\CoolButtonCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UIControls\CoolButtonCtrl.Designer.cs">
<DependentUpon>CoolButtonCtrl.cs</DependentUpon>
</Compile>
<Compile Include="UIControls\RoundedRectangle.cs" />
<Compile Include="Units.cs" />
<Compile Include="Utils.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Forms\ListViewEx.resx">
<DependentUpon>ListViewEx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ModelessForm.resx">
<DependentUpon>ModelessForm.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
+12
View File
@@ -0,0 +1,12 @@
///
/// Copyright (c) 2023 Sensus Slovensko a.s.
///
using System;
namespace Common
{
public static class Const
{
public const string MySqlConnectTimeoutSec = "120";
}
}
+32
View File
@@ -0,0 +1,32 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
namespace Common
{
/// <summary>
/// Database settings required to make a connection
/// </summary>
public class DBSettings : ICloneable
{
public DBType DbType;
public string ConnectionString;
public bool IsValid { get { return (DbType != DBType.None) && !string.IsNullOrEmpty(ConnectionString); } }
public DBSettings()
{
}
public DBSettings(DBType dbType, string connectionString)
{
this.DbType = dbType;
this.ConnectionString = connectionString;
}
public object Clone()
{
return new DBSettings(DbType, ConnectionString);
}
}
}
+121
View File
@@ -0,0 +1,121 @@
///
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using System;
using System.Text;
using System.Xml.Serialization;
namespace Common
{
/// <summary>
/// Test bench database settings, contains bench name and settings od several databases
/// </summary>
public class DatabaseSettings : ICloneable, IComparable
{
// Public fields
public string BenchName;
public bool IsRealBench;
public DBSettings ProceduresDBSettings; /// Configuration database settings
public DBSettings WaterMetersDBSettings; /// Results database settings
public DBSettings EventsDBSettings; /// Events database settings
public DBSettings UsersDBSettings; /// Shared configuration database settings
// Constructor
public DatabaseSettings()
{
BenchName = String.Empty; /// Empty string (avoid null)
IsRealBench = false;
ProceduresDBSettings = new DBSettings(DBType.MySql, string.Empty);
WaterMetersDBSettings = new DBSettings(DBType.MySql, string.Empty);
EventsDBSettings = new DBSettings(DBType.MySql, string.Empty);
UsersDBSettings = new DBSettings(DBType.MySql, string.Empty);
}
public object Clone()
{
DatabaseSettings result = new DatabaseSettings();
result.BenchName = BenchName;
result.IsRealBench = IsRealBench;
result.ProceduresDBSettings = (DBSettings)ProceduresDBSettings.Clone();
result.WaterMetersDBSettings = (DBSettings)WaterMetersDBSettings.Clone();
result.EventsDBSettings = (DBSettings)EventsDBSettings.Clone();
result.UsersDBSettings = (DBSettings)UsersDBSettings.Clone();
return result;
}
public int CompareTo(object dbs2)
{
if (!(dbs2 is DatabaseSettings)) return 0;
return String.Compare(BenchName, (dbs2 as DatabaseSettings).BenchName);
}
/// <summary>
/// Extract and return a DB server from a MySQL connection string.
/// </summary>
public static string GetDBServer(string connectionString)
{
return GetFromConnectionString(connectionString, new string[] { "SERVER=" });
}
/// <summary>
/// Extract and return a DB name from a MySQL connection string.
/// </summary>
public static string GetDBName(string connectionString)
{
return GetFromConnectionString(connectionString, new string[] { "DATABASE=" });
}
/// <summary>
/// Extract and return a username from a MySQL connection string
/// </summary>
public static string GetDBUser(string connectionString)
{
return GetFromConnectionString(connectionString, new string[] { "USER=", "UID=" });
}
/// <summary>
/// Extract and return a password from a MySQL connection string
/// </summary>
public static string GetDBPassword(string connectionString)
{
return GetFromConnectionString(connectionString, new string[] { "PASSWORD=", "PWD=" });
}
/// <summary>
/// Extract and return an element of a MySQL connection string
/// (a host, a database, a user name or a password).
/// Return an empty string on any error.
/// </summary>
public static string GetFromConnectionString(string connectionString, string[] patterns)
{
foreach (var pattern in patterns)
{
int startIx = connectionString.IndexOf(pattern);
if (startIx >= 0)
{
/// pattern found, extract the subsequent element
startIx += pattern.Length;
int endIx = connectionString.IndexOf(';', startIx);
return (endIx > 0) ? connectionString.Substring(startIx, endIx - startIx) : string.Empty;
}
}
/// pattern NOT found
return string.Empty;
}
public override string ToString()
{
return string.Format("{0} config={1} results={2} events={3} users={4}",
BenchName,
ProceduresDBSettings.ConnectionString,
WaterMetersDBSettings.ConnectionString,
EventsDBSettings.ConnectionString,
UsersDBSettings.ConnectionString);
}
}
}
+844
View File
@@ -0,0 +1,844 @@
///
/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Reflection;
namespace Common
{
/// <summary>
/// Helper class to assign descriptions to enum values
/// </summary>
public class Description : Attribute
{
public string Text;
public Description(string t)
{
Text = t;
}
}
public static class GetDescription
{
/// Extension method for enum-s
public static string ToDescription(this Enum en)
{
Type type = en.GetType();
MemberInfo[] memInfo = type.GetMember(en.ToString());
if (memInfo != null && memInfo.Length > 0)
{
object[] attrs = memInfo[0].GetCustomAttributes(typeof(Description), false);
if (attrs != null && attrs.Length > 0)
return ((Description)attrs[0]).Text;
}
return en.ToString(); /// Return ToString() value in case there is no description
}
}
/// <summary>
/// Identifies the type of a database
/// </summary>
public enum DBType
{
None, /// Database disabled
MySql, /// MySQL database
SQLite, /// SQLite
Count
}
public enum ProcedureSelection
{
#if LANG_CS
[Description("Žádné")] None,
[Description("Lokální postupy")] FromLocalDB,
[Description("Postupy ze sdílené databázy")] FromSharedDB,
[Description("Zakázky z Oracle databázy")] OrderNrFromOracleDB,
[Description("Zakázky ze sledovací databázy")] OrderNrFromTracingDB,
#else
[Description("None")] None,
[Description("Local procedures")] FromLocalDB,
[Description("Shared procedures")] FromSharedDB,
[Description("Orders from Oracle DB")] OrderFromOracleDB,
[Description("Orders from Tracing DB")] OrderFromTracingDB,
#endif
Count
}
/// <summary>
/// Obsolete - replaced by enum ProcedureSelection (above) in 3.1 and newer
/// </summary>
public enum RemoteDBUse
{
[Description("Local DB only")] LocalDBOnly,
[Description("Remote DB only")] RemoteDBOnly,
[Description("Both DB-s, local 1st")] BothDBsLocalFirst,
[Description("Both DB-s, remote 1st")] BothDBsRemoteFirst,
Count
}
/// <summary>
/// Obsolete - Contains a procedure name and a database specification (local/remote).
/// </summary>
public class ProcedureInfo
{
public readonly string Name;
public readonly bool IsRemote;
public ProcedureInfo(string name, bool isRemote)
{
Name = name;
IsRemote = isRemote;
}
}
/// <summary>
/// Test designation mode for IperlLogger and IperlHead opto data files
/// </summary>
public enum DesigMode
{
Auto,
Based_on_procedure,
As_specified,
Count
}
public enum LoginMethod
{
UserName, /// = alias, abbreviation
FullName, /// = description
Number,
Count
}
public enum AuthorizedAs
{
PowerUser,
LocalUser,
RemoteUser,
Count
}
/// <summary>
/// GID-s of user groups, each user is member of one or more groups.
/// </summary>
public enum GID
{
Testers,
TestingSpecialists,
HeadOfLab,
MaintenanceSpecialists,
Metrologists,
CalibrationSpecialists,
Administrators, /// application / network / database administrator
TraceabilityManagement,
MetrologicalAuthority,
WaterMeterAuthority,
NrOfGroups, /// Number of groups (this is not a GroupID)
None,
}
public enum MySortOrder
{
None,
Ascending, /// The same like SortOrder.Ascending
Descending, /// The same like SortOrder.Descending
Ascending2, /// Sorts by a surname in ascending order in case or 'Name Surname' column
Descending2, /// Sorts by a surname in descending order in case or 'Name Surname' column
}
/// <summary>
/// Flags returned by each device configuration control Verify(...) function.
/// </summary>
public enum CfgUpdateFlags
{
None = 0,
Error = 0x1, /// Some settings in the user control are invalid and cannot be set
Warning = 0x02, /// Some settings in the user control are suspicious, can be set after user confirmation
RestartRqrd = 0x04, /// TBF program restart is required to apply all changed parameters
AnyChange = 0x08, /// At least one parameter have changed
VolatileChange = 0x10,
InvokeCfgChange = 0x20, /// Invoke CfgChange handler of the component
}
/// <summary>
/// Event severity
/// </summary>
public enum Severity
{
Undefined,
Notification,
Warning,
Error,
FatalError,
Count
}
public enum EventClass
{
Undefined,
EquipmentHW,
Metrology,
TestingProcess,
BadResults,
ComputerResources,
Network,
Other,
Count
}
public enum SubscriberGroup : long
{
None = 0,
Metrology = 1,
Maintenance = 2,
Production = 4,
Management = 8,
Finish = 16,
}
public enum EViewerOption
{
Undefined,
AllEvents,
RecentEvents,
UnreadEvents,
}
public enum ProcedureState
{
Active,
History,
Count,
}
public enum FlowNames
{
QnQtQmin = 0,
Q3Q2Q1 = 1,
QpQi = 2,
Count,
}
public enum ProfileType
{
Q3R,
QnClassColdWater,
QnClassHotWater,
QpQi,
Manual,
Count,
}
public enum ErrorLimitType
{
Manual,
QpClass,
Count,
}
/// <summary> Kind of meters for the procedure / test </summary>
public enum MetersKind
{
#if LANG_DE
[Description("Wasserzähler")] Single,
[Description("Verbundwasserzähler")] Combined,
[Description("Wärmezähler")] HeatMeter,
#elif LANG_FR
[Description("Compteurs eau")] Single,
[Description("Mètres composés")] Combined,
[Description("Thermomètres")] HeatMeter,
#elif LANG_CS
[Description("Vodoměry")] Single,
[Description("Kombinované vodoměry")] Combined,
[Description("Měřiče tepla")] HeatMeter,
#elif LANG_RU
[Description("Счетчик")] Single,
[Description("Комбинированный счетчик")] Combined,
[Description("Счетчик тепла")] HeatMeter,
#else
[Description("Water meters")] Single,
[Description("Compound water meters")] Combined,
[Description("Heat meters")] HeatMeter,
#endif
}
public enum CompoundMeterId : byte
{
Single,
CompoundMain,
CompoundAux,
Compound,
HeatMeterVolume,
HeatMeterEnergy,
SingleOrCompound, /// Only used when querying results
}
public enum Medium
{
[Description("")] NotSpecified,
#if LANG_PL
[Description("zimna")] ColdWater,
[Description("ciepła")] HotWater,
#elif LANG_IT
[Description("freddo")] ColdWater,
[Description("caldo")] HotWater,
#elif LANG_FR
[Description("eau froide")] ColdWater,
[Description("eau chaude")] HotWater,
#else
[Description("cold")] ColdWater,
[Description("hot")] HotWater,
#endif
Count
}
public enum Mounting
{
[Description("")] NotSpecified,
#if LANG_DE
[Description("H")] H, /// horizontal
[Description("V")] V, /// vertical
[Description("STR")] S, /// standrohre
[Description("F")] F, /// fall
[Description("H/V")] HV, /// horizontal / vertical
#else
[Description("H")] H, /// horizontal
[Description("V")] V, /// vertical
[Description("S")] S, /// steig
[Description("F")] F, /// fall
[Description("H/V")] HV, /// horizontal / vertical
#endif
Count
}
public enum TemperatureClass
{
[Description("")] NotSpecified,
[Description("T30")] T30,
[Description("T50")] T50,
[Description("T70")] T70,
[Description("T90")] T90,
[Description("T130")] T130,
[Description("T180")] T180,
[Description("T30/70")] T30_70,
[Description("T30/90")] T30_90,
[Description("T30/130")] T30_130,
[Description("T30/180")] T30_180,
[Description("30")] t30,
[Description("50")] t50,
[Description("70")] t70,
[Description("90")] t90,
[Description("130")] t130,
[Description("180")] t180,
Count
}
public enum FlowProfileSensitivityClass
{
[Description("")] NotSpecified,
[Description("U0")] U0, /// ?
[Description("D0")] D0, /// ?
///
Count
}
public enum PressureLossClass
{
[Description("")] NotSpecified,
[Description("dp63")] dp63, /// 0.063 MPa = 0.63 bar, TODO: Change to "Δp63"
[Description("dp40")] dp40, /// 0.040 MPa = 0.40 bar
[Description("dp25")] dp25, /// 0.025 MPa = 0.25 bar
[Description("dp16")] dp16, /// 0.016 MPa = 0.16 bar
[Description("dp10")] dp10, /// 0.010 MPa = 0.10 bar
Count
}
/// <summary> Maximum Admissible Pressure </summary>
public enum MaxAdmissiblePressure
{
[Description("")] NotSpecified,
[Description("MAP6")] MAP6,
[Description("MAP10")] MAP10,
[Description("MAP16")] MAP16,
[Description("MAP25")] MAP25,
[Description("MAP40")] MAP40,
Count
}
/// <summary> Register reader type </summary>
public enum RegisterReaderType
{
Unknown,
Pulses, /// Sick, optical and similar
Camera, /// CLP1611
DataStream, /// iPerl
Manual, /// Entered by human via form (also from camera images)
Count
}
/// <summary> Transition step is finished when this condition is fulfilled </summary>
public enum StepCondition
{
None,
Scale1Empty,
Scale2Empty,
Scale3Empty,
AllScalesEmpty,
Count
}
/// <summary>
/// State of water filled in the test bench.
/// </summary>
public enum FillState
{
Unknown, /// Test bench fill state is unknown
Empty, /// Test bench is empty, no water
Full, /// Test bench is full of water
Count
}
public enum MeretProtocol
{
[Description("<undefined>")] Undefined,
[Description("Meret (obsolete)")] Meret,
[Description("Modbus")] Modbus,
Count
}
public enum Publish : sbyte
{
#if LANG_DE
/// german
[Description("nie")] Never = 0,
[Description("immer")] Always = 1,
[Description("Bildschirm")] OnScreen = 2,
[Description("intern")] Internal = 3,
#elif LANG_FR
[Description("jamais")] Never = 0,
[Description("toujours")] Always = 1,
[Description("À l'écran")] OnScreen = 2,
[Description("interne")] Internal = 3,
#elif LANG_CS
/// czech
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interně")] Internal = 3,
#elif LANG_SK
/// slovak
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interne")] Internal = 3,
#elif LANG_PL
/// polish
[Description("nigdy")] Never = 0,
[Description("zawsze")] Always = 1,
[Description("na ekranie")] OnScreen = 2,
[Description("wewnętrznie")] Internal = 3,
#elif LANG_RU
/// russian
[Description("никогда")] Never = 0,
[Description("всегда")] Always = 1,
[Description("толька экран")] OnScreen = 2,
[Description("внутренно")] Internal = 3,
#else
/// english
[Description("Never")] Never = 0,
[Description("Always")] Always = 1,
[Description("On screen")] OnScreen = 2,
[Description("Internal")] Internal = 3,
#endif
Count
}
public enum MassMethod : byte
{
#if LANG_DE
/// nemecky
[Description("Waage")] Scale,
[Description("Spanne")] Spread,
[Description("Standardabw.")] StdDev,
#elif LANG_FR
[Description("Balance")] Scale,
[Description("Envergure")] Spread,
[Description("Déviation std.")] StdDev,
#elif LANG_CS
/// cesky
[Description("váhou")] Scale,
[Description("max.rozdíl")] Spread,
[Description("std.dev.")] StdDev,
#else
[Description("Scale")] Scale,
[Description("Spread")] Spread,
[Description("Std.dev.")] StdDev,
#endif
Count
}
/// <summary>
/// Three state test results and/or water meter result (Algeria PT25 requirement).
/// NearlyOK means error is within error limits not narrowed by uncertainty
/// OK: Uncertainty + ErrLimLo <= error <= ErrLimHi - Uncertainty
/// NearlyOK: not OK but stil ErrLimLo <= error <= ErrLimHi
/// Nok: otherwise
/// </summary>
public enum ThreeState
{
#if LANG_FR
[Description("NC")] Nok, /// Totally failed: not OK and not NearlyOK
[Description("2e/Ff")] NearlyOK, /// Nearly OK, not OK but not totally failed
[Description("***")] OK, /// OK
#else
[Description("NOK")] Nok, /// Totally failed: not OK and not NearlyOK
[Description("Nearly OK")] NearlyOK, /// Nearly OK, not OK but not totally failed
[Description("OK")] OK, /// OK
#endif
Count
}
public enum TestProfile
{
UserDefined,
UserDefinedHeatMeter,
Protected, /// The first protected one
ProtectedHeatMeter,
}
public enum Progress
{
JustStarted,
TransitionBefore,
SwitchingFlowDetection,
FlowSetting,
Aborted, /// Use as an argument when a test was aborted
Test,
TransitionAfter,
Completed,
Count,
}
public enum Device
{
Screen,
Printer,
Disk,
}
public enum PageOrientation
{
Portrait,
Landscape,
Count,
}
public enum ItemCategory
{
#if LANG_DE
[Description("Allgemein")] Other,
[Description("Prüfstanddaten")] BenchData,
[Description("Prüfstandergebnisse")] BenchResult,
[Description("Prüfpunktdaten")] TestData,
[Description("Prüfpunktergebnisse")] TestResult,
[Description("Wasserzelledaten")] MeterData,
[Description("Wasserzelleergebnisse")] MeterResult,
#elif LANG_FR
[Description("Autres")] Other,
[Description("Données de banc")] BenchData,
[Description("Résultats du banc")] BenchResult,
[Description("Données de test")] TestData,
[Description("Résultats de test")] TestResult,
[Description("Données du compteur d'eau")] MeterData,
[Description("Résultats du compteur d'eau")] MeterResult,
#else
[Description("Other")] Other,
[Description("Bench data")] BenchData,
[Description("Bench result")] BenchResult,
[Description("Test data")] TestData,
[Description("Test result")] TestResult,
[Description("Meter data")] MeterData,
[Description("Meter result")] MeterResult,
#endif
Count,
}
/// <summary> Possible modes of operation of components and devices. </summary>
public enum DebugMode
{
#if LANG_DE
[Description("Erkennen-aus")] DetectedOff = -2,
[Description("Erkennen-ein")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
[Description("Auto-erkennen")] AutoDetect, /// The component (device) will be auto-detected
[Description("Fehler")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Aus")] Off, /// The component is off
[Description("Aufzeichnen")] Record,
[Description("Abspielen")] Replay,
[Description("Simuliert")] Simulate, /// Test bench simulation, this mode does not require any hardware
[Description("Geerbt")] Inherit,
#elif LANG_FR
[Description("Détection automatique: Éteindre")] DetectedOff = -2,
[Description("Détection automatique: Allumé")] DetectedOn = -1,
[Description("Ordinaire")] Normal = 0,
[Description("Détection automatique")] AutoDetect,
[Description("Erreur d'exécution")] FailureDuringOperation,
[Description("Éteindre")] Off,
[Description("Record")] Record,
[Description("Répondre")] Replay,
[Description("Simuler")] Simulate,
[Description("Hériter")] Inherit,
#else
[Description("Detected off")] DetectedOff = -2,
[Description("Detected on")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
[Description("Auto detect")] AutoDetect, /// The component (device) will be auto-detected
[Description("Run-time error")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Off")] Off, /// The component is off
[Description("Record")] Record,
[Description("Replay")] Replay,
[Description("Simulate")] Simulate, /// Test bench simulation, this mode does not require any hardware
[Description("Inherit")] Inherit,
#endif
Count,
}
public enum LogLevel
{
#if LANG_DE
[Description("Aus")] Off,
[Description("Schwerwiegend")] Fatal,
[Description("Fehler")] Error,
[Description("Warnung")] Warn,
[Description("Info")] Info,
[Description("Debug")] Debug,
[Description("Alles")] All,
#else
[Description("Off")] Off,
[Description("Fatal")] Fatal,
[Description("Error")] Error,
[Description("Warn")] Warn,
[Description("Info")] Info,
[Description("Debug")] Debug,
[Description("All")] All,
#endif
Count,
}
/// <summary> Arrangement of tests </summary>
public enum TestsArrangement
{
Rows,
Columns,
}
/// <summary> Arrangement of meters </summary>
public enum MetersArrangement
{
Vertically,
Horizontally,
}
public enum Alignment
{
#if LANG_DE
[Description("links")] Left,
[Description("zentriert")] Center,
[Description("rechts")] Right,
[Description("angepasst")] Justified,
#elif LANG_FR
[Description("gauche")] Left,
[Description("centré")] Center,
[Description("droit")] Right,
[Description("justifié")] Justified,
#else
[Description("Left")] Left,
[Description("Center")] Center,
[Description("Right")] Right,
[Description("Justified")] Justified,
#endif
Count
}
public enum VertAlignment
{
[Description("Top")] Top,
[Description("Middle")] Middle,
[Description("Bottom")] Bottom,
}
public enum TableForm
{
None,
Rows,
Columns,
ColumnsPL,
Count,
}
public enum ImageRotation
{
[Description("0 deg")] None,
[Description("90 deg")] Deg90,
[Description("180 deg")] Deg180,
[Description("270 deg")] Deg270,
Count
}
public enum CameraDisplayResolution
{
Small,
Medium,
Large,
// FullScreen,
Count,
}
public enum ErrorFlagsMode : sbyte
{
#if LANG_DE
[Description("aus")] Off,
[Description("info")] Info,
[Description("ein")] On,
[Description("stopp")] Stop,
#elif LANG_FR
[Description("éteindre")] Off,
[Description("info")] Info,
[Description("allumé")] On,
[Description("arrêter")] Stop,
#elif LANG_CS
[Description("vypnuto")] Off,
[Description("info")] Info,
[Description("zapnuto")] On,
[Description("stop")] Stop,
#elif LANG_RU
[Description("выкл")] Off,
[Description("инфо")] Info,
[Description("вкл")] On,
[Description("останов")] Stop,
#elif LANG_PL
[Description("nie")] Off,
[Description("info")] Info,
[Description("tak")] On,
[Description("przestać")] Stop,
#else // LANG_EN
[Description("off")] Off,
[Description("info")] Info,
[Description("on")] On,
[Description("stop")] Stop,
#endif
Count
}
public enum ErrorFlagMask : long
{
E1 = (1L << 0), /// shift = 0, E1 = 1L
E2 = (1L << 1),
E3 = (1L << 2),
E4 = (1L << 3),
E5 = (1L << 4),
E6 = (1L << 5),
E7 = (1L << 6),
E8 = (1L << 7),
E9 = (1L << 8),
E10 = (1L << 9),
E11 = (1L << 10),
E12 = (1L << 11),
E13 = (1L << 12),
E14 = (1L << 13),
E15 = (1L << 14),
E16 = (1L << 15),
E17 = (1L << 16),
E18 = (1L << 17),
E19 = (1L << 18),
E20 = (1L << 19),
E21 = (1L << 20),
E22 = (1L << 21),
E23 = (1L << 22),
E24 = (1L << 23),
E25 = (1L << 24),
E26 = (1L << 25), /// iPERL: Invalid Q2 correction factors, mismatch between factors in the water meter and in DB
E27 = (1L << 26), /// iPERL: Wrong counting direction
E28 = (1L << 27), /// iPERL: Missing workflow step (assembly or test)
E29 = (1L << 28),
E30 = (1L << 29),
E31 = (1L << 30),
E32 = (1L << 31),
E33 = (1L << 32),
E34 = (1L << 33),
E35 = (1L << 34),
E36 = (1L << 35),
E37 = (1L << 36),
E38 = (1L << 37),
E39 = (1L << 38),
E40 = (1L << 39),
E41 = (1L << 40),
E42 = (1L << 41),
E43 = (1L << 42),
E44 = (1L << 43),
E45 = (1L << 44),
E46 = (1L << 45),
E47 = (1L << 46),
E48 = (1L << 47),
E49 = (1L << 48),
E50 = (1L << 49),
E51 = (1L << 50),
E52 = (1L << 51),
E53 = (1L << 52),
E54 = (1L << 53),
E55 = (1L << 54),
E56 = (1L << 55),
E57 = (1L << 56),
E58 = (1L << 57),
E59 = (1L << 58),
E60 = (1L << 59),
E61 = (1L << 60),
E62 = (1L << 61),
E63 = (1L << 62),
}
#region iPERL enums
public enum Side
{
#if LANG_CS
[Description("Levá")] Left,
[Description("Pravá")] Right,
#else
[Description("Left")] Left,
[Description("Right")] Right,
#endif
Count
}
public enum FlowDir
{
R_L,
L_R,
Count
}
public enum Counting
{
Arbitrary,
Positive,
Negative,
Count
}
public enum OptoHeadState
{
Disabled,
OptoAndDirOK,
OptoNok,
DirNok,
Count
}
#endregion iPERL enums
}
+495
View File
@@ -0,0 +1,495 @@
///
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using System;
using System.Collections;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Windows.Forms;
using System.Runtime.InteropServices;
namespace Common.Forms
{
/// <summary>
/// Event Handler for SubItem events
/// </summary>
public delegate void SubItemEventHandler(object sender, SubItemEventArgs e);
/// <summary>
/// Event Handler for SubItemEndEditing events
/// </summary>
public delegate void SubItemEndEditingEventHandler(object sender, SubItemEndEditingEventArgs e);
/// <summary>
/// Inherited ListView to allow in-place editing of subitems
/// </summary>
public class ListViewEx : System.Windows.Forms.ListView
{
#region Interop structs, imports and constants
/// <summary>
/// MessageHeader for WM_NOTIFY
/// </summary>
private struct NMHDR
{
#pragma warning disable
public IntPtr hwndFrom;
public Int32 idFrom;
public Int32 code;
#pragma warning restore
}
[DllImport("user32.dll")]
private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wPar, IntPtr lPar);
[DllImport("user32.dll", CharSet=CharSet.Ansi)]
private static extern IntPtr SendMessage(IntPtr hWnd, int msg, int len, ref int [] order);
// ListView messages
private const int LVM_FIRST = 0x1000;
private const int LVM_GETCOLUMNORDERARRAY = (LVM_FIRST + 59);
// Windows Messages that will abort editing
private const int WM_HSCROLL = 0x114;
private const int WM_VSCROLL = 0x115;
private const int WM_SIZE = 0x05;
private const int WM_NOTIFY = 0x4E;
private const int HDN_FIRST = -300;
private const int HDN_BEGINDRAG = (HDN_FIRST-10);
private const int HDN_ITEMCHANGINGA = (HDN_FIRST-0);
private const int HDN_ITEMCHANGINGW = (HDN_FIRST-20);
#endregion
public MySortOrder SortOrder = MySortOrder.None;
public int SortColumn = -1;
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.Container components = null;
public event SubItemEventHandler SubItemClicked;
public event SubItemEventHandler SubItemRightClicked;
public event SubItemEventHandler SubItemBeginEditing;
public event SubItemEndEditingEventHandler SubItemEndEditing;
public ListViewEx()
{
// This call is required by the Windows.Forms Form Designer.
InitializeComponent();
base.FullRowSelect = true;
base.View = View.Details;
base.AllowColumnReorder = true;
}
/// <summary>
/// Clean up any resources being used.
/// </summary>
protected override void Dispose( bool disposing )
{
if( disposing )
{
if( components != null )
components.Dispose();
}
base.Dispose( disposing );
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
}
#endregion
private bool _doubleClickActivation = false;
/// <summary>
/// Is a double click required to start editing a cell?
/// </summary>
public bool DoubleClickActivation
{
get { return _doubleClickActivation; }
set { _doubleClickActivation = value; }
}
/// <summary>
/// Retrieve the order in which columns appear
/// </summary>
/// <returns>Current display order of column indices</returns>
public int[] GetColumnOrder()
{
IntPtr lPar = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)) * Columns.Count);
IntPtr res = SendMessage(Handle, LVM_GETCOLUMNORDERARRAY, new IntPtr(Columns.Count), lPar);
if (res.ToInt32() == 0) // Something went wrong
{
Marshal.FreeHGlobal(lPar);
return null;
}
int [] order = new int[Columns.Count];
Marshal.Copy(lPar, order, 0, Columns.Count);
Marshal.FreeHGlobal(lPar);
return order;
}
/// <summary>
/// Find ListViewItem and SubItem Index at position (x,y)
/// </summary>
/// <param name="x">relative to ListView</param>
/// <param name="y">relative to ListView</param>
/// <param name="item">Item at position (x,y)</param>
/// <returns>SubItem index</returns>
public int GetSubItemAt(int x, int y, out ListViewItem item)
{
item = this.GetItemAt(x, y);
if (item != null)
{
int[] order = GetColumnOrder();
Rectangle lviBounds;
int subItemX;
lviBounds = item.GetBounds(ItemBoundsPortion.Entire);
subItemX = lviBounds.Left;
for (int i=0; i<order.Length; i++)
{
ColumnHeader h = this.Columns[order[i]];
if (x < subItemX+h.Width)
{
return h.Index;
}
subItemX += h.Width;
}
}
return -1;
}
/// <summary>
/// Get bounds for a SubItem
/// </summary>
/// <param name="Item">Target ListViewItem</param>
/// <param name="SubItem">Target SubItem index</param>
/// <returns>Bounds of SubItem (relative to ListView)</returns>
public Rectangle GetSubItemBounds(ListViewItem Item, int SubItem)
{
int[] order = GetColumnOrder();
Rectangle subItemRect = Rectangle.Empty;
if (SubItem >= order.Length)
throw new IndexOutOfRangeException("SubItem "+SubItem+" out of range");
if (Item == null)
throw new ArgumentNullException("Item");
Rectangle lviBounds = Item.GetBounds(ItemBoundsPortion.Entire);
int subItemX = lviBounds.Left;
ColumnHeader col;
int i;
for (i=0; i<order.Length; i++)
{
col = this.Columns[order[i]];
if (col.Index == SubItem)
break;
subItemX += col.Width;
}
subItemRect = new Rectangle(subItemX, lviBounds.Top, this.Columns[order[i]].Width, lviBounds.Height);
return subItemRect;
}
protected override void WndProc(ref Message msg)
{
switch (msg.Msg)
{
// Look for WM_VSCROLL,WM_HSCROLL or WM_SIZE messages.
case WM_VSCROLL:
case WM_HSCROLL:
case WM_SIZE:
EndEditing(false);
break;
case WM_NOTIFY:
// Look for WM_NOTIFY of events that might also change the
// editor's position/size: Column reordering or resizing
NMHDR h = (NMHDR)Marshal.PtrToStructure(msg.LParam, typeof(NMHDR));
if (h.code == HDN_BEGINDRAG ||
h.code == HDN_ITEMCHANGINGA ||
h.code == HDN_ITEMCHANGINGW)
EndEditing(false);
break;
}
base.WndProc(ref msg);
}
#region Initialize editing depending of DoubleClickActivation property
protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
{
base.OnMouseUp(e);
MouseEventArgs me = (MouseEventArgs)e;
if (me.Button == MouseButtons.Right)
{
/// Right mouse button click function
RightClickFunctionSubitemAt(new Point(e.X, e.Y));
}
else
{
/// Normal function (=edit item)
if (DoubleClickActivation)
{
return;
}
EditSubitemAt(new Point(e.X, e.Y));
}
}
protected override void OnDoubleClick(EventArgs e)
{
base.OnDoubleClick (e);
if (!DoubleClickActivation)
{
return;
}
Point pt = this.PointToClient(Cursor.Position);
EditSubitemAt(pt);
}
///<summary>
/// Fire SubItemClicked
///</summary>
///<param name="p">Point of click/doubleclick</param>
private void EditSubitemAt(Point p)
{
ListViewItem item;
int idx = GetSubItemAt(p.X, p.Y, out item);
if (idx >= 0)
{
OnSubItemClicked(new SubItemEventArgs(item, idx));
}
}
///<summary>
/// Fire SubItemRightClicked
///</summary>
///<param name="p">Point of click/doubleclick</param>
private void RightClickFunctionSubitemAt(Point p)
{
ListViewItem item;
int idx = GetSubItemAt(p.X, p.Y, out item);
if (idx >= 0)
{
OnSubItemRightClicked(new SubItemEventArgs(item, idx));
}
}
#endregion
#region In-place editing functions
// The control performing the actual editing
private Control _editingControl;
// The LVI being edited
private ListViewItem _editItem;
// The SubItem being edited
private int _editSubItem;
protected void OnSubItemBeginEditing(SubItemEventArgs e)
{
if (SubItemBeginEditing != null) SubItemBeginEditing(this, e);
}
protected void OnSubItemEndEditing(SubItemEndEditingEventArgs e)
{
if (SubItemEndEditing != null) SubItemEndEditing(this, e);
}
protected void OnSubItemClicked(SubItemEventArgs e)
{
if (SubItemClicked != null) SubItemClicked(this, e);
}
protected void OnSubItemRightClicked(SubItemEventArgs e)
{
if (SubItemRightClicked != null) SubItemRightClicked(this, e);
}
/// <summary>
/// Begin in-place editing of given cell
/// </summary>
/// <param name="c">Control used as cell editor</param>
/// <param name="Item">ListViewItem to edit</param>
/// <param name="SubItem">SubItem index to edit</param>
public void StartEditing(Control c, ListViewItem Item, int SubItem)
{
OnSubItemBeginEditing(new SubItemEventArgs(Item, SubItem));
Rectangle rcSubItem = GetSubItemBounds(Item, SubItem);
if (rcSubItem.X < 0)
{
// Left edge of SubItem not visible - adjust rectangle position and width
rcSubItem.Width += rcSubItem.X;
rcSubItem.X=0;
}
if (rcSubItem.X+rcSubItem.Width > this.Width)
{
// Right edge of SubItem not visible - adjust rectangle width
rcSubItem.Width = this.Width-rcSubItem.Left;
}
// Subitem bounds are relative to the location of the ListView!
rcSubItem.Offset(Left, Top);
// In case the editing control and the listview are on different parents,
// account for different origins
Point origin = new Point(0,0);
Point lvOrigin = this.Parent.PointToScreen(origin);
Point ctlOrigin = c.Parent.PointToScreen(origin);
rcSubItem.Offset(lvOrigin.X-ctlOrigin.X, lvOrigin.Y-ctlOrigin.Y);
// Position and show editor
c.Bounds = rcSubItem;
c.Text = Item.SubItems[SubItem].Text;
c.Visible = true;
c.BringToFront();
c.Focus();
_editingControl = c;
_editingControl.Leave += new EventHandler(_editControl_Leave);
_editingControl.KeyPress += new KeyPressEventHandler(_editControl_KeyPress);
_editItem = Item;
_editSubItem = SubItem;
}
private void _editControl_Leave(object sender, EventArgs e)
{
// cell editor losing focus
EndEditing(true);
}
private void _editControl_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e)
{
switch (e.KeyChar)
{
case (char)(int)Keys.Escape:
{
EndEditing(false);
break;
}
case (char)(int)Keys.Enter:
{
EndEditing(true);
break;
}
}
}
/// <summary>
/// Accept or discard current value of cell editor control
/// </summary>
/// <param name="AcceptChanges">Use the _editingControl's Text as new SubItem text or discard changes?</param>
public void EndEditing(bool AcceptChanges)
{
if (_editingControl == null)
return;
SubItemEndEditingEventArgs e = new SubItemEndEditingEventArgs(
_editItem, // The item being edited
_editSubItem, // The subitem index being edited
AcceptChanges ?
_editingControl.Text : // Use editControl text if changes are accepted
_editItem.SubItems[_editSubItem].Text, // or the original subitem's text, if changes are discarded
!AcceptChanges // Cancel?
);
OnSubItemEndEditing(e);
if (_editSubItem >= 0 && _editSubItem < _editItem.SubItems.Count)
{
_editItem.SubItems[_editSubItem].Text = e.DisplayText;
}
if (_editingControl != null)
{
_editingControl.Leave -= new EventHandler(_editControl_Leave);
_editingControl.KeyPress -= new KeyPressEventHandler(_editControl_KeyPress);
_editingControl.Visible = false;
}
_editingControl = null;
_editItem = null;
_editSubItem = -1;
}
#endregion
}
/// <summary>
/// Event Args for SubItemClicked event
/// </summary>
public class SubItemEventArgs : EventArgs
{
int subItem = -1; /// Sub-item index
ListViewItem item = null;
public int SubItem { get { return subItem; } }
public ListViewItem Item { get { return item; } }
public SubItemEventArgs(ListViewItem item, int subItem)
{
this.subItem = subItem;
this.item = item;
}
}
/// <summary>
/// Event Args for SubItemEndEditingClicked event
/// </summary>
public class SubItemEndEditingEventArgs : SubItemEventArgs
{
string displayText = string.Empty;
bool cancel = true;
public SubItemEndEditingEventArgs(ListViewItem item, int subItem, string displayText, bool cancel) :
base(item, subItem)
{
this.displayText = displayText;
this.cancel = cancel;
}
public string DisplayText
{
get { return displayText; }
set { displayText = value; }
}
public bool Cancel
{
get { return cancel; }
set { cancel = value; }
}
}
}
+109
View File
@@ -0,0 +1,109 @@
///
/// Copyright (c) 2019-2020 Sensus Slovensko a.s.
///
using System;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Windows.Forms;
namespace Common.Forms
{
[EditorBrowsable(EditorBrowsableState.Never)]
public static class ListViewExtensions
{
[StructLayout(LayoutKind.Sequential)]
public struct HDITEM
{
public Mask mask;
public int cxy;
[MarshalAs(UnmanagedType.LPTStr)]
public string pszText;
public IntPtr hbm;
public int cchTextMax;
public Format fmt;
public IntPtr lParam;
// _WIN32_IE >= 0x0300
public int iImage;
public int iOrder;
// _WIN32_IE >= 0x0500
public uint type;
public IntPtr pvFilter;
// _WIN32_WINNT >= 0x0600
public uint state;
[Flags]
public enum Mask
{
Format = 0x4, // HDI_FORMAT
};
[Flags]
public enum Format
{
SortDown = 0x200, // HDF_SORTDOWN
SortUp = 0x400, // HDF_SORTUP
};
};
public const int LVM_FIRST = 0x1000;
public const int LVM_GETHEADER = LVM_FIRST + 31;
public const int HDM_FIRST = 0x1200;
public const int HDM_GETITEM = HDM_FIRST + 11;
public const int HDM_SETITEM = HDM_FIRST + 12;
[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, IntPtr lParam);
[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, ref HDITEM lParam);
public static void SetSortIcon(this ListViewEx listViewControl, int columnIndex, MySortOrder order)
{
IntPtr columnHeader = SendMessage(listViewControl.Handle, LVM_GETHEADER, IntPtr.Zero, IntPtr.Zero);
for (int columnNumber = 0; columnNumber <= listViewControl.Columns.Count - 1; columnNumber++)
{
var columnPtr = new IntPtr(columnNumber);
var item = new HDITEM
{
mask = HDITEM.Mask.Format
};
if (SendMessage(columnHeader, HDM_GETITEM, columnPtr, ref item) == IntPtr.Zero)
{
throw new Win32Exception();
}
if (order != MySortOrder.None && columnNumber == columnIndex)
{
switch (order)
{
case MySortOrder.Ascending:
case MySortOrder.Ascending2:
item.fmt &= ~HDITEM.Format.SortDown;
item.fmt |= HDITEM.Format.SortUp;
break;
case MySortOrder.Descending:
case MySortOrder.Descending2:
item.fmt &= ~HDITEM.Format.SortUp;
item.fmt |= HDITEM.Format.SortDown;
break;
default:
break;
}
}
else
{
item.fmt &= ~HDITEM.Format.SortDown & ~HDITEM.Format.SortUp;
}
if (SendMessage(columnHeader, HDM_SETITEM, columnPtr, ref item) == IntPtr.Zero)
{
throw new Win32Exception();
}
}
}
}
}
+46
View File
@@ -0,0 +1,46 @@
///
/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections;
using System.Windows.Forms;
namespace Common.Forms
{
public class LviDateTimeColumnComparer : IComparer
{
int column;
MySortOrder order;
public LviDateTimeColumnComparer()
{
column = 0;
order = MySortOrder.Ascending;
}
public LviDateTimeColumnComparer(int column, MySortOrder order)
{
this.column = column;
this.order = order;
}
public int Compare(object x, object y)
{
DateTime valX = DateTime.Parse(((ListViewItem)x).SubItems[column].Text);
DateTime valY = DateTime.Parse(((ListViewItem)y).SubItems[column].Text);
if (valX == valY)
{
return 0;
}
else if ((order == MySortOrder.Descending || order == MySortOrder.Descending2))
{
return (valY > valX) ? 1 : -1;
}
else
{
return (valX > valY) ? 1 : -1;
}
}
}
}
+34
View File
@@ -0,0 +1,34 @@
///
/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections;
using System.Windows.Forms;
namespace Common.Forms
{
public class LviIntColumnComparer : IComparer
{
int column;
MySortOrder order;
public LviIntColumnComparer()
{
column = 0;
order = MySortOrder.Ascending;
}
public LviIntColumnComparer(int column, MySortOrder order)
{
this.column = column;
this.order = order;
}
public int Compare(object x, object y)
{
int valX = int.Parse(((ListViewItem)x).SubItems[column].Text);
int valY = int.Parse(((ListViewItem)y).SubItems[column].Text);
return (order == MySortOrder.Descending || order == MySortOrder.Descending2) ? (valY - valX) : (valX - valY);
}
}
}
@@ -2,9 +2,9 @@
using System.Collections;
using System.Windows.Forms;
namespace Users.Forms
namespace Common.Forms
{
class LviNameSurnameColumnComparer : IComparer
public class LviNameSurnameColumnComparer : IComparer
{
private int column;
MySortOrder order;
+34
View File
@@ -0,0 +1,34 @@
///
/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections;
using System.Windows.Forms;
namespace Common.Forms
{
public class LviTextColumnComparer : IComparer
{
private int column;
MySortOrder order;
public LviTextColumnComparer()
{
column = 0;
order = MySortOrder.Ascending;
}
public LviTextColumnComparer(int column, MySortOrder order)
{
this.column = column;
this.order = order;
}
public int Compare(object x, object y)
{
string txtX = ((ListViewItem)x).SubItems[column].Text;
string txtY = ((ListViewItem)y).SubItems[column].Text;
return (order == MySortOrder.Descending || order == MySortOrder.Descending2) ? String.Compare(txtY, txtX) : String.Compare(txtX, txtY);
}
}
}
+10
View File
@@ -0,0 +1,10 @@
using System;
namespace Common.Forms
{
public class MessageEventArgs : EventArgs
{
public string Message;
public MessageEventArgs(string message) { Message = message; }
}
}
+63
View File
@@ -0,0 +1,63 @@
namespace Common.Forms
{
partial class ModelessForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(47, 29);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(35, 13);
this.label1.TabIndex = 0;
this.label1.Text = "label1";
//
// ModelessForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(191, 56);
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "ModelessForm";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ModelessForm";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label1;
}
}
+79
View File
@@ -0,0 +1,79 @@
///
/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
///
using System;
using System.Drawing;
using System.Windows.Forms;
namespace Common.Forms
{
public partial class ModelessForm : Form
{
/// <summary>
/// Constructor to be used by the application
/// </summary>
/// <param name="title">Window title</param>
/// <param name="message">Displayed message</param>
public ModelessForm(string message, int backArgb = 0, int textArgb = 0, Font textFont = null, string title = null)
{
InitializeComponent();
ControlBox = false;
label1.Text = (message != null) ? message : "Please wait";
BackColor = (backArgb != 0) ? Color.FromArgb(backArgb) : Color.LightGreen;
ForeColor = (textArgb != 0) ? Color.FromArgb(textArgb) : Color.Black;
label1.Font = (textFont != null) ? textFont : new Font("Arial", 14, FontStyle.Regular);
Text = (title != null) ? title : string.Empty;
float textWidth = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Width;
float textHeight = Graphics.FromImage(new Bitmap(1, 1)).MeasureString(label1.Text, label1.Font).Height;
Width = (int)textWidth + 120; /// Form width calculated from the text width
Height += (int)textHeight; /// Form height calculated from the text height
UpdateMessageHandler += delegate(object sender, MessageEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<MessageEventArgs>(OnUpdateMessage), sender, args); }
else OnUpdateMessage(sender, args);
};
CloseFormHandler += delegate(object sender, EventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<EventArgs>(OnCloseForm), sender, args); }
else OnCloseForm(sender, args);
};
}
/// <summary>
/// Called from the state machine when an operation forces a modeless dialog close.
/// </summary>
public void UpdateMessage(MessageEventArgs args)
{
if (UpdateMessageHandler == null) return;
try { UpdateMessageHandler(null, args); }
catch (Exception) { }
}
public event EventHandler<MessageEventArgs> UpdateMessageHandler;
void OnUpdateMessage(object sender, MessageEventArgs args)
{
if (args != null && args.Message != null) label1.Text = args.Message;
}
/// <summary>
/// Called from the state machine when an operation forces a modeless dialog close.
/// </summary>
public void CloseForm()
{
if (CloseFormHandler == null) return;
try { CloseFormHandler(null, null); }
catch (Exception) { }
}
public event EventHandler<EventArgs> CloseFormHandler;
void OnCloseForm(object sender, EventArgs args)
{
DialogResult = DialogResult.Cancel;
Close();
}
}
}
+352
View File
@@ -0,0 +1,352 @@
///
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using log4net;
namespace Common
{
public static class Formulas
{
private static readonly ILog log = LogManager.GetLogger(typeof(Formulas));
///
/// Wrappers
///
public static double RealDensity() { return GlobalData.SampleDensity; }
public static double AtTemperature() { return GlobalData.SampleTemp; }
public static double Buoyancy() { return GlobalData.Buoyancy; }
/// Private tables with coeficients to calculate specific enthalpy
static readonly int[] Ii;
static readonly int[] Ji;
static readonly double[] ni;
/// Private table with coeficients to calculate temperature of a platinum thermometer
static readonly double[] Di;
/// <summary>
/// Constructor
/// </summary>
static Formulas()
{
///
/// Initialize tables to calculate specific enthalpies
///
Ii = new int[34] { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 8, 8, 21, 23, 29, 30, 31, 32 };
Ji = new int[34] { -2, -1, 0, 1, 2, 3, 4, 5, -9, -7, -1, 0, 1, 3, -3, 0, 1, 3, 17, -4, 0, 6, -5, -2, 10, -8, -11, -6, -29, -31, -38, -39, -40, -41 };
ni = new double[34] {
0.14632971213167, /// 1
-0.84548187169114, /// 2
-0.37563603672040E1, /// 3
0.33855169168385E1, /// 4
-0.95791963387872, /// 5
0.15772038513228, /// 6
-0.16616417199501E-1, /// 7
0.81214629983568E-3, /// 8
0.28319080123804E-3, /// 9
-0.60706301565874E-3, /// 10
-0.18990068218419E-1, /// 11
-0.32529748770505E-1, /// 12
-0.21841717175414E-1, /// 13
-0.52838357969930E-4, /// 14
-0.47184321073267E-3, /// 15
-0.30001780793026E-3, /// 16
0.47661393906987E-4, /// 17
-0.44141845330846E-5, /// 18
-0.72694996297594E-15, /// 19
-0.31679644845054E-4, /// 20
-0.28270797985312E-5, /// 21
-0.85205128120103E-9, /// 22
-0.22425281908000E-5, /// 23
-0.65171222895601E-6, /// 24
-0.14341729937924E-12, /// 25
-0.40516996860117E-6, /// 26
-0.12734301741641E-8, /// 27
-0.17424871230634E-9, /// 28
-0.68762131295531E-18, /// 29
0.14478307828521E-19, /// 30
0.26335781662795E-22, /// 31
-0.11947622640071E-22, /// 32
0.18228094581404E-23, /// 33
-0.93537087292458E-25, /// 34
};
///
/// Initialize a table to calculate temperature of a platinum thermometer from resistance
///
Di = new double[]
{
439.932854,
472.418020,
37.684494,
7.472018,
2.920828,
0.005184,
-0.963864,
-0.188732,
0.191203,
0.049025,
};
}
/// <summary>
/// Calculate density of distilled water from temperature
/// </summary>
/// <param name="t">ITS-90 temperature in [°C]</param>
/// <returns>Density in [kg/m3]</returns>
public static double DistilledWaterDensityFromTemp(double t)
{
if (t <= 40)
{
const double c0 = 999.839564;
const double c1 = 0.067998613;
const double c2 = -0.0091101468;
const double c3 = 0.00010058299;
const double c4 = -0.0000011275659;
const double c5 = 6.5985371e-09;
return ((((c5 * t + c4) * t + c3) * t + c2) * t + c1) * t + c0;
}
else
{
const double a0 = 9.9983952E2;
const double a1 = 1.6952577E1;
const double a2 = -7.9905127E-3;
const double a3 = -4.6241757E-5;
const double a4 = 1.0584601E-7;
const double a5 = -2.8103006E-10;
const double b = 1.6887236E-2;
return (((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0) / (1.0 + b * t);
}
}
/// <summary>
/// Calculate density of distilled water from temperature (obsolete)
/// </summary>
/// <param name="t">IPTS-68 temperature in [°C]</param>
/// <returns>Density in [kg/m3]</returns>
public static double DistilledWaterDensityFromTempIPTS68(double t)
{
const double a0 = 999.842594;
const double a1 = 0.06793952;
const double a2 = -0.009095290;
const double a3 = 0.0001001685;
const double a4 = -0.000001120083;
const double a5 = 6.536332e-09;
return ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0;
}
/// <summary>
/// Calculate density by comparing calculated data and data from a certificate
/// </summary>
/// <param name="realDensity">Density from a certificate in [kg/m3]</param>
/// <param name="atTemperature">Temperature from a certificate in [°C]</param>
/// <returns>Density correction in [kg/m3]</returns>
public static double DensityCorrection(double realDensity, double atTemperature)
{
/// Calculated data
double calculatedDensity = DistilledWaterDensityFromTemp(atTemperature);
return realDensity - calculatedDensity;
}
/// <summary>
/// Calculate corrected (real) water density from temperature
/// </summary>
/// <param name="t">Temperature in [°C]</param>
/// <returns>Density in [kg/m3]</returns>
public static double WaterDensityFromTemp(double t)
{
return DistilledWaterDensityFromTemp(t) + DensityCorrection(RealDensity(), AtTemperature());
}
/// <summary>
/// Calculate corrected (real) water density from temperature
/// </summary>
/// <param name="t">Temperature in [°C]</param>
/// <returns>Density in [kg/m3]</returns>
public static double WaterDensityFromTempPress(double temp, double pressure)
{
double x0 = 5.08821E-10;
double x1 = 1.2639418;
double x2 = 0.2660269;
double x3 = 0.3734838;
double x4 = 2.0205242;
double theta = temp / 100.0;
double B = x0 * (((x3 * theta + x2) * theta + x1) * theta + 1) / (1 + x4 * theta);
return WaterDensityFromTemp(temp) * (1 + B * Common.Units.ConvertTo(Common.Unit.Pa, pressure));
}
public static float AirDensityFromAmbientVales(float tempC, float pressureBar, float humiPct)
{
double pressurePa = 100000.0 * (double)pressureBar; /// [Pa]
double tempKelvin = 273.15 + (double)tempC;
double coef1 = 1.2811805 / 10000.0 * tempKelvin * tempKelvin
- 1.950987 / 100.0 * tempKelvin
+ 34.04926034
- 6.353631 * 1000.0 / tempKelvin;
double coef3 = humiPct / 100.0 * System.Math.Exp(coef1) / pressurePa;
double airDensityKgm3 = 0.00348353 * pressurePa * (1.0 - 0.378 * coef3) / tempKelvin; /// kg/m3
return (float)airDensityKgm3;
}
/// <summary>
/// Convert 'pulses' to 'volume', prevent division by zero
/// </summary>
public static double VolumeFromPulses(int pulses, double pulsesPerLiter)
{
if (pulsesPerLiter <= double.Epsilon) return 0;
return Convert.ToDouble(pulses) / pulsesPerLiter;
}
/// <summary>
/// Calculate the error in % from 'measured' and 'true' volume, prevent division by zero
/// </summary>
public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
{
if (trueVolume <= float.Epsilon)
{
if (measuredVolume <= float.Epsilon)
{
log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
return -100.0;
}
log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, 99.0);
return 99.0;
}
double error = 100.0 * (measuredVolume - trueVolume) / trueVolume;
log.InfoFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, error);
return error;
}
/// <summary>
/// Converts a measurement error to a correction (used when preparing correction tables).
/// </summary>
/// <param name="measuredValue">Measured value (in arbitrary units)</param>
/// <param name="error">Measurement error in %</param>
/// <returns>Correction in the same units as the measured value</returns>
public static double CorrectionFromError(double measuredValue, double error)
{
double trueValue = measuredValue / (1 + error/100);
double correction = trueValue - measuredValue;
return correction;
}
/// <summary>
/// Calculates the heat coefficient for water
/// </summary>
/// <param name="pressure">Pressure [bar]</param>
/// <param name="T_in">Inlet temperature [°C]</param>
/// <param name="T_out">Outlet temperature [°C]</param>
/// <param name="flowMeasuredAtInlet">true = flow measured @inlet, false = flow measured @outlet</param>
/// <returns> Heat coefficient for water [J/(m3 K)]</returns>
public static double HeatCoefficientWater(double pressure, double T_in, double T_out, bool flowMeasuredAtInlet)
{
if (T_in == T_out) return 0;
const double R = 461.526; /// [J kg^-1 K^-1]
const double p_star_Pa = 16.53E6; /// [Pa] (=16.53 MPa)
const double T_star = 1386.0; /// [K]
double T_in_K = Common.Units.ConvertTo(Common.Unit.K, T_in);
double T_out_K = Common.Units.ConvertTo(Common.Unit.K, T_out);
double tau_in = T_star / T_in_K;
double tau_out = T_star / T_out_K;
double pi = Common.Units.ConvertTo(Common.Unit.Pa, pressure) / p_star_Pa;
double h_in = tau_in * GammaTau(pi, tau_in) * R * T_in_K;
double h_out = tau_out * GammaTau(pi, tau_out) * R * T_out_K;
double ni = flowMeasuredAtInlet ? GammaPi(pi, tau_in) * R * T_in_K / p_star_Pa
: GammaPi(pi, tau_out) * R * T_out_K / p_star_Pa;
return (h_in - h_out) / (ni * (T_in - T_out));
}
/// <summary>
/// gamma(pi) see also STN EN 1434-1 Annex A (A.4)
/// </summary>
/// <param name="pi">pi = p / p* where p* = 16.53 MPa</param>
/// <param name="tau">tau = T* / T where T* = 1386 K</param>
/// <returns>gamma(pi)</returns>
static double GammaPi(double pi, double tau)
{
double result = 0;
for (int i = 0; i < 34; i++)
{
result -= ni[i] * Ii[i] * Math.Pow(7.1 - pi, Ii[i] - 1) * Math.Pow(tau - 1.222, Ji[i]);
}
return result;
}
/// <summary>
/// gamma(tau) see also STN EN 1434-1 Annex A (A.7)
/// </summary>
/// <param name="pi">pi = p / p* where p* = 16.53 MPa</param>
/// <param name="tau">tau = T* / T where T* = 1386 K</param>
/// <returns>gamma(tau)</returns>
static double GammaTau(double pi, double tau)
{
double result = 0;
for (int i = 0; i < 34; i++)
{
result += ni[i] * Math.Pow(7.1 - pi, Ii[i]) * Ji[i] * Math.Pow(tau - 1.222, Ji[i] - 1);
}
return result;
}
/// <summary>
/// Conversion of measured resistance of a platinum thermometer to temperature according to ITS-90
/// </summary>
/// <param name="R">Measured resistance in [°C]</param>
/// <param name="R001C">Calibrated resistance in Ohm at 0.01°C</param>
/// <param name="a7">Calibrated ITS-90 coefficient a7</param>
/// <param name="b7">Calibrated ITS-90 coefficient b7</param>
/// <param name="c7">Calibrated ITS-90 coefficient c7</param>
/// <returns>Temperature in [°C]</returns>
public static double PlatinumResistanceTM_ITS90_R2T(double R, double R001C, double a7, double b7, double c7)
{
double w = R / R001C; /// ratio
double r1 = w - 1.0;
double dw = r1 * (a7 + r1 * (b7 + r1 * c7)); /// = a7*r1 + b7*r1^2 + c7*r1^3
double wr = w - dw;
double x = (wr - 2.64) / 1.64;
double sum = 0;
for (int i = Di.Length - 1; i >= 0; i--)
{
sum = sum * x + Di[i];
}
return sum;
}
/// <summary>
/// Conversion of measured resistance of a platinum thermometer to temperature using Callendar-Van Dusen equations
/// </summary>
/// <param name="R">Measured resistance in [°C]</param>
/// <param name="R0">Calibrated resistance in Ohm at 0°C</param>
/// <param name="A">Calibration coefficient a</param>
/// <param name="B">Calibration coefficient b</param>
/// <returns>Temperature in [°C]</returns>
public static double PlatinumResistanceTM_ITS27_R2T(double R, double R0, double A, double B)
{
if (R0 * R0 * A * A - 4 * R0 * B * (R0 - R) <= 0) return 0; /// Out of range
return (-(R0 * A) + Math.Sqrt(R0 * R0 * A * A - 4 * R0 * B * (R0 - R))) / (2 * R0 * B);
}
}
}
+11
View File
@@ -0,0 +1,11 @@
using System;
namespace Common
{
public interface IMeasurementCorrection
{
int RangeIx { get; set; }
double Measurement { get; set; }
double Correction { get; set; }
}
}
+26
View File
@@ -0,0 +1,26 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
namespace Common
{
public interface IOrderInfo
{
string POName { get; }
string VariantCode { get; }
string ModuleParam { get; }
int PiecesCount { get; }
string SNPrefix { get; }
int SNFirst { get; }
int SNDigitsCount { get; }
string SNSuffix { get; }
string RAPrefix { get; }
int RAFirst { get; }
string RASuffix { get; }
string Remark { get; }
int CurrentPcsCount { get; set; }
int CurrentSN { get; set; }
int CurrentRA { get; set; }
}
}
@@ -1,11 +1,11 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
namespace Config.Entities
namespace Common
{
public interface IParamsProvider
{
@@ -31,7 +31,7 @@ namespace Config.Entities
/// Returns a list of possible values of one parameter (ComboBox when editing) or null (Textbox when editing).
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
IList<string> ParamValues(int ix);
ICollection<string> ParamValues(int ix);
/// <summary>
/// Returns a parameter value in the string form
+14
View File
@@ -0,0 +1,14 @@
using System;
namespace Common
{
public interface IUncertainty
{
float Measurement { get; }
float MainUncertainty { get; }
float Resolution { get; }
float DriftPerYr { get; }
float Conditions { get; }
float UncertaintyOfCorrection { get; }
}
}
+22
View File
@@ -0,0 +1,22 @@
using System;
namespace Common
{
public interface IUser
{
string UserName { get; } /// = name, alias, abbreviation
string FullName { get; } /// = description
string Tag { get; }
int Number { get; }
/// Access rights
bool IsMemberOf(GID group);
bool IsMemberOf(GID[] groups);
bool IsCorrectPassword(string password);
/// Password complexity, history, etc.
bool IsPasswordExpired();
bool IsPasswordUsedInPast(string passwordCandidate);
void SetPassword(string password);
}
}
+269
View File
@@ -0,0 +1,269 @@
///
/// Copyright (c) 2015-2021 Sensus Metering Systems
///
using System;
using System.Globalization;
namespace Common.Iperl
{
public enum OptoTelegramFlags : byte
{
OK = 0,
OK_TestStart,
OK_TestEnd,
InvalidTelegram, /// Wrong telegram format of checksum error
SyncError,
}
public class OptoTelegramRaw
{
public static readonly int Length = 42;
private static CultureInfo culture;
///
/// Strobed value
///
public static decimal TestStartTimestampDec;
///
/// Stored values
///
public OptoTelegramFlags Flags;
public DateTime DateTime; /// From PC
public float RefFlow; /// [m3/h]
public int Counter;
public Int32 EmfRaw; /// Signed EMF from iPerl opto data
public Int16 MagneticFieldRaw;
public Int16 FlowRaw;
public UInt32 VolumeRaw;
public Int64 VolumeRawExt;
public Int16 Impedance;
public UInt32 Timestamp;
public Int64 TimestampExt;
public byte CheckSum;
///
/// Calculated values
///
public double EMF()
{
return 0.000000333 * (double)EmfRaw;
}
public double MagneticField() { return (double)MagneticFieldRaw; }
public double Flow(double scalingFactor) { return 0.225 * scalingFactor * (double)FlowRaw; }
public double Volume(double scalingFactor) { return 0.0000625 * scalingFactor * (double)VolumeRawExt; }
public Int32 FlipTime() { return Impedance; }
public decimal TimestampDec() { return (decimal)TimestampExt / (decimal)8192; }
public double VolumeDelta(double scalingFactor, OptoTelegramRaw previous) { return (previous == null) ? 0 : Volume(scalingFactor) - previous.Volume(scalingFactor); }
public decimal TimeDelta() { return TimestampDec() - TestStartTimestampDec; }
public string Label()
{
if (Flags == OptoTelegramFlags.OK_TestStart) return "#### start test ####";
else if (Flags == OptoTelegramFlags.OK_TestEnd) return "#### end of test ####";
else return string.Empty;
}
static OptoTelegramRaw()
{
culture = CultureInfo.CreateSpecificCulture("DE"); /// This is to use comma as decimal number separator
}
public OptoTelegramRaw()
{
}
/// <summary>
/// Parses optical telegram and returns OptoTelegramRaw object
/// </summary>
/// <description>
/// Create a configuration structure from a complete byte array
///
/// Telegram description:
///
/// AAAAAA[tab]BBBB[tab]CCCC[tab]DDDDDD[tab]EEEE[tab]FFFFFFFF[tab]GG[cr][lf] (42 bytes)
///
/// Data Comment Type Calculate to decimal
/// ----------------------------------------------------------------
/// AAAAAA EMF Int24 Value * 0.000000333
/// BBBB Magnetic field Int16 Value
/// CCCC Flow Int16 Value * 0.225 * Scalig factor
/// DDDDDD Volume Int24 Value / 16000 * Scaling factor
/// EEEE Impedance Int16 Value
/// FFFFFFFF Timestamp Uint32 Value / 8192
/// GG Checksum Byte
/// ----------------------------------------------------------------
///
/// Example:
/// FFFFFE 51EA 0000 65324E 0087 F6319DFF 86
/// FFDD3A 51F9 0000 65324E 0088 F631A60B 45
/// ...
/// </description>
/// <param name="data">A complete byte array data</param>
/// <returns>true = telegram OK, false = telegram NOK</returns>
public bool UpdateFromString(string telegram, int counter, float refFlow, ref Int64 volumeRawExtLast, ref Int64 timestampExtLast, bool isLog = false)
{
DateTime = DateTime.Now;
Counter = counter;
RefFlow = refFlow;
if ((telegram == null) || (telegram.Length < Length) ||
(telegram[6] != '\t') || (telegram[11] != '\t') || (telegram[16] != '\t') ||
(telegram[23] != '\t') || (telegram[28] != '\t') || (telegram[37] != '\t') ||
(!isLog && (telegram[40] != '\r' || telegram[41] != '\n')))
{
Flags = OptoTelegramFlags.InvalidTelegram;
return false;
}
UInt32 uEmfRaw;
bool f1 = UInt32.TryParse(telegram.Substring(0, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out uEmfRaw);
EmfRaw = (uEmfRaw > 0x7FFFFF) ? ((int)uEmfRaw - 0x1000000) : (int)uEmfRaw;
bool f2 = Int16.TryParse(telegram.Substring(7, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out MagneticFieldRaw);
bool f3 = Int16.TryParse(telegram.Substring(12, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out FlowRaw);
bool f4 = UInt32.TryParse(telegram.Substring(17, 6), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out VolumeRaw);
bool f5 = Int16.TryParse(telegram.Substring(24, 4), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out Impedance);
bool f6 = UInt32.TryParse(telegram.Substring(29, 8), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out Timestamp);
bool f7 = byte.TryParse(telegram.Substring(38, 2), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out CheckSum);
byte calculatedCheckSum = 0;
for (int i = 0; i < Length - 4; i++)
{
calculatedCheckSum += (byte)telegram[i];
}
bool allOk = f1 && f2 && f3 && f4 && f5 && f6 && f7 && (calculatedCheckSum == CheckSum);
if (allOk)
{
///
/// Cope with 'VolumeRaw' overflow
///
Int64 uncorrected = (Int64)(((UInt64)volumeRawExtLast & 0xFFFFFFFFFF000000UL) | VolumeRaw);
if (Math.Abs(uncorrected - volumeRawExtLast) <= 0x800000L)
{
VolumeRawExt = volumeRawExtLast = uncorrected;
}
else if (Math.Abs(uncorrected + 0x1000000L - volumeRawExtLast) <= 0x800000L)
{
VolumeRawExt = volumeRawExtLast = uncorrected + 0x1000000L;
}
else if (Math.Abs(uncorrected - 0x1000000L - volumeRawExtLast) <= 0x800000L)
{
VolumeRawExt = volumeRawExtLast = uncorrected - 0x1000000L;
}
else
{
VolumeRawExt = volumeRawExtLast = uncorrected;
}
///
/// Cope with 'Timestamp' overflow
///
uncorrected = (Int64)(((UInt64)timestampExtLast & 0xFFFFFFFF00000000UL) | Timestamp);
if (Math.Abs(uncorrected - timestampExtLast) <= 0x80000000L)
{
TimestampExt = timestampExtLast = uncorrected;
}
else if (Math.Abs(uncorrected + 0x100000000L - timestampExtLast) <= 0x80000000L)
{
TimestampExt = timestampExtLast = uncorrected + 0x100000000L;
}
else if (Math.Abs(uncorrected - 0x100000000L - timestampExtLast) <= 0x80000000L)
{
TimestampExt = timestampExtLast = uncorrected - 0x100000000L;
}
else
{
TimestampExt = timestampExtLast = uncorrected;
}
}
Flags = allOk ? OptoTelegramFlags.OK : OptoTelegramFlags.InvalidTelegram;
return allOk;
}
/// <summary>
/// Alternative to UpdateFromString(...) when data are flushed
/// </summary>
public bool UpdateFromStringDummy(string telegram)
{
DateTime = DateTime.Now;
RefFlow = 0;
if ((telegram == null) || (telegram.Length < Length) ||
(telegram[6] != '\t') || (telegram[11] != '\t') || (telegram[16] != '\t') ||
(telegram[23] != '\t') || (telegram[28] != '\t') || (telegram[37] != '\t') ||
(telegram[40] != '\r') || (telegram[41] != '\n'))
{
Flags = OptoTelegramFlags.InvalidTelegram;
return false;
}
bool f7 = byte.TryParse(telegram.Substring(38, 2), NumberStyles.HexNumber, CultureInfo.CurrentCulture, out CheckSum);
byte calculatedCheckSum = 0;
for (int i = 0; i < Length - 4; i++)
{
calculatedCheckSum += (byte)telegram[i];
}
bool allOk = f7 && (calculatedCheckSum == CheckSum);
Flags = allOk ? OptoTelegramFlags.OK : OptoTelegramFlags.InvalidTelegram;
return allOk;
}
public void SetFlags(OptoTelegramFlags flags)
{
this.Flags = flags;
}
public string ToString(double scalingFactor, OptoTelegramRaw previous)
{
if (Flags == OptoTelegramFlags.SyncError)
{
return "Sychronization error";
}
else if (Flags == OptoTelegramFlags.InvalidTelegram)
{
return "Invalid telegram";
}
else /// if (flags == OptoTelegramFlags.OK / OptoTelegramFlags.OK_TestStart / OptoTelegramFlags.OK_TestEnd)
{
return string.Format("{0}:{1}:{2}.{3}\t{4} :\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}\t{13}\t{14}\t{15}\t{16}\t{17}\t{18}\t{19}\t{20}\t{21}\t{22}",
DateTime.Hour.ToString("D2"),
DateTime.Minute.ToString("D2"),
DateTime.Second.ToString("D2"),
DateTime.Millisecond.ToString("D4"),
Counter,
(EmfRaw & 0x00FFFFFF).ToString("X6"),
MagneticFieldRaw.ToString("X4"),
FlowRaw.ToString("X4"),
VolumeRaw.ToString("X6"),
Impedance.ToString("X4"),
Timestamp.ToString("X8"),
CheckSum.ToString("X2"),
EMF().ToString("F4", culture),
MagneticField().ToString("F0", culture),
Flow(scalingFactor).ToString("F2", culture),
Volume(scalingFactor).ToString("F4", culture),
FlipTime().ToString("F0", culture),
TimestampDec().ToString("F4", culture),
(RefFlow * 1000).ToString("F2", culture),
VolumeDelta(scalingFactor, previous).ToString("F4", culture),
TimeDelta().ToString("F3", culture),
scalingFactor.ToString("F1", culture),
Label());
}
}
}
}
@@ -2,9 +2,8 @@
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Printing;
using Config.Entities;
namespace Results.Output.Printers
namespace Common.Printers
{
public class PrintersCommon : PrintDocument
{
+36
View File
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Common")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Common")]
[assembly: AssemblyCopyright("Copyright © 2020-2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("4e3e3538-fd80-47d5-9417-2268afa590cf")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,6 +1,6 @@
using System;
namespace TracingDB
namespace Common
{
public class QuitAppException : Exception
{
+72
View File
@@ -0,0 +1,72 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
namespace Common
{
[XmlRoot("dictionary")]
public class SerializableDictionary<TKey, TValue>
: Dictionary<TKey, TValue>, IXmlSerializable
{
public System.Xml.Schema.XmlSchema GetSchema()
{
return null;
}
public void ReadXml(System.Xml.XmlReader reader)
{
XmlSerializer keySerializer = new XmlSerializer(typeof(TKey));
XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue));
bool wasEmpty = reader.IsEmptyElement;
reader.Read();
if (wasEmpty)
return;
while (reader.NodeType != System.Xml.XmlNodeType.EndElement)
{
reader.ReadStartElement("item");
reader.ReadStartElement("key");
TKey key = (TKey)keySerializer.Deserialize(reader);
reader.ReadEndElement();
reader.ReadStartElement("value");
TValue value = (TValue)valueSerializer.Deserialize(reader);
reader.ReadEndElement();
this.Add(key, value);
reader.ReadEndElement();
reader.MoveToContent();
}
reader.ReadEndElement();
}
public void WriteXml(System.Xml.XmlWriter writer)
{
XmlSerializer keySerializer = new XmlSerializer(typeof(TKey));
XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue));
foreach (TKey key in this.Keys)
{
writer.WriteStartElement("item");
writer.WriteStartElement("key");
keySerializer.Serialize(writer, key);
writer.WriteEndElement();
writer.WriteStartElement("value");
TValue value = this[key];
valueSerializer.Serialize(writer, value);
writer.WriteEndElement();
writer.WriteEndElement();
}
}
}
}
+338
View File
@@ -0,0 +1,338 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Common.Iperl;
namespace Common
{
public static class Extensions
{
public static float[] SubArray(this float[] array, int offset, int length)
{
float[] result = new float[length];
Array.Copy(array, offset, result, 0, length);
return result;
}
}
public class StatisticalMetrics
{
const int VectorSize = 7;
const int MinLength = 100;
const float AdcBit = (float)57e-9;
const int NeighbourhoodSize = 30; /// To determine extended outliers
/// <summary>
/// Calculates a 7-dimensional vector with these components:
/// x[0] = X1 = Number of outliers
/// x[1] = X2 = Relative cal-factor shift due to outliers
/// x[2] = X3 = Standard deviation of high-pass filteres ++++ demodulation of EMF (cut-off at Nyquist frequency)
/// x[3] = X4 = Robust standard deviation of high-pass filtered ++++ demodulation
/// x[4] = X5 = Peak-to-peak of low-pass filtered ++++ demodulation of EMF (cut-off TBD)
/// x[5] = X6 = Peak-to-peak of reference flow rate
/// x[6] = X7 = Mean impedance (++-- demodulation)
/// </summary>
/// <param name="optoData"></param>
/// <param name="optoDataCount"></param>
/// <param name="startIx"></param>
/// <param name="endIx"></param>
/// <returns></returns>
public static float[] Calculate(OptoTelegramRaw[] optoData, int optoDataCount, int startIx, int endIx, bool downsample,
out float[] offsetV, out float[] kOhmsR, out float[] kOhmsC, out float[] dutFlow,
out float[] refFlow, out float[] flowRatio, out float[] magField, out float[] emfV,
out PointF[] outliers, out PointF[] extendedOutliers)
{
offsetV = kOhmsR = kOhmsC = dutFlow = refFlow = flowRatio = magField = emfV = null;
outliers = extendedOutliers = null;
if (optoData == null || optoData.Length < optoDataCount ||
startIx < 0 || endIx >= optoDataCount || endIx <= startIx + MinLength + 3) return null;
float[] modulatedData = GetModulatedEmf(optoData, optoDataCount, AdcBit);
FindShiftAndDemodulate(modulatedData, downsample,
new float[] { +1, +1, +1, +1 }, out offsetV,
new float[] { +1, +1, -1, -1 }, out kOhmsR,
new float[] { +1, -1, -1, +1 }, out kOhmsC,
new float[] { +1, -1, +1, -1 }, out dutFlow);
//offsetV = FirFilter(modulatedData, new float[] { 1, 3, 4, 4, 3, 1}, 0.0625F);
magField = GetMagField(optoData, optoDataCount, downsample, new float[] { 1, 1, 1, 1 });
refFlow = GetRefFlow(optoData, optoDataCount, downsample, new float[] { 1, 1, 1, 1 });
flowRatio = new float[Math.Min(dutFlow.Length, refFlow.Length)];
for (int i = 0; i < flowRatio.Length; i++)
{
flowRatio[i] = (refFlow[i] != 0) ? dutFlow[i] / refFlow[i] : 1;
}
float[] x = new float[VectorSize];
/// X1 = Number of outliers
int outliersCount = GetOutliers(flowRatio, out outliers, out extendedOutliers);
/// X2 = Relative cal-factor shift due to outliers
/// X3 = Standard deviation of high-pass filteres ++++ demodulation of EMF (cut-off at Nyquist frequency)
/// X4 = Robust standard deviation of high-pass filtered ++++ demodulation
/// X5 = Peak-to-peak of low-pass filtered ++++ demodulation of EMF (cut-off TBD)
/// X6 = Peak-to-peak of reference flow rate
/// X7 = Mean impedance (++-- demodulation)
double sum = 0;
foreach (var z in kOhmsR) sum += z;
x[6] = Convert.ToSingle(sum / kOhmsR.Length);
return x;
}
static float[] GetModulatedEmf(OptoTelegramRaw[] optoData, int optoDataCount, float factor)
{
if (optoData == null || optoDataCount < 0) return null;
float[] result = new float[optoDataCount];
for (int i = 0; i < optoDataCount; i++)
{
result[i] = optoData[i].EmfRaw * factor;
}
return result;
}
static float[] GetMagField(OptoTelegramRaw[] optoData, int optoDataCount, bool downsample, float[] kernel)
{
if (optoData == null || optoDataCount < 0 || (downsample && (kernel == null || kernel.Length < 4))) return null;
int resultLen = downsample ? (optoDataCount / 4) : optoDataCount;
float[] result = new float[resultLen];
if (downsample)
{
float ksum = 0;
for (int j = 0; j < kernel.Length; j++) ksum += kernel[j];
for (int j = 0; j < kernel.Length; j++) kernel[j] /= ksum;
for (int i = 0; (4 * i) + kernel.Length - 1 < optoDataCount; i++)
{
float sum = 0;
for (int j = 0; j < kernel.Length; j++) sum += Convert.ToSingle(optoData[4 * i + j].MagneticFieldRaw) * kernel[j];
result[i] = sum;
}
}
else
{
for (int i = 0; i < optoDataCount; i++) result[i] = optoData[i].MagneticFieldRaw;
}
return result;
}
static float[] GetRefFlow(OptoTelegramRaw[] optoData, int optoDataCount, bool downsample, float[] kernel)
{
if (optoData == null || optoDataCount < 0 || (downsample && (kernel == null || kernel.Length < 4))) return null;
int resultLen = downsample ? (optoDataCount / 4) : optoDataCount;
float[] result = new float[resultLen];
if (downsample)
{
float ksum = 0;
for (int j = 0; j < kernel.Length; j++) ksum += kernel[j];
for (int j = 0; j < kernel.Length; j++) kernel[j] /= ksum;
for (int i = 0; (4 * i) + kernel.Length - 1 < optoDataCount; i++)
{
float sum = 0;
for (int j = 0; j < kernel.Length; j++) sum += Convert.ToSingle(optoData[4 * i + j].RefFlow) * kernel[j];
result[i] = sum;
}
}
else
{
for (int i = 0; i < optoDataCount; i++) result[i] = optoData[i].RefFlow;
}
return result;
}
public static void FindShiftAndDemodulate(float[] modulatedData, bool downsample,
float[] kernel1, out float[] data1,
float[] kernel2, out float[] data2,
float[] kernel3, out float[] data3,
float[] kernel4, out float[] data4)
{
int shift = GetShift(modulatedData.SubArray(0, MinLength));
data1 = (kernel1 != null) ? Demodulate(modulatedData, kernel1, shift, downsample) : null;
data2 = (kernel2 != null) ? Demodulate(modulatedData, kernel2, shift, downsample) : null;
data3 = (kernel3 != null) ? Demodulate(modulatedData, kernel3, shift, downsample) : null;
data4 = (kernel4 != null) ? Demodulate(modulatedData, kernel4, shift, downsample) : null;
}
/// <summary>
/// Unlike FIR filtering, demodulation shifts the kernel in 4 phases
/// </summary>
/// <param name="data">Input data</param>
/// <param name="kernel">Demodulation kernel</param>
/// <param name="shift">shift 0..3</param>
/// <returns>Output data</returns>
static float[] Demodulate(float[] data, float[] kernel, int shift, bool downsample)
{
if (data == null || data.Length < MinLength || kernel == null || kernel.Length != 4)
{
return null;
}
float ksum = 0;
for (int i = 0; i < 4; i++) ksum += Math.Abs(kernel[i]);
for (int i = 0; i < 4; i++) kernel[i] /= ksum;
int rsltLen = downsample ? (data.Length - 3) / 4 : data.Length - 3;
float[] result = new float[rsltLen];
if (downsample)
{
for (int i = shift; i < 4 * rsltLen; i += 4)
{
float sum = 0;
for (int j = 0; j < 4; j++) sum += data[i + j] * kernel[(i + j + 4 - shift) % 4];
result[i / 4] = sum;
}
}
else
{
for (int i = 0; i < rsltLen; i++)
{
float sum = 0;
for (int j = 0; j < 4; j++) sum += data[i + j] * kernel[(i + j + 4 - shift) % 4];
result[i] = sum;
}
}
return result;
}
/// <summary>
/// Determine modulation phase by maximizing ++-- demodulation result.
/// </summary>
/// <param name="modulatedEmf">Input data</param>
/// <returns>0..3 = modulation phase or, -1 = error</returns>
static int GetShift(float[] modulatedData)
{
float[] kernel = new float[4] { 1, 1, -1, -1 };
int maximizingShift = -1;
float maximum = float.MinValue;
for (int shift = 0; shift <= 3; shift++)
{
var demodulatedCandidate = Demodulate(modulatedData, kernel, shift, false);
float sum = 0;
foreach (var d in demodulatedCandidate) sum += d;
if (sum > maximum)
{
maximum = sum;
maximizingShift = shift;
}
}
return maximizingShift;
}
/// <summary>
/// FIR filtering = convolution with a kernel
/// </summary>
/// <param name="data">Input data</param>
/// <param name="kernel">Convolution kernel</param>
/// <returns>Output data</returns>
static float[] FirFilter(float[] data, float[] kernel, float factor)
{
if (data == null || kernel == null) return null;
int kernelLen = kernel.Length;
int rsltLen = data.Length - kernelLen + 1;
if (rsltLen < 0) return null;
float[] result = new float[rsltLen];
for (int i = 0; i < rsltLen; i++)
{
float sum = 0;
for (int j = 0; j < kernelLen; j++) sum += data[i + j] * kernel[j];
result[i] = sum * factor;
}
return result;
}
static int GetOutliers(float[] flowRatio, out PointF[] outliers, out PointF[] extendedOutliers)
{
float mean = Enumerable.Average(flowRatio);
var fr = new float[flowRatio.Length];
for (int i = 0; i < fr.Length; i++) fr[i] = flowRatio[i] - mean;
Array.Sort(fr);
float qLo = fr[fr.Length / 4];
float qHi = fr[3 * fr.Length / 4];
int N = fr.Length / 2;
float sumY = 0;
float sumYY = 0;
for (int i = fr.Length / 4; i < 3 * fr.Length / 4; i++)
{
sumY += fr[i];
sumYY += fr[i] * fr[i];
}
float std = (float)Math.Sqrt(sumYY / N - (sumY / N) * (sumY / N));
float robustStd = std * 5.1812824F;
float threshold = 7 * robustStd;
/// Restore fr as it was before sorting
for (int i = 0; i < fr.Length; i++) fr[i] = flowRatio[i] - mean;
IList<PointF> listOfOutliers = new List<PointF>();
bool[] boolExtendedOutliers = new bool[fr.Length];
int outliersCount = 0;
for (int i = 0; i < fr.Length; i++)
{
if (fr[i] < -threshold || fr[i] > threshold)
{
/// This is an outlier
listOfOutliers.Add(new PointF(Convert.ToSingle(i), fr[i] + mean));
outliersCount++;
for (int j = Math.Max(0, i - NeighbourhoodSize); j <= Math.Min(i + NeighbourhoodSize, fr.Length - 1); j++)
{
boolExtendedOutliers[j] = true;
}
}
}
IList<PointF> listOfExtendedOutliers = new List<PointF>();
for (int i = 0; i < fr.Length; i++)
{
if (boolExtendedOutliers[i])
{
listOfExtendedOutliers.Add(new PointF(Convert.ToSingle(i), fr[i] + mean));
}
}
outliers = listOfOutliers.ToArray<PointF>();
extendedOutliers = listOfExtendedOutliers.ToArray<PointF>();
return outliersCount;
}
}
}
+272
View File
@@ -0,0 +1,272 @@
///
/// Copyright (c) 2013-2021 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace Common
{
public static class Telegram
{
const UInt16 crcSeed = 0xFFFF; // Initial crc value
const UInt16 crcGP = 0xA001; // Generating polynomial
/// <summary>
/// For standard CRC16 (remainder of division)
/// to start a new crc, set CRC16 = SEED
/// then for each byte call UpdateCRC(byte, &CRC16);
/// CRC16 will contain the result
/// (if you calculate all of the incoming data
/// INCLUDING the crc, the result should be 0x0000
/// and if you are sending the crc be sure to
/// send the bytes in the correct order)
/// <summary>
static void UpdateCRC(byte b, ref UInt16 crc)
{
crc ^= (UInt16)b;
for (int i = 0; i < 8; i++)
{
bool carry = (crc & 0x0001) != 0;
crc >>= 1;
if (carry) crc ^= crcGP;
}
}
/// <summary>
/// Calculates the CRC from a data telegram (an array of bytes).
/// A complete telegram including two bytes reserved for the CRC
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
/// <returns>Calculated CRC</returns>
public static UInt16 CalculateTelegramCRC(byte[] data, int enforcedLen = 0)
{
int len = (enforcedLen != 0) ? Math.Min(enforcedLen, data.Length) : data.Length;
UInt16 crc = crcSeed;
for (int i = 0; i < len - 2; i++) UpdateCRC(data[i], ref crc);
return crc;
}
/// <summary>
/// Calculates the CRC from a data telegram (an array of bytes).
/// A complete telegram including two bytes reserved for the CRC
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
/// <returns>Calculated CRC</returns>
public static UInt16 CalculateTelegramCRC(int offset, byte[] data, int enforcedLen = 0)
{
int len = (enforcedLen != 0) ? Math.Min(enforcedLen, data.Length - offset) : data.Length - offset;
UInt16 crc = crcSeed;
for (int i = 0; i < len - 2; i++) UpdateCRC(data[offset + i], ref crc);
return crc;
}
/// <summary>
/// This function modifies the last 2 bytes in the message buffer
/// by the CRC calculated from the remaining first (Lenght - 2) bytes.
/// A complete telegram including two bytes reserved for the CRC
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
public static void UpdateTelegramCRC(byte[] data)
{
int len = data.Length;
if (len < 2) return;
UInt16 crc = CalculateTelegramCRC(data);
data[len - 2] = (byte)(crc & 0xFF);
data[len - 1] = (byte)(crc >> 8);
}
/// <summary>
/// This function compares the last 2 bytes in the message buffer
/// with the CRC calculated from the remaining first (Lenght - 2) bytes.
/// A complete telegram including two bytes reserved for the CRC
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
/// <returns>true if the CRC in the telegram is correct</returns>
public static bool VerifyTelegramCRC(byte[] data, int enforcedLen = 0)
{
if (data == null || data.Length == 0 || enforcedLen > data.Length) return false;
int len = (enforcedLen != 0) ? enforcedLen : data.Length;
if (len < 2) return false;
UInt16 crc = CalculateTelegramCRC(data, len);
return (data[len - 2] == (byte)(crc & 0xFF)) && (data[len - 1] == (byte)(crc >> 8));
}
/// <summary>
/// This function compares the last 2 bytes in the message buffer
/// with the CRC calculated from the remaining first (Lenght - 2) bytes.
/// A complete telegram including two bytes reserved for the CRC
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
/// <returns>true if the CRC in the telegram is correct</returns>
public static bool VerifyTelegramCRC(int offset, byte[] data, int enforcedLen = 0)
{
if (data == null || data.Length == 0 || enforcedLen > data.Length - offset) return false;
int len = (enforcedLen != 0) ? enforcedLen : data.Length - offset;
if (len < 2) return false;
UInt16 crc = CalculateTelegramCRC(offset, data, len);
return (data[offset + len - 2] == (byte)(crc & 0xFF)) && (data[offset + len - 1] == (byte)(crc >> 8));
}
/// <summary>
/// Calculates the checksum from a data telegram (an array of bytes).
/// A complete telegram including one byte reserved for the checksum
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
/// <returns>Calculated checksum</returns>
public static byte CalculateTelegramChecksum(byte[] data)
{
byte checksum = 0;
for (int i = 0; i < data.Length - 1; i++) checksum = (byte)(checksum ^ data[i]);
return checksum;
}
/// <summary>
/// Calculates the checksum from a data telegram (an array of bytes).
/// A complete telegram including one bytes reserved for the checksum
/// must be supplied as an argument.
/// </summary>
/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
/// <param name="data">Data telegram</param>
/// <returns>Calculated checksum</returns>
public static byte CalculateTelegramChecksum(int hartPreambLen, byte[] data)
{
byte checksum = 0;
for (int i = hartPreambLen; i < data.Length - 1; i++) checksum = (byte)(checksum ^ data[i]);
return checksum;
}
/// <summary>
/// This function modifies the last byte in the message buffer
/// by the checksum calculated from the remaining first (Lenght - 1) bytes.
/// A complete telegram including one bytes reserved for the checksum
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
public static void UpdateTelegramChecksum(byte[] data)
{
int len = data.Length;
if (len < 1) return;
data[len - 1] = CalculateTelegramChecksum(data);
}
/// <summary>
/// This function modifies the last byte in the message buffer
/// by the checksum calculated from the preceeding (Lenght - hartPreambLen - 1) bytes.
/// First hartPreambLen bytes in the telegram are skipped.
/// A complete telegram including preamble and one bytes reserved for the checksum
/// after data bytes must be supplied as an argument.
/// </summary>
/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
/// <param name="data">Data telegram</param>
public static void UpdateTelegramChecksum(int hartPreambLen, byte[] data)
{
if (data.Length - hartPreambLen < 1) return;
data[data.Length - 1] = CalculateTelegramChecksum(hartPreambLen, data);
}
/// <summary>
/// This function compares the last byte in the message buffer
/// with the checksum calculated from the remaining first (Lenght - 1) bytes.
/// A complete telegram including two bytes reserved for the checksum
/// must be supplied as an argument.
/// </summary>
/// <param name="data">Data telegram</param>
/// <returns>true if the checksum in the telegram is correct</returns>
public static bool VerifyTelegramChecksum(byte[] data)
{
int len = data.Length;
if (len < 1) return false;
return (data[len - 1] == CalculateTelegramChecksum(data));
}
/// <summary>
/// This function compares the last byte in the message buffer
/// with the checksum calculated from the remaining first (Lenght - 1) bytes.
/// A complete telegram including two bytes reserved for the checksum
/// must be supplied as an argument.
/// </summary>
/// <param name="hartPreambLen">Length of HART telegram preamble (FF bytes)</param>
/// <param name="data">Data telegram</param>
/// <returns>true if the checksum in the telegram is correct</returns>
public static bool VerifyTelegramChecksum(int hartPreambLen, byte[] data)
{
if (data.Length - hartPreambLen < 1) return false;
return (data[data.Length - 1] == CalculateTelegramChecksum(hartPreambLen, data));
}
public static string LogTelegram(string intro, byte[] data, int from = 0, int len = -1)
{
System.Text.StringBuilder sb = new System.Text.StringBuilder(256);
int length = (len >= 0) ? len : (data.Length - from);
sb.Append(intro);
sb.Append(length.ToString());
sb.Append(" bytes:");
for (int i = from; i < from + length; i++)
{
byte b = data[i];
sb.Append(" ");
sb.Append(((int)b).ToString("X2"));
}
return sb.ToString();
}
public static string LogTelegram(string intro, IList<byte> data, int from = 0, int len = -1)
{
System.Text.StringBuilder sb = new System.Text.StringBuilder(256);
int length = (len >= 0) ? len : (data.Count - from);
sb.Append(intro);
sb.Append(length.ToString());
sb.Append(" bytes:");
for (int i = from; i < from + length; i++)
{
byte b = data[i];
sb.Append(" ");
sb.Append(((int)b).ToString("X2"));
}
return sb.ToString();
}
public static string LogTelegram(string intro, string data)
{
System.Text.StringBuilder sb = new System.Text.StringBuilder(80);
sb.Append(intro);
sb.Append(data.Length.ToString());
sb.Append(" bytes:");
foreach (var d in data)
{
sb.Append(" ");
sb.Append(((int)d).ToString("X2"));
}
return sb.ToString();
}
}
}
+54
View File
@@ -0,0 +1,54 @@
namespace Common.UIControls
{
partial class CoolButtonCtrl
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// CoolButton
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Transparent;
this.DoubleBuffered = true;
this.Name = "CoolButton";
this.Size = new System.Drawing.Size(72, 29);
this.Load += new System.EventHandler(this.CoolButtonLoad);
this.SizeChanged += new System.EventHandler(this.CoolButtonSizeChanged);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.CoolButtonPaint);
this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.CoolButtonMouseDown);
this.MouseEnter += new System.EventHandler(this.CoolButtonMouseEnter);
this.MouseLeave += new System.EventHandler(this.CoolButtonMouseLeave);
this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.CoolButtonMouseUp);
this.ResumeLayout(false);
}
#endregion
}
}
+231
View File
@@ -0,0 +1,231 @@
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Windows.Forms;
namespace Common.UIControls
{
public partial class CoolButtonCtrl : UserControl
{
private Color _buttonColor;
private Color _textColor;
private Color _focusColor;
private Color _borderColor;
private Color _highlightBorderColor;
private Color _highlightButtonColor;
private Font _buttonFont;
private string _buttonText;
private bool _mouseOver;
private bool _mouseDown;
public delegate void ButtonClickedArgs(object sender);
public event ButtonClickedArgs ButtonClicked;
public Color FocusColor
{
get { return _focusColor; }
set
{
_focusColor = value;
Refresh();
}
}
public Color TextColor
{
get { return _textColor; }
set
{
_textColor = value;
Refresh();
}
}
public Color HighlightBorderColor
{
get { return _highlightBorderColor; }
set
{
_highlightBorderColor = value;
Refresh();
}
}
public Color HighlightButtonColor
{
get { return _highlightButtonColor; }
set
{
_highlightButtonColor = value;
Refresh();
}
}
public string ButtonText
{
get { return _buttonText; }
set
{
_buttonText = value;
Refresh();
}
}
public Font ButtonFont
{
get { return _buttonFont; }
set
{
_buttonFont = value;
Refresh();
}
}
public Color BorderColor
{
get { return _borderColor; }
set
{
_borderColor = value;
Refresh();
}
}
public Color ButtonColor
{
get { return _buttonColor; }
set
{
_buttonColor = value;
Refresh();
}
}
public CoolButtonCtrl()
{
InitializeComponent();
_buttonColor = Color.FromArgb(243, 243, 243);
_borderColor = Color.FromArgb(220, 220, 220);
_highlightBorderColor = Color.FromArgb(198, 198, 198);
_highlightButtonColor = Color.FromArgb(246, 246, 246);
_focusColor = Color.FromArgb(77, 144, 254);
_buttonFont = new Font("Arial", 8, FontStyle.Bold);
_buttonText = "button";
_textColor = Color.Black;
_mouseOver = false;
_mouseDown = false;
LostFocus += CoolButtonFocus;
GotFocus += CoolButtonFocus;
}
void CoolButtonFocus(object sender, EventArgs e)
{
Refresh();
}
private void CoolButtonLoad(object sender, EventArgs e)
{
}
private void CoolButtonPaint(object sender, PaintEventArgs e)
{
var bmp = new Bitmap(ClientSize.Width, ClientSize.Height);
Graphics g = Graphics.FromImage(bmp);
if (!_mouseOver)
{
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
GraphicsPath path = RoundedRectangle.Create(0, 0, ClientSize.Width - 4, ClientSize.Height - 4);
SizeF fontSize = g.MeasureString(_buttonText, _buttonFont);
int horWidth = ((ClientSize.Width - 4 - (int)fontSize.Width) / 2);
int verHeight = ((ClientSize.Height - 4 - (int)fontSize.Height) / 2);
g.FillPath(new SolidBrush(_buttonColor), path);
g.DrawPath(Focused ? new Pen(_focusColor) : new Pen(_borderColor), path);
g.DrawString(_buttonText, _buttonFont, new SolidBrush(_textColor), horWidth, verHeight);
}
else
{
g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
GraphicsPath path = RoundedRectangle.Create(0, 0, ClientSize.Width - 4, ClientSize.Height - 4);
SizeF fontSize = g.MeasureString(_buttonText, _buttonFont);
int horWidth = ((ClientSize.Width - 4 - (int)fontSize.Width) / 2);
int verHeight = ((ClientSize.Height - 4 - (int)fontSize.Height) / 2);
g.FillPath(new SolidBrush(_highlightButtonColor), path);
g.DrawPath(ContainsFocus ? new Pen(_focusColor) : new Pen(_borderColor), path);
g.DrawString(_buttonText, _buttonFont, new SolidBrush(_textColor), horWidth, verHeight);
Color a1 = Color.FromArgb(255, 198, 198, 198);
Color a2 = Color.FromArgb(128, 198, 198, 198);
Color a3 = Color.FromArgb(64, 198, 198, 198);
var shadowBmp = new Bitmap(1, 3);
var shadowBmp2 = new Bitmap(3, 1);
shadowBmp.SetPixel(0, 0, a1);
shadowBmp.SetPixel(0, 1, a2);
shadowBmp.SetPixel(0, 2, a3);
shadowBmp2.SetPixel(0, 0, a1);
shadowBmp2.SetPixel(1, 0, a2);
shadowBmp2.SetPixel(2, 0, a3);
for (int z = 4; z < ClientSize.Width - 4; z++)
{
g.DrawImage(shadowBmp, z, ClientSize.Height - 4, 1, 3);
}
for (int z = 4; z < ClientSize.Height - 4; z++)
{
g.DrawImage(shadowBmp2, ClientSize.Width - 4, z, 3, 1);
}
g.DrawPath(Focused ? new Pen(_focusColor) : new Pen(_borderColor), path);
}
e.Graphics.DrawImage(bmp, 0, 0, ClientSize.Width, ClientSize.Height);
//bmp.Dispose();
}
private void CoolButtonMouseEnter(object sender, EventArgs e)
{
_mouseOver = true;
Refresh();
}
private void CoolButtonMouseLeave(object sender, EventArgs e)
{
_mouseOver = false;
_mouseDown = false;
Refresh();
}
private void CoolButtonSizeChanged(object sender, EventArgs e)
{
Refresh();
}
private void CoolButtonMouseDown(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left)
_mouseDown = true;
}
private void CoolButtonMouseUp(object sender, MouseEventArgs e)
{
if (e.Button != MouseButtons.Left)
return;
if (_mouseDown)
{
if (ButtonClicked != null)
{
ButtonClicked(this);
}
}
_mouseDown = false;
}
}
}
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
+107
View File
@@ -0,0 +1,107 @@
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
namespace Common.UIControls
{
public abstract class RoundedRectangle
{
[Flags]
public enum RectangleCorners
{
None = 0, TopLeft = 1, TopRight = 2, BottomLeft = 4, BottomRight = 8,
All = TopLeft | TopRight | BottomLeft | BottomRight
}
public static GraphicsPath Create(int x, int y, int width, int height,
int radius, RectangleCorners corners)
{
int xw = x + width;
int yh = y + height;
int xwr = xw - radius;
int yhr = yh - radius;
int xr = x + radius;
int yr = y + radius;
int r2 = radius * 2;
int xwr2 = xw - r2;
int yhr2 = yh - r2;
var p = new GraphicsPath();
p.StartFigure();
//Top Left Corner
if ((RectangleCorners.TopLeft & corners) == RectangleCorners.TopLeft)
{
p.AddArc(x, y, r2, r2, 180, 90);
}
else
{
p.AddLine(x, yr, x, y);
p.AddLine(x, y, xr, y);
}
//Top Edge
p.AddLine(xr, y, xwr, y);
//Top Right Corner
if ((RectangleCorners.TopRight & corners) == RectangleCorners.TopRight)
{
p.AddArc(xwr2, y, r2, r2, 270, 90);
}
else
{
p.AddLine(xwr, y, xw, y);
p.AddLine(xw, y, xw, yr);
}
//Right Edge
p.AddLine(xw, yr, xw, yhr);
//Bottom Right Corner
if ((RectangleCorners.BottomRight & corners) == RectangleCorners.BottomRight)
{
p.AddArc(xwr2, yhr2, r2, r2, 0, 90);
}
else
{
p.AddLine(xw, yhr, xw, yh);
p.AddLine(xw, yh, xwr, yh);
}
//Bottom Edge
p.AddLine(xwr, yh, xr, yh);
//Bottom Left Corner
if ((RectangleCorners.BottomLeft & corners) == RectangleCorners.BottomLeft)
{
p.AddArc(x, yhr2, r2, r2, 90, 90);
}
else
{
p.AddLine(xr, yh, x, yh);
p.AddLine(x, yh, x, yhr);
}
//Left Edge
p.AddLine(x, yhr, x, yr);
p.CloseFigure();
return p;
}
public static GraphicsPath Create(Rectangle rect, int radius, RectangleCorners c)
{ return Create(rect.X, rect.Y, rect.Width, rect.Height, radius, c); }
public static GraphicsPath Create(int x, int y, int width, int height, int radius)
{ return Create(x, y, width, height, radius, RectangleCorners.All); }
public static GraphicsPath Create(Rectangle rect, int radius)
{ return Create(rect.X, rect.Y, rect.Width, rect.Height, radius); }
public static GraphicsPath Create(int x, int y, int width, int height)
{ return Create(x, y, width, height, 5); }
public static GraphicsPath Create(Rectangle rect)
{ return Create(rect.X, rect.Y, rect.Width, rect.Height); }
}
}
+564
View File
@@ -0,0 +1,564 @@
///
/// Copyright (c) 2016-2021 Sensus Slovensko a.s.
///
using System;
namespace Common
{
public enum Unit
{
[Description("---")] None,
[Description("imp.")] pulse,
#if LANG_PL
[Description("stopień")] degree,
#else
[Description("degree")] degree,
#endif
[Description("ml")] ml, /// 1 ml = 0.001 l
[Description("l")] l, /// * 1 liter
[Description("dm3")] dm3, /// 1 dm3 = 1 l
[Description("US gal")] USgal, /// 1 US gallon = 3.78541178 l
[Description("imper.gal")] UKgal, /// 1 imperial gallon = 4.54609 l
[Description("cf")] cf, /// 1 cubic foot = 28.316846592 l
[Description("m3")] m3, /// 1 m3 = 1000 l
[Description("l/h")] lph, /// 1 l/h = 0.001 m3/h
[Description("cf/h")] cfph, /// 1 cf/h = 0.028316846592 m3/h
[Description("l/m")] lpm, /// 1 l/m = 60 l/h = 0.06 m3/h
[Description("US gal/m")] USgalpm, /// 1 US gallon per minute = 0.2271247068 m3/h
[Description("m3/h")] m3ph, /// * 1 m3/h
[Description("l/s")] lps, /// 1 liter/s = 3.6 m3/h
[Description("US gal/s")] USgalps, /// 1 US gallon per second = 13.627482408 m3/h
[Description("m3/m")] m3pm, /// 1 m3/m = 60 m3/h
[Description("cf/s")] cfs, /// 1 cubic foot per second = 101.9406477312 m3/h
[Description("g")] g, /// 0.001 kg
[Description("oz")] oz, /// 0.0283495231 kg
[Description("lb")] lb, /// 0.45359237 kg
[Description("kg")] kg, /// * 1 kilogram
[Description("t")] t, /// 1000 kg
[Description("ms")] ms, /// 1 ms = 0.001 s
[Description("s")] s, /// * 1 second
[Description("min")] min, /// 1 min = 60 s
[Description("hr")] hour, /// 1 hour = 60 min = 3600 s
[Description("°C")] C, /// * degree Celsius (°C)
[Description("°F")] F, /// degree Fahrenheit
[Description("K")] K, /// degree Kelvin
[Description("Pa")] Pa, /// 1 Pa = 0.01 hPa
[Description("hPa")] hPa, /// 1 hPa = 100 Pa
[Description("mbar")] mbar, /// 1 mbar = 1 hPa = 100 Pa
[Description("kPa")] kPa, /// 1 kPa = 10 hPa = 1000 Pa
[Description("inHg")] inHg, /// 1 inHg = 33.864 hPa
[Description("psi")] psi, /// 1 psi = 0.0689475729 bar
[Description("bar")] bar, /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
[Description("MPa")] MPa, /// 1 MPa = 10000 hPa
[Description("R%")] RPct, /// * 1 R%
[Description("promile")] Promile, /// 1 promile = 0.1 %
[Description("%")] Pct, /// * 1 %
[Description("mm")] mm, /// * 1 millimeter
[Description("cm")] cm, /// 1 cm = 10 mm
[Description("in")] inch, /// 1 inch = 25.4 mm
[Description("dm")] dm, /// 1 dm = 100 mm
[Description("ft")] foot, /// 1 foot = 304.8 mm
[Description("yd")] yard, /// 1 yard = 914.4 mm
[Description("m")] m, /// 1 m = 1000 mm
[Description("kg/m3")] kgpm3, /// * 1 kg/m3 = 0.001 kg/l
[Description("kg/l")] kgpl, /// 1 kg/l = 1000 kg/m3
[Description("J")] J, /// * 1 Joul
[Description("kJ")] kJ, /// 1 kJ = 1000 J
[Description("MJ")] MJ, /// 1 MJ = 1000000 J
[Description("Wh")] Wh, /// 1 Wh = 3600 J
[Description("kWh")] kWh, /// 1 kWh = 3600000 J
[Description("MWh")] MWh, /// 1 MWh = 3600000000 J
[Description("uS/cm")] uSpcm, /// * 1 uS/cm
[Description("mS/m")] mSpm, /// 1 mS/m = 10 uS/cm
#if LANG_PL
[Description("imp/l")] ppl, /// * 1 pulse/l
[Description("imp/dm3")] ppdm3, /// * 1 pulse/dm3
[Description("stopień/l")] degpl, /// * 1 degree/l
[Description("stopień/dm3")] degpdm3, /// * 1 degree/dm3
[Description("l/imp")] lpp, /// * 1 l/pulse
[Description("dm3/imp")] dm3pp, /// * 1 dm3/pulse
[Description("l/stopień")] lpdeg, /// * 1 l/degree
[Description("dm3/stopień")] dm3pdeg, /// * 1 dm3/degree
#else
[Description("pulse/l")] ppl, /// * 1 pulse/l
[Description("pulse/dm3")] ppdm3, /// 1 pulse/dm3
[Description("degree/l")] degpl, /// 1 degree/l
[Description("degree/dm3")] degpdm3, /// 1 degree/dm3
[Description("l/pulse")] lpp, /// 1 l/pulse
[Description("dm3/pulse")] dm3pp, /// 1 dm3/pulse
[Description("l/degree")] lpdeg, /// 1 l/degree
[Description("dm3/degree")] dm3pdeg, /// 1 dm3/degree
#endif
///
[Description("pulse/kWh")] ppkWh, /// * 1 pulse/kWh
[Description("kWh/pulse")] kWhpp, /// 1 kWh/pulse
Count
}
public enum Quantity
{
/// Quantities with units and conversions (double -> double)
#if LANG_DE
[Description("Volumen")] Volume,
[Description("Durchfluss")] Flow,
[Description("Masse")] Mass,
[Description("Zeit")] Time,
[Description("Temperatur")] Temperature,
[Description("Druck")] Pressure,
[Description("Feuchtigkeit")] Humidity,
[Description("Fehler")] Error,
[Description("Länge")] Length,
[Description("Dichte")] Density,
[Description("Energie")] Energy,
[Description("Impulse")] Pulses,
[Description("Impulse/l")] PulsePerLtr,
[Description("Impulse/kWh")] PulsePerKWh,
[Description("Leitfähigkeit")] Conductivity,
/// Quantities without units and conversions
[Description("Nummer")] Number,
[Description("Text")] String,
[Description("Boolean")] Boolean,
[Description("Datum und Uhrzeit")] DateTime,
[Description("Aufgezählt")] Enumerated,
#elif LANG_PL
[Description("Objętość")] Volume,
[Description("Przepływ")] Flow,
[Description("Masa")] Mass,
[Description("Czas")] Time,
[Description("Temperatura")] Temperature,
[Description("Ciśnienie")] Pressure,
[Description("Wilgotność")] Humidity,
[Description("Błąd")] Error,
[Description("Długość")] Length,
[Description("Gęstość")] Density,
[Description("Energia")] Energy,
[Description("Impulsy")] Pulses,
[Description("Impulsy/litr")] PulsePerLtr,
[Description("Impulsy/kWh")] PulsePerKWh,
[Description("Przewodność")] Conductivity,
/// Quantities without units and conversions
[Description("Numer")] Number,
[Description("Tekst")] String,
[Description("Boolean")] Boolean,
[Description("Data i czas")] DateTime,
[Description("Wyliczone")] Enumerated,
#elif LANG_CS
[Description("Objem")] Volume,
[Description("Průtok")] Flow,
[Description("Hmotnost")] Mass,
[Description("Čas")] Time,
[Description("Teplota")] Temperature,
[Description("Tlak")] Pressure,
[Description("Vlhkost")] Humidity,
[Description("Chyba")] Error,
[Description("Délka")] Length,
[Description("Hustota")] Density,
[Description("Energie")] Energy,
[Description("Pulzy")] Pulses,
[Description("Pulzy/litr")] PulsePerLtr,
[Description("Pulzy/kWh")] PulsePerKWh,
[Description("Vodivost")] Conductivity,
/// Quantities without units and conversions
[Description("Počet")] Number,
[Description("Text")] String,
[Description("Boolean")] Boolean,
[Description("Datum a čas")] DateTime,
[Description("Vyjmenované")] Enumerated,
#elif LANG_IT
[Description("Volume")] Volume,
[Description("Flusso")] Flow,
[Description("Massa")] Mass,
[Description("Tempo")] Time,
[Description("Temperatura")] Temperature,
[Description("Pressione")] Pressure,
[Description("Umidità")] Humidity,
[Description("Errore")] Error,
[Description("Lungezza")] Length,
[Description("Densità")] Density,
[Description("Energia")] Energy,
[Description("Impulso")] Pulses,
[Description("Impulso/litro")] PulsePerLtr,
[Description("Impulso/kWh")] PulsePerKWh,
[Description("Conduttività")] Conductivity,
/// Quantities without units and conversions
[Description("Numero")] Number,
[Description("Stringa")] String,
[Description("Boolean")] Boolean,
[Description("Data e ora")] DateTime,
[Description("Enumerato")] Enumerated,
#else
[Description("Volume")] Volume,
[Description("Flow")] Flow,
[Description("Mass")] Mass,
[Description("Time")] Time,
[Description("Temperature")] Temperature,
[Description("Pressure")] Pressure,
[Description("Humidity")] Humidity,
[Description("Error")] Error,
[Description("Length")] Length,
[Description("Density")] Density,
[Description("Energy")] Energy,
[Description("Pulses")] Pulses,
[Description("Pulses/liter")] PulsePerLtr,
[Description("Pulses/kWh")] PulsePerKWh,
[Description("Conductivity")] Conductivity,
/// Quantities without units and conversions
[Description("Number")] Number,
[Description("String")] String,
[Description("Boolean")] Boolean,
[Description("Date and time")] DateTime,
[Description("Enumerated")] Enumerated,
#endif
Count,
}
public static class Units
{
public static bool IsUnitless(Quantity quantity)
{
return quantity >= Quantity.Number;
}
public static bool IsDefaultUnit(Unit unit)
{
return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
}
public static bool IsQuantity(Unit unit, Quantity quantity)
{
return (quantity == GetQuantity(unit));
}
public static Quantity GetQuantity(Unit unit)
{
switch (unit)
{
case Unit.pulse:
case Unit.degree:
return Quantity.Pulses;
case Unit.ml:
case Unit.l:
case Unit.dm3:
case Unit.USgal:
case Unit.UKgal:
case Unit.cf:
case Unit.m3:
return Quantity.Volume;
case Unit.lph:
case Unit.cfph:
case Unit.lpm:
case Unit.USgalpm:
case Unit.m3ph:
case Unit.lps:
case Unit.USgalps:
case Unit.m3pm:
case Unit.cfs:
return Quantity.Flow;
case Unit.g:
case Unit.oz:
case Unit.lb:
case Unit.kg:
case Unit.t:
return Quantity.Mass;
case Unit.ms:
case Unit.s:
case Unit.min:
case Unit.hour:
return Quantity.Time;
case Unit.C:
case Unit.F:
case Unit.K:
return Quantity.Temperature;
case Unit.Pa:
case Unit.hPa:
case Unit.mbar:
case Unit.kPa:
case Unit.inHg:
case Unit.psi:
case Unit.bar:
case Unit.MPa:
return Quantity.Pressure;
case Unit.RPct:
return Quantity.Humidity;
case Unit.Promile:
case Unit.Pct:
return Quantity.Error;
case Unit.mm:
case Unit.cm:
case Unit.inch:
case Unit.dm:
case Unit.foot:
case Unit.yard:
case Unit.m:
return Quantity.Length;
case Unit.kgpm3:
case Unit.kgpl:
return Quantity.Density;
case Unit.J:
case Unit.kJ:
case Unit.MJ:
case Unit.Wh:
case Unit.kWh:
case Unit.MWh:
return Quantity.Energy;
case Unit.uSpcm:
case Unit.mSpm:
return Quantity.Conductivity;
case Unit.ppl:
case Unit.ppdm3:
case Unit.degpl:
case Unit.degpdm3:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg:
return Quantity.PulsePerLtr;
case Unit.ppkWh:
case Unit.kWhpp:
return Quantity.PulsePerKWh;
default:
return Quantity.Number;
}
}
public static bool IsVolume(Unit unit) { return IsQuantity(unit, Quantity.Volume); }
public static bool IsFlow(Unit unit) { return IsQuantity(unit, Quantity.Flow); }
public static bool IsMass(Unit unit) { return IsQuantity(unit, Quantity.Mass); }
public static bool IsTime(Unit unit) { return IsQuantity(unit, Quantity.Time); }
public static bool IsTemperature(Unit unit) { return IsQuantity(unit, Quantity.Temperature); }
public static bool IsPressure(Unit unit) { return IsQuantity(unit, Quantity.Pressure); }
public static bool IsHumidity(Unit unit) { return IsQuantity(unit, Quantity.Humidity); }
public static bool IsError(Unit unit) { return IsQuantity(unit, Quantity.Error); }
public static bool IsLength(Unit unit) { return IsQuantity(unit, Quantity.Length); }
public static bool IsDensity(Unit unit) { return IsQuantity(unit, Quantity.Density); }
public static bool IsEnergy(Unit unit) { return IsQuantity(unit, Quantity.Energy); }
public static bool IsPulses(Unit unit) { return IsQuantity(unit, Quantity.Pulses); }
public static bool IsPulsePerLtr(Unit unit) { return IsQuantity(unit, Quantity.PulsePerLtr); }
public static bool IsPulsePerKWh(Unit unit) { return IsQuantity(unit, Quantity.PulsePerKWh); }
public static bool IsConductivity(Unit unit) { return IsQuantity(unit, Quantity.Conductivity); }
public static float ConvertTo(Unit unit, float v)
{
return (float)ConvertTo(unit, (double)v);
}
public static double ConvertTo(Unit unit, double v)
{
switch (unit)
{
/// Volume: internal representation in l
case Unit.ml: return 1000 * v; /// 1 ml = 0.001 l
case Unit.USgal: return 0.26417205 * v; /// 1 gal(US) = 3.78541178 l
case Unit.UKgal: return 0.21996925 * v; /// 1 gal(UK) = 4.54609 l
case Unit.cf: return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
case Unit.m3: return 0.001 * v; /// 1 m3 = 1000 l
/// Flow: internal representation in m3/h
case Unit.lph: return 1000 * v; /// 1 l/h
case Unit.cfph: return 35.3146667214886 * v;/// 1 cf/h
case Unit.lpm: return v / 0.06; /// 1 l/m
case Unit.USgalpm: return 4.40286754395493 * v;/// 1 US gallon per minute
case Unit.lps: return v / 3.6; /// 1 l/s
case Unit.USgalps: return 0.0733811257326 * v; /// 1 US gallon per second
case Unit.m3pm: return v / 60; /// 1 m3/m
case Unit.cfs: return 0.009809629644858 * v; /// 1 cubic foot per second
/// Mass: internal representation in kg
case Unit.g: return 1000 * v; /// 1 g = 0.001 kg
case Unit.oz: return 35.273962 * v; /// 1 oz = 0.0283495231 kg
case Unit.lb: return 2.2046226 * v; /// 1 lb = 0.45359237 kg
case Unit.t: return 0.001 * v; /// 1 t = 1000 kg
/// Time or duration: internal representation in seconds [s]
case Unit.ms: return 1000 * v;
case Unit.min: return v / 60;
case Unit.hour: return v / 3600;
/// Temperature: internal representation in °C
case Unit.F: return 1.8 * v + 32; /// degree Fahrenheit
case Unit.K: return v + 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 100000 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 1000 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 1000 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 100 * v; /// 1 kPa = 10 HPa
case Unit.inHg: return 29.53 * v; /// 1 inHg =
case Unit.psi: return 14.5037738 * v; /// 1 psi =
case Unit.MPa: return 0.1 * v; /// 1 MPa = 10000 hPa
/// Relative error: internal representation in %
case Unit.Promile: return 10 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.cm: return 0.1 * v; /// 1 cm = 10 mm
case Unit.inch: return v / 25.4; /// 1 inch = 25.4 mm
case Unit.dm: return 0.01 * v; /// 1 dm = 100 mm
case Unit.foot: return v / 304.8; /// 1 foot = 304.8 mm
case Unit.yard: return v / 914.4; /// 1 yard = 914,4 mm
case Unit.m: return 0.001 * v; /// 1 m = 1000 mm
/// Density: internal representation in kg/m3
case Unit.kgpl: return 0.001 * v;
/// Energy, internal representation in Joul
case Unit.kJ: return 0.001 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 0.000001 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return v / 3600.0; /// 1 Wh = 3600 J
case Unit.kWh: return v / 3600000.0; /// 1 kWh = 3600000 J
case Unit.MWh: return v / 3600000000.0; /// 1 MWh = 3600000000 J
/// Electrical conductivity
case Unit.mSpm: return 0.1 * v;
/// Invert pulses
case Unit.kWhpp:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg: return (v <= float.Epsilon) ? 0 : 1/v;
default: return v; /// Do not convert
}
}
public static float ConvertFrom(Unit unit, float v)
{
return (float)ConvertFrom(unit, (double)v);
}
public static double ConvertFrom(Unit unit, double v)
{
switch (unit)
{
/// Volume: internal representation in l
case Unit.ml: return 0.001 * v; /// 0.001 l
case Unit.USgal: return 3.78541178 * v; /// 1 gal(US) = 3.78541178 l
case Unit.UKgal: return 4.54609 * v; /// 1 gal(UK) = 4.54609 l
case Unit.cf: return 28.316846592 * v; /// 1 cubic foot = 28.316846592 l
case Unit.m3: return 1000 * v; /// 1000 l
/// Flow: internal representation in m3/h
case Unit.lph: return 0.001 * v; /// 1 l/h
case Unit.cfph: return 0.028316846592 * v; /// 1 cf/h
case Unit.lpm: return 0.06 * v; /// 1 l/m
case Unit.USgalpm: return 0.2271247068 * v; /// 1 US gallon per minute
case Unit.lps: return 3.6 * v; /// 1 l/s
case Unit.USgalps: return 13.627482408 * v; /// 1 US gallon per second
case Unit.m3pm: return 60 * v; /// 1 m3/m
case Unit.cfs: return 101.9406477312 * v; /// 1 cubic foot per second
/// Mass: internal representation in kg
case Unit.g: return 0.001 * v; /// 1 g = 0.001 kg
case Unit.oz: return 0.0283495231 * v; /// 1 oz = 0.0283495231 kg
case Unit.lb: return 0.45359237 * v; /// 1 lb = 0.45359237 kg
case Unit.t: return 1000 * v; /// 1 t = 1000 kg
/// Time or duration: internal representation in seconds [s]
case Unit.ms: return 0.001 * v;
case Unit.min: return 60 * v;
case Unit.hour: return 3600 * v;
/// Temperature: internal representation in °C
case Unit.F: return 5 * (v - 32) / 9; /// degree Fahrenheit
case Unit.K: return v - 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 0.00001 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 0.001 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 0.001 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 0.01 * v; /// 1 kPa = 10 HPa
case Unit.inHg: return 0.033864 * v; /// 1 inHg = 33.864 hPa
case Unit.psi: return 0.0689475729 * v; /// 1 psi = 0.0689475729 bar
case Unit.MPa: return 10 * v; /// 1 MPa = 10000 hPa
/// Relative error: internal representation in %
case Unit.Promile: return 0.1 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.cm: return 10 * v; /// 1 cm = 10 mm
case Unit.inch: return 25.4 * v; /// 1 inch = 25.4 mm
case Unit.dm: return 100 * v; /// 1 dm = 100 mm
case Unit.foot: return 304.8 * v; /// 1 foot = 304.8 mm
case Unit.yard: return 914.4 * v; /// 1 yard = 914,4 mm
case Unit.m: return 1000 * v; /// 1 m = 1000 mm
/// Density: internal representation in kg/m3
case Unit.kgpl: return 1000 * v;
/// Energy, internal representation in Joul
case Unit.kJ: return 1000 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 1000000 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return 3600 * v; /// 1 Wh = 3600 J
case Unit.kWh: return 3600000 * v; /// 1 kWh = 3600000 J
case Unit.MWh: return 3600000000 * v; /// 1 kWh = 3600000000 J
/// Electrical conductivity
case Unit.mSpm: return 10 * v;
/// Invert
case Unit.kWhpp:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg: return (v <= float.Epsilon) ? 0 : 1/v;
default: return v; /// Do not convert
}
}
/// <summary>
/// Converts a string to a unit
/// </summary>
/// <param name="description">Unit description string</param>
/// <returns>Converted unit or Unit.None if not recognized</returns>
public static Unit FromDescription(string description)
{
for (Unit unit = 0; unit < Unit.Count; unit++)
{
if (unit.ToDescription() == description) return unit;
}
return Unit.None;
}
}
}
+137
View File
@@ -0,0 +1,137 @@
///
/// Copyright (c) 2021-2022 Sensus Slovensko a.s.
///
using System;
using System.IO.Ports;
namespace Common
{
public class Utils
{
public static string GetTestName(string name, int repeats, int repetitionNr)
{
if (name == null) return null;
if (repeats == 1) return name;
return string.Format("{0} ({1}/{2})", name, repetitionNr, repeats);
}
public static string ToNiceString(double value, int sigDigits)
{
string format = SignificantDigitsToFmt(value, sigDigits);
return (format == "F0") ? value.ToString("F0") : value.ToString(format).TrimEnd(new char[] { '0' });
}
public static FlowNames ProfileType2FlowNames(ProfileType pt)
{
switch (pt)
{
case ProfileType.Q3R: return FlowNames.Q3Q2Q1;
case ProfileType.QnClassColdWater: return FlowNames.QnQtQmin;
case ProfileType.QnClassHotWater: return FlowNames.QnQtQmin;
case ProfileType.QpQi: return FlowNames.QpQi;
default: return FlowNames.Q3Q2Q1;
}
}
public static string SignificantDigitsToFmt(double value, int sigDigits)
{
if (sigDigits == 6)
{
if (value >= 99999.5 || value < -99999.5) return "F0";
else if (value >= 9999.95 || value < -9999.95) return "F1";
else if (value >= 999.995 || value < -999.995) return "F2";
else if (value >= 99.9995 || value < -99.9995) return "F3";
else if (value >= 9.99995 || value < -9.99995) return "F4";
else if (value >= 0.999995 || value < -0.999995) return "F5";
else if (value >= 0.0999995 || value < -0.0999995) return "F6";
else if (value >= 0.00999995 || value < -0.00999995) return "F7";
else if (value >= 0.000999995 || value < -0.000999995) return "F8";
else if (value >= 0.0000999995 || value < -0.0000999995) return "F9";
else return "F10";
}
else if (sigDigits == 5)
{
if (value >= 9999.5 || value < -9999.5) return "F0";
else if (value >= 999.95 || value < -999.95) return "F1";
else if (value >= 99.995 || value < -99.995) return "F2";
else if (value >= 9.9995 || value < -9.9995) return "F3";
else if (value >= 0.99995 || value < -0.99995) return "F4";
else if (value >= 0.099995 || value < -0.099995) return "F5";
else if (value >= 0.0099995 || value < -0.0099995) return "F6";
else if (value >= 0.00099995 || value < -0.00099995) return "F7";
else if (value >= 0.000099995 || value < -0.000099995) return "F8";
else return "F9";
}
else if (sigDigits == 4)
{
if (value >= 999.5 || value < -999.5) return "F0";
else if (value >= 99.95 || value < -99.95) return "F1";
else if (value >= 9.995 || value < -9.995) return "F2";
else if (value >= 0.9995 || value < -0.9995) return "F3";
else if (value >= 0.09995 || value < -0.09995) return "F4";
else if (value >= 0.009995 || value < -0.009995) return "F5";
else if (value >= 0.0009995 || value < -0.0009995) return "F6";
else if (value >= 0.00009995 || value < -0.00009995) return "F7";
else return "F8";
}
else if (sigDigits == 3)
{
if (value >= 99.5 || value < -99.5) return "F0";
else if (value >= 9.95 || value < -9.95) return "F1";
else if (value >= 0.995 || value < -0.995) return "F2";
else if (value >= 0.0995 || value < -0.0995) return "F3";
else if (value >= 0.00995 || value < -0.00995) return "F4";
else if (value >= 0.000995 || value < -0.000995) return "F5";
else if (value >= 0.0000995 || value < -0.0000995) return "F6";
else return "F7";
}
else if (sigDigits == 2)
{
if (value >= 9.5 || value < -9.5) return "F0";
else if (value >= 0.95 || value < -0.95) return "F1";
else if (value >= 0.095 || value < -0.095) return "F2";
else if (value >= 0.0095 || value < -0.0095) return "F3";
else if (value >= 0.00095 || value < -0.00095) return "F4";
else if (value >= 0.000095 || value < -0.000095) return "F5";
else return "F6";
}
else /// if (sigDigits == 1)
{
if (value >= 0.95 || value < -0.95) return "F0";
else if (value >= 0.095 || value < -0.095) return "F1";
else if (value >= 0.0095 || value < -0.0095) return "F2";
else if (value >= 0.00095 || value < -0.00095) return "F3";
else if (value >= 0.000095 || value < -0.000095) return "F4";
else return "F5";
}
}
public static Parity GetParity(string str, Parity defaultParity = Parity.None)
{
if (str.Equals(Parity.None.ToString())) return Parity.None;
if (str.Equals(Parity.Even.ToString())) return Parity.Even;
if (str.Equals(Parity.Odd.ToString())) return Parity.Odd;
if (str.Equals(Parity.Mark.ToString())) return Parity.Mark;
if (str.Equals(Parity.Space.ToString())) return Parity.Space;
return defaultParity;
}
public static StopBits GetStopBits(string str, StopBits defaultStopBits = StopBits.One)
{
if (str.Equals(StopBits.None.ToString())) return StopBits.None;
if (str.Equals(StopBits.One.ToString())) return StopBits.One;
if (str.Equals(StopBits.OnePointFive.ToString())) return StopBits.OnePointFive;
if (str.Equals(StopBits.Two.ToString())) return StopBits.Two;
return defaultStopBits;
}
public static Handshake GetHandshake(string str, Handshake defaultHandshake = Handshake.None)
{
if (str.Equals(Handshake.None.ToString())) return Handshake.None;
if (str.Equals(Handshake.RequestToSend.ToString())) return Handshake.RequestToSend;
if (str.Equals(Handshake.XOnXOff.ToString())) return Handshake.XOnXOff;
if (str.Equals(Handshake.RequestToSendXOnXOff.ToString())) return Handshake.RequestToSendXOnXOff;
return defaultHandshake;
}
}
}
+46
View File
@@ -0,0 +1,46 @@
using System;
using System.Drawing;
namespace Config.CalendarEvent
{
/// <summary>
/// An interface for creating event types
/// </summary>
public interface ICalendarEvent
{
DateTime Date { get; set; } /// The Date that the event occurs
Frequency Frequency { get; set; } /// A value indicating how often the event occurs
bool AllDay { get; set; } /// True if the time component of DateTime value can be ignored
bool TriggerOnExactDayOnly { get; set; } /// If this is a recurring event, set this to true to make the event show up only from the day specified forward
string Source { get; set; } /// Source of this calendar event (becomes the source of the triggered event)
string Title { get; set; } /// The name of the event (becomes the text of the triggered event)
AutoAction AutoAction { get; set; } /// Automated action to be done or event to be triggered (triggered event Severity)
string Parameters { get; set; } /// Automated action parameters (e.g. name of a procedure to start)
int Rank { get; set; } /// The ranking of the event that determines the order in which it is displayed on a particular day
bool Hidden { get; set; } /// True if the event is hidden/invisible, otherwise false
bool ReadOnly { get; set; } /// True if the event details cannot be modified
int BackColor { get; set; } /// The color that the event show up in on the calendar
int TextColor { get; set; } /// The text color of the event
bool TooltipEnabled { get; set; } /// True if a tooltip should be displayed when hovering over the event
/// <summary>
/// Set this to a custom function that will automatically determine if the event should be rendered on a given day.
/// This is only executed if <see cref="Frequency"/> is set to custom.
/// </summary>
CustomRecurringFrequenciesHandler CustomRecurringFunction { get; set; }
/// <summary>
/// A function for cloning an event instance
/// </summary>
/// <returns>A cloned <see cref="ICalendarEvent"/></returns>
ICalendarEvent Clone();
}
/// <summary>
/// A delegate for creating custom recurring frequencies
/// </summary>
/// <param name="evnt">The <see cref="ICalendarEvent"/> in question</param>
/// <param name="day">The day in question</param>
/// <returns>Should return a boolean value that indicates if the event should be rendered on the day passed in</returns>
public delegate bool CustomRecurringFrequenciesHandler(ICalendarEvent evnt, DateTime day);
}
+226
View File
@@ -0,0 +1,226 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
using Config.Resources;
namespace Config.CalendarEvent
{
/// <summary>
/// Enumeration of calendar event actions
/// </summary>
public enum AutoAction
{
Undefined,
None, /// No action at all
Notification, /// Trigger a notification event
Warning, /// Trigger a warning event
Error, /// Trigger an error event and stop test bench function
FatalErr, /// Trigger a fatal error and stop test bench function
InvokeBeforeCycle, /// Invoke a maintenance procedure before a cycle after entering order number
InvokeInsideCycle, /// Invoke conditional tests inside a cycle (if any)
InvokeAfterCycle, /// Invoke a maintenance procedure after a cycle after saving results
BackupData,
Count,
}
/// <summary>
/// Enumeration of built-in recurring event frequencies
/// </summary>
public enum Frequency
{
Undefined,
Once, /// Indicates that the event is non recurring will occur only one time
Yearly, /// Indicates that the event will occur once a year, on the month and day specified
Monthly, /// Indicates that the event will occur every month
Weekly, /// Indicates that the event will occur every week
EveryTuTh, /// Indicates that the event will occur every Tuesday and Thursday
EveryMoWeFr, /// Indicates that the event will occur every Mon, Wed and Fri
EveryWkday, /// Indicates that the event will occur every week day (Mon - Fri)
Daily, /// Indicates that the event will occur every day
EveryShift,
Custom, /// Indicates that the recuring schedule of this event is unique
Count
}
public class Utils
{
public static string Action2String(AutoAction action)
{
return action.ToString();
}
public static AutoAction String2Action(string astr)
{
for (AutoAction a = AutoAction.None; a < AutoAction.Count; a++)
{
if (Action2String(a) == astr) return a;
}
return AutoAction.Undefined;
}
public static string Freq2String(Frequency f)
{
switch (f)
{
case Frequency.Custom: return Strings.Custom;
case Frequency.Daily: return Strings.Daily;
case Frequency.EveryMoWeFr: return Strings.Every_Mon_Wed_and_Fri;
case Frequency.EveryTuTh: return Strings.Every_Tue_and_Thu;
case Frequency.EveryWkday: return Strings.Every_Week_Day;
case Frequency.EveryShift: return Strings.Every_shift;
case Frequency.Monthly: return Strings.Every_Month;
case Frequency.Once: return Strings.Once;
case Frequency.Weekly: return Strings.Every_week;
case Frequency.Yearly: return Strings.Every_year;
default: return string.Empty;
}
}
public static Frequency String2Freq(string fstr)
{
for (Frequency f = Frequency.Once; f < Frequency.Count; f++)
{
if (Freq2String(f) == fstr) return f;
}
return Frequency.Undefined;
}
/// <summary>
/// Determine whether an event date matches given day and time (dt)
/// (whether an event needs to be rendered on a specific day).
/// </summary>
/// <param name="evnt">Calendar event</param>
/// <param name="dt">Day and time</param>
/// <returns>true = needs to be rendered</returns>
public static bool DayMatchesExactly(ICalendarEvent evnt, DateTime dt)
{
DayOfWeek dow = dt.DayOfWeek;
switch (evnt.Frequency)
{
case Frequency.EveryShift: return (dow == DayOfWeek.Sunday && evnt.Date.Hour >= 22) ||
dow == DayOfWeek.Monday ||
dow == DayOfWeek.Tuesday ||
dow == DayOfWeek.Wednesday ||
dow == DayOfWeek.Thursday ||
(dow == DayOfWeek.Friday && evnt.Date.Hour < 22);
case Frequency.Daily: return true;
case Frequency.EveryMoWeFr: return (dow == DayOfWeek.Monday) || (dow == DayOfWeek.Wednesday) || (dow == DayOfWeek.Friday);
case Frequency.EveryTuTh: return (dow == DayOfWeek.Tuesday) || (dow == DayOfWeek.Thursday);
case Frequency.EveryWkday: return (dow != DayOfWeek.Sunday) && (dow != DayOfWeek.Saturday);
case Frequency.Weekly: return evnt.Date.DayOfWeek == dow;
case Frequency.Monthly: return evnt.Date.Day == dt.Day;
case Frequency.Yearly: return evnt.Date.Month == dt.Month && evnt.Date.Day == dt.Day;
case Frequency.Once: return evnt.Date.Year == dt.Year && evnt.Date.Month == dt.Month && evnt.Date.Day == dt.Day;
case Frequency.Custom: return (evnt.CustomRecurringFunction != null) && evnt.CustomRecurringFunction(evnt, dt);
default: return false;
}
}
public static bool IsCalendarEventTrigerred(ICalendarEvent evnt, DateTime dateTimeNow)
{
DateTime evntDT = evnt.AllDay
? new DateTime(evnt.Date.Year, evnt.Date.Month, evnt.Date.Day, 0, 0, 0)
: evnt.Date;
if (evnt.Frequency == Frequency.EveryShift)
{
DateTime dt1 = evntDT;
DateTime dt2 = evntDT + new TimeSpan(8, 0, 0);
DateTime dt3 = evntDT + new TimeSpan(16, 0, 0);
return (dateTimeNow >= dt1) || (dateTimeNow >= dt1) || (dateTimeNow >= dt3);
}
else if (!evnt.TriggerOnExactDayOnly)
{
/// Trigger after event expires
return (dateTimeNow >= evntDT);
}
else
{
/// Trigger event on exact date only
return (dateTimeNow >= evntDT) && DayMatchesExactly(evnt, dateTimeNow);
}
}
/// <summary>
/// Called to update event.Date after an event was trigerred and a required action was done.
/// </summary>
/// <param name="evnt">Calendar event</param>
/// <param name="currentDate">Current date and time which triggered the event</param>
/// <returns>true when event.Date was updated</returns>
public static bool UpdateRecurringDate(ICalendarEvent evnt, DateTime currentDate)
{
switch (evnt.Frequency)
{
case Frequency.Yearly:
do {
evnt.Date = evnt.Date.AddYears(1);
}
while (evnt.Date <= currentDate);
return true;
case Frequency.Monthly:
do {
evnt.Date = evnt.Date.AddMonths(1);
}
while (evnt.Date <= currentDate);
return true;
case Frequency.Weekly:
do {
evnt.Date += new TimeSpan(7, 0, 0, 0); /// add one week
}
while (evnt.Date <= currentDate);
return true;
case Frequency.EveryTuTh:
do {
evnt.Date += new TimeSpan(1, 0, 0, 0); /// add one day
}
while ((evnt.Date <= currentDate) || ((evnt.Date.DayOfWeek != DayOfWeek.Tuesday) &&
(evnt.Date.DayOfWeek != DayOfWeek.Thursday)));
return true;
case Frequency.EveryMoWeFr:
do {
evnt.Date += new TimeSpan(1, 0, 0, 0); /// add one day
}
while ((evnt.Date <= currentDate) || ((currentDate.DayOfWeek != DayOfWeek.Monday) &&
(currentDate.DayOfWeek != DayOfWeek.Wednesday) &&
(currentDate.DayOfWeek != DayOfWeek.Friday)));
return true;
case Frequency.EveryWkday:
do {
evnt.Date += new TimeSpan(1, 0, 0, 0); /// add one day
}
while ((evnt.Date <= currentDate) || (currentDate.DayOfWeek == DayOfWeek.Saturday) || (currentDate.DayOfWeek == DayOfWeek.Sunday));
return true;
case Frequency.Daily:
do {
evnt.Date += new TimeSpan(1, 0, 0, 0); /// add one day
}
while (evnt.Date <= currentDate);
return true;
case Frequency.EveryShift:
do {
evnt.Date += new TimeSpan(8, 0, 0); /// add eight hours
}
while (evnt.Date <= currentDate);
return true;
default:
/// This is not a recurring calendar event, 'Date' was not updated
return false;
}
}
}
}
+12 -8
View File
@@ -19,18 +19,18 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
<DefineConstants>TRACE;DEBUG;FUZHOU_150</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;MUNICH</DefineConstants>
<DefineConstants>TRACE;FUZHOU_150</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
@@ -67,21 +67,19 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CalendarEvent\ICalendarEvent.cs" />
<Compile Include="Data.cs" />
<Compile Include="DatabaseSettings.cs" />
<Compile Include="Entities\BenchPath.cs" />
<Compile Include="Entities\CustomEvent.cs" />
<Compile Include="Entities\Component.cs" />
<Compile Include="Entities\ComponentProcedure.cs" />
<Compile Include="Entities\ComponentTest.cs" />
<Compile Include="Entities\Enums.cs" />
<Compile Include="Entities\FeedingPath.cs" />
<Compile Include="Entities\Group.cs" />
<Compile Include="Entities\HeatMetersPath.cs" />
<Compile Include="Entities\IHasItemNr.cs" />
<Compile Include="Entities\IHasName.cs" />
<Compile Include="Entities\IHasValves.cs" />
<Compile Include="Entities\IParamsProvider.cs" />
<Compile Include="Entities\IperlEnums.cs" />
<Compile Include="Entities\MeasurementCorrection.cs" />
<Compile Include="Entities\MetersPath.cs" />
<Compile Include="Entities\OutputPath.cs" />
@@ -89,18 +87,21 @@
<Compile Include="Entities\Profile.cs" />
<Compile Include="Entities\PTest.cs" />
<Compile Include="Entities\Test.cs" />
<Compile Include="Entities\TestInstance.cs" />
<Compile Include="Entities\TransitionSequence.cs" />
<Compile Include="Entities\TransitionStep.cs" />
<Compile Include="Entities\Uncertainty.cs" />
<Compile Include="Entities\User.cs" />
<Compile Include="Entities\VirtualBenchSequence.cs" />
<Compile Include="Entities\VirtualBenchStep.cs" />
<Compile Include="CalendarEvent\Utils.cs" />
<Compile Include="FluentCommon.cs" />
<Compile Include="Formulas.cs" />
<Compile Include="Mappings\BenchPathMap.cs" />
<Compile Include="Mappings\ComponentMap.cs" />
<Compile Include="Mappings\ComponentProcedureMap.cs" />
<Compile Include="Mappings\ComponentTestMap.cs" />
<Compile Include="Mappings\CustomEventMap.cs" />
<Compile Include="Mappings\FeedingPathMap.cs" />
<Compile Include="Mappings\GroupMap.cs" />
<Compile Include="Mappings\HeatMetersPathMap.cs" />
@@ -121,7 +122,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
<Compile Include="Units.cs" />
<Compile Include="Utils.cs" />
</ItemGroup>
<ItemGroup>
@@ -137,6 +137,10 @@
<EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj">
<Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
<Name>Common</Name>
</ProjectReference>
<ProjectReference Include="..\Users\Users.csproj">
<Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
<Name>Users</Name>
+44 -61
View File
@@ -2,37 +2,55 @@
namespace Config
{
public class Data : Users.GlobalData
public class Data : Users.CurrentUser
{
public const string AdminUsername = "admin";
public const string AdminPassword = "staratura";
public const string SQLiteDbFName = "SQLite.db";
#if MUNICH
public const int WMsCount = 3;
public const int LineSize = 3;
public const int CompoundWMsCount = 3;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 3;
#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
#if DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
public const int WMsCount = 3;
public const int LineSize = 3;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || GENESIS || SLM_150 || PETERSBURG_200
public const int MaxPartNr = 1;
#elif MUNICH
public const int WMsCount = 3;
public const int LineSize = 3;
public const int CompoundWMsCount = 3;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 3;
#elif MALTA_WSD25
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 3;
public const int MaxPartNr = 1;
#elif BADGER_MALA_TRAT || BERLIN || FUZHOU_150 || FUZHOU_300 || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || SENTEC || SLM_150 || TORINO_50
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 1;
#elif PUCHONG_200
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 3;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 3;
#elif DEWA_300 || ROMA_200
#elif RUM_MOB
public const int WMsCount = 8;
public const int LineSize = 8;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TURA_SPECIAL
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif DEWA_300 || FUZHOU_100 || ROMA_200 || LUXEMBURG_40
public const int WMsCount = 10;
public const int LineSize = 10;
public const int CompoundWMsCount = 1;
@@ -44,73 +62,38 @@ namespace Config
public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif IZRAEL_50
public const int WMsCount = 40;
public const int LineSize = 10;
public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif FUZHOU_100
public const int WMsCount = 10;
public const int LineSize = 10;
#elif SLM_END || WARSAW_END
public const int WMsCount = 10;
public const int LineSize = 5;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TORINO_50 || BADGER_MALA_TRAT || BERLIN
public const int WMsCount = 6;
public const int LineSize = 6;
public const int MaxPartNr = 4;
#elif SLM_50
public const int WMsCount = 12;
public const int LineSize = 12;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 1;
#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
public const int HeatMetersCount = 6;
public const int MaxPartNr = WMsCount / LineSize;
#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MILWAUKEE || MURES_40 || PETERSBURG_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
public const int WMsCount = 20;
public const int LineSize = 10;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif RUM_MOB
public const int WMsCount = 8;
public const int LineSize = 8;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TURA_IPERL || TURA_IPERL_NEW
public const int WMsCount = 40;
public const int LineSize = 20;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TURA_SPECIAL || SENTEC
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif SLM_50
public const int WMsCount = 12;
public const int LineSize = 12;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 6;
public const int MaxPartNr = WMsCount / LineSize;
#elif SLM_END || WARSAW_END
public const int WMsCount = 10;
public const int LineSize = 5;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 4;
#elif MALTA_WSD25
public const int WMsCount = 6;
public const int LineSize = 6;
#elif IZRAEL_50
public const int WMsCount = 40;
public const int LineSize = 10;
public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#endif
///
/// Database related: This object reference is set after a successful user login
///
public static DatabaseSettings CurrentBench;
public static double RealDensity = 0; /// true water density [kg/m3]
public static double AtTemperature = 0; /// measured at temperature [°C]
public static double Buoyancy = 0;
-54
View File
@@ -1,54 +0,0 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Text;
using System.Xml.Serialization;
namespace Config
{
/// <summary>
/// Test bench database settings, contains bench name and settings od several databases
/// </summary>
public class DatabaseSettings : ICloneable
{
// Public fields
public string BenchName;
public bool IsRealBench;
public Users.DBSettings ProceduresDBSettings; /// Config database settings
public Users.DBSettings WaterMetersDBSettings; /// Results database settings
public Users.DBSettings UsersDBSettings; /// Users database settings
// Constructor
public DatabaseSettings()
{
BenchName = String.Empty; /// Empty string (avoid null)
IsRealBench = false;
ProceduresDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
WaterMetersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
UsersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
}
public object Clone()
{
DatabaseSettings result = new DatabaseSettings();
result.BenchName = BenchName;
result.IsRealBench = IsRealBench;
result.ProceduresDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
result.WaterMetersDBSettings = (Users.DBSettings)WaterMetersDBSettings.Clone();
result.UsersDBSettings = (Users.DBSettings)UsersDBSettings.Clone();
return result;
}
public override string ToString()
{
return string.Format("{0} config={1} results={2} users={3}",
BenchName,
ProceduresDBSettings.ConnectionString,
WaterMetersDBSettings.ConnectionString,
UsersDBSettings.ConnectionString);
}
}
}
+11 -3
View File
@@ -1,8 +1,9 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using Common;
namespace Config.Entities
{
@@ -14,6 +15,8 @@ namespace Config.Entities
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual Unit FlowUnit { get; set; } /// Not mapped to database, used in UI
public virtual string Selector { get; set; }
public virtual string TempMtrUp { get; set; }
public virtual string TempMtrDown { get; set; }
public virtual string PressMtrUp { get; set; }
@@ -25,13 +28,16 @@ namespace Config.Entities
public virtual string ValvesOpen { get; set; }
public virtual string ValvesClose { get; set; }
public virtual bool QfromTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool QtoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
/// ------------- Additional stuff not mapped into the database -------------
public BenchPath()
{
ValvesOpen = string.Empty;
ValvesClose = string.Empty;
}
}
public BenchPath(string name, int itemNr)
: this()
@@ -46,7 +52,9 @@ namespace Config.Entities
result.Qfrom = Qfrom;
result.Qto = Qto;
result.TempMtrUp = TempMtrUp;
result.FlowUnit = FlowUnit;
result.Selector = Selector;
result.TempMtrUp = TempMtrUp;
result.TempMtrDown = TempMtrDown;
result.PressMtrUp = PressMtrUp;
result.PressMtrDown = PressMtrDown;
+2 -1
View File
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using Common;
namespace Config.Entities
{
@@ -86,7 +87,7 @@ namespace Config.Entities
else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation;
else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off;
else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record;
else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply;
else if (line.Equals(DebugMode.Replay.ToString())) result.Mode = DebugMode.Replay;
else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate;
else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit;
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.IO;
using Common;
namespace Config.Entities
{
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.IO;
using Common;
namespace Config.Entities
{
+93
View File
@@ -0,0 +1,93 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
using Config.CalendarEvent;
namespace Config.Entities
{
public class CustomEvent : Config.CalendarEvent.ICalendarEvent
{
public virtual int Id { get; protected set; }
public virtual DateTime Date { get; set; } /// The Date that the event occurs
public virtual Frequency Frequency { get; set; } /// A value indicating how often the event occurs
public virtual bool AllDay { get; set; } /// True if the time component of the date can be ignored
public virtual bool TriggerOnExactDayOnly { get; set; } /// If this is a recurring event, set this to true to make the event show up only from the day specified forward
public virtual string Source { get; set; } /// Source of this calendar event (becomes the source of the triggered event)
public virtual string Title { get; set; } /// The name of the event (becomes the text of the triggered event)
public virtual AutoAction AutoAction { get; set; } /// Automated action to be done or event to be triggered
public virtual string Parameters { get; set; } /// Automated action parameters (e.g. name of a procedure to start)
public virtual int Rank { get; set; } /// The ranking of the event that determines the order in which it is displayed on a particular day
public virtual bool Hidden { get; set; } /// True if the event is enabled, otherwise false
public virtual bool ReadOnly { get; set; } /// True if the event details cannot be modified
public virtual int BackColor { get; set; } /// The color that the event show up in on the calendar: (MSB)AARRGGBB(LSB)
public virtual int TextColor { get; set; } /// The text color of the event: (MSB)AARRGGBB(LSB)
public virtual bool TooltipEnabled { get; set; } /// True if a tooltip should be displayed when hovering over the event
public virtual CustomRecurringFrequenciesHandler
CustomRecurringFunction { get; set; } /// Not mapped to DB, always null
/// <summary>
/// CustomEvent Constructor
/// </summary>
public CustomEvent()
{
}
public CustomEvent(DateTime dateTime, string text)
{
Date = dateTime;
Frequency = Config.CalendarEvent.Frequency.Once;
AllDay = false;
TriggerOnExactDayOnly = false;
Source = "Calendar";
Title = text;
AutoAction = AutoAction.None;
Parameters = string.Empty;
Rank = 2;
Hidden = false;
ReadOnly = false;
BackColor = unchecked((int)0xFFFF5050); /// (MSB)AARRGGBB(LSB) ... pink
TextColor = unchecked((int)0xFFFFFFFF); /// (MSB)AARRGGBB(LSB) ... white
TooltipEnabled = true;
CustomRecurringFunction = null;
}
public virtual Config.CalendarEvent.ICalendarEvent Clone()
{
return new CustomEvent
{
Date = this.Date,
Frequency = this.Frequency,
AllDay = this.AllDay,
TriggerOnExactDayOnly = this.TriggerOnExactDayOnly,
Source = this.Source,
Title = this.Title,
AutoAction = this.AutoAction,
Parameters = this.Parameters,
Rank = this.Rank,
Hidden = this.Hidden,
ReadOnly = this.ReadOnly,
BackColor = this.BackColor,
TextColor = this.TextColor,
TooltipEnabled = this.TooltipEnabled,
CustomRecurringFunction = this.CustomRecurringFunction,
};
}
/// <summary>
/// Returns true when updated
/// </summary>
/// <param name="currentDate">Current date and time</param>
/// <returns>true when the entity was updated</returns>
public virtual bool UpdateRecurringDate(DateTime currentDate)
{
return Config.CalendarEvent.Utils.UpdateRecurringDate(this, currentDate);
}
public override string ToString()
{
return Title;
}
}
}
-691
View File
@@ -1,691 +0,0 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Reflection;
namespace Config.Entities
{
/// <summary>
/// Helper class to assign descriptions to enum values
/// </summary>
public class Description : Attribute
{
public string Text;
public Description(string t)
{
Text = t;
}
}
public static class GetDescription
{
/// Extension method for enum-s
public static string ToDescription(this Enum en)
{
Type type = en.GetType();
MemberInfo[] memInfo = type.GetMember(en.ToString());
if (memInfo != null && memInfo.Length > 0)
{
object[] attrs = memInfo[0].GetCustomAttributes(typeof(Description), false);
if (attrs != null && attrs.Length > 0)
return ((Description)attrs[0]).Text;
}
return en.ToString(); /// Return ToString() value in case there is no description
}
}
/// <summary>
/// Flags returned by each device configuration control Verify(...) function.
/// </summary>
public enum CfgUpdateFlags
{
None = 0,
Error = 0x1, /// Some settings in the user control are invalid and cannot be set
Warning = 0x02, /// Some settings in the user control are suspicious, can be set after user confirmation
RestartRqrd = 0x04, /// TBF program restart is required to apply all changed parameters
AnyChange = 0x08, /// At least one parameter have changed
VolatileChange = 0x10,
InvokeCfgChange = 0x20, /// Invoke CfgChange handler of the component
}
public enum RemoteDBUse
{
[Description("Local DB only")] LocalDBOnly,
[Description("Remote DB only")] RemoteDBOnly,
[Description("Both DB-s, local 1st")] BothDBsLocalFirst,
[Description("Both DB-s, remote 1st")] BothDBsRemoteFirst,
Count
}
/// <summary>
/// Contains a procedure name and a database specification (local/remote).
/// </summary>
public class ProcedureInfo
{
public readonly string Name;
public readonly Users.Entities.DBKind DBKind;
public ProcedureInfo(string name, Users.Entities.DBKind dbKind)
{
Name = name;
DBKind = dbKind;
}
}
public enum ProcedureState
{
Active,
History,
Count,
}
public enum ProfileType
{
Q3R,
QnClassColdWater,
QnClassHotWater,
QpQi,
Manual,
Count,
}
public enum ErrorLimitType
{
Manual,
QpClass,
Count,
}
/// <summary> Kind of meters for the procedure / test </summary>
public enum MetersKind
{
#if LANG_DE
[Description("Wasserzähler")] Single,
[Description("Verbundwasserzähler")] Combined,
[Description("Wärmezähler")] HeatMeter,
#elif LANG_FR
[Description("Compteurs eau")] Single,
[Description("Mètres composés")] Combined,
[Description("Thermomètres")] HeatMeter,
#elif LANG_CS
[Description("Vodoměry")] Single,
[Description("Kombinované vodoměry")] Combined,
[Description("Měřiče tepla")] HeatMeter,
#elif LANG_RU
[Description("Счетчик")] Single,
[Description("Комбинированный счетчик")] Combined,
[Description("Счетчик тепла")] HeatMeter,
#else
[Description("Water meters")] Single,
[Description("Compound water meters")] Combined,
[Description("Heat meters")] HeatMeter,
#endif
}
public enum CompoundMeterId : byte
{
Single,
CompoundMain,
CompoundAux,
Compound,
HeatMeterVolume,
HeatMeterEnergy,
SingleOrCompound, /// Only used when querying results
}
public enum Medium
{
[Description("")] NotSpecified,
#if LANG_PL
[Description("zimna")] ColdWater,
[Description("ciepła")] HotWater,
#elif LANG_IT
[Description("freddo")] ColdWater,
[Description("caldo")] HotWater,
#elif LANG_FR
[Description("eau froide")] ColdWater,
[Description("eau chaude")] HotWater,
#else
[Description("cold")] ColdWater,
[Description("hot")] HotWater,
#endif
Count
}
public enum Mounting
{
[Description("")] NotSpecified,
#if LANG_DE
[Description("H")] H, /// horizontal
[Description("V")] V, /// vertical
[Description("STR")] S, /// standrohre
[Description("F")] F, /// fall
#else
[Description("H")] H, /// horizontal
[Description("V")] V, /// vertical
[Description("S")] S, /// steig
[Description("F")] F, /// fall
#endif
Count
}
public enum TemperatureClass
{
[Description("")] NotSpecified,
[Description("T30")] T30,
[Description("T50")] T50,
[Description("T70")] T70,
[Description("T90")] T90,
[Description("T130")] T130,
[Description("T180")] T180,
[Description("T30/70")] T30_70,
[Description("T30/90")] T30_90,
[Description("T30/130")] T30_130,
[Description("T30/180")] T30_180,
[Description("30")] t30,
[Description("50")] t50,
[Description("70")] t70,
[Description("90")] t90,
[Description("130")] t130,
[Description("180")] t180,
Count
}
public enum FlowProfileSensitivityClass
{
[Description("")] NotSpecified,
[Description("U0")] U0, /// ?
[Description("D0")] D0, /// ?
Count
}
public enum PressureLossClass
{
[Description("")] NotSpecified,
[Description("dp63")] dp63, /// 0.063 MPa = 0.63 bar, TODO: Change to "Δp63"
[Description("dp40")] dp40, /// 0.040 MPa = 0.40 bar
[Description("dp25")] dp25, /// 0.025 MPa = 0.25 bar
[Description("dp16")] dp16, /// 0.016 MPa = 0.16 bar
[Description("dp10")] dp10, /// 0.010 MPa = 0.10 bar
Count
}
/// <summary> Maximum Admissible Pressure </summary>
public enum MaxAdmissiblePressure
{
[Description("")] NotSpecified,
[Description("MAP6")] MAP6,
[Description("MAP10")] MAP10,
[Description("MAP16")] MAP16,
[Description("MAP25")] MAP25,
[Description("MAP40")] MAP40,
Count
}
/// <summary> Register reader type </summary>
public enum RegisterReaderType
{
Unknown,
Pulses, /// Sick, optical and similar
Camera, /// CLP1611
DataStream, /// iPerl
Manual, /// Entered by human via form (also from camera images)
Count
}
/// <summary> Transition step is finished when this condition is fulfilled </summary>
public enum StepCondition
{
None,
Scale1Empty,
Scale2Empty,
Scale3Empty,
AllScalesEmpty,
Count
}
public enum MeretProtocol
{
[Description("<undefined>")] Undefined,
[Description("Meret (obsolete)")] Meret,
[Description("Modbus")] Modbus,
Count
}
public enum Publish : sbyte
{
#if LANG_DE
/// german
[Description("nie")] Never = 0,
[Description("immer")] Always = 1,
[Description("Bildschirm")] OnScreen = 2,
[Description("intern")] Internal = 3,
#elif LANG_FR
[Description("jamais")] Never = 0,
[Description("toujours")] Always = 1,
[Description("À l'écran")] OnScreen = 2,
[Description("interne")] Internal = 3,
#elif LANG_CS
/// czech
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interně")] Internal = 3,
#elif LANG_SK
/// slovak
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interne")] Internal = 3,
#elif LANG_PL
/// polish
[Description("nigdy")] Never = 0,
[Description("zawsze")] Always = 1,
[Description("na ekranie")] OnScreen = 2,
[Description("wewnętrznie")] Internal = 3,
#elif LANG_RU
/// russian
[Description("никогда")] Never = 0,
[Description("всегда")] Always = 1,
[Description("толька экран")] OnScreen = 2,
[Description("внутренно")] Internal = 3,
#else
/// english
[Description("Never")] Never = 0,
[Description("Always")] Always = 1,
[Description("On screen")] OnScreen = 2,
[Description("Internal")] Internal = 3,
#endif
Count
}
public enum MassMethod : byte
{
#if LANG_DE
/// nemecky
[Description("Waage")] Scale,
[Description("Spanne")] Spread,
[Description("Standardabw.")] StdDev,
#elif LANG_FR
[Description("Balance")] Scale,
[Description("Envergure")] Spread,
[Description("Déviation std.")] StdDev,
#elif LANG_CS
/// cesky
[Description("váhou")] Scale,
[Description("max.rozdíl")] Spread,
[Description("std.dev.")] StdDev,
#else
[Description("Scale")] Scale,
[Description("Spread")] Spread,
[Description("Std.dev.")] StdDev,
#endif
Count
}
public enum TestProfile
{
UserDefined,
UserDefinedHeatMeter,
Protected, /// The first protected one
ProtectedHeatMeter,
}
public enum Progress
{
JustStarted,
TransitionBefore,
SwitchingFlowDetection,
FlowSetting,
Aborted, /// Use as an argument when a test was aborted
Test,
TransitionAfter,
Completed,
Count,
}
public enum Device
{
Screen,
Printer,
Disk,
}
public enum PageOrientation
{
Portrait,
Landscape,
Count,
}
public enum ItemCategory
{
#if LANG_DE
[Description("Allgemein")] Other,
[Description("Prüfstanddaten")] BenchData,
[Description("Prüfstandergebnisse")] BenchResult,
[Description("Prüfpunktdaten")] TestData,
[Description("Prüfpunktergebnisse")] TestResult,
[Description("Wasserzelledaten")] MeterData,
[Description("Wasserzelleergebnisse")] MeterResult,
#elif LANG_FR
[Description("Autres")] Other,
[Description("Données de banc")] BenchData,
[Description("Résultats du banc")] BenchResult,
[Description("Données de test")] TestData,
[Description("Résultats de test")] TestResult,
[Description("Données du compteur d'eau")] MeterData,
[Description("Résultats du compteur d'eau")] MeterResult,
#else
[Description("Other")] Other,
[Description("Bench data")] BenchData,
[Description("Bench result")] BenchResult,
[Description("Test data")] TestData,
[Description("Test result")] TestResult,
[Description("Meter data")] MeterData,
[Description("Meter result")] MeterResult,
#endif
Count,
}
/// <summary> Possible modes of operation of components and devices. </summary>
public enum DebugMode
{
#if LANG_DE
[Description("Erkennen-aus")] DetectedOff = -2,
[Description("Erkennen-ein")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
[Description("Auto-erkennen")] AutoDetect, /// The component (device) will be auto-detected
[Description("Fehler")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Aus")] Off, /// The component is off
[Description("Aufzeichnen")] Record,
[Description("Reply")] Reply,
[Description("Simuliert")] Simulate, /// Test bench simulation, this mode does not require any hardware
[Description("Geerbt")] Inherit,
#elif LANG_FR
[Description("Détection automatique: Éteindre")] DetectedOff = -2,
[Description("Détection automatique: Allumé")] DetectedOn = -1,
[Description("Ordinaire")] Normal = 0,
[Description("Détection automatique")] AutoDetect,
[Description("Erreur d'exécution")] FailureDuringOperation,
[Description("Éteindre")] Off,
[Description("Record")] Record,
[Description("Répondre")] Reply,
[Description("Simuler")] Simulate,
[Description("Hériter")] Inherit,
#else
[Description("Detected off")] DetectedOff = -2,
[Description("Detected on")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
[Description("Auto detect")] AutoDetect, /// The component (device) will be auto-detected
[Description("Run-time error")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Off")] Off, /// The component is off
[Description("Record")] Record,
[Description("Reply")] Reply,
[Description("Simulate")] Simulate, /// Test bench simulation, this mode does not require any hardware
[Description("Inherit")] Inherit,
#endif
Count,
}
public enum LogLevel
{
#if LANG_DE
[Description("Aus")] Off,
[Description("Schwerwiegend")] Fatal,
[Description("Fehler")] Error,
[Description("Warnung")] Warn,
[Description("Info")] Info,
[Description("Debug")] Debug,
[Description("Alles")] All,
#else
[Description("Off")] Off,
[Description("Fatal")] Fatal,
[Description("Error")] Error,
[Description("Warn")] Warn,
[Description("Info")] Info,
[Description("Debug")] Debug,
[Description("All")] All,
#endif
Count,
}
/// <summary> Arrangement of tests </summary>
public enum TestsArrangement
{
Rows,
Columns,
}
/// <summary> Arrangement of meters </summary>
public enum MetersArrangement
{
Vertically,
Horizontally,
}
public enum Alignment
{
#if LANG_DE
[Description("links")] Left,
[Description("zentriert")] Center,
[Description("rechts")] Right,
[Description("angepasst")] Justified,
#elif LANG_FR
[Description("gauche")] Left,
[Description("centré")] Center,
[Description("droit")] Right,
[Description("justifié")] Justified,
#else
[Description("Left")] Left,
[Description("Center")] Center,
[Description("Right")] Right,
[Description("Justified")] Justified,
#endif
Count
}
public enum VertAlignment
{
[Description("Top")] Top,
[Description("Middle")] Middle,
[Description("Bottom")] Bottom,
}
public enum TableForm
{
None,
Rows,
Columns,
ColumnsPL,
Count,
}
public enum ImageRotation
{
[Description("0 deg")] None,
[Description("90 deg")] Deg90,
[Description("180 deg")] Deg180,
[Description("270 deg")] Deg270,
Count
}
public enum CameraDisplayResolution
{
Small,
Medium,
Large,
// FullScreen,
Count,
}
public enum ErrorFlagsMode : sbyte
{
#if LANG_DE
[Description("aus")] Off,
[Description("info")] Info,
[Description("ein")] On,
#elif LANG_FR
[Description("éteindre")] Off,
[Description("info")] Info,
[Description("allumé")] On,
#elif LANG_CS
[Description("vypnuto")] Off,
[Description("info")] Info,
[Description("zapnuto")] On,
#elif LANG_RU
[Description("выкл")] Off,
[Description("инфо")] Info,
[Description("вкл")] On,
#elif LANG_PL
[Description("nie")] Off,
[Description("info")] Info,
[Description("tak")] On,
#else // LANG_EN
[Description("off")] Off,
[Description("info")] Info,
[Description("on")] On,
#endif
Count
}
public enum ErrorFlagShift
{
E1 = 0,
E2,
E3,
E4,
E5,
E6,
E7,
E8,
E9,
E10,
E11,
E12,
E13,
E14,
E15,
E16,
E17,
E18,
E19,
E20,
E21,
E22,
E23,
E24,
E25,
E26,
E27,
E28,
E29,
E30,
E31,
E32,
E33,
E34,
E35,
E36,
E37,
E38,
E39,
E40,
E41,
E42,
E43,
E44,
E45,
E46,
E47,
E48,
E49,
E50,
E51,
E52,
E53,
E54,
E55,
E56,
E57,
E58,
E59,
E60,
E61,
E62,
E63,
}
public enum ErrorFlagMask : long
{
E1 = (1 << (int)ErrorFlagShift.E1),
E2 = (1 << (int)ErrorFlagShift.E2),
E3 = (1 << (int)ErrorFlagShift.E3),
E4 = (1 << (int)ErrorFlagShift.E4),
E5 = (1 << (int)ErrorFlagShift.E5),
E6 = (1 << (int)ErrorFlagShift.E6),
E7 = (1 << (int)ErrorFlagShift.E7),
E8 = (1 << (int)ErrorFlagShift.E8),
E9 = (1 << (int)ErrorFlagShift.E9),
E10 = (1 << (int)ErrorFlagShift.E10),
E11 = (1 << (int)ErrorFlagShift.E11),
E12 = (1 << (int)ErrorFlagShift.E12),
E13 = (1 << (int)ErrorFlagShift.E13),
E14 = (1 << (int)ErrorFlagShift.E14),
E15 = (1 << (int)ErrorFlagShift.E15),
E16 = (1 << (int)ErrorFlagShift.E16),
E17 = (1 << (int)ErrorFlagShift.E17),
E18 = (1 << (int)ErrorFlagShift.E18),
E19 = (1 << (int)ErrorFlagShift.E19),
E20 = (1 << (int)ErrorFlagShift.E20),
E21 = (1 << (int)ErrorFlagShift.E21),
E22 = (1 << (int)ErrorFlagShift.E22),
E23 = (1 << (int)ErrorFlagShift.E23),
E24 = (1 << (int)ErrorFlagShift.E24),
E25 = (1 << (int)ErrorFlagShift.E25),
E26 = (1 << (int)ErrorFlagShift.E26),
E27 = (1 << (int)ErrorFlagShift.E27),
E28 = (1 << (int)ErrorFlagShift.E28),
E29 = (1 << (int)ErrorFlagShift.E29),
E30 = (1 << (int)ErrorFlagShift.E30),
E31 = (1 << (int)ErrorFlagShift.E31),
E32 = (1 << (int)ErrorFlagShift.E32),
E33 = (1 << (int)ErrorFlagShift.E33),
E34 = (1 << (int)ErrorFlagShift.E34),
E35 = (1 << (int)ErrorFlagShift.E35),
E36 = (1 << (int)ErrorFlagShift.E36),
E37 = (1 << (int)ErrorFlagShift.E37),
E38 = (1 << (int)ErrorFlagShift.E38),
E39 = (1 << (int)ErrorFlagShift.E39),
E40 = (1 << (int)ErrorFlagShift.E40),
E41 = (1 << (int)ErrorFlagShift.E41),
E42 = (1 << (int)ErrorFlagShift.E42),
E43 = (1 << (int)ErrorFlagShift.E43),
E44 = (1 << (int)ErrorFlagShift.E44),
E45 = (1 << (int)ErrorFlagShift.E45),
E46 = (1 << (int)ErrorFlagShift.E46),
E47 = (1 << (int)ErrorFlagShift.E47),
E48 = (1 << (int)ErrorFlagShift.E48),
E49 = (1 << (int)ErrorFlagShift.E49),
E50 = (1 << (int)ErrorFlagShift.E50),
E51 = (1 << (int)ErrorFlagShift.E51),
E52 = (1 << (int)ErrorFlagShift.E52),
E53 = (1 << (int)ErrorFlagShift.E53),
E54 = (1 << (int)ErrorFlagShift.E54),
E55 = (1 << (int)ErrorFlagShift.E55),
E56 = (1 << (int)ErrorFlagShift.E56),
E57 = (1 << (int)ErrorFlagShift.E57),
E58 = (1 << (int)ErrorFlagShift.E58),
E59 = (1 << (int)ErrorFlagShift.E59),
E60 = (1 << (int)ErrorFlagShift.E60),
E61 = (1 << (int)ErrorFlagShift.E61),
E62 = (1 << (int)ErrorFlagShift.E62),
E63 = (1 << (int)ErrorFlagShift.E63),
}
}
+18 -10
View File
@@ -1,19 +1,22 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using Common;
namespace Config.Entities
{
public class FeedingPath : IHasName, IHasItemNr, IHasValves
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual Unit FlowUnit { get; set; } /// Not mapped to database, used in UI
public virtual string Selector { get; set; }
public virtual string Pump { get; set; }
public virtual string RegulValvesPct { get; set; } /// Positions of regulation valves in % separated by ';'
@@ -21,6 +24,9 @@ namespace Config.Entities
public virtual string ValvesOpen { get; set; }
public virtual string ValvesClose { get; set; }
public virtual bool QfromTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool QtoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
/// ------------- Additional stuff not mapped into the database -------------
public FeedingPath()
@@ -40,12 +46,14 @@ namespace Config.Entities
{
FeedingPath result = new FeedingPath(name, itemNr);
result.Qfrom = Qfrom;
result.Qto = Qto;
result.Pump = Pump;
result.Qfrom = Qfrom;
result.Qto = Qto;
result.FlowUnit = FlowUnit;
result.Selector = Selector;
result.Pump = Pump;
result.RegulValvesPct = RegulValvesPct;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
return result;
}
+2 -2
View File
@@ -9,7 +9,7 @@ namespace Config.Entities
public class Group
{
public virtual int Id { get; protected set; }
public virtual Users.Entities.GID GID { get; set; }
public virtual Common.GID GID { get; set; }
public virtual long AccessFlags { get; set; } /// Bitfield of access flags: bit0 .. bit62
public virtual IList<User> Users { get; set; } /// Group can be a member of a list of users
@@ -18,7 +18,7 @@ namespace Config.Entities
Users = new List<User>();
}
public Group(Users.Entities.GID gid)
public Group(Common.GID gid)
: this()
{
GID = gid;
-44
View File
@@ -1,44 +0,0 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System;
namespace Config.Entities
{
public enum Side
{
#if LANG_CS
[Description("Levá")] Left,
[Description("Pravá")] Right,
#else
[Description("Left")] Left,
[Description("Right")] Right,
#endif
Count
}
public enum FlowDir
{
R_L,
L_R,
Count
}
public enum Counting
{
Arbitrary,
Positive,
Negative,
Count
}
public enum OptoHeadState
{
Disabled,
OptoAndDirOK,
OptoNok,
DirNok,
Count
}
}
+69 -5
View File
@@ -1,16 +1,17 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
namespace Config.Entities
{
public class MeasurementCorrection
public class MeasurementCorrection : Common.IMeasurementCorrection, IComparable<MeasurementCorrection>
{
public virtual int Id { get; protected set; }
public virtual int RangeIx { get; set; } /// 0..5
public virtual float Measurement { get; set; }
public virtual float Correction { get; set; }
public virtual double Measurement { get; set; }
public virtual double Correction { get; set; }
public MeasurementCorrection()
{
@@ -21,5 +22,68 @@ namespace Config.Entities
{
RangeIx = rangeIx;
}
}
public virtual int CompareTo(MeasurementCorrection other)
{
return (Measurement > other.Measurement) ? 1 : ((Measurement == other.Measurement) ? 0 : -1);
}
/// <summary>
/// Calculates corrected value from a list of corrections by interpolation.
/// It is assumed that values in the list 'corrections' are sorted.
/// </summary>
/// <param name="rawMeasurement">Raw uncorrected value</param>
/// <param name="corrections">Sorted (value, correction) pairs</param>
/// <returns>Corrected value</returns>
public static double CorrectedValue(double rawValue, IList<MeasurementCorrection> corrections)
{
return rawValue + GetCorrection(rawValue, corrections);
}
/// <summary>
/// Get a correction from a list of corrections by interpolation.
/// It is assumed that values in the list 'corrections' are sorted.
/// </summary>
/// <param name="rawMeasurement">Raw uncorrected value</param>
/// <param name="corrections">Sorted (value, correction) pairs</param>
/// <returns>Corrected value</returns>
public static double GetCorrection(double rawValue, IList<MeasurementCorrection> corrections)
{
if ((corrections == null) || (corrections.Count == 0)) return 0; /// No correction
if (rawValue < corrections[0].Measurement)
{
/// rawValue is below the lowest value in the correction table
return corrections[0].Correction;
}
for (int i = 1; i < corrections.Count; i++)
{
if (rawValue < corrections[i].Measurement)
{
double d1 = rawValue - corrections[i - 1].Measurement;
double d2 = corrections[i].Measurement - rawValue;
if (d1 + d2 <= float.Epsilon)
{
/// Neigboring values in the corection table are close to each other -> calculate the average
return (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
}
else
{
/// Interpolate the correction from neigboring values in the corection table
return (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
}
}
}
/// rawValue is above the highest value in the correction table
return corrections[corrections.Count - 1].Correction;
}
public override string ToString()
{
return string.Format("{0} {1} ({2})", Measurement, Correction, RangeIx);
}
}
}
+29 -21
View File
@@ -1,39 +1,45 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using Common;
namespace Config.Entities
{
public class OutputPath : IHasName, IHasItemNr, IHasValves
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual Unit FlowUnit { get; set; } /// Not mapped to database, used in UI
public virtual string Selector { get; set; }
public virtual string RegulValve { get; set; }
public virtual string FlowMeter { get; set; }
public virtual float PidCoef { get; set; } /// PID coefficient for the regulation path
public virtual float PidCoef { get; set; } /// PID coefficient for the regulation path
public virtual string StartValve { get; set; }
public virtual string Diverter { get; set; }
public virtual string TempDiv { get; set; }
public virtual string Scale { get; set; }
public virtual string EmptyTankValve { get; set; } /// Not used anywhere
public virtual string RegulValvesPct { get; set; } /// Positions of regulation valves in % separated by ';'
/// Valves
public virtual string ValvesOpen { get; set; }
public virtual string ValvesClose { get; set; }
public virtual bool QfromTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool QtoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
/// ------------- Additional stuff not mapped into the database -------------
public OutputPath()
{
ValvesOpen = string.Empty;
ValvesClose = string.Empty;
}
}
public OutputPath(string name, int itemNr)
: this()
@@ -46,19 +52,21 @@ namespace Config.Entities
{
OutputPath result = new OutputPath(name, itemNr);
result.Name = Name;
result.Qfrom = Qfrom;
result.Qto = Qto;
result.RegulValve = RegulValve;
result.FlowMeter = FlowMeter;
result.PidCoef = PidCoef;
result.StartValve = StartValve;
result.Diverter = Diverter;
result.TempDiv = TempDiv;
result.Scale = Scale;
result.EmptyTankValve = EmptyTankValve;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
result.Name = Name;
result.Qfrom = Qfrom;
result.Qto = Qto;
result.FlowUnit = FlowUnit;
result.Selector = Selector;
result.RegulValve = RegulValve;
result.FlowMeter = FlowMeter;
result.PidCoef = PidCoef;
result.StartValve = StartValve;
result.Diverter = Diverter;
result.TempDiv = TempDiv;
result.Scale = Scale;
result.RegulValvesPct = RegulValvesPct;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
return result;
}
+46 -21
View File
@@ -1,9 +1,10 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
/// Copyright (c) 2019-2022 Sensus Slovensko a.s.
///
using System;
using System.Globalization;
using System.IO;
using Common;
namespace Config.Entities
{
@@ -26,6 +27,7 @@ namespace Config.Entities
public virtual double PressLimHi { get; set; } /// [bar] max. water pressure
public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
public virtual bool Evaluate { get; set; }
public virtual string Method { get; set; } /// Test method (component name)
public virtual sbyte E1 { get; set; } ///
public virtual sbyte E2 { get; set; } ///
@@ -78,26 +80,27 @@ namespace Config.Entities
TempLimHi = 25.0; /// [°C]
PressLimLo = 0; /// [bar]
PressLimHi = 16.0; /// [bar]
Publish = (sbyte)Config.Entities.Publish.Always;
Publish = (sbyte)Common.Publish.Always;
Evaluate = true;
Method = string.Empty;
E1 = 1;
E2 = 1;
E3 = 1;
E4 = 1;
E5 = 1;
E6 = 1;
E7 = 1;
E8 = 1;
E9 = 1;
E10 = 1;
E11 = 1;
E12 = 1;
E13 = 1;
E14 = 1;
E15 = 1;
E16 = 1;
E21 = 1;
E1 = (sbyte)ErrorFlagsMode.On;
E2 = (sbyte)ErrorFlagsMode.On;
E3 = (sbyte)ErrorFlagsMode.On;
E4 = (sbyte)ErrorFlagsMode.On;
E5 = (sbyte)ErrorFlagsMode.On;
E6 = (sbyte)ErrorFlagsMode.On;
E7 = (sbyte)ErrorFlagsMode.On;
E8 = (sbyte)ErrorFlagsMode.On;
E9 = (sbyte)ErrorFlagsMode.On;
E10 = (sbyte)ErrorFlagsMode.On;
E11 = (sbyte)ErrorFlagsMode.On;
E12 = (sbyte)ErrorFlagsMode.On;
E13 = (sbyte)ErrorFlagsMode.On;
E14 = (sbyte)ErrorFlagsMode.On;
E15 = (sbyte)ErrorFlagsMode.On;
E16 = (sbyte)ErrorFlagsMode.Off;
E21 = (sbyte)ErrorFlagsMode.Off;
Delta_Q_pct = 5.0; /// [%]
Delta_T = 10.0; /// [°C]
@@ -139,6 +142,7 @@ namespace Config.Entities
result.PressLimHi = PressLimHi;
result.Publish = Publish;
result.Evaluate = Evaluate;
result.Method = Method;
result.E1 = E1;
result.E2 = E2;
@@ -192,6 +196,7 @@ namespace Config.Entities
output.WriteLine(PressLimHi.ToString(ci));
output.WriteLine(Publish.ToString());
output.WriteLine(Evaluate.ToString());
output.WriteLine(Method);
output.WriteLine(E1.ToString());
output.WriteLine(E2.ToString());
@@ -246,10 +251,29 @@ namespace Config.Entities
tst.ErrLimHi = double.Parse(input.ReadLine(), ci);
tst.TempLimLo = double.Parse(input.ReadLine(), ci);
tst.TempLimHi = double.Parse(input.ReadLine(), ci);
tst.Publish = sbyte.Parse(input.ReadLine());
tst.PressLimLo = double.Parse(input.ReadLine(), ci);
tst.PressLimHi = double.Parse(input.ReadLine(), ci);
tst.Publish = sbyte.Parse(input.ReadLine(), ci);
tst.Evaluate = bool.Parse(input.ReadLine());
tst.Method = input.ReadLine();
/// TODO (E1 .. E21)
tst.E1 = sbyte.Parse(input.ReadLine(), ci);
tst.E2 = sbyte.Parse(input.ReadLine(), ci);
tst.E3 = sbyte.Parse(input.ReadLine(), ci);
tst.E4 = sbyte.Parse(input.ReadLine(), ci);
tst.E5 = sbyte.Parse(input.ReadLine(), ci);
tst.E6 = sbyte.Parse(input.ReadLine(), ci);
tst.E7 = sbyte.Parse(input.ReadLine(), ci);
tst.E8 = sbyte.Parse(input.ReadLine(), ci);
tst.E9 = sbyte.Parse(input.ReadLine(), ci);
tst.E10 = sbyte.Parse(input.ReadLine(), ci);
tst.E11 = sbyte.Parse(input.ReadLine(), ci);
tst.E12 = sbyte.Parse(input.ReadLine(), ci);
tst.E13 = sbyte.Parse(input.ReadLine(), ci);
tst.E14 = sbyte.Parse(input.ReadLine(), ci);
tst.E15 = sbyte.Parse(input.ReadLine(), ci);
tst.E16 = sbyte.Parse(input.ReadLine(), ci);
tst.E21 = sbyte.Parse(input.ReadLine(), ci);
tst.Delta_Q_pct = double.Parse(input.ReadLine(), ci);
tst.Delta_T = double.Parse(input.ReadLine(), ci);
@@ -292,6 +316,7 @@ namespace Config.Entities
ln = inp.ReadLine(); if (ln != PressLimHi.ToString(ci)) { diff.AppendFormat(fmt, "Pressure_max", PressLimHi.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Publish.ToString()) { diff.AppendFormat(fmt, "Publish", Publish.ToString(), ln); };
ln = inp.ReadLine(); if (ln != Evaluate.ToString()) { diff.AppendFormat(fmt, "Evaluate", Evaluate.ToString(), ln); };
ln = inp.ReadLine(); if (ln != Method) { diff.AppendFormat(fmt, "Method", Method, ln); };
ln = inp.ReadLine(); if (ln != E1.ToString()) { diff.AppendFormat(fmt, "E1", E1.ToString(), ln); };
ln = inp.ReadLine(); if (ln != E2.ToString()) { diff.AppendFormat(fmt, "E2", E2.ToString(), ln); };
+104 -8
View File
@@ -1,17 +1,18 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using Common;
namespace Config.Entities
{
/// <summary>
/// Stores one test procedure, supports revisions and history log
/// </summary>
public class Procedure : IHasName, IHasItemNr
public class Procedure : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
@@ -36,35 +37,57 @@ namespace Config.Entities
public virtual bool ManualCtrlDisabled { get; set; } /// true = manual control of valves, etc. is disabled
public virtual string DataEntry { get; set; } /// Component to use for data entry
public virtual string ResultsPrinter { get; set; } /// Component to use for printing the results
public virtual string ResultsWriter { get; set; } /// Component to use for saving the results into the file
public virtual string TransitionStart { get; set; }
public virtual string ResultsPrinter { get; set; } /// Component for printing results
public virtual string ResultsWriter { get; set; } /// Component for saving results into a file
public virtual string EventTriggers { get; set; } /// Component for analysing results and triggering events
public virtual string TransitionStart { get; set; }
public virtual string TransitionEnd { get; set; }
public virtual string AltProcName { get; set; } /// Alternative procedure name (null or string.Empty = no alt. procedure)
public virtual int AltProcPeriod { get; set; } /// Period of alternative procedures (0 = no alt. procedure)
public virtual float DN { get; set; } /// Not mapped to DB, valid in ProceduresCtrl for procedure filtering only
public virtual double Qn { get; set; } /// - ' ' -
public virtual string MClass { get; set; } /// - ' ' -
public virtual string Producer { get; set; } /// - ' ' -
public virtual IList<ComponentProcedure> MoreParams { get; set; }
public virtual IList<Test> Tests { get; set; }
TestInstance[] testInstances;
/// Wrapper
public virtual IList<Test> RegularTests()
{
IList<Test> rslt = new List<Test>();
foreach (var t in Tests) if (t.IsRegular()) rslt.Add(t);
return rslt;
}
/// ------------- Additional stuff not mapped into the database -------------
public Procedure()
{
MoreParams = new List<ComponentProcedure>();
Tests = new List<Test>();
testInstances = null;
///
/// Default values
///
CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
CreationUser = Users.CurrentUser.UserName();
CreationTime = DateTime.Now;
LastChgUser = CreationUser;
LastChgTime = CreationTime;
MetersKind = Entities.MetersKind.Single;
MetersKind = MetersKind.Single;
Watermeters = string.Empty;
Description = string.Empty;
LongDescription = string.Empty;
DN = 0;
Qn = 0;
MClass = string.Empty;
Producer = string.Empty;
}
public Procedure(string name, int itemNr)
@@ -74,6 +97,70 @@ namespace Config.Entities
ItemNr = itemNr;
}
public virtual TestInstance[] UpdateTestInstances(IList<string> loopStartNames, IList<string> loopEndNames, IList<string> autoTests = null)
{
List<TestInstance> instances = new List<TestInstance>();
if (Tests != null)
{
int i = 0;
while (i < Tests.Count)
{
if (!loopStartNames.Contains(Tests[i].Method) && !loopEndNames.Contains(Tests[i].Method)) /// Loop.End is ignored outside a loop
{
///
/// Outside a loop
///
for (int j = 1; j <= Tests[i].Repeats; j++)
if (Tests[i].BelongsTo(autoTests))
instances.Add(new TestInstance(Tests[i], j));
}
else if (loopStartNames.Contains(Tests[i].Method))
{
///
/// Entering a loop
///
int loopsCount = Tests[i].Repeats;
List<Test> testsInsideLoop = new List<Test>();
i++;
while (i < Tests.Count && !loopEndNames.Contains(Tests[i].Method))
{
///
/// Inside a loop
///
if (Tests[i].Repeats == loopsCount && !loopStartNames.Contains(Tests[i].Method)) /// Loop.Start is ignored inside a loop
{
if (Tests[i].BelongsTo(autoTests))
testsInsideLoop.Add(Tests[i]);
}
i++;
}
///
/// Append instances of tests inside the last loop to the list
///
for (int j = 1; j <= loopsCount; j++)
{
foreach (var t in testsInsideLoop)
instances.Add(new TestInstance(t, j));
}
}
i++;
}
}
testInstances = instances.ToArray();
return testInstances;
}
public virtual TestInstance[] GetTestInstances()
{
return testInstances;
}
public virtual Procedure Clone()
{
Procedure result = new Procedure();
@@ -98,11 +185,17 @@ namespace Config.Entities
result.DataEntry = DataEntry;
result.ResultsPrinter = ResultsPrinter;
result.ResultsWriter = ResultsWriter;
result.TransitionStart = TransitionStart;
result.EventTriggers = EventTriggers;
result.TransitionStart = TransitionStart;
result.TransitionEnd = TransitionEnd;
result.AltProcName = AltProcName;
result.AltProcPeriod = AltProcPeriod;
result.DN = DN;
result.Qn = Qn;
result.MClass = MClass;
result.Producer = Producer;
foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone(result)); }
foreach (var test in Tests) { result.Tests.Add(test.Clone()); }
@@ -126,6 +219,7 @@ namespace Config.Entities
output.WriteLine(DataEntry);
output.WriteLine(ResultsPrinter);
output.WriteLine(ResultsWriter);
output.WriteLine(EventTriggers);
output.WriteLine(TransitionStart);
output.WriteLine(TransitionEnd);
@@ -158,6 +252,7 @@ namespace Config.Entities
result.DataEntry = input.ReadLine();
result.ResultsPrinter = input.ReadLine();
result.ResultsWriter = input.ReadLine();
result.EventTriggers = input.ReadLine();
result.TransitionStart = input.ReadLine();
result.TransitionEnd = input.ReadLine();
@@ -204,6 +299,7 @@ namespace Config.Entities
ln = inp.ReadLine(); if (ln != DataEntry) { diff.AppendFormat(fmt, "DataEntry", DataEntry, ln); };
ln = inp.ReadLine(); if (ln != ResultsPrinter) { diff.AppendFormat(fmt, "ResultsPrinter", ResultsPrinter, ln); };
ln = inp.ReadLine(); if (ln != ResultsWriter) { diff.AppendFormat(fmt, "ResultsWriter", ResultsWriter, ln); };
ln = inp.ReadLine(); if (ln != EventTriggers) { diff.AppendFormat(fmt, "EventTriggers", EventTriggers, ln); };
ln = inp.ReadLine(); if (ln != TransitionStart) { diff.AppendFormat(fmt, "TransitionStart", TransitionStart, ln); };
ln = inp.ReadLine(); if (ln != TransitionEnd) { diff.AppendFormat(fmt, "TransitionEnd", TransitionEnd, ln); };
+6 -2
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using Common;
namespace Config.Entities
{
@@ -35,7 +36,7 @@ namespace Config.Entities
///
/// Default values
///
CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
CreationUser = Users.CurrentUser.UserName();
CreationTime = DateTime.Now;
LastChgUser = CreationUser;
LastChgTime = CreationTime;
@@ -77,6 +78,8 @@ namespace Config.Entities
output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
output.WriteLine(LastChgUser);
output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
output.WriteLine(((sbyte)ProfileType).ToString());
output.WriteLine(((sbyte)ErrorLimitType).ToString());
foreach (var test in Tests) { test.Export(output); }
output.WriteLine();
@@ -95,7 +98,8 @@ namespace Config.Entities
result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
result.LastChgUser = input.ReadLine();
result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
string line = input.ReadLine();
result.ProfileType = (ProfileType)sbyte.Parse(input.ReadLine());
result.ErrorLimitType = (ErrorLimitType)sbyte.Parse(input.ReadLine());
while (true)
{
+149 -81
View File
@@ -1,10 +1,11 @@
///
/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using Common;
namespace Config.Entities
{
@@ -21,11 +22,11 @@ namespace Config.Entities
public virtual TestProfile Profile { get; set; } /// UserDefined, Protected, UserDefinedHeatMeter, ProtectedHeatMeter
public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
public virtual bool DoEvaluate { get; set; }
public virtual float Qtg { get; set; } /// Target water flow [m3/h]
public virtual float Qfrom { get; set; } /// Water flow low limit in [m3/h]
public virtual float Qto { get; set; } /// Water flow high limit in [m3/h]
public virtual float Volume { get; set; } /// Test volume (target) in [l]
public virtual float TstTime { get; set; } /// Test time (estimate) in [s]
public virtual double Qtg { get; set; } /// Target water flow [m3/h]
public virtual double Qfrom { get; set; } /// Water flow low limit in [m3/h]
public virtual double Qto { get; set; } /// Water flow high limit in [m3/h]
public virtual double Volume { get; set; } /// Test volume (target) in [l]
public virtual double TestTime { get; set; } /// Test time (estimate) in [s]
public virtual string Method { get; set; }
public virtual float ErrLimLo { get; set; } /// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
public virtual float ErrLimHi { get; set; } /// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -33,10 +34,10 @@ namespace Config.Entities
public virtual int Repeats { get; set; }
public virtual bool DoDraining { get; set; }
public virtual bool DoDrainingAfter { get; set; }
public virtual bool DoControlWaterTemp { get; set; }
public virtual float TempLimLo { get; set; } /// Lower limit for the controlled temperature
public virtual float TempLimHi { get; set; } /// Upper limit for the controlled temperature
public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
public virtual string TempControl { get; set; } /// Water temperature controller, null or empty = Do not control water temp
public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
public virtual int MassRepeats { get; set; } /// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
public virtual float MassSpread { get; set; } /// Max spread of mass. measurements at the beginning/end of test, 0 = default
public virtual MassMethod MassMethod { get; set; } /// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -44,7 +45,7 @@ namespace Config.Entities
public virtual int TimeFlow2Mass { get; set; } /// Delay time from the flow stable to the 1st mass measurement in [s]
public virtual int TimePump2StartV { get; set; } /// Delay time from the start of the pump to opening the start valve in [s]
public virtual int TimeStop2Mass { get; set; } /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
public virtual double TolerRed { get; set; } /// = Filter
public virtual double ShortPulses { get; set; } /// = Filter
public virtual string RedType { get; set; }
public virtual string FeedingPath { get; set; }
public virtual string BenchPath { get; set; }
@@ -53,12 +54,32 @@ namespace Config.Entities
#if HEAT_METERS
public virtual string HeatMetersPath { get; set; }
#endif
public virtual string RelTransBefore { get; set; }
public virtual string RelTransBetween { get; set; }
public virtual string TransitionAfter { get; set; }
public virtual string TransBefore { get; set; }
public virtual string TransBetween { get; set; }
public virtual string TransAfter { get; set; }
#if ORACLE_DB
public virtual int OraId { get; set; }
public virtual int OraIdRepetMulti { get; set; }
public virtual string OraDesignation { get; set; }
public virtual int RawDataId { get; set; }
public virtual int RawDataIdRepetMulti { get; set; }
public virtual string RawDataDesignation { get; set; }
#endif
public virtual bool IsOuterLoopStart { get; set; } /// Not mapped to database
public virtual bool IsOuterLoopEnd { get; set; } /// Not mapped to database
public virtual bool IsOuterLoopStart { get; set; } /// Not mapped to database
public virtual bool IsOuterLoopEnd { get; set; } /// Not mapped to database
public virtual bool QtgTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool QfromTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool QtoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool VolumeTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool TempLimLoTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual bool TempLimHiTextChngd { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual Unit VolumeUnit { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual Unit FlowUnit { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual Unit MassUnit { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual Unit TempUnit { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual Unit PressUnit { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual Unit LengthUnit { get; set; } /// Not mapped to database, used in ProcedureDlg / Metrology1Tab
public virtual IList<ComponentTest> MoreParams { get; set; }
@@ -75,30 +96,38 @@ namespace Config.Entities
///
Part = 0;
Profile = TestProfile.UserDefined;
Publish = (sbyte)Config.Entities.Publish.Always;
Publish = (sbyte)Common.Publish.Always;
DoEvaluate = true;
Repeats = 1;
ErrLimLo = -2.0f; /// [%] lower error limit
ErrLimHi = 2.0f; /// [%] upper error limit
Uncertainty = 0;
Repeats = 1;
DoDraining = false;
DoDrainingAfter = false;
DoControlWaterTemp = false;
TempLimLo = 15.0f;
TempLimHi = 25.0f;
ErrLimLo = -2.0f; /// [%] lower error limit
ErrLimHi = 2.0f; /// [%] upper error limit
Uncertainty = 0;
TempControl = string.Empty;
PumpPower = 60.0f; /// [%]
MassRepeats = 0; /// default
MassSpread = 0; /// default
MassMethod = MassMethod.Scale; /// default
MassMethod = MassMethod.Scale; /// default
TimeBeforeFlow = 10; /// [s] time before the start of flow control in [s]
TimeFlow2Mass = 5; /// [s] time from the flow stable to the 1st mass measurement in [s]
TimePump2StartV = 1; /// [s] time from the 1st mass measurement to the test start in [s]
TimeStop2Mass = 5; /// [s] between the test end and the final mass measurement
TolerRed = 0; /// = Filter parameter
RelTransBefore = string.Empty;
RelTransBetween = string.Empty;
TransitionAfter = string.Empty;
}
ShortPulses = 0; /// Short pulses parameter (0 or 1)
TransBefore = string.Empty;
TransBetween = string.Empty;
TransAfter = string.Empty;
#if ORACLE_DB
OraId = 0;
OraIdRepetMulti = 0;
OraDesignation = string.Empty;
RawDataId = 0;
RawDataIdRepetMulti = 0;
RawDataDesignation = string.Empty;
#endif
}
public Test(string name, int itemNr, Procedure procedure)
: this()
@@ -108,6 +137,32 @@ namespace Config.Entities
Procedure = procedure;
}
public virtual bool IsRegular()
{
/// Irregular / event triggered test names have form "[event] TestName"
return (Name.Length > 0 && Name[0] != '[') || !Name.Contains("]");
}
public virtual bool BelongsTo(IList<string> autoTests)
{
if (IsRegular()) return true;
if (autoTests == null) return false;
string action = Name.Substring(1, Name.IndexOf(']') - 1);
return autoTests.Contains(action);
}
public virtual void ResetChngdFlags()
{
QtgTextChngd = false;
QfromTextChngd = false;
QtoTextChngd = false;
VolumeTextChngd = false;
TempLimLoTextChngd = false;
TempLimHiTextChngd = false;
}
// Makes a new copy of this object (not just a reference)
public virtual Test Clone()
{
@@ -121,7 +176,7 @@ namespace Config.Entities
result.Qfrom = Qfrom;
result.Qto = Qto;
result.Volume = Volume;
result.TstTime = TstTime;
result.TestTime = TestTime;
result.Method = Method;
result.ErrLimLo = ErrLimLo;
result.ErrLimHi = ErrLimHi;
@@ -129,10 +184,10 @@ namespace Config.Entities
result.Repeats = Repeats;
result.DoDraining = DoDraining;
result.DoDrainingAfter = DoDrainingAfter;
result.DoControlWaterTemp = DoControlWaterTemp;
result.TempLimLo = TempLimLo;
result.TempLimHi = TempLimHi;
result.PumpPower = PumpPower;
result.TempControl = TempControl;
result.PumpPower = PumpPower;
result.MassRepeats = MassRepeats;
result.MassSpread = MassSpread;
result.MassMethod = MassMethod;
@@ -140,7 +195,7 @@ namespace Config.Entities
result.TimeFlow2Mass = TimeFlow2Mass;
result.TimePump2StartV = TimePump2StartV;
result.TimeStop2Mass = TimeStop2Mass;
result.TolerRed = TolerRed;
result.ShortPulses = ShortPulses;
result.RedType = RedType;
result.FeedingPath = FeedingPath;
result.BenchPath = BenchPath;
@@ -149,10 +204,24 @@ namespace Config.Entities
#if HEAT_METERS
result.HeatMetersPath = HeatMetersPath;
#endif
result.RelTransBefore = RelTransBefore;
result.RelTransBetween = RelTransBetween;
result.TransitionAfter = TransitionAfter;
foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
result.TransBefore = TransBefore;
result.TransBetween = TransBetween;
result.TransAfter = TransAfter;
#if ORACLE_DB
result.OraId = OraId;
result.OraIdRepetMulti = OraIdRepetMulti;
result.OraDesignation = OraDesignation;
result.RawDataId = RawDataId;
result.RawDataIdRepetMulti = RawDataIdRepetMulti;
result.RawDataDesignation = RawDataDesignation;
#endif
result.VolumeUnit = VolumeUnit;
result.FlowUnit = FlowUnit;
result.MassUnit = MassUnit;
result.TempUnit = TempUnit;
result.PressUnit = PressUnit;
result.LengthUnit = LengthUnit;
foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
return result;
}
@@ -169,7 +238,7 @@ namespace Config.Entities
output.WriteLine(Qfrom.ToString(ci));
output.WriteLine(Qto.ToString(ci));
output.WriteLine(Volume.ToString(ci));
output.WriteLine(TstTime.ToString(ci));
output.WriteLine(TestTime.ToString(ci));
output.WriteLine(Method);
output.WriteLine(ErrLimLo.ToString(ci));
output.WriteLine(ErrLimHi.ToString(ci));
@@ -177,10 +246,10 @@ namespace Config.Entities
output.WriteLine(Repeats.ToString(ci));
output.WriteLine(DoDraining.ToString());
output.WriteLine(DoDrainingAfter.ToString());
output.WriteLine(DoControlWaterTemp.ToString());
output.WriteLine(TempLimLo.ToString(ci));
output.WriteLine(TempLimHi.ToString(ci));
output.WriteLine(PumpPower.ToString(ci));
output.WriteLine((TempControl != null) ? TempControl : string.Empty);
output.WriteLine(PumpPower.ToString(ci));
output.WriteLine(MassRepeats.ToString(ci));
output.WriteLine(MassSpread.ToString(ci));
output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -192,11 +261,18 @@ namespace Config.Entities
output.WriteLine(BenchPath);
output.WriteLine(OutputPath);
output.WriteLine(MetersPath);
output.WriteLine(RelTransBefore);
output.WriteLine(RelTransBetween);
output.WriteLine(TransBefore);
output.WriteLine(TransBetween);
output.WriteLine(Profile);
output.WriteLine(TransitionAfter);
output.WriteLine(TransAfter);
#if ORACLE_DB
output.WriteLine(OraId);
output.WriteLine(OraIdRepetMulti);
output.WriteLine(OraDesignation);
output.WriteLine(RawDataId);
output.WriteLine(RawDataIdRepetMulti);
output.WriteLine(RawDataDesignation);
#endif
foreach (var prms in MoreParams) { prms.Export(output); }
output.WriteLine();
}
@@ -216,11 +292,11 @@ namespace Config.Entities
tst.Part = int.Parse(input.ReadLine(), ci);
tst.Publish = sbyte.Parse(input.ReadLine(), ci);
tst.DoEvaluate = bool.Parse(input.ReadLine());
tst.Qtg = float.Parse(input.ReadLine(), ci);
tst.Qfrom = float.Parse(input.ReadLine(), ci);
tst.Qto = float.Parse(input.ReadLine(), ci);
tst.Volume = float.Parse(input.ReadLine(), ci);
tst.TstTime = float.Parse(input.ReadLine(), ci);
tst.Qtg = double.Parse(input.ReadLine(), ci);
tst.Qfrom = double.Parse(input.ReadLine(), ci);
tst.Qto = double.Parse(input.ReadLine(), ci);
tst.Volume = double.Parse(input.ReadLine(), ci);
tst.TestTime = double.Parse(input.ReadLine(), ci);
tst.Method = input.ReadLine();
tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -228,10 +304,10 @@ namespace Config.Entities
tst.Repeats = int.Parse(input.ReadLine(), ci);
tst.DoDraining = bool.Parse(input.ReadLine());
tst.DoDrainingAfter = bool.Parse(input.ReadLine());
tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
tst.TempLimLo = float.Parse(input.ReadLine(), ci);
tst.TempLimHi = float.Parse(input.ReadLine(), ci);
tst.PumpPower = float.Parse(input.ReadLine(), ci);
tst.TempControl = input.ReadLine();
tst.PumpPower = float.Parse(input.ReadLine(), ci);
tst.MassRepeats = int.Parse(input.ReadLine(), ci);
tst.MassSpread = float.Parse(input.ReadLine(), ci);
tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -243,13 +319,21 @@ namespace Config.Entities
tst.BenchPath = input.ReadLine();
tst.OutputPath = input.ReadLine();
tst.MetersPath = input.ReadLine();
tst.RelTransBefore = input.ReadLine();
tst.RelTransBetween = input.ReadLine();
tst.TransBefore = input.ReadLine();
tst.TransBetween = input.ReadLine();
string line = input.ReadLine();
tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
: line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
: line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined; /// UserDefined is the default
tst.TransitionAfter = input.ReadLine();
tst.TransAfter = input.ReadLine();
#if ORACLE_DB
tst.OraId = int.Parse(input.ReadLine(), ci);
tst.OraIdRepetMulti = int.Parse(input.ReadLine(), ci);
tst.OraDesignation = input.ReadLine();
tst.RawDataId = int.Parse(input.ReadLine(), ci);
tst.RawDataIdRepetMulti = int.Parse(input.ReadLine(), ci);
tst.RawDataDesignation = input.ReadLine();
#endif
while (true)
{
@@ -282,7 +366,7 @@ namespace Config.Entities
ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci)) { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Qto.ToString(ci)) { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Volume.ToString(ci)) { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TstTime.ToString(ci)) { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TestTime.ToString(ci)) { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Method) { diff.AppendFormat(fmt, "Method", Method, ln); };
ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci)) { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci)) { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
@@ -290,9 +374,9 @@ namespace Config.Entities
ln = inp.ReadLine(); if (ln != Repeats.ToString(ci)) { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci)) { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci)) { diff.AppendFormat(fmt, "Zeroing", DoDrainingAfter.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString()) { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci)) { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci)) { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempControl) { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci)) { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci)) { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci)) { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };
@@ -305,11 +389,18 @@ namespace Config.Entities
ln = inp.ReadLine(); if (ln != BenchPath) { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
ln = inp.ReadLine(); if (ln != OutputPath) { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
ln = inp.ReadLine(); if (ln != MetersPath) { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
ln = inp.ReadLine(); if (ln != RelTransBefore) { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
ln = inp.ReadLine(); if (ln != RelTransBetween) { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
ln = inp.ReadLine(); if (ln != Profile.ToString()) { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
ln = inp.ReadLine(); if (ln != TransitionAfter) { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
ln = inp.ReadLine(); if (ln != TransBefore) { diff.AppendFormat(fmt, "RelTransBefore", TransBefore, ln); };
ln = inp.ReadLine(); if (ln != TransBetween) { diff.AppendFormat(fmt, "RelTransBetween", TransBetween, ln); };
ln = inp.ReadLine(); if (ln != Profile.ToString()) { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
ln = inp.ReadLine(); if (ln != TransAfter) { diff.AppendFormat(fmt, "TransitionAfter", TransAfter, ln); };
#if ORACLE_DB
ln = inp.ReadLine(); if (ln != OraId.ToString(ci)) { diff.AppendFormat(fmt, "OraId", OraId.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != OraIdRepetMulti.ToString(ci)) { diff.AppendFormat(fmt, "OraIdRepetMulti", OraIdRepetMulti.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != OraDesignation) { diff.AppendFormat(fmt, "OraDesignation", OraDesignation, ln); };
ln = inp.ReadLine(); if (ln != RawDataId.ToString(ci)) { diff.AppendFormat(fmt, "RawDataId", RawDataId.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != RawDataIdRepetMulti.ToString(ci)){ diff.AppendFormat(fmt, "RawDataIdRepetMulti", RawDataIdRepetMulti.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != RawDataDesignation) { diff.AppendFormat(fmt, "RawDataDesignation", RawDataDesignation, ln); };
#endif
return diff.ToString();
}
@@ -409,29 +500,6 @@ namespace Config.Entities
return false;
}
/// <summary>
/// Determines whether tests part number is OK.
/// Examples of correct part number are:
/// 1, 2, 12, 21 in case of max. part nr.== 2
/// 1, 2, 3, 4, 12, 13, 14, 23, 24, 34, 123, 124, 134, 234, 1234 in case of max. part nr.== 4
/// </summary>
/// <param name="partNr">Tests par tnumber</param>
/// <returns>true when Part number is OK</returns>
public static bool IsGoodPartNr(int partNr)
{
bool firstDigitIsOK = ((partNr % 10) > 0) && ((partNr % 10) <= Config.Data.MaxPartNr);
bool secondDigitIsOK = (((partNr/10) % 10) > 0) && (((partNr/10) % 10) <= Config.Data.MaxPartNr);
bool thirdDigitIsOK = (((partNr/100) % 10) > 0) && (((partNr/100) % 10) <= Config.Data.MaxPartNr);
bool fourthDigitIsOK = (((partNr/1000) % 10) > 0) && (((partNr/1000) % 10) <= Config.Data.MaxPartNr);
if (firstDigitIsOK && (partNr / 10 == 0)) return true;
if (firstDigitIsOK && secondDigitIsOK && (partNr / 100 == 0)) return true;
if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && (partNr / 1000 == 0)) return true;
if (firstDigitIsOK && secondDigitIsOK && thirdDigitIsOK && fourthDigitIsOK && (partNr / 10000 == 0)) return true;
return false;
}
public override string ToString()
{
string partStr = (Part > 0) ? string.Format(", part {0}", Part) : string.Empty;
+32
View File
@@ -0,0 +1,32 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
namespace Config.Entities
{
public class TestInstance
{
public Test Test;
public int Repetition;
public string Name
{
get
{
return (Test != null) ? Common.Utils.GetTestName(Test.Name, Test.Repeats, Repetition) : string.Empty;
}
}
public TestInstance(Test test, int repetition)
{
Test = test;
Repetition = repetition;
}
public override string ToString()
{
return Name;
}
}
}
+2 -2
View File
@@ -1,11 +1,11 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
///
using System;
namespace Config.Entities
{
public class Uncertainty
public class Uncertainty : Common.IUncertainty
{
public virtual int Id { get; protected set; }
public virtual float Measurement { get; set; }
-183
View File
@@ -1,193 +1,10 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Windows.Forms;
using FluentNHibernate.Cfg;
using FluentNHibernate.Cfg.Db;
using NHibernate;
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
using Config.Resources;
namespace Config
{
public static class FluentCommon
{
/// <summary>
/// Session factories for regular sessions.
/// </summary>
public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Users.Entities.DBKind.Count];
/// <summary>
/// NHibernate session factory (to create the database session 'SessionFactory')
/// </summary>
/// <returns>A database session</returns>
static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database)
{
Users.Entities.DBType dbType;
string connectionString;
switch (database)
{
default:
case Users.Entities.DBKind.Config:
dbType = Data.CurrentBench.ProceduresDBSettings.DbType;
connectionString = Data.CurrentBench.ProceduresDBSettings.ConnectionString;
break;
case Users.Entities.DBKind.Results:
dbType = Data.CurrentBench.WaterMetersDBSettings.DbType;
connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
break;
case Users.Entities.DBKind.RemoteConfig:
dbType = Data.CurrentBench.UsersDBSettings.DbType;
connectionString = Data.CurrentBench.UsersDBSettings.ConnectionString;
break;
}
return CreateSessionFactory(database, dbType, connectionString, false);
}
/// <summary>
/// NHibernate session factory (to create the database session 'SessionFactory')
/// </summary>
/// <returns>A database session</returns>
public static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database, Users.Entities.DBType dbType, string connectionString, bool createDB)
{
try
{
FluentConfiguration cfg = Fluently.Configure();
switch (dbType)
{
default:
case Users.Entities.DBType.SQLite:
cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
break;
case Users.Entities.DBType.MySql:
cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
break;
}
switch (database)
{
default:
case Users.Entities.DBKind.Config:
case Users.Entities.DBKind.RemoteConfig:
cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
break;
case Users.Entities.DBKind.Results:
cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
break;
}
if (createDB)
{
return cfg.ExposeConfiguration(BuildSchemaCreate).BuildSessionFactory();
}
else
{
return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory();
}
}
catch (Exception exc)
{
MessageBox.Show(string.Format(Strings.Cannot_open_DB_Cause_0, exc.Message),
Strings.Error,
MessageBoxButtons.OK,
MessageBoxIcon.Error);
return null;
}
}
public delegate void BuildSchemaDlgt(Configuration config);
static void BuildSchema(Configuration config)
{
/// This NHibernate tool takes a configuration (with mapping info in)
/// and exports a database schema from it
new SchemaExport(config).SetOutputFile("db_schema");
}
static void BuildSchemaCreate(Configuration config)
{
/// This NHibernate tool takes a configuration (with mapping info in)
/// and exports a database schema from it
new SchemaExport(config).Create(true, true);
}
/// Create a NHibernate session for the given database
public static ISession CreateSession(Users.Entities.DBKind database)
{
int ix = (int)database;
if (ix < 0 || ix >= (int)Users.Entities.DBKind.Count) return null;
if (SessionFactories[ix] == null) SessionFactories[ix] = CreateSessionFactory(database);
return SessionFactories[ix].OpenSession();
}
/// <summary>
/// Create an empty users database.
/// Database contains only the user 'admin' and the control board component 'CB'.
/// </summary>
/// <param name="dbType">DBType.SQLite or DBType.MySql</param>
/// <param name="connectionString">Connection string</param>
/// <returns>true=success, false=error</returns>
public static bool CreateEmptyConfigDB(Users.Entities.DBType dbType, string connectionString)
{
ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
if (sessionFactory == null) return false;
/// Populate the database
using (var session = sessionFactory.OpenSession())
{
using (var transaction = session.BeginTransaction())
{
///
/// Create user 'admin'
///
var admin = new Config.Entities.User
{
UserName = Data.AdminUsername,
FullName = Strings.Administrator,
LastPwChange = DateTime.Now
};
admin.SetPassword(Data.AdminPassword);
///
/// Prepare all groups, add some of them to admin
///
for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
{
Config.Entities.Group group = new Config.Entities.Group(gid);
switch (gid)
{
case Users.Entities.GID.Testers:
case Users.Entities.GID.TestingSpecialists:
case Users.Entities.GID.HeadOfLab:
case Users.Entities.GID.MaintenanceSpecialists:
case Users.Entities.GID.Metrologists:
case Users.Entities.GID.CalibrationSpecialists:
case Users.Entities.GID.Administrators:
#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
case Users.Entities.GID.TraceabilityManagement:
#elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
case Users.Entities.GID.MetrologicalAuthority:
case Users.Entities.GID.WaterMeterAuthority:
#endif
admin.AddGroup(group);
session.SaveOrUpdate(group); /// Save this group
break;
}
}
session.SaveOrUpdate(admin); /// Save user 'admin'
transaction.Commit();
}
}
return true;
}
}
}
+9 -8
View File
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using log4net;
using Common;
namespace Config
{
@@ -182,7 +183,7 @@ namespace Config
double theta = temp / 100.0;
double B = x0 * (((x3 * theta + x2) * theta + x1) * theta + 1) / (1 + x4 * theta);
return WaterDensityFromTemp(temp) * (1 + B * Config.Units.ConvertTo(Config.Unit.Pa, pressure));
return WaterDensityFromTemp(temp) * (1 + B * Units.ConvertTo(Unit.Pa, pressure));
}
@@ -213,9 +214,9 @@ namespace Config
/// </summary>
public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
{
if (trueVolume <= float.Epsilon)
if (-float.Epsilon <= trueVolume && trueVolume <= float.Epsilon)
{
if (measuredVolume <= float.Epsilon)
if (-float.Epsilon <= measuredVolume && measuredVolume <= float.Epsilon)
{
log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
return -100.0;
@@ -238,7 +239,7 @@ namespace Config
/// <param name="rawMeasurement">Raw uncorrected value</param>
/// <param name="corrections">Sorted (value, correction) pairs</param>
/// <returns>Corrected value</returns>
public static double CorrectedValue(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
public static double CorrectedValue(double rawValue, IList<IMeasurementCorrection> corrections)
{
return rawValue + GetCorrection(rawValue, corrections);
}
@@ -250,7 +251,7 @@ namespace Config
/// <param name="rawMeasurement">Raw uncorrected value</param>
/// <param name="corrections">Sorted (value, correction) pairs</param>
/// <returns>Corrected value</returns>
public static double GetCorrection(double rawValue, IList<Config.Entities.MeasurementCorrection> corrections)
public static double GetCorrection(double rawValue, IList<IMeasurementCorrection> corrections)
{
if ((corrections == null) || (corrections.Count == 0)) return 0; /// No correction
@@ -316,11 +317,11 @@ namespace Config
const double p_star_Pa = 16.53E6; /// [Pa] (=16.53 MPa)
const double T_star = 1386.0; /// [K]
double T_in_K = Config.Units.ConvertTo(Config.Unit.K, T_in);
double T_out_K = Config.Units.ConvertTo(Config.Unit.K, T_out);
double T_in_K = Units.ConvertTo(Unit.K, T_in);
double T_out_K = Units.ConvertTo(Unit.K, T_out);
double tau_in = T_star / T_in_K;
double tau_out = T_star / T_out_K;
double pi = Config.Units.ConvertTo(Config.Unit.Pa, pressure) / p_star_Pa;
double pi = Units.ConvertTo(Unit.Pa, pressure) / p_star_Pa;
double h_in = tau_in * GammaTau(pi, tau_in) * R * T_in_K;
double h_out = tau_out * GammaTau(pi, tau_out) * R * T_out_K;
+3 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Config.Entities;
@@ -15,7 +15,8 @@ namespace Config.Mappings
Map(x => x.Name);
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.TempMtrUp).Column("TempIn");
Map(x => x.Selector);
Map(x => x.TempMtrUp).Column("TempIn");
Map(x => x.TempMtrDown).Column("TempOut");
Map(x => x.PressMtrUp).Column("PressIn");
Map(x => x.PressMtrDown).Column("PressOut");
+30
View File
@@ -0,0 +1,30 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Config.Entities;
namespace Config.Mappings
{
class CustomEventMap : ClassMap<CustomEvent>
{
public CustomEventMap()
{
Id(x => x.Id);
Map(x => x.Date);
Map(x => x.Frequency);
Map(x => x.AllDay);
Map(x => x.TriggerOnExactDayOnly);
Map(x => x.Source);
Map(x => x.Title);
Map(x => x.AutoAction);
Map(x => x.Parameters);
Map(x => x.Rank);
Map(x => x.Hidden);
Map(x => x.ReadOnly);
Map(x => x.BackColor);
Map(x => x.TextColor);
Map(x => x.TooltipEnabled);
}
}
}
+3 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Config.Entities;
@@ -15,7 +15,8 @@ namespace Config.Mappings
Map(x => x.Name);
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.Pump);
Map(x => x.Selector);
Map(x => x.Pump);
Map(x => x.RegulValvesPct);
Map(x => x.ValvesOpen)
.CustomType("StringClob")
+5 -3
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Config.Entities;
@@ -15,7 +15,8 @@ namespace Config.Mappings
Map(x => x.Name);
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.RegulValve);
Map(x => x.Selector);
Map(x => x.RegulValve);
Map(x => x.FlowMeter);
Map(x => x.PidCoef);
Map(x => x.StartValve);
@@ -23,7 +24,8 @@ namespace Config.Mappings
Map(x => x.TempDiv);
Map(x => x.Scale)
.Column("Balance");
Map(x => x.EmptyTankValve);
Map(x => x.RegulValvesPct)
.Column("EmptyTankValve");
Map(x => x.ValvesOpen)
.CustomType("StringClob")
.CustomSqlType("varchar(8000)");
+1
View File
@@ -24,6 +24,7 @@ namespace Config.Mappings
Map(x => x.PressLimHi);
Map(x => x.Publish);
Map(x => x.Evaluate);
Map(x => x.Method);
Map(x => x.E1);
Map(x => x.E2);
Map(x => x.E3);
+2 -1
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Config.Entities;
@@ -35,6 +35,7 @@ namespace Config.Mappings
Map(x => x.DataEntry);
Map(x => x.ResultsPrinter);
Map(x => x.ResultsWriter);
Map(x => x.EventTriggers);
Map(x => x.TransitionStart);
Map(x => x.TransitionEnd);
+17 -10
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using Config.Entities;
@@ -18,22 +18,21 @@ namespace Config.Mappings
Map(x => x.Publish);
Map(x => x.DoEvaluate)
.Column("Evaluate");
#if TEST_PROFILES
Map(x => x.Qtg);
#endif
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.Volume);
Map(x => x.TstTime);
Map(x => x.TestTime)
.Column("TstTime");
Map(x => x.Repeats);
Map(x => x.DoDraining)
.Column("Emptying");
Map(x => x.DoDrainingAfter)
.Column("Zeroing");
Map(x => x.DoControlWaterTemp);
Map(x => x.TempLimLo);
Map(x => x.TempLimHi);
Map(x => x.PumpPower);
Map(x => x.TempControl);
Map(x => x.PumpPower);
Map(x => x.MassRepeats);
Map(x => x.MassSpread);
Map(x => x.MassMethod)
@@ -47,7 +46,7 @@ namespace Config.Mappings
Map(x => x.ErrLimLo);
Map(x => x.ErrLimHi);
Map(x => x.Uncertainty);
Map(x => x.TolerRed)
Map(x => x.ShortPulses)
.Column("TolerRed"); /// ???
Map(x => x.RedType);
Map(x => x.FeedingPath);
@@ -57,12 +56,20 @@ namespace Config.Mappings
#if HEAT_METERS
Map(x => x.HeatMetersPath);
#endif
Map(x => x.RelTransBefore)
Map(x => x.TransBefore)
.Column("RelTransBefore");
Map(x => x.RelTransBetween)
Map(x => x.TransBetween)
.Column("RelTransBetween");
Map(x => x.TransitionAfter)
Map(x => x.TransAfter)
.Column("TransitionAfter");
#if ORACLE_DB
Map(x => x.OraId);
Map(x => x.OraIdRepetMulti);
Map(x => x.OraDesignation);
Map(x => x.RawDataId);
Map(x => x.RawDataIdRepetMulti);
Map(x => x.RawDataDesignation);
#endif
HasMany(x => x.MoreParams)
.Cascade.All();
+3 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sensus")]
[assembly: AssemblyProduct("Config")]
[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko a.s.")]
[assembly: AssemblyCopyright("Copyright © 2013 - 2022 Sensus Slovensko a.s.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.25.1400.0")]
[assembly: AssemblyFileVersion("2.25.1400.0")]
[assembly: AssemblyVersion("2.31.1990.0")]
[assembly: AssemblyFileVersion("2.31.1990.0")]
+101 -55
View File
@@ -60,24 +60,6 @@ namespace Config.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Administrator.
/// </summary>
internal static string Administrator {
get {
return ResourceManager.GetString("Administrator", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Calibration Specialist.
/// </summary>
internal static string Calibration_Specialist {
get {
return ResourceManager.GetString("Calibration_Specialist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Cannot open DB Cause 0.
/// </summary>
@@ -92,8 +74,7 @@ namespace Config.Resources {
/// </summary>
internal static string Error
{
get
{
get {
return ResourceManager.GetString("Error", resourceCulture);
}
}
@@ -107,33 +88,6 @@ namespace Config.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Head of Lab.
/// </summary>
internal static string Head_of_Lab {
get {
return ResourceManager.GetString("Head_of_Lab", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Maintenance Specialist.
/// </summary>
internal static string Maintenance_Specialist {
get {
return ResourceManager.GetString("Maintenance_Specialist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Metrologist.
/// </summary>
internal static string Metrologist {
get {
return ResourceManager.GetString("Metrologist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Passed.
/// </summary>
@@ -142,22 +96,114 @@ namespace Config.Resources {
return ResourceManager.GetString("Passed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tester.
/// Looks up a localized string similar to Once.
/// </summary>
internal static string Tester {
internal static string Once
{
get {
return ResourceManager.GetString("Tester", resourceCulture);
return ResourceManager.GetString("Once", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Testing Specialist.
/// Looks up a localized string similar to Every year.
/// </summary>
internal static string Testing_Specialist {
internal static string Every_year
{
get {
return ResourceManager.GetString("Testing_Specialist", resourceCulture);
return ResourceManager.GetString("Every_year", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Every Month.
/// </summary>
internal static string Every_Month
{
get {
return ResourceManager.GetString("Every_Month", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Every week.
/// </summary>
internal static string Every_week
{
get {
return ResourceManager.GetString("Every_week", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Daily.
/// </summary>
internal static string Daily
{
get {
return ResourceManager.GetString("Daily", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Every shift.
/// </summary>
internal static string Every_shift
{
get {
return ResourceManager.GetString("Every_shift", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Every Monday, Wednesday and Friday.
/// </summary>
internal static string Every_Mon_Wed_and_Fri
{
get {
return ResourceManager.GetString("Every_Mon_Wed_and_Fri", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Every Tuesday and Thursday.
/// </summary>
internal static string Every_Tue_and_Thu
{
get {
return ResourceManager.GetString("Every_Tue_and_Thu", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Every Week Day (Mon - Fri).
/// </summary>
internal static string Every_Week_Day
{
get {
return ResourceManager.GetString("Every_Week_Day", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Custom.
/// </summary>
internal static string Custom
{
get {
return ResourceManager.GetString("Custom", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Administrator.
/// </summary>
internal static string Administrator
{
get {
return ResourceManager.GetString("Administrator", resourceCulture);
}
}
}
+33
View File
@@ -117,7 +117,40 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Custom" xml:space="preserve">
<value>Volitelně</value>
</data>
<data name="Daily" xml:space="preserve">
<value>Každý den</value>
</data>
<data name="Error" xml:space="preserve">
<value>Chyba</value>
</data>
<data name="Every_Month" xml:space="preserve">
<value>Každý měsíc</value>
</data>
<data name="Every_Mon_Wed_and_Fri" xml:space="preserve">
<value>Každý pondělí, středu a pátek</value>
</data>
<data name="Every_shift" xml:space="preserve">
<value>Každou směnu</value>
</data>
<data name="Every_Tue_and_Thu" xml:space="preserve">
<value>Každý úterí a čtvrtek</value>
</data>
<data name="Every_week" xml:space="preserve">
<value>Každý týden</value>
</data>
<data name="Every_Week_Day" xml:space="preserve">
<value>Každý pracovní den (pon. - pá.)</value>
</data>
<data name="Every_year" xml:space="preserve">
<value>Každý rok</value>
</data>
<data name="Once" xml:space="preserve">
<value>Jednou</value>
</data>
<data name="Administrator" xml:space="preserve">
<value>Správce</value>
</data>
</root>
+3 -3
View File
@@ -118,15 +118,15 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Failed" xml:space="preserve">
<value>NiO</value>
<value>Nicht OK</value>
</data>
<data name="Passed" xml:space="preserve">
<value>iO</value>
<value>OK</value>
</data>
<data name="Error" xml:space="preserve">
<value>Fehler</value>
</data>
<data name="Cannot_open_DB_Cause_0" xml:space="preserve">
<value>Datenbank kann nicht geöffnet.\\r\\nUrsache:\\r\\n{0}</value>
<value>Datenbank kann nicht geöffnet werden.\\r\\nUrsache:\\r\\n{0}</value>
</data>
</root>
+33
View File
@@ -129,4 +129,37 @@
<data name="Error" xml:space="preserve">
<value>Error</value>
</data>
<data name="Custom" xml:space="preserve">
<value>Custom</value>
</data>
<data name="Daily" xml:space="preserve">
<value>Daily</value>
</data>
<data name="Every_Month" xml:space="preserve">
<value>Every Month</value>
</data>
<data name="Every_Mon_Wed_and_Fri" xml:space="preserve">
<value>Every Monday, Wednesday and Friday</value>
</data>
<data name="Every_shift" xml:space="preserve">
<value>Every shift</value>
</data>
<data name="Every_Tue_and_Thu" xml:space="preserve">
<value>Every Tuesday and Thursday</value>
</data>
<data name="Every_week" xml:space="preserve">
<value>Every week</value>
</data>
<data name="Every_Week_Day" xml:space="preserve">
<value>Every Week Day (Mon - Fri)</value>
</data>
<data name="Every_year" xml:space="preserve">
<value>Every year</value>
</data>
<data name="Once" xml:space="preserve">
<value>Once</value>
</data>
<data name="Administrator" xml:space="preserve">
<value>Administrator</value>
</data>
</root>
-478
View File
@@ -1,478 +0,0 @@
///
/// Copyright (c) 2016-2018 Sensus Slovensko a.s.
///
using System;
using System.Reflection;
using Config.Entities;
namespace Config
{
public enum Unit
{
[Description("---")] None,
[Description("imp.")] pulse,
#if LANG_PL
[Description("stopień")] degree,
#else
[Description("degree")] degree,
#endif
[Description("l")] l, /// * 1 liter
[Description("dm3")] dm3, /// 1 dm3 = 1 liter
[Description("m3")] m3, /// 1000 l
[Description("gal(UK)")] gal_UK, /// 1 gal(UK) = 4.54609 l
[Description("gal(US)")] gal_US, /// 1 gal(US) = 3.78541178 l
[Description("l/h")] lph, /// 1 liter/h
[Description("m3/h")] m3ph, /// * 1 m3/h = 1000 l/h
[Description("g")] g, /// 0.001 kg
[Description("kg")] kg, /// * 1 kilogram
[Description("t")] t, /// 1000 kg
[Description("lb")] lb, /// 0.45359237 kg
[Description("s")] s, /// * 1 second
[Description("min")] min, /// 1 min = 60 s
[Description("hr")] hour, /// 1 hour = 60 min = 3600 s
[Description("ms")] ms, /// 1 ms = 0.001 s
[Description("°C")] C, /// * degree Celsius (°C)
[Description("°F")] F, /// degree Fahrenheit
[Description("K")] K, /// degree Kelvin
[Description("Pa")] Pa, /// 1 Pa = 0.01 hPa
[Description("hPa")] hPa, /// 1 hPa = 100 Pa
[Description("kPa")] kPa, /// 1 kPa = 10 HPa
[Description("MPa")] MPa, /// 1 MPa = 10000 hPa
[Description("mbar")] mbar, /// 1 mbar = 1 hPa = 100 Pa
[Description("bar")] bar, /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
[Description("inHg")] inHg, /// 1 inHg = 33.864 hPa
[Description("R%")] RPct, /// * 1 R%
[Description("%")] Pct, /// * 1 %
[Description("promile")] Promile, /// 1 promile = 0.1 %
[Description("mm")] mm, /// * 1 millimeter
[Description("cm")] cm, /// 1 cm = 10 mm
[Description("m")] m, /// 1 m = 1000 mm
[Description("in")] inch, /// 1 inch = 25.4 mm
[Description("kg/m3")] kgpm3, /// * 1 kg/m3 = 0.001 kg/l
[Description("kg/l")] kgpl, /// 1 kg/l = 1000 kg/m3
[Description("J")] J, /// * 1 Joul
[Description("kJ")] kJ, /// 1 kJ = 1000 J
[Description("MJ")] MJ, /// 1 MJ = 1000000 J
[Description("Wh")] Wh, /// 1 Wh = 3600 J
[Description("kWh")] kWh, /// 1 kWh = 3600000 J
[Description("MWh")] MWh, /// 1 MWh = 3600000000 J
#if LANG_PL
[Description("imp/l")] ppl, /// * 1 pulse/l
[Description("imp/dm3")] ppdm3, /// * 1 pulse/dm3
[Description("stopień/l")] degpl, /// * 1 degree/l
[Description("stopień/dm3")] degpdm3, /// * 1 degree/dm3
[Description("l/imp")] lpp, /// * 1 l/pulse
[Description("dm3/imp")] dm3pp, /// * 1 dm3/pulse
[Description("l/stopień")] lpdeg, /// * 1 l/degree
[Description("dm3/stopień")] dm3pdeg, /// * 1 dm3/degree
#else
[Description("pulse/l")] ppl, /// * 1 pulse/l
[Description("pulse/dm3")] ppdm3, /// * 1 pulse/dm3
[Description("degree/l")] degpl, /// * 1 degree/l
[Description("degree/dm3")] degpdm3, /// * 1 degree/dm3
[Description("l/pulse")] lpp, /// * 1 l/pulse
[Description("dm3/pulse")] dm3pp, /// * 1 dm3/pulse
[Description("l/degree")] lpdeg, /// * 1 l/degree
[Description("dm3/degree")] dm3pdeg, /// * 1 dm3/degree
#endif
///
[Description("pulse/kWh")] ppkWh, /// * 1 pulse/kWh
[Description("kWh/pulse")] kWhpp, /// * 1 kWh/pulse
Count
}
public enum Quantity
{
/// Quantities with units and conversions (double -> double)
#if LANG_DE
[Description("Volumen")] Volume,
[Description("Durchfluss")] Flow,
[Description("Masse")] Mass,
[Description("Zeit")] Time,
[Description("Temperatur")] Temperature,
[Description("Druck")] Pressure,
[Description("Feuchtigkeit")] Humidity,
[Description("Fehler")] Error,
[Description("Länge")] Length,
[Description("Dichte")] Density,
[Description("Energie")] Energy,
[Description("Impulse")] Pulses,
[Description("Impulse/l")] PulsePerLtr,
[Description("Impulse/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Nummer")] Number,
[Description("Text")] String,
[Description("Boolean")] Boolean,
[Description("Datum und Uhrzeit")] DateTime,
#elif LANG_PL
[Description("Objętość")] Volume,
[Description("Przepływ")] Flow,
[Description("Masa")] Mass,
[Description("Czas")] Time,
[Description("Temperatura")] Temperature,
[Description("Ciśnienie")] Pressure,
[Description("Wilgotność")] Humidity,
[Description("Błąd")] Error,
[Description("Długość")] Length,
[Description("Gęstość")] Density,
[Description("Energia")] Energy,
[Description("Impulsy")] Pulses,
[Description("Impulsy/litr")] PulsePerLtr,
[Description("Impulsy/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Numer")] Number,
[Description("Tekst")] String,
[Description("Boolean")] Boolean,
[Description("Data i czas")] DateTime,
#elif LANG_CS
[Description("Objem")] Volume,
[Description("Průtok")] Flow,
[Description("Hmotnost")] Mass,
[Description("Čas")] Time,
[Description("Teplota")] Temperature,
[Description("Tlak")] Pressure,
[Description("Vlhkost")] Humidity,
[Description("Chyba")] Error,
[Description("Délka")] Length,
[Description("Hustota")] Density,
[Description("Energie")] Energy,
[Description("Pulzy")] Pulses,
[Description("Pulzy/litr")] PulsePerLtr,
[Description("Pulzy/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Počet")] Number,
[Description("Text")] String,
[Description("Boolean")] Boolean,
[Description("Datum a čas")] DateTime,
#elif LANG_IT
[Description("Volume")] Volume,
[Description("Flusso")] Flow,
[Description("Massa")] Mass,
[Description("Tempo")] Time,
[Description("Temperatura")] Temperature,
[Description("Pressione")] Pressure,
[Description("Umidità")] Humidity,
[Description("Errore")] Error,
[Description("Lungezza")] Length,
[Description("Densità")] Density,
[Description("Energia")] Energy,
[Description("Impulso")] Pulses,
[Description("Impulso/litro")] PulsePerLtr,
[Description("Impulso/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Numero")] Number,
[Description("Stringa")] String,
[Description("Boolean")] Boolean,
[Description("Data e ora")] DateTime,
#else
[Description("Volume")] Volume,
[Description("Flow")] Flow,
[Description("Mass")] Mass,
[Description("Time")] Time,
[Description("Temperature")] Temperature,
[Description("Pressure")] Pressure,
[Description("Humidity")] Humidity,
[Description("Error")] Error,
[Description("Length")] Length,
[Description("Density")] Density,
[Description("Energy")] Energy,
[Description("Pulses")] Pulses,
[Description("Pulses/liter")] PulsePerLtr,
[Description("Pulses/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Number")] Number,
[Description("String")] String,
[Description("Boolean")] Boolean,
[Description("Date and time")] DateTime,
#endif
Count,
}
public static class Units
{
public static bool IsUnitless(Quantity quantity)
{
return quantity >= Quantity.Number;
}
public static bool IsDefaultUnit(Unit unit)
{
return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C || unit == Unit.bar || unit == Unit.RPct ||
unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 || unit == Unit.J || unit == Unit.ppl || unit == Unit.ppkWh;
}
public static bool IsQuantity(Unit units, Quantity quantity)
{
return (quantity == GetQuantity(units));
}
public static Quantity GetQuantity(Unit units)
{
switch (units)
{
case Unit.pulse:
case Unit.degree:
return Config.Quantity.Pulses;
case Unit.l:
case Unit.dm3:
case Unit.m3:
case Unit.gal_UK:
case Unit.gal_US:
return Config.Quantity.Volume;
case Unit.lph:
case Unit.m3ph:
return Config.Quantity.Flow;
case Unit.g:
case Unit.kg:
case Unit.t:
case Unit.lb:
return Config.Quantity.Mass;
case Unit.s:
case Unit.min:
case Unit.hour:
case Unit.ms:
return Config.Quantity.Time;
case Unit.C:
case Unit.F:
case Unit.K:
return Config.Quantity.Temperature;
case Unit.Pa:
case Unit.hPa:
case Unit.mbar:
case Unit.kPa:
case Unit.bar:
case Unit.MPa:
case Unit.inHg:
return Config.Quantity.Pressure;
case Unit.RPct:
return Config.Quantity.Humidity;
case Unit.Pct:
case Unit.Promile:
return Config.Quantity.Error;
case Unit.mm:
case Unit.cm:
case Unit.m:
case Unit.inch:
return Config.Quantity.Length;
case Unit.kgpm3:
case Unit.kgpl:
return Config.Quantity.Density;
case Unit.J:
case Unit.kJ:
case Unit.MJ:
case Unit.Wh:
case Unit.kWh:
case Unit.MWh:
return Config.Quantity.Energy;
case Unit.ppl:
case Unit.ppdm3:
case Unit.degpl:
case Unit.degpdm3:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg:
return Config.Quantity.PulsePerLtr;
case Unit.ppkWh:
case Unit.kWhpp:
return Config.Quantity.PulsePerKWh;
default:
return Config.Quantity.Number;
}
}
public static bool IsVolume(Unit units) { return IsQuantity(units, Config.Quantity.Volume); }
public static bool IsFlow(Unit units) { return IsQuantity(units, Config.Quantity.Flow); }
public static bool IsMass(Unit units) { return IsQuantity(units, Config.Quantity.Mass); }
public static bool IsTime(Unit units) { return IsQuantity(units, Config.Quantity.Time); }
public static bool IsTemperature(Unit units) { return IsQuantity(units, Config.Quantity.Temperature); }
public static bool IsPressure(Unit units) { return IsQuantity(units, Config.Quantity.Pressure); }
public static bool IsHumidity(Unit units) { return IsQuantity(units, Config.Quantity.Humidity); }
public static bool IsError(Unit units) { return IsQuantity(units, Config.Quantity.Error); }
public static bool IsLength(Unit units) { return IsQuantity(units, Config.Quantity.Length); }
public static bool IsDensity(Unit units) { return IsQuantity(units, Config.Quantity.Density); }
public static bool IsEnergy(Unit units) { return IsQuantity(units, Config.Quantity.Energy); }
public static bool IsPulses(Unit units) { return IsQuantity(units, Config.Quantity.Pulses); }
public static bool IsPulsePerLtr(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerLtr); }
public static bool IsPulsePerKWh(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerKWh); }
public static double ConvertTo(Unit units, double v)
{
switch (units)
{
/// Volume: internal representation in l
case Unit.dm3:
case Unit.l: return v; /// 1 liter
case Unit.m3: return 0.001 * v; /// 1 m3 = 1000 l
case Unit.gal_UK: return 0.21996925 * v; /// 1 gal(UK) = 4.54609 l
case Unit.gal_US: return 0.26417205 * v; /// 1 gal(US) = 3.78541178 l
/// Flow: internal representation in m3/h
case Unit.lph: return 1000 * v; /// 1 liter/h
case Unit.m3ph: return v; /// 1 m3/h = 1000 l/h
/// Mass: internal representation in kg
case Unit.g: return 1000 * v; /// 1 g = 0.001 kg
case Unit.kg: return v; /// 1 kilogram
case Unit.t: return 0.001 * v; /// 1 t = 1000 kg
case Unit.lb: return 2.2046226 * v; /// 1 lb = 0.45359237 kg
/// Time or duration: internal representation in seconds [s]
case Unit.s: return v;
case Unit.min: return v / 60;
case Unit.hour: return v / 3600;
case Unit.ms: return 1000 * v;
/// Temperature: internal representation in °C
case Unit.C: return v; /// degree Celsius (°C)
case Unit.F: return 1.8 * v + 32; /// degree Fahrenheit
case Unit.K: return v + 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 100000 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 1000 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 1000 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 100 * v; /// 1 kPa = 10 HPa
case Unit.bar: return v; /// 1 bar = 1000 mbar = 100000 Pa
case Unit.MPa: return 0.1 * v; /// 1 MPa = 10000 hPa
case Unit.inHg: return 29.53 * v; /// 1 inHg = 33.864 hPa
/// Error: internal representation in %
case Unit.Pct: return v; /// 1 %
case Unit.Promile: return 10 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.mm: return v; /// 1 mm
case Unit.cm: return 0.1 * v; /// 1 cm = 10 mm
case Unit.m: return 0.001 * v; /// 1 m = 1000 mm
case Unit.inch: return v / 25.4; /// 1 inch = 25.4 mm
/// Density: internal representation in kg/m3
case Unit.kgpm3: return v;
case Unit.kgpl: return 0.001 * v;
/// Energy, internal representation in Joul
case Unit.J: return v; /// 1 Joul
case Unit.kJ: return 0.001 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 0.000001 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return v / 3600.0; /// 1 Wh = 3600 J
case Unit.kWh: return v / 3600000.0; /// 1 kWh = 3600000 J
case Unit.MWh: return v / 3600000000.0;/// 1 MWh = 3600000000 J
case Unit.kWhpp:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg: return ((v <= float.Epsilon) ? 0 : 1 / v);
default: return v;
}
}
public static double ConvertFrom(Unit units, double v)
{
switch (units)
{
/// Volume: internal representation in l
case Unit.dm3:
case Unit.l: return v; /// 1 liter
case Unit.m3: return 1000 * v; /// 1000 l
case Unit.gal_UK: return 4.54609 * v; /// 1 gal(UK) = 4.54609 l
case Unit.gal_US: return 3.78541178 * v; /// 1 gal(US) = 3.78541178 l
/// Flow: internal representation in m3/h
case Unit.lph: return 0.001 * v; /// 1 liter/h
case Unit.m3ph: return v; /// 1 m3/h = 1000 l/h
/// Mass: internal representation in kg
case Unit.g: return 0.001 * v; /// 1 g = 0.001 kg
case Unit.kg: return v; /// 1 kilogram
case Unit.t: return 1000 * v; /// 1 t = 1000 kg
case Unit.lb: return 0.45359237 * v; /// 1 lb = 0.45359237 kg
/// Time or duration: internal representation in seconds [s]
case Unit.s: return v;
case Unit.min: return 60 * v;
case Unit.hour: return 3600 * v;
case Unit.ms: return v / 1000;
/// Temperature: internal representation in °C
case Unit.C: return v; /// degree Celsius (°C)
case Unit.F: return 5 * (v-32) / 9; /// degree Fahrenheit
case Unit.K: return v - 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 0.00001 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 0.001 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 0.001 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 0.01 * v; /// 1 kPa = 10 HPa
case Unit.bar: return v; /// 1 bar = 1000 mbar = 100000 Pa
case Unit.MPa: return 10 * v; /// 1 MPa = 10000 hPa
case Unit.inHg: return 0.033864 * v; /// 1 inHg = 33.864 hPa
/// Error: internal representation in %
case Unit.Pct: return v; /// 1 %
case Unit.Promile: return 0.1 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.mm: return v; /// 1 mm
case Unit.cm: return 10 * v; /// 1 cm = 10 mm
case Unit.m: return 1000 * v; /// 1 m = 1000 mm
case Unit.inch: return 25.4 * v; /// 1 inch = 25.4 mm
/// Density: internal representation in kg/m3
case Unit.kgpm3: return v;
case Unit.kgpl: return 1000 * v;
/// Energy, internal representation in Joul
case Unit.J: return v; /// 1 Joul
case Unit.kJ: return 1000 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 1000000 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return 3600 * v; /// 1 Wh = 3600 J
case Unit.kWh: return 3600000 * v; /// 1 kWh = 3600000 J
case Unit.MWh: return 3600000000 * v; /// 1 kWh = 3600000000 J
case Unit.kWhpp:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg: return ((v == 0) ? 0 : 1 / v);
default: return v;
}
}
}
}
+1 -189
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
/// Copyright (c) 2017-2022 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -10,80 +10,6 @@ namespace Config
{
public static class Utils
{
public static string SignificantDigitsToFmt(double value, int sigDigits)
{
if (sigDigits == 6)
{
if (value >= 99999.5 || value < -99999.5) return "F0";
else if (value >= 9999.95 || value < -9999.95) return "F1";
else if (value >= 999.995 || value < -999.995) return "F2";
else if (value >= 99.9995 || value < -99.9995) return "F3";
else if (value >= 9.99995 || value < -9.99995) return "F4";
else if (value >= 0.999995 || value < -0.999995) return "F5";
else if (value >= 0.0999995 || value < -0.0999995) return "F6";
else if (value >= 0.00999995 || value < -0.00999995) return "F7";
else if (value >= 0.000999995 || value < -0.000999995) return "F8";
else if (value >= 0.0000999995 || value < -0.0000999995) return "F9";
else return "F10";
}
else if (sigDigits == 5)
{
if (value >= 9999.5 || value < -9999.5) return "F0";
else if (value >= 999.95 || value < -999.95) return "F1";
else if (value >= 99.995 || value < -99.995) return "F2";
else if (value >= 9.9995 || value < -9.9995) return "F3";
else if (value >= 0.99995 || value < -0.99995) return "F4";
else if (value >= 0.099995 || value < -0.099995) return "F5";
else if (value >= 0.0099995 || value < -0.0099995) return "F6";
else if (value >= 0.00099995 || value < -0.00099995) return "F7";
else if (value >= 0.000099995 || value < -0.000099995) return "F8";
else return "F9";
}
else if (sigDigits == 4)
{
if (value >= 999.5 || value < -999.5) return "F0";
else if (value >= 99.95 || value < -99.95) return "F1";
else if (value >= 9.995 || value < -9.995) return "F2";
else if (value >= 0.9995 || value < -0.9995) return "F3";
else if (value >= 0.09995 || value < -0.09995) return "F4";
else if (value >= 0.009995 || value < -0.009995) return "F5";
else if (value >= 0.0009995 || value < -0.0009995) return "F6";
else if (value >= 0.00009995 || value < -0.00009995) return "F7";
else return "F8";
}
else if (sigDigits == 3)
{
if (value >= 99.5 || value < -99.5) return "F0";
else if (value >= 9.95 || value < -9.95) return "F1";
else if (value >= 0.995 || value < -0.995) return "F2";
else if (value >= 0.0995 || value < -0.0995) return "F3";
else if (value >= 0.00995 || value < -0.00995) return "F4";
else if (value >= 0.000995 || value < -0.000995) return "F5";
else if (value >= 0.0000995 || value < -0.0000995) return "F6";
else return "F7";
}
else if (sigDigits == 2)
{
if (value >= 9.5 || value < -9.5) return "F0";
else if (value >= 0.95 || value < -0.95) return "F1";
else if (value >= 0.095 || value < -0.095) return "F2";
else if (value >= 0.0095 || value < -0.0095) return "F3";
else if (value >= 0.00095 || value < -0.00095) return "F4";
else if (value >= 0.000095 || value < -0.000095) return "F5";
else return "F6";
}
else /// if (sigDigits == 1)
{
if (value >= 0.95 || value < -0.95) return "F0";
else if (value >= 0.095 || value < -0.095) return "F1";
else if (value >= 0.0095 || value < -0.0095) return "F2";
else if (value >= 0.00095 || value < -0.00095) return "F3";
else if (value >= 0.000095 || value < -0.000095) return "F4";
else return "F5";
}
}
/// <summary>
/// Extract and return a DB server from a MySQL connection string.
/// </summary>
@@ -138,119 +64,5 @@ namespace Config
/// pattern NOT found
return string.Empty;
}
/// <summary>
/// Get either Q1 or Qmin flow for a given Qn and metrological class
/// </summary>
/// <param name="Qn">Nominal flow in m3/h</param>
/// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
/// <param name="medium">NotSpecified, ColdWater or HotWater</param>
/// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
/// <returns>Q1 or Qmin flow in m3/h</returns>
public static double GetQ1Qmin(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
{
if (string.IsNullOrEmpty(metroClass)) return Qdflt;
int metroClassRatio;
if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
{
return Qn / (double)metroClassRatio;
}
else
{
if (medium == Entities.Medium.HotWater)
{
switch (metroClass)
{
case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
case "B": return (Qn < 15) ? (0.02 * Qn) : (0.04 * Qn);
case "C": return (Qn < 15) ? (0.01 * Qn) : (0.02 * Qn);
case "D": return (Qn < 15) ? (0.01 * Qn) : Qdflt;
default: break;
}
}
else
{
switch (metroClass)
{
case "A": return (Qn < 15) ? (0.04 * Qn) : (0.08 * Qn);
case "B": return (Qn < 15) ? (0.02 * Qn) : (0.03 * Qn);
case "C": return (Qn < 15) ? (0.01 * Qn) : (0.006 * Qn);
default: break;
}
}
}
return Qdflt;
}
/// <summary>
/// Get either Q2 or Qt flow for a given Qn and metrological class
/// </summary>
/// <param name="Qn">Nominal flow in m3/h</param>
/// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
/// <param name="medium">NotSpecified, ColdWater or HotWater</param>
/// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
/// <returns>Q2 or Qt flow in m3/h</returns>
public static double GetQ2Qt(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
{
if (string.IsNullOrEmpty(metroClass)) return Qdflt;
int metroClassRatio;
if ((metroClass[0] == 'R') && int.TryParse(metroClass.Substring(1), out metroClassRatio) && (metroClassRatio > 0))
{
return 1.6 * Qn / (double)metroClassRatio;
}
if (medium == Entities.Medium.HotWater)
{
switch (metroClass)
{
case "A": return (Qn < 15) ? (0.1 * Qn) : (0.2 * Qn);
case "B": return (Qn < 15) ? (0.08 * Qn) : (0.15 * Qn);
case "C": return (Qn < 15) ? (0.06 * Qn) : (0.1 * Qn);
case "D": return (Qn < 15) ? (0.015 * Qn) : Qdflt;
default: break;
}
}
else
{
switch (metroClass)
{
case "A": return (Qn < 15) ? (0.1 * Qn) : (0.3 * Qn);
case "B": return (Qn < 15) ? (0.08 * Qn) : (0.2 * Qn);
case "C": return (Qn < 15) ? (0.015 * Qn) : (0.015 * Qn);
default: break;
}
}
return Qdflt;
}
/// <summary>
/// Get either Q4 or Qmax flow for a given Qn and metrological class
/// </summary>
/// <param name="Qn">Nominal flow in m3/h</param>
/// <param name="metroClass">Metrological class ("A" ,"B", "C" or "R#")</param>
/// <param name="medium">NotSpecified, ColdWater or HotWater</param>
/// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
/// <returns>Q4 or Qmax flow in m3/h</returns>
public static double GetQ4Qmax(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
{
if (string.IsNullOrEmpty(metroClass)) return Qdflt;
switch (metroClass[0])
{
case 'A':
case 'B':
case 'C':
case 'D':
return 2 * Qn;
case 'R':
return 1.25 * Qn;
default:
return Qdflt;
}
}
}
}
+23
View File
@@ -0,0 +1,23 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
namespace DataStreamInterface
{
public class DataFrame
{
public readonly Int64 ID; /// Frame ID
public readonly double Time; /// Time stamp in units of time
public readonly double Volume; /// Volume in units of volume
public readonly double[] Quantity; /// An array of optional quantities in their respective units
public DataFrame(Int64 id, double time, double volume, double[] quantity)
{
ID = id;
Time = time;
Volume = volume;
Quantity = quantity;
}
}
}
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DataStreamInterface</RootNamespace>
<AssemblyName>DataStreamInterface</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="DataFrame.cs" />
<Compile Include="Enums.cs" />
<Compile Include="IDataStreamMeter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Doc\Software interface for datastream water meters.docx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
+401
View File
@@ -0,0 +1,401 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
namespace DataStreamInterface
{
public enum Unit
{
None,
pulse,
degree,
/// Volume
ml, /// 1 ml = 0.001 l
l, /// * 1 liter
dm3, /// 1 dm3 = 1 l
USgal, /// 1 US gallon = 3.78541178 l
UKgal, /// 1 imperial gallon = 4.54609 l
cf, /// 1 cubic foot = 28.316846592 l
m3, /// 1 m3 = 1000 l
/// Flow
lph, /// 1 l/h = 0.001 m3/h
lpm, /// 1 l/m = 60 l/h = 0.06 m3/h
m3ph, /// * 1 m3/h
lps, /// 1 liter/s = 3.6 m3/h
USgalps, /// 1 US gallon per second = 13.627482408 m3/h
m3pm, /// 1 m3/m = 60 m3/h
cfs, /// 1 cubic foot per second = 101.9406477312 m3/h
/// Mass
g, /// 0.001 kg
lb, /// 0.45359237 kg
kg, /// * 1 kilogram
t, /// 1000 kg
/// Time
ms, /// 1 ms = 0.001 s
s, /// * 1 second = 1 s
min, /// 1 min = 60 s
hour, /// 1 hour = 60 min = 3600 s
/// Temperature
C, /// * degree Celsius (°C)
F, /// degree Fahrenheit
K, /// degree Kelvin
/// Pressure
Pa, /// 1 Pa = 0.01 hPa
hPa, /// 1 hPa = 100 Pa
mbar, /// 1 mbar = 1 hPa = 100 Pa
kPa, /// 1 kPa = 10 HPa
inHg, /// 1 inHg = 33.864 hPa
psi, /// 1 psi = 0.0689475729 bar
bar, /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
MPa, /// 1 MPa = 10000 hPa
/// Humidity
RPct, /// * 1 R%
/// Relative error
Promile, /// 1 promile = 0.1 %
Pct, /// * 1 %
/// Length
mm, /// * 1 millimeter
cm, /// 1 cm = 10 mm
inch, /// 1 inch = 25.4 mm
dm, /// 1 dm = 100 mm
foot, /// 1 foot = 304.8 mm
yard, /// 1 yard = 914.4 mm
m, /// 1 m = 1000 mm
/// Density
kgpm3, /// * 1 kg/m3 = 0.001 kg/l
kgpl, /// 1 kg/l = 1000 kg/m3
/// Energy
J, /// * 1 Joul
kJ, /// 1 kJ = 1000 J
MJ, /// 1 MJ = 1000000 J
Wh, /// 1 Wh = 3600 J
kWh, /// 1 kWh = 3600000 J
MWh, /// 1 MWh = 3600000000 J
/// Electrical conductivity
uSpcm, /// * 1 uS/cm
mSpm, /// 1 mS/m = 10 uS/cm
/// Meter coefficient - volume
ppl, /// * 1 pulse/l
ppdm3, /// 1 pulse/dm3
degpl, /// 1 degree/l
degpdm3, /// 1 degree/dm3
lpp, /// 1 l/pulse
dm3pp, /// 1 dm3/pulse
lpdeg, /// 1 l/degree
dm3pdeg, /// 1 dm3/degree
/// Meter coefficient - energy
ppkWh, /// * 1 pulse/kWh
kWhpp, /// 1 kWh/pulse
}
public enum Quantity
{
/// Quantities with units and conversions (double -> double)
Volume,
Flow,
Mass,
Time,
Temperature,
Pressure,
Humidity,
Error,
Length,
Density,
Energy,
Pulses,
PulsePerLtr,
PulsePerKWh,
Conductivity,
/// Quantities without units and conversions
Number,
String,
Boolean,
DateTime,
Enumerated,
}
public static class Units
{
public static bool IsDefaultUnit(Unit unit)
{
return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
}
public static Quantity GetQuantity(Unit units)
{
switch (units)
{
case Unit.pulse:
case Unit.degree:
return Quantity.Pulses;
case Unit.ml:
case Unit.l:
case Unit.dm3:
case Unit.USgal:
case Unit.UKgal:
case Unit.cf:
case Unit.m3:
return Quantity.Volume;
case Unit.lph:
case Unit.lpm:
case Unit.m3ph:
case Unit.lps:
case Unit.USgalps:
case Unit.m3pm:
case Unit.cfs:
return Quantity.Flow;
case Unit.g:
case Unit.lb:
case Unit.kg:
case Unit.t:
return Quantity.Mass;
case Unit.ms:
case Unit.s:
case Unit.min:
case Unit.hour:
return Quantity.Time;
case Unit.C:
case Unit.F:
case Unit.K:
return Quantity.Temperature;
case Unit.Pa:
case Unit.hPa:
case Unit.mbar:
case Unit.kPa:
case Unit.inHg:
case Unit.psi:
case Unit.bar:
case Unit.MPa:
return Quantity.Pressure;
case Unit.RPct:
return Quantity.Humidity;
case Unit.Promile:
case Unit.Pct:
return Quantity.Error;
case Unit.mm:
case Unit.cm:
case Unit.inch:
case Unit.dm:
case Unit.foot:
case Unit.yard:
case Unit.m:
return Quantity.Length;
case Unit.kgpm3:
case Unit.kgpl:
return Quantity.Density;
case Unit.J:
case Unit.kJ:
case Unit.MJ:
case Unit.Wh:
case Unit.kWh:
case Unit.MWh:
return Quantity.Energy;
case Unit.uSpcm:
case Unit.mSpm:
return Quantity.Conductivity;
case Unit.ppl:
case Unit.ppdm3:
case Unit.degpl:
case Unit.degpdm3:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg:
return Quantity.PulsePerLtr;
case Unit.ppkWh:
case Unit.kWhpp:
return Quantity.PulsePerKWh;
default:
return Quantity.Number;
}
}
public static double ConvertTo(Unit units, double v)
{
switch (units)
{
/// Volume: internal representation in l
case Unit.ml: return 1000 * v; /// 1 l = 1000 ml
case Unit.USgal: return 0.26417205 * v; /// 1 gal(US) = 3.78541178 l
case Unit.UKgal: return 0.21996925 * v; /// 1 gal(UK) = 4.54609 l
case Unit.cf: return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
case Unit.m3: return 0.001 * v; /// 1 m3 = 1000 l
/// Flow: internal representation in m3/h
case Unit.lph: return 1000 * v; /// 1 l/h
case Unit.lpm: return v / 0.06; /// 1 l/m
case Unit.lps: return v / 3.6; /// 1 l/s
case Unit.USgalps: return 0.0733811257326 * v; /// 1 US gallon per second
case Unit.m3pm: return v / 60; /// 1 m3/m
case Unit.cfs: return 0.009809629644858 * v; /// 1 cubic foot per second
/// Mass: internal representation in kg
case Unit.g: return 1000 * v; /// 1 g = 0.001 kg
case Unit.lb: return 2.2046226 * v; /// 1 lb = 0.45359237 kg
case Unit.t: return 0.001 * v; /// 1 t = 1000 kg
/// Time or duration: internal representation in seconds [s]
case Unit.ms: return 1000 * v;
case Unit.min: return v / 60;
case Unit.hour: return v / 3600;
/// Temperature: internal representation in °C
case Unit.F: return 1.8 * v + 32; /// degree Fahrenheit
case Unit.K: return v + 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 100000 * v;
case Unit.hPa: return 1000 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 1000 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 100 * v; /// 1 kPa = 10 HPa
case Unit.inHg: return 29.53 * v; /// 1 inHg =
case Unit.psi: return 14.5037738 * v; /// 1 psi =
case Unit.MPa: return 0.1 * v; /// 1 MPa = 10000 hPa
/// Relative error: internal representation in %
case Unit.Promile: return 10 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.cm: return 0.1 * v; /// 1 cm = 10 mm
case Unit.inch: return v / 25.4; /// 1 inch = 25.4 mm
case Unit.dm: return 0.01 * v; /// 1 dm = 100 mm
case Unit.foot: return v / 304.8; /// 1 foot = 304.8 mm
case Unit.yard: return v / 914.4; /// 1 yard = 914,4 mm
case Unit.m: return 0.001 * v; /// 1 m = 1000 mm
/// Density: internal representation in kg/m3
case Unit.kgpl: return 0.001 * v;
/// Energy, internal representation in Joul
case Unit.kJ: return 0.001 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 0.000001 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return v / 3600.0; /// 1 Wh = 3600 J
case Unit.kWh: return v / 3600000.0; /// 1 kWh = 3600000 J
case Unit.MWh: return v / 3600000000.0; /// 1 MWh = 3600000000 J
/// Electrical conductivity
case Unit.mSpm: return 0.1 * v;
/// Invert pulses
case Unit.kWhpp:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg: return (v <= float.Epsilon) ? 0 : 1/v;
default: return v; /// Do not convert
}
}
public static double ConvertFrom(Unit units, double v)
{
switch (units)
{
/// Volume: internal representation in l
case Unit.ml: return 0.001 * v; /// 0.001 l
case Unit.USgal: return 3.78541178 * v; /// 1 gal(US) = 3.78541178 l
case Unit.UKgal: return 4.54609 * v; /// 1 gal(UK) = 4.54609 l
case Unit.cf: return 28.316846592 * v; /// 1 cubic foot = 28.316846592 l
case Unit.m3: return 1000 * v; /// 1000 l
/// Flow: internal representation in m3/h
case Unit.lph: return 0.001 * v; /// 1 l/h
case Unit.lpm: return 0.06 * v; /// 1 l/m
case Unit.lps: return 3.6 * v; /// 1 l/s
case Unit.USgalps: return 13.627482408 * v; /// 1 US gallon per second
case Unit.m3pm: return 60 * v; /// 1 m3/m
case Unit.cfs: return 101.9406477312 * v; /// 1 cubic foot per second
/// Mass: internal representation in kg
case Unit.g: return 0.001 * v; /// 1 g = 0.001 kg
case Unit.lb: return 0.45359237 * v; /// 1 lb = 0.45359237 kg
case Unit.t: return 1000 * v; /// 1 t = 1000 kg
/// Time or duration: internal representation in seconds [s]
case Unit.ms: return 0.001 * v;
case Unit.min: return 60 * v;
case Unit.hour: return 3600 * v;
/// Temperature: internal representation in °C
case Unit.F: return 5 * (v - 32) / 9; /// degree Fahrenheit
case Unit.K: return v - 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 0.00001 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 0.001 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 0.001 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 0.01 * v; /// 1 kPa = 10 HPa
case Unit.inHg: return 0.033864 * v; /// 1 inHg = 33.864 hPa
case Unit.psi: return 0.0689475729 * v; /// 1 psi = 0.0689475729 bar
case Unit.MPa: return 10 * v; /// 1 MPa = 10000 hPa
/// Relative error: internal representation in %
case Unit.Promile: return 0.1 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.cm: return 10 * v; /// 1 cm = 10 mm
case Unit.inch: return 25.4 * v; /// 1 inch = 25.4 mm
case Unit.dm: return 100 * v; /// 1 dm = 100 mm
case Unit.foot: return 304.8 * v; /// 1 foot = 304.8 mm
case Unit.yard: return 914.4 * v; /// 1 yard = 914,4 mm
case Unit.m: return 1000 * v; /// 1 m = 1000 mm
/// Density: internal representation in kg/m3
case Unit.kgpl: return 1000 * v;
/// Energy, internal representation in Joul
case Unit.kJ: return 1000 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 1000000 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return 3600 * v; /// 1 Wh = 3600 J
case Unit.kWh: return 3600000 * v; /// 1 kWh = 3600000 J
case Unit.MWh: return 3600000000 * v; /// 1 kWh = 3600000000 J
/// Electrical conductivity
case Unit.mSpm: return 10 * v;
/// Invert
case Unit.kWhpp:
case Unit.lpp:
case Unit.dm3pp:
case Unit.lpdeg:
case Unit.dm3pdeg: return (v <= float.Epsilon) ? 0 : 1/v;
default: return v; /// Do not convert
}
}
}
}
+140
View File
@@ -0,0 +1,140 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
namespace DataStreamInterface
{
public interface IDataStreamMeter
{
/// <summary>
/// Returns count of water meters supported by the data stream component
/// </summary>
/// <returns>Water meters count</returns>
int GetMetersCount();
/// <summary>
/// Get state of the connected data stream meter
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <param name="state">Current state of the meter</param>
/// <param name="parameter">Current extra parameter of the meter</param>
/// <returns>true when successful</returns>
bool GetState(int meterIx, out int state, out string parameter);
/// <summary>
/// Set state of the connected data stream meter
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <param name="state">Required state of the meter</param>
/// <param name="parameter">Required extra parameter of the meter</param>
/// <returns>true when successful</returns>
bool SetState(int meterIx, int state, string parameter);
bool SetStateAll(int state, string parameter);
/// <summary>
/// Establish connection with a data stream meter
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <param name="connectionParameters">Connection parameters</param>
/// <param name="meterId">Meter ID (e.g. serial number)</param>
/// <returns>true when successful</returns>
bool OpenConnection(int meterIx, string connectionParameters, out string meterId);
/// <summary>
/// Stars saving measurement results into internal data structures of the component.
/// Each data frame obtains a unique ID.
/// The very first data fraim obrains ID = 0.
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <returns>true when successful</returns>
bool StartMeasurement(int meterIx);
bool StartMeasurementAll();
/// <summary>
/// Stops saving measurement results into internal data structures of the component.
/// Updates ID of the last date frame received from the meter.
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <param name="storedFramesCount">Number of stored date frames</param>
/// <returns>true when successful</returns>
bool StopMeasurement(int meterIx, out Int64 storedFramesCount);
bool StopMeasurementAll(out Int64[] storedFramesCounts);
/// <summary>
/// Closes connection with the data stream meter
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <returns>true when successful</returns>
bool CloseConnection(int meterIx);
bool CloseConnectionAll();
/// <summary>
/// This function is called when TBF program is shutting down.
/// </summary>
/// <returns>true when successful</returns>
bool Shutdown();
///------------------------------------------------
/// Units of time, volume and optional quantities
///------------------------------------------------
/// <summary>
/// Returns time units (s, ms, ...)
/// </summary>
Unit GetTimeUnits();
/// <summary>
/// Returns units of volume (ml, l, ...)
/// </summary>
Unit GetVolumeUnits();
///-----------------------------------------------
/// Optional quantities: count, units, captions
///-----------------------------------------------
/// <summary>
/// Returns count of optional quantities in each data frame
/// </summary>
/// <returns>Count of optional quantities</returns>
int GetQuantitiesCount();
/// <summary>
/// Returns units of the specified quantity
/// </summary>
/// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
Unit GetQuantityUnits(int quantityNr);
/// <summary>
/// Returns caption of the specified quantity
/// </summary>
/// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
string GetQuantityCaption(int quantityNr);
///---------------------------
/// Datastream data exchange
///---------------------------
/// <summary>
/// Retuns 'count' data frames starting with data frame with ID = 'id'
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <param name="id">First frame ID</param>
/// <param name="count">Frames count</param>
/// <returns>Selected data frames</returns>
DataFrame[] GetFrames(int meterIx, Int64 id, int count);
/// <summary>
/// Returns ID of the data frame where time equals or exceeds the specified time.
/// When time of the first frame (ID=0) is larger then specified time, function returns 0.
/// </summary>
/// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
/// <param name="time">Time</param>
/// <returns>ID of the data frame at or after the pecified time</returns>
Int64 GetID(int meterIx, double time);
}
}
@@ -0,0 +1,38 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Resources;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DataStreamInterface")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DataStreamInterface")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("e44458ee-b635-4d7c-a763-20054399e817")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: NeutralResourcesLanguageAttribute("en")]
+36
View File
@@ -0,0 +1,36 @@
using System;
using System.Text;
using System.Windows.Forms;
namespace DataStreamInterfaceTest
{
public class ActivityLog
{
const int LinesCount = 50;
TextBox textBox;
string[] lines;
string activity;
public ActivityLog(TextBox textBox)
{
this.textBox = textBox;
lines = new string[LinesCount];
for (int i = 0; i < LinesCount; i++) lines[i] = string.Empty;
}
public void Print(string log)
{
for (int i = LinesCount - 1; i > 0; i--) lines[i] = lines[i - 1];
lines[0] = log;
DisplayLines();
}
private void DisplayLines()
{
StringBuilder sb = new StringBuilder();
foreach (var line in lines) sb.AppendLine(line);
textBox.Text = sb.ToString();
}
}
}
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DataStreamInterfaceTest</RootNamespace>
<AssemblyName>DataStreamInterfaceTest</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ActivityLog.cs" />
<Compile Include="DemoMainWnd.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DemoMainWnd.Designer.cs">
<DependentUpon>DemoMainWnd.cs</DependentUpon>
</Compile>
<Compile Include="GetDblValueDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GetDblValueDlg.designer.cs">
<DependentUpon>GetDblValueDlg.cs</DependentUpon>
</Compile>
<Compile Include="GetFrameBoundariesDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GetFrameBoundariesDlg.designer.cs">
<DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
</Compile>
<Compile Include="GetIntegerNumberDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GetIntegerNumberDlg.Designer.cs">
<DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
</Compile>
<Compile Include="GetStateDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GetStateDlg.designer.cs">
<DependentUpon>GetStateDlg.cs</DependentUpon>
</Compile>
<Compile Include="LviIDComparer.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="DemoMainWnd.resx">
<DependentUpon>DemoMainWnd.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="GetDblValueDlg.resx">
<DependentUpon>GetDblValueDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GetFrameBoundariesDlg.resx">
<DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GetIntegerNumberDlg.resx">
<DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GetStateDlg.resx">
<DependentUpon>GetStateDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DataStreamInterface\DataStreamInterface.csproj">
<Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
<Name>DataStreamInterface</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
+380
View File
@@ -0,0 +1,380 @@
namespace DataStreamInterfaceTest
{
partial class DemoMainWnd
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.getIDButton = new System.Windows.Forms.Button();
this.getFramesButton = new System.Windows.Forms.Button();
this.measurementLabel = new System.Windows.Forms.Label();
this.stateLabel = new System.Windows.Forms.Label();
this.capabilitiesLabel = new System.Windows.Forms.Label();
this.getQuantityUnitsButton = new System.Windows.Forms.Button();
this.getQuantityCaptionButton = new System.Windows.Forms.Button();
this.getQuantitiesCountButton = new System.Windows.Forms.Button();
this.getVolumeUnitsButton = new System.Windows.Forms.Button();
this.getTimeUnitsButton = new System.Windows.Forms.Button();
this.setStateButton = new System.Windows.Forms.Button();
this.getStateButton = new System.Windows.Forms.Button();
this.stopMeasurementButton = new System.Windows.Forms.Button();
this.startMeasurementButton = new System.Windows.Forms.Button();
this.closeConnectionButton = new System.Windows.Forms.Button();
this.openConnectionButton = new System.Windows.Forms.Button();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.logsTextBox = new System.Windows.Forms.TextBox();
this.dataTabControl = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.framesListView = new System.Windows.Forms.ListView();
this.tabPage2 = new System.Windows.Forms.TabPage();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
this.dataTabControl.SuspendLayout();
this.tabPage1.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer1.IsSplitterFixed = true;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.getIDButton);
this.splitContainer1.Panel1.Controls.Add(this.getFramesButton);
this.splitContainer1.Panel1.Controls.Add(this.measurementLabel);
this.splitContainer1.Panel1.Controls.Add(this.stateLabel);
this.splitContainer1.Panel1.Controls.Add(this.capabilitiesLabel);
this.splitContainer1.Panel1.Controls.Add(this.getQuantityUnitsButton);
this.splitContainer1.Panel1.Controls.Add(this.getQuantityCaptionButton);
this.splitContainer1.Panel1.Controls.Add(this.getQuantitiesCountButton);
this.splitContainer1.Panel1.Controls.Add(this.getVolumeUnitsButton);
this.splitContainer1.Panel1.Controls.Add(this.getTimeUnitsButton);
this.splitContainer1.Panel1.Controls.Add(this.setStateButton);
this.splitContainer1.Panel1.Controls.Add(this.getStateButton);
this.splitContainer1.Panel1.Controls.Add(this.stopMeasurementButton);
this.splitContainer1.Panel1.Controls.Add(this.startMeasurementButton);
this.splitContainer1.Panel1.Controls.Add(this.closeConnectionButton);
this.splitContainer1.Panel1.Controls.Add(this.openConnectionButton);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
this.splitContainer1.Size = new System.Drawing.Size(826, 583);
this.splitContainer1.SplitterDistance = 150;
this.splitContainer1.TabIndex = 0;
//
// getIDButton
//
this.getIDButton.Location = new System.Drawing.Point(12, 480);
this.getIDButton.Name = "getIDButton";
this.getIDButton.Size = new System.Drawing.Size(128, 24);
this.getIDButton.TabIndex = 12;
this.getIDButton.Text = "Get ID";
this.getIDButton.UseVisualStyleBackColor = true;
this.getIDButton.Click += new System.EventHandler(this.getIDButton_Click);
//
// getFramesButton
//
this.getFramesButton.Location = new System.Drawing.Point(12, 450);
this.getFramesButton.Name = "getFramesButton";
this.getFramesButton.Size = new System.Drawing.Size(128, 24);
this.getFramesButton.TabIndex = 11;
this.getFramesButton.Text = "Get frames";
this.getFramesButton.UseVisualStyleBackColor = true;
this.getFramesButton.Click += new System.EventHandler(this.getFramesButton_Click);
//
// measurementLabel
//
this.measurementLabel.AutoSize = true;
this.measurementLabel.Location = new System.Drawing.Point(12, 374);
this.measurementLabel.Name = "measurementLabel";
this.measurementLabel.Size = new System.Drawing.Size(74, 13);
this.measurementLabel.TabIndex = 15;
this.measurementLabel.Text = "Measurement:";
//
// stateLabel
//
this.stateLabel.AutoSize = true;
this.stateLabel.Location = new System.Drawing.Point(12, 194);
this.stateLabel.Name = "stateLabel";
this.stateLabel.Size = new System.Drawing.Size(112, 13);
this.stateLabel.TabIndex = 14;
this.stateLabel.Text = "State and connection:";
//
// capabilitiesLabel
//
this.capabilitiesLabel.AutoSize = true;
this.capabilitiesLabel.Location = new System.Drawing.Point(12, 9);
this.capabilitiesLabel.Name = "capabilitiesLabel";
this.capabilitiesLabel.Size = new System.Drawing.Size(63, 13);
this.capabilitiesLabel.TabIndex = 13;
this.capabilitiesLabel.Text = "Capabilities:";
//
// getQuantityUnitsButton
//
this.getQuantityUnitsButton.Location = new System.Drawing.Point(12, 145);
this.getQuantityUnitsButton.Name = "getQuantityUnitsButton";
this.getQuantityUnitsButton.Size = new System.Drawing.Size(128, 24);
this.getQuantityUnitsButton.TabIndex = 4;
this.getQuantityUnitsButton.Text = "Get quantity units";
this.getQuantityUnitsButton.UseVisualStyleBackColor = true;
this.getQuantityUnitsButton.Click += new System.EventHandler(this.getQuantityUnitsButton_Click);
//
// getQuantityCaptionButton
//
this.getQuantityCaptionButton.Location = new System.Drawing.Point(12, 115);
this.getQuantityCaptionButton.Name = "getQuantityCaptionButton";
this.getQuantityCaptionButton.Size = new System.Drawing.Size(128, 24);
this.getQuantityCaptionButton.TabIndex = 3;
this.getQuantityCaptionButton.Text = "Get quantity caption";
this.getQuantityCaptionButton.UseVisualStyleBackColor = true;
this.getQuantityCaptionButton.Click += new System.EventHandler(this.getQuantityCaptionButton_Click);
//
// getQuantitiesCountButton
//
this.getQuantitiesCountButton.Location = new System.Drawing.Point(12, 85);
this.getQuantitiesCountButton.Name = "getQuantitiesCountButton";
this.getQuantitiesCountButton.Size = new System.Drawing.Size(128, 24);
this.getQuantitiesCountButton.TabIndex = 2;
this.getQuantitiesCountButton.Text = "Get quantities count";
this.getQuantitiesCountButton.UseVisualStyleBackColor = true;
this.getQuantitiesCountButton.Click += new System.EventHandler(this.getQuantitiesCountButton_Click);
//
// getVolumeUnitsButton
//
this.getVolumeUnitsButton.Location = new System.Drawing.Point(12, 55);
this.getVolumeUnitsButton.Name = "getVolumeUnitsButton";
this.getVolumeUnitsButton.Size = new System.Drawing.Size(128, 24);
this.getVolumeUnitsButton.TabIndex = 1;
this.getVolumeUnitsButton.Text = "Get volume units";
this.getVolumeUnitsButton.UseVisualStyleBackColor = true;
this.getVolumeUnitsButton.Click += new System.EventHandler(this.getVolumeUnitsButton_Click);
//
// getTimeUnitsButton
//
this.getTimeUnitsButton.Location = new System.Drawing.Point(12, 25);
this.getTimeUnitsButton.Name = "getTimeUnitsButton";
this.getTimeUnitsButton.Size = new System.Drawing.Size(128, 24);
this.getTimeUnitsButton.TabIndex = 0;
this.getTimeUnitsButton.Text = "Get time units";
this.getTimeUnitsButton.UseVisualStyleBackColor = true;
this.getTimeUnitsButton.Click += new System.EventHandler(this.getTimeUnitsButton_Click);
//
// setStateButton
//
this.setStateButton.Location = new System.Drawing.Point(12, 315);
this.setStateButton.Name = "setStateButton";
this.setStateButton.Size = new System.Drawing.Size(128, 24);
this.setStateButton.TabIndex = 8;
this.setStateButton.Text = "Set state";
this.setStateButton.UseVisualStyleBackColor = true;
this.setStateButton.Click += new System.EventHandler(this.setStateButton_Click);
//
// getStateButton
//
this.getStateButton.Location = new System.Drawing.Point(12, 285);
this.getStateButton.Name = "getStateButton";
this.getStateButton.Size = new System.Drawing.Size(128, 24);
this.getStateButton.TabIndex = 7;
this.getStateButton.Text = "Get state";
this.getStateButton.UseVisualStyleBackColor = true;
this.getStateButton.Click += new System.EventHandler(this.getStateButton_Click);
//
// stopMeasurementButton
//
this.stopMeasurementButton.Location = new System.Drawing.Point(12, 420);
this.stopMeasurementButton.Name = "stopMeasurementButton";
this.stopMeasurementButton.Size = new System.Drawing.Size(128, 24);
this.stopMeasurementButton.TabIndex = 10;
this.stopMeasurementButton.Text = "Stop measurement";
this.stopMeasurementButton.UseVisualStyleBackColor = true;
this.stopMeasurementButton.Click += new System.EventHandler(this.stopMeasurementButton_Click);
//
// startMeasurementButton
//
this.startMeasurementButton.Location = new System.Drawing.Point(12, 390);
this.startMeasurementButton.Name = "startMeasurementButton";
this.startMeasurementButton.Size = new System.Drawing.Size(128, 24);
this.startMeasurementButton.TabIndex = 9;
this.startMeasurementButton.Text = "Start measurement";
this.startMeasurementButton.UseVisualStyleBackColor = true;
this.startMeasurementButton.Click += new System.EventHandler(this.startMeasurementButton_Click);
//
// closeConnectionButton
//
this.closeConnectionButton.Location = new System.Drawing.Point(12, 240);
this.closeConnectionButton.Name = "closeConnectionButton";
this.closeConnectionButton.Size = new System.Drawing.Size(128, 24);
this.closeConnectionButton.TabIndex = 6;
this.closeConnectionButton.Text = "Close connection";
this.closeConnectionButton.UseVisualStyleBackColor = true;
this.closeConnectionButton.Click += new System.EventHandler(this.closeConnectionButton_Click);
//
// openConnectionButton
//
this.openConnectionButton.Location = new System.Drawing.Point(12, 210);
this.openConnectionButton.Name = "openConnectionButton";
this.openConnectionButton.Size = new System.Drawing.Size(128, 24);
this.openConnectionButton.TabIndex = 5;
this.openConnectionButton.Text = "Open connection";
this.openConnectionButton.UseVisualStyleBackColor = true;
this.openConnectionButton.Click += new System.EventHandler(this.openConnectionButton_Click);
//
// splitContainer2
//
this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer2.Location = new System.Drawing.Point(0, 0);
this.splitContainer2.Name = "splitContainer2";
this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
// splitContainer2.Panel1
//
this.splitContainer2.Panel1.Controls.Add(this.logsTextBox);
//
// splitContainer2.Panel2
//
this.splitContainer2.Panel2.Controls.Add(this.dataTabControl);
this.splitContainer2.Size = new System.Drawing.Size(672, 583);
this.splitContainer2.SplitterDistance = 222;
this.splitContainer2.TabIndex = 0;
//
// logsTextBox
//
this.logsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.logsTextBox.Location = new System.Drawing.Point(0, 0);
this.logsTextBox.Multiline = true;
this.logsTextBox.Name = "logsTextBox";
this.logsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.logsTextBox.Size = new System.Drawing.Size(672, 222);
this.logsTextBox.TabIndex = 0;
//
// dataTabControl
//
this.dataTabControl.Controls.Add(this.tabPage1);
this.dataTabControl.Controls.Add(this.tabPage2);
this.dataTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataTabControl.Location = new System.Drawing.Point(0, 0);
this.dataTabControl.Name = "dataTabControl";
this.dataTabControl.SelectedIndex = 0;
this.dataTabControl.Size = new System.Drawing.Size(672, 357);
this.dataTabControl.TabIndex = 0;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.framesListView);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(664, 331);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Transferred frames";
this.tabPage1.UseVisualStyleBackColor = true;
//
// framesListView
//
this.framesListView.Dock = System.Windows.Forms.DockStyle.Fill;
this.framesListView.GridLines = true;
this.framesListView.Location = new System.Drawing.Point(3, 3);
this.framesListView.Name = "framesListView";
this.framesListView.Size = new System.Drawing.Size(658, 325);
this.framesListView.TabIndex = 0;
this.framesListView.UseCompatibleStateImageBehavior = false;
this.framesListView.View = System.Windows.Forms.View.Details;
//
// tabPage2
//
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(664, 331);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Graph";
this.tabPage2.UseVisualStyleBackColor = true;
//
// DemoMainWnd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(826, 583);
this.Controls.Add(this.splitContainer1);
this.Name = "DemoMainWnd";
this.Text = "Datastream interface test";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DemoMainWnd_FormClosing);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel1.PerformLayout();
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel1.PerformLayout();
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
this.dataTabControl.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Button openConnectionButton;
private System.Windows.Forms.Button closeConnectionButton;
private System.Windows.Forms.Button stopMeasurementButton;
private System.Windows.Forms.Button startMeasurementButton;
private System.Windows.Forms.Button setStateButton;
private System.Windows.Forms.Button getStateButton;
private System.Windows.Forms.Button getQuantityUnitsButton;
private System.Windows.Forms.Button getQuantityCaptionButton;
private System.Windows.Forms.Button getQuantitiesCountButton;
private System.Windows.Forms.Button getVolumeUnitsButton;
private System.Windows.Forms.Button getTimeUnitsButton;
private System.Windows.Forms.Label measurementLabel;
private System.Windows.Forms.Label stateLabel;
private System.Windows.Forms.Label capabilitiesLabel;
private System.Windows.Forms.Button getIDButton;
private System.Windows.Forms.Button getFramesButton;
private System.Windows.Forms.SplitContainer splitContainer2;
private System.Windows.Forms.TextBox logsTextBox;
private System.Windows.Forms.TabControl dataTabControl;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.ListView framesListView;
private System.Windows.Forms.TabPage tabPage2;
}
}
+292
View File
@@ -0,0 +1,292 @@
using System;
using System.Text;
using System.Windows.Forms;
using DataStreamInterface;
namespace DataStreamInterfaceTest
{
public partial class DemoMainWnd : Form
{
IDataStreamMeter dataStreamMeter;
ActivityLog activityLog;
Unit timeUnits;
Unit volumeUnits;
int quantitiesCount;
string[] quantityCaption;
Unit[] quantityUnit;
Int64 storedFramesCount;
DataFrame[] transferredFrames;
public DemoMainWnd() : this(null) { }
public DemoMainWnd(IDataStreamMeter dataStreamMeter)
{
InitializeComponent();
this.dataStreamMeter = dataStreamMeter;
activityLog = new ActivityLog(logsTextBox);
framesListView.Columns.Add("ID", 100);
framesListView.Columns.Add("Time", 100);
framesListView.Columns.Add("Volume", 100);
framesListView.Columns.Add("Additional quantities", 300);
framesListView.ListViewItemSorter = new LviIDComparer();
}
void ShowNoMeterInterfaceMessage()
{
MessageBox.Show("No datastream meter interface");
}
private void getTimeUnitsButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
timeUnits = dataStreamMeter.GetTimeUnits();
activityLog.Print(string.Format("Time units are {0}", timeUnits));
}
}
private void getVolumeUnitsButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
volumeUnits = dataStreamMeter.GetVolumeUnits();
activityLog.Print(string.Format("Volume units are {0}", volumeUnits));
}
}
private void getQuantitiesCountButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
int quantitesCountOri = quantitiesCount;
quantitiesCount = dataStreamMeter.GetQuantitiesCount();
activityLog.Print(string.Format("There are {0} additional quantites", quantitiesCount));
if (quantitesCountOri == 0)
{
quantityUnit = new Unit[quantitiesCount];
quantityCaption = new string[quantitiesCount];
for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
}
else if (quantitiesCount != quantitesCountOri)
{
quantityUnit = new Unit[quantitiesCount];
quantityCaption = new string[quantitiesCount];
for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
activityLog.Print(string.Format("Quantities count changed during operation"));
MessageBox.Show("Quantities count changed during operation", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
}
}
private void getQuantityCaptionButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
if (dlg.ShowDialog() == DialogResult.OK)
{
quantityCaption[dlg.Number] = dataStreamMeter.GetQuantityCaption(dlg.Number);
activityLog.Print(string.Format("Caption of quantity #{0} is {1}", dlg.Number, quantityCaption[dlg.Number]));
}
}
}
private void getQuantityUnitsButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
if (dlg.ShowDialog() == DialogResult.OK)
{
quantityUnit[dlg.Number] = dataStreamMeter.GetQuantityUnits(dlg.Number);
activityLog.Print(string.Format("Units of quantity #{0} are {1}", dlg.Number, quantityUnit[dlg.Number]));
}
}
}
private void openConnectionButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
string meterId;
if (dataStreamMeter.OpenConnection(0, "no connection parameters", out meterId))
{
activityLog.Print(string.Format("Connection established, meter ID is {0}", meterId));
}
else
{
activityLog.Print("Failed to establish a connection");
}
}
}
private void closeConnectionButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
if (dataStreamMeter.CloseConnection(0))
{
framesListView.Items.Clear();
activityLog.Print("Connection closed");
}
else
{
activityLog.Print("Failed to close the connection");
}
}
}
private void DemoMainWnd_FormClosing(object sender, FormClosingEventArgs e)
{
if (dataStreamMeter == null)
{
dataStreamMeter.Shutdown();
}
}
private void getStateButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
int state;
string parameter;
if (dataStreamMeter.GetState(0, out state, out parameter))
{
activityLog.Print(string.Format("Water meter state is {0} / {1}", state, parameter));
}
else
{
activityLog.Print("Failed to obtain the water meter state");
}
}
}
private void setStateButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
GetStateDlg dlg = new GetStateDlg();
if (dlg.ShowDialog() == DialogResult.OK)
{
if (dataStreamMeter.SetState(0, dlg.State, dlg.Parameter))
{
activityLog.Print(string.Format("Water meter state set to {0} / {1}", dlg.State, dlg.Parameter));
}
else
{
activityLog.Print(string.Format("Failed to set the water meter state to {0} / {1}", dlg.State, dlg.Parameter));
}
}
}
}
private void startMeasurementButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
if (dataStreamMeter.StartMeasurement(0))
{
framesListView.Items.Clear();
activityLog.Print(string.Format("Measurement started"));
}
else
{
activityLog.Print("Failed to start a measurement");
}
}
}
private void stopMeasurementButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
if (dataStreamMeter.StopMeasurement(0, out storedFramesCount))
{
framesListView.Items.Clear();
activityLog.Print(string.Format("Measurement sopped, {0} frames acquired", storedFramesCount));
}
else
{
activityLog.Print("Failed to stop the measurement");
}
}
}
private void getFramesButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
GetFrameBoundariesDlg dlg = new GetFrameBoundariesDlg("Enter frames range boundaries", 0, storedFramesCount - 1);
if (dlg.ShowDialog() != DialogResult.OK) return;
DataFrame[] frames = dataStreamMeter.GetFrames(0, dlg.From, Convert.ToInt32(dlg.To - dlg.From + 1));
{
foreach (var frame in frames)
{
if (frame != null) framesListView.Items.Add(GetListViewItem(frame));
}
}
}
}
private void getIDButton_Click(object sender, EventArgs e)
{
if (dataStreamMeter == null)
ShowNoMeterInterfaceMessage();
else
{
GetDblValueDlg dlg = new GetDblValueDlg("Enter time in seconds");
if (dlg.ShowDialog() == DialogResult.OK)
{
Int64 id = dataStreamMeter.GetID(0, dlg.DblValue);
activityLog.Print(string.Format("GetID({0}) returned {1}", dlg.DblValue, id));
}
}
}
ListViewItem GetListViewItem(DataFrame frame)
{
ListViewItem lvi = new ListViewItem(frame.ID.ToString());
lvi.SubItems.Add(frame.Time.ToString());
lvi.SubItems.Add(frame.Volume.ToString());
StringBuilder sb = new StringBuilder();
foreach (var quantity in frame.Quantity)
{
sb.Append(quantity.ToString());
sb.Append(" ");
}
lvi.SubItems.Add(sb.ToString());
lvi.Tag = frame;
return lvi;
}
}
}
+88
View File
@@ -0,0 +1,88 @@
namespace DataStreamInterfaceTest
{
partial class GetDblValueDlg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.valueTextBox = new System.Windows.Forms.TextBox();
this.okButton = new System.Windows.Forms.Button();
this.cancelButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// valueTextBox
//
this.valueTextBox.Location = new System.Drawing.Point(35, 20);
this.valueTextBox.Name = "valueTextBox";
this.valueTextBox.Size = new System.Drawing.Size(94, 20);
this.valueTextBox.TabIndex = 0;
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.Location = new System.Drawing.Point(216, 16);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 29);
this.okButton.TabIndex = 1;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
// cancelButton
//
this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(306, 16);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 29);
this.cancelButton.TabIndex = 2;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseVisualStyleBackColor = true;
//
// GetFlowDlg
//
this.AcceptButton = this.okButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(396, 58);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
this.Controls.Add(this.valueTextBox);
this.Name = "GetFlowDlg";
this.Text = "Enter flow";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TextBox valueTextBox;
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.Button cancelButton;
}
}
+59
View File
@@ -0,0 +1,59 @@
using System;
using System.Globalization;
using System.Windows.Forms;
namespace DataStreamInterfaceTest
{
public partial class GetDblValueDlg : Form
{
public double DblValue;
double lowerLimit;
double upperLimit;
public GetDblValueDlg()
: this("Enter flow in [m3/h] please")
{
}
public GetDblValueDlg(string title)
: this(title, 0, 100.0)
{
}
public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
{
InitializeComponent();
this.Text = title;
this.lowerLimit = lowerLimit;
this.upperLimit = upperLimit;
}
private void okButton_Click(object sender, EventArgs e)
{
double val;
if (TryParseUDouble(valueTextBox.Text, out val))
{
DblValue = val;
DialogResult = DialogResult.OK;
Close();
}
else
{
MessageBox.Show("Invalid value");
DialogResult = DialogResult.None;
}
}
/// <summary>
/// Parse an unsigned double number
/// </summary>
bool TryParseUDouble(string text, out double result)
{
return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
}
}
}
+126
View File
@@ -0,0 +1,126 @@
namespace DataStreamInterfaceTest
{
partial class GetFrameBoundariesDlg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.fromTextBox = new System.Windows.Forms.TextBox();
this.okButton = new System.Windows.Forms.Button();
this.cancelButton = new System.Windows.Forms.Button();
this.toTextBox = new System.Windows.Forms.TextBox();
this.fromLabel = new System.Windows.Forms.Label();
this.toLabel = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// fromTextBox
//
this.fromTextBox.Location = new System.Drawing.Point(89, 16);
this.fromTextBox.Name = "fromTextBox";
this.fromTextBox.Size = new System.Drawing.Size(100, 20);
this.fromTextBox.TabIndex = 0;
//
// okButton
//
this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.Location = new System.Drawing.Point(225, 24);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 36);
this.okButton.TabIndex = 1;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
// cancelButton
//
this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(316, 24);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 36);
this.cancelButton.TabIndex = 2;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseVisualStyleBackColor = true;
//
// toTextBox
//
this.toTextBox.Location = new System.Drawing.Point(89, 46);
this.toTextBox.Name = "toTextBox";
this.toTextBox.Size = new System.Drawing.Size(100, 20);
this.toTextBox.TabIndex = 3;
//
// fromLabel
//
this.fromLabel.AutoSize = true;
this.fromLabel.Location = new System.Drawing.Point(12, 19);
this.fromLabel.Name = "fromLabel";
this.fromLabel.Size = new System.Drawing.Size(30, 13);
this.fromLabel.TabIndex = 4;
this.fromLabel.Text = "From";
//
// toLabel
//
this.toLabel.AutoSize = true;
this.toLabel.Location = new System.Drawing.Point(12, 49);
this.toLabel.Name = "toLabel";
this.toLabel.Size = new System.Drawing.Size(20, 13);
this.toLabel.TabIndex = 5;
this.toLabel.Text = "To";
//
// GetFrameBoundariesDlg
//
this.AcceptButton = this.okButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(419, 79);
this.ControlBox = false;
this.Controls.Add(this.toLabel);
this.Controls.Add(this.fromLabel);
this.Controls.Add(this.toTextBox);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
this.Controls.Add(this.fromTextBox);
this.Name = "GetFrameBoundariesDlg";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Enter frames range boundaries";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TextBox fromTextBox;
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.Button cancelButton;
private System.Windows.Forms.TextBox toTextBox;
private System.Windows.Forms.Label fromLabel;
private System.Windows.Forms.Label toLabel;
}
}
@@ -0,0 +1,88 @@
using System;
using System.Windows.Forms;
namespace DataStreamInterfaceTest
{
public partial class GetFrameBoundariesDlg : Form
{
/// <summary>
/// Integer number entered in this form
/// </summary>
public Int64 From;
public Int64 To;
Int64 lowerLimit;
Int64 upperLimit;
/// <summary>
/// Default constructor
/// </summary>
public GetFrameBoundariesDlg()
: this("Enter state please")
{
}
/// <summary>
/// Constructor with a custom window title.
/// </summary>
/// <param name="title">Window title</param>
public GetFrameBoundariesDlg(string title)
: this(title, Int64.MinValue, Int64.MaxValue)
{
}
/// <summary>
/// Constructor with a custom window title, limits and non-empty initial value.
/// </summary>
/// <param name="title">Window title</param>
/// <param name="lowerLimit">Lower limit</param>
/// <param name="upperLimit">Upper limit</param>
/// <param name="initialValue">Initial value</param>
public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit, int initialValue)
: this(title, lowerLimit, upperLimit)
{
fromTextBox.Text = initialValue.ToString();
}
/// <summary>
/// Constructor with a custom window title and lower/upper limits.
/// </summary>
/// <param name="title">Window title</param>
/// <param name="lowerLimit">Lower limit</param>
/// <param name="upperLimit">Upper limit</param>
public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit)
{
InitializeComponent();
this.Text = title;
this.lowerLimit = lowerLimit;
this.upperLimit = upperLimit;
}
/// <summary>
/// OK button handler that verifies validity of the entered value.
/// </summary>
private void okButton_Click(object sender, EventArgs e)
{
Int64 from;
Int64 to;
if (Int64.TryParse(fromTextBox.Text, out from) && from >= lowerLimit && from <= upperLimit &&
Int64.TryParse(toTextBox.Text, out to) && to >= lowerLimit && to <= upperLimit &&
to >= from && to < from + Int32.MaxValue)
{
From = from;
To = to;
DialogResult = DialogResult.OK;
}
else
{
string message = (lowerLimit != 0 || upperLimit != Int32.MaxValue)
? string.Format("Invalid boundaries ({0}..{1})", lowerLimit, upperLimit)
: "Invalid boundaries";
MessageBox.Show(message);
DialogResult = DialogResult.None; /// Prevent closing this window
}
}
}
}
+90
View File
@@ -0,0 +1,90 @@
namespace DataStreamInterfaceTest
{
partial class GetIntegerNumberDlg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.numberTextBox = new System.Windows.Forms.TextBox();
this.okButton = new System.Windows.Forms.Button();
this.cancelButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// numberTextBox
//
this.numberTextBox.Location = new System.Drawing.Point(36, 16);
this.numberTextBox.Name = "numberTextBox";
this.numberTextBox.Size = new System.Drawing.Size(100, 20);
this.numberTextBox.TabIndex = 0;
//
// okButton
//
this.okButton.Location = new System.Drawing.Point(174, 7);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 36);
this.okButton.TabIndex = 1;
this.okButton.Text = "OK";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.cancelButton.Location = new System.Drawing.Point(265, 7);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 36);
this.cancelButton.TabIndex = 2;
this.cancelButton.Text = "Cancel";
this.cancelButton.UseVisualStyleBackColor = true;
//
// GetIntegerNumberDlg
//
this.AcceptButton = this.okButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.CancelButton = this.cancelButton;
this.ClientSize = new System.Drawing.Size(363, 50);
this.ControlBox = false;
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
this.Controls.Add(this.numberTextBox);
this.Name = "GetIntegerNumberDlg";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Enter integer number please";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TextBox numberTextBox;
private System.Windows.Forms.Button okButton;
private System.Windows.Forms.Button cancelButton;
}
}
@@ -0,0 +1,83 @@
using System;
using System.Windows.Forms;
namespace DataStreamInterfaceTest
{
public partial class GetIntegerNumberDlg : Form
{
/// <summary>
/// Integer number entered in this form
/// </summary>
public int Number;
int lowerLimit;
int upperLimit;
/// <summary>
/// Default constructor
/// </summary>
public GetIntegerNumberDlg()
: this("Enter integer number please")
{
}
/// <summary>
/// Constructor with a custom window title.
/// </summary>
/// <param name="title">Window title</param>
public GetIntegerNumberDlg(string title)
: this(title, Int32.MinValue, Int32.MaxValue)
{
}
/// <summary>
/// Constructor with a custom window title, limits and non-empty initial value.
/// </summary>
/// <param name="title">Window title</param>
/// <param name="lowerLimit">Lower limit</param>
/// <param name="upperLimit">Upper limit</param>
/// <param name="initialValue">Initial value</param>
public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit, int initialValue)
: this(title, lowerLimit, upperLimit)
{
numberTextBox.Text = initialValue.ToString();
}
/// <summary>
/// Constructor with a custom window title and lower/upper limits.
/// </summary>
/// <param name="title">Window title</param>
/// <param name="lowerLimit">Lower limit</param>
/// <param name="upperLimit">Upper limit</param>
public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit)
{
InitializeComponent();
this.Text = title;
this.lowerLimit = lowerLimit;
this.upperLimit = upperLimit;
}
/// <summary>
/// OK button handler that verifies validity of the entered value.
/// </summary>
private void okButton_Click(object sender, EventArgs e)
{
int number;
if (int.TryParse(numberTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
{
Number = number;
DialogResult = DialogResult.OK;
}
else
{
string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
? string.Format("Invalid integer number ({0}..{1})", lowerLimit, upperLimit)
: "Invalid integer number";
MessageBox.Show(message);
DialogResult = DialogResult.None; /// Prevent closing this window
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More