Compare commits

..
Author SHA1 Message Date
michal 19985eb084 next backup 2024-11-20 11:35:26 +01:00
michal c2816c92cf backup project settings 2024-11-20 11:33:34 +01:00
michal 7d15073bb5 improve logs and added try, catch blocks 2024-11-14 13:05:33 +01:00
Milan Hanajik 79be186bef Reconfigured for Bari 2023-08-09 12:36:41 +02:00
Milan Hanajik 0fbc9e2bad DataEntry.Uni bug fixes, ver. 3.6.2086 2023-08-09 12:36:15 +02:00
Milan Hanajik ed5cd89d6a File names of test start and test end pictures are defined in DataEntry.Uni. 2023-08-02 10:19:12 +02:00
Milan Hanajik dd5b20ab38 DataEntry.Uni camera support in TestStartEndForm, ver. 3.6.2072 2023-08-01 11:54:01 +02:00
Milan Hanajik 3f35506b26 TestWizard.TestProfileSelection : Conversion to float avoided. 2023-07-13 13:31:22 +02:00
Milan Hanajik 1ee7e00928 sluprimadev --> deluh1web03 2023-07-12 12:07:15 +02:00
Milan Hanajik ffbfd5ebd5 Ver. 3.6.2068 2023-07-04 13:35:09 +02:00
Milan Hanajik 7a2afd1bdc Bug fix in ProcessTabPageCtrl : Exception when simulating, ver. 3.6.2067 2023-07-03 13:27:08 +02:00
Milan Hanajik 30f9ea19dd OrderManagement : Finish button, Show finished orders check box, ver. 3.0.14 2023-06-24 16:40:36 +02:00
Milan Hanajik 2ec8683b27 UpgradeSelectionDlg implements 3.1 -> 3.2 and 3.2 -> 3.3 2023-06-23 16:48:44 +02:00
Milan Hanajik 4f59f23c6f Clean-up, bug fix in SharedDatabase.Utils.GetTestName( ) - could freeze, ver. 3.6.2062 2023-06-23 16:48:44 +02:00
Milan Hanajik daac273edb DataEntry.Uni re-factorization and minor fix when ORACLE_DB, items in summaryResults. 2023-06-23 16:48:06 +02:00
Milan Hanajik edb084260f Bug in water meter chart fixed : Incorrect error limit lines 2023-06-16 15:30:38 +02:00
Milan Hanajik 8370c7c2e7 1. MainSeqUtils.CreateNewBatchResults( ) : WaterMeterData.ErrLimHi/LoQ initialized properly, 2. comments. 2023-06-16 13:34:24 +02:00
Milan Hanajik 4a394cc5d5 UI.Procedures.ProceduresCtrl : MoreContent.DEAndSequences added. 2023-06-15 11:31:46 +02:00
Milan Hanajik f4db55cc0b S640TestApp to verify web-services, etc. 2023-06-15 11:29:50 +02:00
Milan Hanajik b4f41a2f1f Workplace...S640Stream : New evaluation, Green/yellow progress bar, Interval 400ms, ver. 3.1.19 2023-05-26 14:09:54 +02:00
Milan Hanajik 5b9156d670 PartDlg, PartsCtrl updated, CodeForm of relased workflows can be modified, ver. 3.0.5 2023-05-25 14:54:39 +02:00
Milan Hanajik bebb83f6fc SharedDatabase.Entities.Part.OraDBType removed, CodeType/CodeForm descriptions updated. 2023-05-25 14:54:28 +02:00
Milan Hanajik 130b59fc91 DataEntry.Uni.TestStartEndForm implemented 2023-05-19 15:11:18 +02:00
Milan Hanajik b2a7cfb0d4 DataEntry.Uni Items passed in a list, w/o limits, Cfg with arrays, TODO: TestStartEndForm 2023-05-19 15:11:18 +02:00
Milan Hanajik b67857f658 Access right clean-up for PL. 2023-05-19 15:11:10 +02:00
Milan Hanajik 046fab05c0 S640CommForm bug fix : Crashed when order info was missing. 2023-05-19 10:11:07 +02:00
Milan Hanajik 6004a65572 ver. 3.6.2046 2023-05-11 12:00:21 +02:00
Milan Hanajik 0962efd159 1. DataEntry.Uni implemented, 2. TeststartEndForm with s/n-s, 3. DataEntry.Double24 and Fewa deleted, ver. 3.6.2045 2023-05-11 11:56:43 +02:00
Milan Hanajik cb1a471248 Preparation for DataEntry.Uni 2023-04-24 20:00:49 +02:00
Milan Hanajik 8da049219a TestWizard.VolumeAndErrorSelection fixed - conversion to float avoided. 2023-04-24 20:00:49 +02:00
Milan Hanajik 91b55eb19c 'Starting the system' message on start-up before MainWnd opens, ver. 3.6.2035 2023-04-06 10:55:00 +02:00
Milan Hanajik 6b582bea64 Printing from PreviousResultsDlg, CompoundDetectionTextBox.AppendText( ), ver. 3.6.2035 2023-04-06 08:37:32 +02:00
Milan Hanajik 61910932c2 CombinedWithDetectionSeq, ProcessTabPageCtrl and SeqBase.ReadRegistersTempPressAmbient() changes, ver. 3.6.2030 2023-03-31 11:28:04 +02:00
Milan Hanajik 1ecf528ff0 RegValve.ChangeRegValvePositionOp fixed 2023-03-30 12:07:59 +02:00
Milan Hanajik 9a5ee99a82 TestWizard.FlowSelection fixed, conversion to float avoided. 2023-03-30 10:04:25 +02:00
Milan Hanajik cf626d7b91 Batch.SaveTime introduced, Batch.EndTime calculation modified. 2023-03-30 10:04:14 +02:00
Milan Hanajik b9e8eeab00 UpgradeSelectionDlg changes : ver. 3.3 -> ver. 3.6 2023-03-30 09:09:16 +02:00
Milan Hanajik b880b62924 WMChart can plot error limits other then 2% and 5% and qp,qi style hyperbolic error limits, related DB and UI changes, ver. 3.6.2028 2023-03-24 16:43:21 +01:00
Milan Hanajik 36f8bfa32f All Output.Printers components : string PrinterName parameter specifies printer to be used. 2023-03-14 11:22:38 +01:00
Milan Hanajik 8be3b53db4 default_printer added to Resources.Strings 2023-03-14 11:22:38 +01:00
Milan Hanajik 95759e70b4 DataEntry.Standard24 clean-up, ver. 3.5.2024 2023-03-07 09:54:46 +01:00
Milan Hanajik 2e6a17121f Bug fix in StandingStartMassCollectionSeq 2023-03-06 12:21:43 +01:00
Milan Hanajik ed21db65c3 Uni.RegValveAnalog : Initial implementation for UNI, ver. 3.5.2015 2023-02-13 09:54:05 +01:00
Milan Hanajik d29a425880 Order of saving results to MySql DB and to other destinations changed, try-catch for other destinations. 2023-02-08 10:16:46 +01:00
Milan Hanajik a4139d7a73 Uni.RegValve clean-up. 2023-02-06 15:39:33 +01:00
Milan Hanajik a6a517b6ea Bug fixes : TestRslt.IsStartStop( ), IsRelErrTest( ), IsVolumeMethod( ), ... 2023-02-06 08:54:53 +01:00
Milan Hanajik 07f36f2945 Bug fix in Uni.RegValve.SetFlowOp : 2000 --> flowMeter.NominalFreq, ver. 3.5.2013 2023-01-26 14:57:21 +01:00
Milan Hanajik e2048ed64c Bug fix in Danfoss.VLT2800.Pump, ver. 3.5.2012 2023-01-25 13:42:14 +01:00
Milan Hanajik 90b62779fd Bug fix : DataEntry.StandardCamera.TestStartEndForm crashed when no RR was defined at certain position 2022-12-21 09:37:06 +01:00
Milan Hanajik 1c6488d621 Camera modifications : CheckDeviceCaps( ), CameraBinaryFiles2, etc, ver. 3.5.1997 2022-12-15 16:22:19 +01:00
Milan Hanajik 62e9f612fc Shared buttons : Accelator keys 2022-12-15 16:22:19 +01:00
Milan Hanajik 9e9a01bd43 Approval by legalizator when #define LANG_PL, ver. 3.5.1993 2022-11-30 11:06:39 +01:00
Milan Hanajik 6dcd40c640 Profiles: Method added, imp./exp. fixed, Procedures: Selection by profile, Create from profile button, etc, ver. 3.5.1992 2022-11-25 13:59:35 +01:00
Milan Hanajik b54de856af Power user password changes. 2022-11-21 12:41:29 +01:00
Milan Hanajik 118ce9797f FixedStartMassCollection : Diverter to tank after start valve is closed, ver. 3.4.1981 2022-11-11 14:26:38 +01:00
Milan Hanajik 36ae8479ca 'Winiki lub E' support MeterTestRslt 2022-11-11 14:14:44 +01:00
Milan Hanajik 9ca9d41ddc Browsing previous results : SerialNr can be used as a search criterion. 2022-11-09 12:19:42 +01:00
Milan Hanajik 4f26815e68 PressureMeter : var pressLimit in new double[] { 2.18, 2.2, 2.22, 2.24, 2.26, 2.27 }, ver. 3.4.1977 2022-11-04 12:29:40 +01:00
Milan Hanajik abd68f9a44 BatchNr is displayed in MainWnd status bar. 2022-10-28 15:04:07 +02:00
Milan Hanajik ae8a0ca4c1 Changes in TBF.Rig.Uni.RegValve(s), TBF.Rig.CB.Uni.Action.RegVlvMoveToPos, etc. 2022-10-28 15:04:07 +02:00
Milan Hanajik ac5684a2b5 Config.Entities.OutputPath.RegVPositions added, UI and SequenceBase changes, ver. 3.4.1975 2022-10-28 15:03:58 +02:00
Milan Hanajik 0f738be73e Bug fix 2022-10-21 15:45:53 +02:00
Milan Hanajik 4b85db202e Bug fix, ver. 3.3.1973 2022-10-21 08:46:43 +02:00
Milan Hanajik 96c300d34f PressureMeter.Meret : WaitUntilPressureIsOp conditions, ver. 3.3.1972 2022-10-13 19:13:45 +02:00
Milan Hanajik dbdf1f8fb6 Project dependencies for Workplace (Nanjing) fixed. 2022-10-13 18:22:32 +02:00
Milan Hanajik 6158ee93dc As in 2.30.1971 : StandardCamera.TestStartEndForm with OCR, LiveStreamOp with overlay (test par.), camera does not upload binary files on startup. 2022-10-04 16:46:17 +02:00
Milan Hanajik 6270e0c417 UltrasoundLevelMeter is displayed on the schematic drawing. 2022-09-29 16:59:25 +02:00
Milan Hanajik 67ba9986f2 Renaming transition sequences enhanced.. 2022-09-08 08:16:37 +02:00
Milan Hanajik d2e8f4f0e3 Better on-screen error message when a path is missing in a test, ver. 3.3.1941 2022-08-05 14:58:47 +02:00
Milan c9ea85b7b8 Results project upgraded by VS2022. 2022-08-02 11:49:41 +02:00
Milan Hanajik 86ed8b13bf TestMethods.StandingStartMassCollWODiv added, ver. 3.3.1940 2022-08-02 09:33:37 +02:00
Milan Hanajik 328c170888 StandingStartMassCollection test without a diverter is now possible, ver. 3.3.1935 2022-07-31 17:34:04 +02:00
Milan Hanajik ee31628417 All projects target .Net Framework 4.7.2 2022-07-28 12:50:01 +02:00
Milan Hanajik 267a6557df Bug fix in LocalSettings related to Path/Meters, ver. 3.3.1934 2022-07-28 10:18:32 +02:00
Milan Hanajik 177d17cb81 Sample log4netConfig file modiifed. 2022-07-27 15:05:11 +02:00
Milan Hanajik 4d0441d9a2 Qfrom, Qto, Volume, TestTime : float -> double, config DB change. 2022-07-06 15:51:48 +02:00
Milan Hanajik 01523d3765 Custom units in MetrologyDlg tabs Balance, FlowMeter, PressMeter and TempMeter, ver. 3.3.1928 2022-06-24 14:36:08 +02:00
Milan Hanajik 751f3b29bb Clean-up 2022-06-24 14:34:05 +02:00
Milan Hanajik 969041354b DataStream.Reader.ProcParams class added. 2022-06-14 13:52:08 +02:00
Milan Hanajik ba3fcad44d ErrorFlags and FlyingStartMassCollProlong : English units supported. 2022-06-03 14:21:02 +02:00
Milan Hanajik 877c8446ae TempControl.Novus : (1) fixes in sequence operations implementation, (2) N1040 support. 2022-06-03 14:16:42 +02:00
Milan Hanajik ae6ee631c6 TBF.UI.Bench.Paths controls support imperial units for flow. 2022-06-03 13:53:57 +02:00
Milan Hanajik 155a3a3113 ProcedureDlg clean-up 2022-06-03 13:11:03 +02:00
Milan Hanajik c00f90ed8a SensusTestInfo related : Synchronization with branch 2.28 2022-05-31 09:32:34 +02:00
Milan Hanajik 285facc3fd OneWMResult...Ctrl caption with position and pruefindex, wm.Pruefindex initialized to 0, set in SensusOracle.Database 2022-05-31 09:21:16 +02:00
Milan Hanajik b9d1fe5de7 Simulation of fixed start mass collection method with still camera images possible. 2022-05-31 08:40:51 +02:00
Milan Hanajik 56e519b4e4 Bug fix (Test.TempControl related). 2022-05-31 08:33:39 +02:00
Milan Hanajik 33f5274a6d More Common.CurrentUser related changes (IPERL/ORACLE) 2022-05-30 16:18:56 +02:00
Milan Hanajik f1f662a419 Common..CurrentUser static class with Stack<UserAndForm> userStack, Change( ) and Restore( ). 2022-05-25 15:23:55 +02:00
Milan Hanajik 00fc9ea847 1 "Set temprature setp..." seq. condition never met, 2 FlowMetersInParallel : InactiveFlowmtr for correct display, ver. 3.2.1913 2022-05-16 11:11:05 +02:00
Milan Hanajik b0a534315e Flow control problems when parallel flow meters are used fixed, ver. 3.2.1912 2022-05-16 09:47:59 +02:00
Milan Hanajik 158bba0d27 Bug fix in TempControl.Novus and Easytherm, both ProcParams contains Temp_A/B/C/D/E, related ConditionOp-s, ver. 3.2.1911 2022-05-13 17:49:44 +02:00
Milan Hanajik 4a1eb91c2f Various.CoverTest bug fix, ver. 3.2.1910 2022-05-13 13:48:33 +02:00
Milan Hanajik ae876a649a Tempterature controller setpoint set at the beginning of all tests in the main sequence, ver. 3.2.1909 2022-05-13 13:48:33 +02:00
Milan Hanajik e608c9fd6b UI.Procedures.ProcedureDlg Metrology 2 tab supports TempControl test parameter. 2022-05-13 13:48:17 +02:00
Milan Hanajik a8ba5d5113 string Test.TempControl and string TestData.TempControl added and used in sequences. 2022-05-13 13:47:53 +02:00
Milan Hanajik 2bae912fa0 1 ITempControl moved to GenericDevices, 2 Dummy.TempControl component, 3 TempControl.Easytherm changed to fit ITempControl. 2022-05-13 09:33:03 +02:00
Milan Hanajik 451faf1586 TempControl.Novus : Setpoint step is configurable (incl. rounding) 2022-05-12 12:16:12 +02:00
Milan Hanajik 1a49390ba8 ProcessTabPageCtrl supports compound meters. 2022-05-10 13:05:20 +02:00
Milan Hanajik 395e159522 Water flow related result items cleaned-up, Flow_ctv/_min/_max/_start_/end and Qc removed. 2022-05-10 13:05:20 +02:00
Milan Hanajik fefd846f13 Dead code removed (ProcessTabPageCtrl6/24/48). 2022-05-10 13:05:20 +02:00
Milan Hanajik 19d54d4990 ProcessTabPageCtrl : uses CB Activity, displays S/Ns, supports Flying start and compound meters, ver. 3.1.1907 2022-05-07 14:18:48 +02:00
Milan Hanajik e428897822 ControlBoard Activity added, updated in operations, values are defined in Enums. 2022-05-06 17:18:45 +02:00
Milan Hanajik 1b402566ed Bug fix in FlyingStartMassCollection simulation. 2022-05-06 17:18:45 +02:00
Milan Hanajik 5d23bcade3 Bug fix in Uni.RegValve.SetFlowOp : flowMeter.NominalFreq instead of 2000, ver. 3.1.1903 2022-05-05 10:42:30 +02:00
Milan Hanajik 56d68f0b63 ProcessTabPageCtrl displays PulsesPerLiter fo water meters, ver. 3.1.1902 2022-05-04 14:57:40 +02:00
Milan Hanajik c16e9a8d56 Changes in Results.Entities.TestRslt done in SharedDatabase.Entities.TestRslt as well. 2022-05-04 14:03:26 +02:00
Milan Hanajik 955e55f327 BenchInfo component is loaded and TBF.Data.SetData( ) is called in Program.Main(.) before MainWnd is created. 2022-05-04 12:38:12 +02:00
Milan Hanajik fbd9c976eb FlowMetersInParallel : StartStatistics(test), UpdateStatistics(delta), StopStatistics( ) 2022-05-04 10:56:38 +02:00
Milan Hanajik 2c0ae68db0 IFlowMeterSingle with GetRange(.) and CorrectedFlow(.), Test method calculations clean-up, refactorization, ver. 3.1.1901 2022-05-04 10:23:21 +02:00
Milan Hanajik 9a42e199e3 Uni.FlyingStartStopTestOp bug fix, ver. 3.1.1899 2022-04-29 15:36:45 +02:00
Milan Hanajik e3bb64ef0f Scale display bug fix when units are g, Parallel flowmeter initialization, ReadFlow() fix and logging, ver. 3.1.1898 2022-04-29 14:57:54 +02:00
Milan Hanajik 4361227975 ProcessTabPageCtrl-Test data displed, ProcessData.Mass and RefPulses are properties, ClearProcessValues() at the beginning of each test, etc, ver. 3.1.1896 2022-04-28 09:16:07 +02:00
Milan Hanajik c5d550259f MsrdUnit and MsrdFormat added to ScaleCfg 2022-04-28 09:16:07 +02:00
Milan Hanajik ab140cc6af IFlowMeter, IPressureMeter and ITempMeter extended to support Process tab page updates. 2022-04-26 16:53:10 +02:00
Milan Hanajik 43ce2552a2 Scale capacity, etc. : float --> double 2022-04-26 16:53:10 +02:00
Milan Hanajik d6880fc1b7 TBF.Resources.Strings : Clean-up 2022-04-26 16:53:10 +02:00
Milan Hanajik 4b450846df Bug fix in SchematicDrawing - Diverter edges. 2022-04-26 16:53:10 +02:00
Milan Hanajik 95fb7ab9cc Novus : Setpoint incr/decr from UI, comm. latency removed, isHeating/isCooling evaluation modified, clean-up 2022-04-26 16:53:10 +02:00
Milan Hanajik c5db2c0138 SchematicDrawing.IDrawingItCmpntWithCustomBmp and several bitmaps added, ver. 3.1.1886 2022-04-26 16:53:10 +02:00
Milan Hanajik deabff9a18 TBF.Rig.Modbus.TempControl folder with Easytherm and Novus components. 2022-04-26 16:52:49 +02:00
Milan Hanajik fc81344857 Initialization and logging of several TBF.Rig.Modbus components. 2022-04-26 16:51:23 +02:00
Milan Hanajik fd35f20501 ProcessTabPageCtrl schem. diag. OK, Bridge.StateMachineTickHandler exception handling changed 2022-04-15 13:40:00 +02:00
Milan Hanajik 80f4308ae1 Bug fix in TBF.Rig.Bench/Feeding/Meters/OutputPath 2022-04-15 13:40:00 +02:00
Milan Hanajik 33f823b2d8 UniCB : (1) Supports output bits 0..7 (2) Uses QuidoRS outputs for route bits 64..79 2022-04-15 13:39:49 +02:00
Milan Hanajik 5ad4a07965 Clean-up 2022-04-13 16:05:31 +02:00
Milan Hanajik 03900e453e Bridge.ProcessDataHandler and Bridge.OnProcessData( ) calls removed. 2022-04-08 16:03:45 +02:00
Milan Hanajik e96692405c Leak/PMaxTest refactorization, LeakTest : 1. close valve+pump off 2. delay 3. start mass 4. leak test 5. end mass 2022-04-08 11:50:15 +02:00
Milan Hanajik 4f70997a38 PumpTandem bug fix : Error handling when one of two pumps was renamed. 2022-04-07 15:08:06 +02:00
Milan Hanajik f3a61411f5 Default database type is DBType.MySql. 2022-04-05 12:16:17 +02:00
Milan Hanajik f20acf0e11 DataEntry.Double24 component added. 2022-04-01 12:31:58 +02:00
Milan Hanajik 57e413d6ff iPerlCommunication changes from 2.27 branch : Conditional Q2 error correction fixed, ver. 3.1.1874 2022-04-01 11:18:56 +02:00
Milan Hanajik 12abe09661 (1) Workplace log4net configuration, (2) ControlBoard.Uni comments 2022-04-01 09:16:27 +02:00
Milan Hanajik 4e09cf5adb GenericTest (Laser) : MInimize box enabled, ver. 3.0.2 2022-03-24 07:53:47 +01:00
Milan Hanajik 938da3ac62 DataEntry.S620 : Purchase order re-read before starting form,at the end of the cycle, ver. 3.1.1873 2022-03-23 07:57:53 +01:00
Milan Hanajik 3c59cd1bee Workplace : Order name length up to 10 digits, ver. 3.1.17 2022-03-21 18:28:12 +01:00
Milan Hanajik 8578c7f220 Workplace : OrderInfo updates are transactions, separate DB session for tracing records and OrderInfo updates, ver. 3.1.16 2022-03-17 13:31:15 +01:00
Milan Hanajik f23fc0d4c4 OrderManagement: 1.POName max. 10 digits 2.Modifications by others checked 3.DB updates are transactions 4.Order state refreshed each 5 s 5.version displayed in wnd title, ver. 3.0.13 2022-03-17 13:29:05 +01:00
Milan Hanajik 10b17c250c More logging in DataEntry.S620.FormForMechanicalMetersWithTracing, etc, ver. 3.1.1872 2022-03-09 12:10:14 +01:00
Milan Hanajik 8d47659660 ProcessTabPageCtrl bug fix, Common.Formulas improvement, clean-up, ver. 3.1.1867 2022-01-28 18:35:09 +01:00
Milan Hanajik 08a08282b5 Bug fixes : 1. DaEntry.Std24.TestStartEndForm, 2. StandingStartMassColl mass msrmnt, not finished, process data logging, ver. 3.1.1864 2022-01-28 16:36:58 +01:00
Milan Hanajik 851c51aa7c SetFlowOp with 'delay' parameter (default 0), flow setting starts after this delay in sec. 2022-01-28 14:43:42 +01:00
Milan Hanajik ecc92176f3 Clean-up after comparing 2.27 and 3.1 branches, ver. 3.1.1861 2022-01-28 14:43:42 +01:00
Milan Hanajik 2a97a8f584 UI : ProcedureDlg : TempLo, TempHi, TempUnit, Uncertainty and Repeats in Metrology I and II swapped. 2022-01-28 14:43:42 +01:00
Milan Hanajik c18f06af07 TM.iPerlCommunication and IperlHead synced with v.2.27, ISessionDataMngmnt replaces IHasClearSessionData and IHasTestName. 2022-01-28 14:43:33 +01:00
Milan Hanajik b9b609cabf Clean-up 2022-01-23 20:11:34 +01:00
Milan Hanajik f96bf993d8 Various.Clamping added, Various.CoverTest modified, ver. 3.1.1857 2022-01-21 16:08:03 +01:00
Milan Hanajik 899b379cf7 FeatureVectorCalculator updated to current version. 2022-01-20 18:32:30 +01:00
Milan Hanajik 868d16d8ee Bug fixes in TestMethods.StandingStart, ver. 3.1.1856 2022-01-19 15:42:34 +01:00
Milan Hanajik bfe7c5a29e ProductionTracing : UserLogin, ComboBox history saved, UI-Workflow next to Order, UI-Panel1 size, ver. 3.0.2 2022-01-19 14:03:49 +01:00
Milan Hanajik c7c1c21ab3 TestMethods.StandingStart added, ver. 3.1.1854 2022-01-17 15:30:11 +01:00
Milan Hanajik fe9cfa42ff Bug fixes in test method sequences : return missing in case of a configuration error. 2022-01-17 15:28:18 +01:00
Milan Hanajik 32762f0fdb Bug fix in MeasurementCorrection.GetCorrection( ), ver. 3.1.1853 2022-01-17 12:45:47 +01:00
Milan Hanajik d42ad8c5cf GenericTest and RecordProessing modifications for Laser in Nanjing, ver. 3.0.1 2022-01-17 10:26:56 +01:00
Milan Hanajik 2eaf2b044c SharedDatabase.WorkflowSummary.ReadFromDB(), int wm.ProcessId -> string wm.Workflow, etc. 2022-01-17 10:26:55 +01:00
Milan Hanajik 0b400fcbd0 SharedDatabase.WorkflowSummary added. 2022-01-17 10:26:45 +01:00
Milan Hanajik 7facefb305 Radio address format "D9" defined on one place: SharedDatabase.Const.RAFormat 2022-01-15 13:01:50 +01:00
Milan Hanajik 917051f072 Water meter test results graph fixed, ver. 3.1.1849 2022-01-12 12:38:01 +01:00
Milan Hanajik 589fd9cf18 OrderManagement bug fix, ver. 3.0.11 2022-01-12 10:39:05 +01:00
Milan Hanajik 4914ded61d Workplace ver. 3.1.15 2022-01-12 09:33:52 +01:00
Milan Hanajik 1af0b71503 Production tracing clean-up, ver. 3.1.1848 2022-01-12 07:53:03 +01:00
Milan Hanajik 2f1a8cc9d6 Production tracing : Saving records OK, Verification should be OK (TODO: Test) 2022-01-11 20:28:28 +01:00
Milan Hanajik 32047ef76a Clean-up 2022-01-11 20:27:06 +01:00
Milan Hanajik 18f7de5f97 WorkflowConfigurator handles case CurrrentUser==null correctly, Max. part name len.=10, ver. 3.0.4 2022-01-11 14:52:50 +01:00
Milan Hanajik 6d3fa9b110 Added DB columns : SharedDatabase.Entities.OrderInfo.Year, ...ReferenceRecord.Name1,Name2, OrderManagement ver. 3.0.10 2022-01-11 13:03:16 +01:00
Milan Hanajik eea94d1d9f ProductionTracing : saving StepRecord and updating ReferenceRecord. ver. 3.1.1847 2022-01-10 08:11:52 +01:00
Milan Hanajik a6ba6e26b2 SharedDatabase entities/mappings changes, StepRecord added, RR.Code1,2,3,4, etc. Workplace ver. 3.1.14 2022-01-10 07:27:18 +01:00
Milan Hanajik c75e3d08d3 GenericTest project added. 2022-01-07 16:04:16 +01:00
Milan Hanajik 43a32adb7e Workplace, DataMatrix4Net and RecordProcessing projects added. 2022-01-07 14:15:02 +01:00
Milan Hanajik 9a7ed9668b SharedDatabase : DoubleLoginDlg, TripleLoginDlg. 2022-01-07 12:23:31 +01:00
Milan Hanajik 068aee3cbd WorkflowConfigurator project added. 2022-01-07 12:23:23 +01:00
Milan Hanajik 2710823931 ListViewEx clean-up. 2022-01-07 12:23:22 +01:00
Milan Hanajik 6150c5b808 Common : QuitAppException class added, ModelessForm troubleshooted 2022-01-07 12:22:54 +01:00
Milan Hanajik 3c93e56b67 SharedDatabase clean-up 2022-01-06 15:41:19 +01:00
Milan Hanajik af13e2f2b4 Events.EndSession added, after S640Communication at the end 'End session' is invoked automatically. 2022-01-06 08:00:07 +01:00
Milan Hanajik 4d018a8ba8 DataEntry.iPerl bug fixes when invoked without the production tracing, ver. 3.1.1846 2022-01-06 08:00:07 +01:00
Milan Hanajik df89050d78 DataEntry.S620 bug fixes when invoked without an order (after restoring results). 2022-01-06 08:00:06 +01:00
Milan Hanajik 6071d7f598 Bug fixes : Ambient temperature, pressure, humidity calculation in Results. 2022-01-06 08:00:06 +01:00
Milan Hanajik 1b767f6298 MeterTestRslt.Passed set correctly in iPerlCommunicationSeq.MakeQ2CorrectedFrom( ), etc., ver. 3.1.1845 2022-01-05 08:18:48 +01:00
Milan Hanajik 8da5512eb0 enum FillState in Common.Enums, FillState ProcessData.FillState introduced and used in TBF.Rig.Sequences. 2022-01-04 18:10:44 +01:00
Milan Hanajik 1133a2d5bf Bug fixes : 1 Saving results cannot be stopped, 2 Processing statistics, 3 SensusTestInfo 2022-01-04 15:30:10 +01:00
Milan Hanajik c8ff5f8813 ResultsBrowser with Assigned s/n, Complete s/n and RadioAddress (Nanjing), ver. 3.1.1803 2021-12-21 09:25:46 +01:00
Milan Hanajik 1f0bbc0d4e DataEntry.S620 : Serial number assignment fixed, AssignedSN = -1 when not assigned, ver. 3.1.1843 2021-12-17 11:51:53 +01:00
Milan Hanajik ba549cbaee MainWnd: Reload procedures button. 2021-12-17 11:51:53 +01:00
Milan Hanajik 1a8a6defd9 OrderManagement.OrderStateDlg displays order progress information, ver. 3.0.9 2021-12-16 10:01:35 +01:00
Milan Hanajik 9a5f2c1a60 OrderInfo : CurrentNr1,2,3,4,5 added, 2021-12-16 08:18:54 +01:00
Milan Hanajik ee89158ae3 Uni.FlowMeter nominal frequency is a parameter, ver. 3.1.1840 2021-12-15 14:34:45 +01:00
Milan Hanajik 15e9c25dcf DataEntry.S620 : Serial number assignment, ver. 3.1.1839 2021-12-15 09:36:21 +01:00
Milan Hanajik c826b40e80 OrderManagement: Conflict check, OrderInfo.VacoDescription/MadeInText/Packing Varchar(255) added, etc. ver. 3.0.7 2021-12-14 23:08:36 +01:00
Milan Hanajik 804cf2aaea ver. 3.1.1836 2021-12-14 08:15:05 +01:00
Milan Hanajik 47511ef873 Tracing: CurrentPcsCount/CurrentSN/CurrentRA incremented, OrderInfo, Workflow and Workplace re-read from DB after sel., ver. 3.1.1835. 2021-12-13 15:03:52 +01:00
Milan Hanajik 43caffd73d S640CommForm Start/Ende.pro fixed, OriRadioAddress added to results, OrderInfo.Clone9) fixed, ver. 3.1.1833 2021-12-10 11:39:16 +01:00
Milan Hanajik 0d0355c65a ProductionTracing for Nanjing, OrderInfo updated after assignment of serial numbers, ver. 3.1.1831 2021-12-10 07:59:58 +01:00
Milan Hanajik dfddc8a980 OrderManagement : Copy button, ver. 3.0.7 2021-12-10 07:59:58 +01:00
Milan Hanajik 68c3ccbef6 SelectedProcedure stored in ProcessData, used in DataEntry.iPERL and S620, S640Comm cleaned, IOrderInfo, I640Cfg, OrderManagement v.3.0.6, etc. 2021-12-09 17:12:52 +01:00
Milan Hanajik ff28d507cf TestMethods.Evacuation added. 2021-12-09 17:12:51 +01:00
Milan Hanajik 2c00ed6dc4 SensusOracle : UID and Pwd invisible, CreateWztypIfMissing, VtAuftragPd, VtPruefpunktSollSd.Qbezeichnung max 8 char, more logging 2021-12-09 17:12:51 +01:00
Milan Hanajik cd84c82475 SensusOracle : Automatic WZ_TYPE_ID assignment and creation OK, ver. 3.1.1815 2021-12-09 17:12:51 +01:00
Milan Hanajik e324de985f Metrology and Uncertainties dialogs display tabs for Rig.Scales.MettlerToledo. 2021-12-09 17:12:51 +01:00
Milan Hanajik 0e45ef6689 TBF.Rig.Network.Comet.Ambient fixed : UpdateProcessData() was missing. 2021-12-09 16:35:04 +01:00
Milan Hanajik edc48d8723 Gitignore modified. 2021-12-09 16:35:04 +01:00
Milan Hanajik 3630af4a59 OrderManagement ver. 3.0.4 : Support for predefined orders 2021-12-01 16:55:06 +01:00
Milan Hanajik d1e0d1466d SharedDatabase synchronized with Production-Monitoring.TracingDB 2021-12-01 13:13:59 +01:00
Milan Hanajik bbffc3b406 TBF.UI.ResultsMI.SendAainDBAndWMSelectionForm as in 2.27 2021-11-29 22:17:45 +01:00
Milan Hanajik 9bc9db1792 DB.SensusOracle : Automatic WMTypeId assignment in progress. 2021-11-29 14:01:57 +01:00
Milan Hanajik 19c9e3a2da FileWriters,IperlLogger fixed in DesigMode == Based_on_procedure 2021-11-28 07:58:16 +01:00
Milan Hanajik 9a79ff1344 Scales.MettlerToledo : SICS command I4 : Zero length scale S/N is accepted, ver. 3.1.1814 2021-11-26 14:14:26 +01:00
Milan Hanajik 021f17c774 SharedDatabase.Entities.Part.CodeType and CodeForm --> sbyte, ver. 3.1.1813 2021-11-26 10:33:21 +01:00
Milan Hanajik 513c808f2b OrderManagement : barcode size, State and RA sort orders, EditOrderDlg localization, ver. 3.0.3 2021-11-22 23:31:25 +01:00
Milan Hanajik 09a0968b76 Workflow used in DataEntry.S620, LaserMarking stored to WaterMeter.Remark. 2021-11-18 14:54:03 +01:00
Milan Hanajik 351157dbba LaserMarking added to OrderInfo, OrderInfo printing, bug fixes. 2021-11-18 14:53:12 +01:00
Milan Hanajik 0494054171 Yet more MainWnd, MainSeq, etc. changes,ver. 3.1.1811 2021-11-18 14:53:12 +01:00
Milan Hanajik 587f6dffd0 More MainWnd, MainSeq, DataEntry.S620 and OrderManagement changes, ver. 3.1.1810 2021-11-18 14:53:12 +01:00
Milan Hanajik a35716733d MainWnd and DataEntry.S620 changes 2021-11-18 14:53:12 +01:00
Milan Hanajik 44761ff411 OrderManagement project added, ver. 3.1.1809 2021-11-18 14:53:11 +01:00
Milan Hanajik 5f7a80b826 SharedDatabase : OrderInfo table modified. 2021-11-18 14:53:11 +01:00
Milan Hanajik 99337ba7d9 Results.Output.Printers.PrintersCommon --> Common.Printers.PrintersCommon 2021-11-18 14:53:11 +01:00
Milan Hanajik 772080ae3b ListViewEx and MySortOrder related changes. 2021-11-13 05:38:10 +01:00
Milan Hanajik 9b5ee442a6 DataEntry.S620.FormForMechanicalMetersWithTracing localization. 2021-11-11 15:26:56 +01:00
Milan Hanajik 51b3e994c3 Bug fixes : (1) UniCB timing after a delay in worker thread (DB request), (2) Scales.MettlerToledo.ScaleCfg, ver. 3.1.1806 2021-11-11 13:32:54 +01:00
Milan Hanajik 335fce3e39 Bug fix : 6x try / catch to resolve crashes caused by GemCard, etc., ver. 3.1.1805 2021-11-11 08:19:35 +01:00
Milan Hanajik 44fc7b92fd TM.S640Communication as in 2.27 branch (EnterSerialNumbers, 40 wms), DataEntry.iPerl with Direction and Orders enum parameters. 2021-11-10 09:40:56 +01:00
Milan Hanajik 0f5c4b083d Unit selection in UI.Procedures.ProcedureDlg and UI.Procedures.TestWizard, ver. 3.1.1801 2021-11-09 08:48:27 +01:00
Milan Hanajik 5996fda348 SensusOracle.Database synchronized with 2.26/27, TestBenchGroupId, idBenutzer, ver. 3.1.1800 2021-11-08 09:17:00 +01:00
Milan Hanajik 339d79595d Uni.FlowMetersInParallel in schematic drawing, ver. 3.1.1795 2021-11-04 12:37:37 +01:00
Milan Hanajik a2a3d5940e Uni.FlowMetersInParallel enabled, CB.Uni.OutputMessage supports parallel flow meters, etc, ver. 3.1.1794 2021-11-04 11:57:32 +01:00
Milan Hanajik 62913cf68f Uni.RegValve position can be changed by mouse-clicks on the set point bar, ver. 3.1.1792 2021-11-02 14:36:11 +01:00
Milan Hanajik 3b70baeff0 Artefacts when drawing set points or tank level fixed, style changes. 2021-11-02 14:07:12 +01:00
Milan Hanajik bfa69ef611 Inputs mapped to route bits 80..119, UniCB to bit 120, Emergency stop from bit 96* (not from State), ver. 3.1.1788 2021-10-29 16:00:42 +02:00
Milan Hanajik 8c7bd51ca8 More logging PID (ActionID.SetFlow), SetFlowOp : ValveMove command send in case Flow == 0, ver. 3.1.1785 2021-10-29 15:59:41 +02:00
Milan Hanajik 87fa7fb669 Changes done in 2.26 branch. 2021-10-27 12:02:43 +02:00
Milan Hanajik 7205682d75 Bug fix : prevent SW crash when Scale.MettlerToledo is added in 'Not controlled by this PC' mode, ver.3.1.1773 2021-10-11 13:46:52 +02:00
Milan Hanajik 235da5e9e1 Platform target AnyCPU whereever possible. 2021-10-11 13:19:32 +02:00
Milan Hanajik 13b30b2caf DB.SensusOracle.DatabaseCfg : database access passwords are not readable 2021-10-11 09:22:20 +02:00
Milan Hanajik b5e2a7bdc9 TBF.UI.Procedures clean-up 2021-10-11 09:14:19 +02:00
Milan Hanajik 078bd8aaf4 TBF.Rig.Scales.MettlerToledo replaces three MettlerToledo components, ver. 3.1.1772 2021-10-11 09:14:05 +02:00
Milan Hanajik cef5dc3c10 ResultsBrowser supports 9 test benches, config directory is a s.ibling to bin directory 2021-09-23 09:34:07 +02:00
Milan Hanajik 1355777fe0 MettlerToledo.Standard.BalanceDev processes ID1 commands (only), ver. 3.1.1746 2021-09-22 18:42:14 +02:00
Milan Hanajik f82da6e4c8 Bug fix in TBF.Data.SetData( ) - divide by zero, ver. 3.1.1740 2021-09-20 15:11:24 +02:00
Milan Hanajik 6c181cdb67 TBF.Data initialization on TBF start-up (also in case IsRealBench = false), ver. 3.1.1736 2021-09-19 14:45:02 +02:00
Milan Hanajik a0aea713b0 Common.Data --> TBF.Data and TBF.DB 2021-09-19 14:44:55 +02:00
Milan Hanajik 709636e82b Common.Data.SampleDensity/Temp/Buoyancy/AdminUsername/AdminPassword --> Common.GlobalData. 2021-09-19 13:34:03 +02:00
Milan Hanajik 273f2b73d4 ControlBoard.Uni.StandingStartStopTestOp and TestMethods.StandingStartMassCollection changes, ver. 3.1.1734 2021-09-07 16:38:46 +02:00
Milan Hanajik c74047c292 UniCB.StopFlowControl( ) implemented, used 3x in SetFlowOp.Stop( ) instead of uniCB.StopAll( ) 2021-09-07 16:38:45 +02:00
Milan Hanajik dd72d6f046 Precise measurement of StandingStartMassCollection test time, TBF.Boxes.DateTimeBox. 2021-09-07 16:38:38 +02:00
Milan Hanajik f80181e53e 5x Color.Goldenrod --> Color.LightSteelBlue 2021-09-07 16:38:37 +02:00
Milan Hanajik 7988cd60ba Modbus.QuidoRS supports inputs reading. 2021-09-07 09:02:01 +02:00
Milan Hanajik 057e4fa240 Clean-up : ComponentsManagerDlg, Telegram, Modbus, QuidoRS, IOperation, S640Stream 2021-09-07 09:01:10 +02:00
Milan Hanajik 398661b763 iPerlCommunication : Default Q2 corrections, ConditnlUpdateQ2CorrRL/LR, fixes in CheckBoxEditMode, MuxBoard and Quido support removed. 2021-08-29 10:08:29 +02:00
Milan Hanajik 6809c75613 Bug fixes in MetrologyDlgDensityTab and MetrologyDlgBuoyancyTab. 2021-08-26 13:19:53 +02:00
Milan Hanajik 3e674b972a SensusOracle.Database : Insert/update of VT_ZAEHLER_PD modified, ResultsMI.DeleteFromOracleForm 2021-08-19 10:26:00 +02:00
Milan Hanajik 3a6b734aee FixedStart... methods use Math.Abs( ) of a difference of volumes to be able to cope with a reverse flow. 2021-08-18 14:12:51 +02:00
Milan Hanajik 554709538b Color.DarkGoldenrod --> DarkGray in 44 forms (DataEntry, KPackE.DataEntryForRadio, Adjustment, ManualEntry, PulsesTest(Manual), ManualLevelMsrmnt). 2021-08-18 14:08:07 +02:00
Milan Hanajik 47efa15dd5 Clean-up 2021-08-18 14:05:07 +02:00
Milan Hanajik a8f42cbb63 iPerlCommunicationForm.cs changes (sync. .with 2.26 branch) 2021-07-28 12:28:34 +02:00
Milan Hanajik a975b5d0f4 GraphsTabPageCtrl : 1. Unlimited history, 2. Dynamic subnodes. 2021-07-27 15:56:23 +02:00
Milan Hanajik af551b07bf (1) MainSeq allows showCycleEndFormOp==null now, (2) iPerlCommunicationForm edit mode fixes, ver. 3.1.1709 2021-07-20 10:10:25 +02:00
Milan Hanajik 84b48c4ecc Feature vector calculator - initial version of the offline tool. 2021-07-20 09:46:23 +02:00
Milan Hanajik 16de6c5d8b OptoTelegramRaw and CalculateFeatureVector() moved to Common project. 2021-07-20 09:46:23 +02:00
Milan Hanajik 3b81f1a143 IPERL : Results.Entities.MeterTestRslt.X1 .. X9, ErrorBC added, X1 = flow st. dev., Q_WZ (and VolumeMeter) calculation bug fix, etc. 2021-07-20 09:46:23 +02:00
Milan Hanajik aa04ea620b TestMethods.PMaxTest bug fix : when pump reached 100% PMaxTest started regardless of the pressure. 2021-07-20 09:46:23 +02:00
Milan Hanajik 3a28e33437 OptoTelegramRaw improvements 2021-07-20 09:46:23 +02:00
Milan Hanajik 95f9b01cb0 New RR.DataStream.MefImport and RR.DataStream.Reader components. 2021-07-20 09:46:15 +02:00
Milan Hanajik 6309796af5 DataStreamInterface project synchronized with 2.26 branch. 2021-07-02 15:26:22 +02:00
Milan Hanajik 2a2eae0c6a Common.Data.WMsCount = 20, etc., ver. 3.1.1685 2021-06-30 10:06:18 +02:00
Milan Hanajik 11c47964a9 SensusOracle.Database bug fix : Q_WZ in VT_PRUEFREIHE_IST_PD 2021-06-28 14:02:57 +02:00
Milan Hanajik 4c89c0f7c4 RegValve.SetFlowOp : RqrdFlowRangeRatio = 0.5, requiredFlowLo/HI -= MeasurementCorrection.GetCorrection(...), 2021-06-28 13:58:13 +02:00
Milan Hanajik 2106e82ede ErrorFlags STOP stops cycle 2021-06-28 13:56:26 +02:00
Milan Hanajik cd15ab2432 IperlHead as in 2.26, MeterTestRslt.ExtraDataPath and related changes, set in FlyingStart, FlStMassCollection and FlStMassCollProlonged. 2021-06-27 15:52:05 +02:00
Milan Hanajik ac7c737d1b ORACLE_DB, MANAGED, TURA_IPERL undefined, required for Nanjing only, ver. 3.1.1677 2021-06-24 08:13:53 +02:00
Milan Hanajik 827a9f7c58 Changes for Xylem Nanjing, ver. 3.1.1676 2021-06-18 15:35:46 +02:00
Milan Hanajik f1ef16e1a3 TBF.UI.Process.ProcessTabPageCtrl introduced, etc. 2021-05-26 23:42:16 +02:00
Milan Hanajik 7613613fad SerialStream.S640Stream in progress. 2021-05-25 22:13:11 +02:00
Milan Hanajik 9d01d565df DataEntry.Standard6 bug fix, ver. 3.1.1656 2021-05-24 16:39:01 +02:00
Milan Hanajik 9f5c89db06 SchematicDrawing background color = Color.FromArgb(240,240,240), ver. 3.1.1655 2021-05-23 21:21:47 +02:00
Milan Hanajik 0568966ba6 StandingStartMassCollectionSeq : Start mass measurement and start state data entry done at the same time, ver. 3.1.1654 2021-05-21 17:49:26 +02:00
Milan Hanajik 62d725d879 Standing start/stop fixed, ver. 3.1.1653 2021-05-21 17:13:45 +02:00
Milan Hanajik 81151935bc iPerlHead : TimeFromSamples( ), VolumeFromSamples( ), StartEndFilterSamplesCount = 20 2021-05-19 16:16:53 +02:00
Milan Hanajik bec7287531 TBF.UI.Procedures.ProcedureDlg : 5-th file writer. 2021-05-17 11:55:33 +02:00
Milan Hanajik db3a40d817 UI.Settings.UpgradeSelectionDlg : Upgrade pipes, ver. 3.1.1646 2021-05-14 13:41:10 +02:00
Milan Hanajik 0a1966d5f9 Pipes use Id instead if Name to identify end-components. 2021-05-14 13:39:45 +02:00
Milan Hanajik cfe55e430a Pump start logging, ver. 3.1.1645 2021-05-11 14:28:27 +02:00
Milan Hanajik 2642e3cc46 ControlBoard.Uni : (1) 2s old serial data removed from the input buffer, (2) improved serial data logging. 2021-05-11 14:21:04 +02:00
Milan Hanajik 4f1e7507f9 Modbus.PumpFM.DanfossVLT.Pump.Initialize( ) modification : modbus.ComponentNames[pumpCfg.ModbusAddress] = Name; 2021-05-04 15:15:35 +02:00
Milan Hanajik 3a2ab6c286 Combination of data from the current route, from digital outputs and from UI modified, ver. 3.1.1642 2021-05-04 14:10:25 +02:00
Milan Hanajik fc95847377 ControlBoard.Uni initialzation fixed : diverters count taken into account, ver. 3.1.1641 2021-05-04 10:32:26 +02:00
Milan Hanajik c5769bed0c 10.42.128.16 --> 10.42.128.24 2021-04-30 12:24:29 +02:00
Milan Hanajik 24413482bc 'Scale', 'Diverter' and 'RegValve' results items added, ver. 3.1.1640 2021-04-30 08:52:57 +02:00
Milan Hanajik 65b5164f0b Changes in TBF.Utils.GetRegulVallvesPositions( ) and SequenceBase (see bug fix in 2.26.1636). 2021-04-28 11:00:28 +02:00
Milan Hanajik b98af02b55 Changes in binding between KPackE.Radio and KPackE.RegisterReader (Register(), Unregister()). 2021-04-26 11:56:21 +02:00
Milan Hanajik 4e32d037ea New style Dummy.FlowMeter.FlowMeterCfg with format and unit. 2021-04-26 11:56:21 +02:00
Milan Hanajik 5ea9c51f77 Uni.FlowMeter.FlowMeterCfg.MsrdValLimLo/Hi is not serialized, can be accessed from the component. 2021-04-26 11:56:21 +02:00
Milan Hanajik 08c0a61110 Bug fixes 2021-04-26 11:56:21 +02:00
Milan Hanajik fdb1e112dc (1) Dummy.Flowmeter displays flow measured by a scale, (2) OoR values are orange. 2021-04-26 11:56:01 +02:00
Milan Hanajik 870b49d8ad Output.SensusTestInfo : (1) S620_Kiwa, (2) CreateFromProcedure() fixed (as in 2.26.1622) 2021-04-26 06:50:53 +02:00
Milan Hanajik 17c77758c6 Correct reading of WM pulses (windowing effect, only lower 16 bits of a counter value are available). 2021-04-19 14:48:03 +02:00
Milan Hanajik 3f0124825d WMsCount is 20, the same count as supported by UniCB. 2021-04-19 14:07:18 +02:00
Milan Hanajik 5507a65170 3s between test start and route change, ver. 3.1.1628 2021-04-16 17:17:25 +02:00
Milan Hanajik b2099ad68c Standing start/stop method fixed, ver. 3.1.1627 2021-04-16 16:47:28 +02:00
Milan Hanajik 9d1698b462 FixedStartMassCollection --> StandingStartMassCollection 2021-04-16 14:16:07 +02:00
Milan Hanajik 847956f708 FixedStartMassCollection modified, ControlBoard.Elde repmoved, ver. 3.1.1624 2021-04-16 14:06:47 +02:00
Milan Hanajik 95d5d16c83 FixedStartMassCollelction in progress. 2021-04-16 13:05:50 +02:00
Milan Hanajik b36a76f413 More ReadMassOp / Mass / etc. 2021-04-15 16:49:28 +02:00
Milan Hanajik 1f05cc420c ReadMassOp removed, ProcessData.Mass removed, TestMethods.FixedStartMassCollection, ver. 3.1.1620 2021-04-15 13:15:18 +02:00
Milan Hanajik eeaf1e1682 DummySeq modified, no message, temperature, pressure measured once, start/end time set, ver. 3.1.1618 2021-04-15 13:07:30 +02:00
Milan Hanajik 1905d3644e Bug fix in LeakTestSeq. 2021-04-14 11:59:44 +02:00
Milan Hanajik 39197ddd71 Bug fix in CalculateDivTransitionTime( ), div. transition time stored in results, DiverterTestSeq calculates average transition time. 2021-04-13 23:34:06 +02:00
Milan Hanajik 8b8198e298 (1) TestMethods.Dummy.CheckDeviceCaps( ), (2) Trivial simulation mode in some test methods, ver. 3.1.1614 2021-04-13 23:34:06 +02:00
Milan Hanajik b57ffac9bc Use of Selector in Wizard in FlowSelection dialog. 2021-04-13 15:35:38 +02:00
Milan Hanajik 1dc35e6135 Paths : Selector : UI changes. 2021-04-13 15:35:38 +02:00
Milan Hanajik 5aec3c1ecc Bug fix : Results.BatchResults.NewFromProcedure( ) uses GetTestInstances( ), ver. 3.1.1610 2021-04-13 15:35:24 +02:00
Milan Hanajik 3603d31add SensusTestInfo changes as in v. 2.26.1608 (Australia 169 MHz). 2021-04-13 10:42:02 +02:00
Milan Hanajik be326dae5f MergeResultsDBs console application added to solution. 2021-04-12 13:09:28 +02:00
Milan Hanajik ce3328fbf6 Results.Entities bug fixes and copy constructors. 2021-04-12 13:09:28 +02:00
Milan Hanajik 9724e8779a Modbus logging with child component names, ver. 3.1.1606 2021-04-09 16:29:24 +02:00
Milan Hanajik f33bc4f167 Modbus : Multiple modules use common time scheduling (one Thread.Sleep in RunDeviceAfter), ver. 3.1.1605 2021-04-09 13:37:46 +02:00
Milan Hanajik d84588650f ControlBoard.Papouch modified for 4 QuidoRS boards, ver. 3.1.1604 2021-04-09 11:26:52 +02:00
Milan Hanajik 02747a975a Code cleanup. 2021-04-09 11:26:11 +02:00
Milan Hanajik 5d78f7428b Minor improvements, ver. 3.1.1603 2021-04-08 16:12:47 +02:00
Milan Hanajik d5544d3041 MainSeqUtils : Prevent crash when draining tanks at the end, ver. 3.1.1602 2021-04-08 14:30:25 +02:00
Milan Hanajik d02e06cb9a UI.Procedures.ProceduresCtrl can display procedure properties of Sensus-Oracle-DB component. 2021-04-08 13:52:35 +02:00
Milan Hanajik 988bcd6387 BuiltIn.Valve initialization changed. 2021-04-08 10:05:02 +02:00
Milan Hanajik 56294bbffc ToString( ) methods of all components are equal, start with ClassName. 2021-04-07 22:18:53 +02:00
Milan Hanajik 3a8f9ea2e0 MeterTestRslt.WriteBinary( ) hot fix. 2021-04-07 12:06:40 +02:00
Milan Hanajik 6d9a7e2385 Bug fix in StateMachine.InitializeDevices( ), Modbus.RegTelegramsPerSecond = 3, MaxTelegramsPerSecond = 5, ver. 3.1.1601 2021-04-06 10:24:42 +02:00
Milan Hanajik dd24c8b073 TestRslt.Buoyancy ---> TestRslt.MassOfEvapWater, ver. 3.1.1600 2021-04-05 14:12:42 +02:00
Milan Hanajik 4e12942f5f Users : SMART_CARD_READER_SUPORT define to enable a smart card reader support in LoginDlg. 2021-04-03 16:58:08 +02:00
Milan Hanajik a81858ee9f Changes for iPERL, builds OK when TURA_IPERL;IPERL;ORACLE_DB are defined in Config, Results and TBF projects. 2021-04-03 16:38:37 +02:00
Milan Hanajik 3b211b8644 MainWnd : ProcessTabPageCtrl24 used always (TODO: Rewrite ProcessTabPageCtrl). 2021-04-03 16:16:53 +02:00
Milan Hanajik 0732e8360f #if STABLE_MASS_EXTRAS removed, it is enabled always now. 2021-04-03 16:15:44 +02:00
Milan Hanajik c53cb8ace0 Initialization( ) changed, is abstract in ComponentBase, builds OK. 2021-04-03 09:39:17 +02:00
Milan Hanajik a58fe1f997 Initialization of 30 components changed, done in Initialize( ). 2021-04-03 00:54:27 +02:00
Milan Hanajik cb1a66381f MetrologyDlg tabs style changes. 2021-04-03 00:54:27 +02:00
Milan Hanajik 535038bce1 Style changes to prevent warnings. 2021-04-03 00:54:18 +02:00
Milan Hanajik e651244601 PlatformTarget set to x86 in some projects to avoid warnings, enable debugging. 2021-04-02 23:38:27 +02:00
Milan Hanajik b63408cc68 UI.Shared.EmergencyStopForm removed. 2021-04-02 23:35:26 +02:00
Milan Hanajik bb3a6ff4f3 BuiltIn components clean-up. 2021-04-02 20:27:02 +02:00
Milan Hanajik ce0b8af4a0 DataContainer components clean-up. 2021-04-02 20:25:31 +02:00
Milan Hanajik 1bc3e5d6eb IDevice.Initialize( ) ---> IComponent.Initialize( ). 2021-04-02 18:13:00 +02:00
Milan Hanajik 08c2d3b0d8 EmergencyStopModelessDlg removed. 2021-04-02 18:11:53 +02:00
Milan Hanajik 4fda48f7e7 Components initialization clean-up. 2021-04-02 17:28:15 +02:00
Milan Hanajik dd08ca770d ResetStaticProperties( ) eliminated from ComponentBase, IComponentFactory and factories. 2021-04-02 16:10:38 +02:00
Milan Hanajik c7e87c95da CLP1611, TestMethods.Counter : ResetStaticProperties( ) eliminated, code from constructor moved to Initialize( ). 2021-04-02 16:08:24 +02:00
Milan Hanajik 79e80e8b6d TankWithLevelMsrmnt.Tank : shared static properties and ResetstaticProperties( ) eliminated. 2021-04-02 15:49:02 +02:00
Milan Hanajik 689841cd2d MettlerToledo.Multi removed from the project. 2021-04-02 15:16:45 +02:00
Milan Hanajik 0cc21f40af MettlerToledo.Stabdard.Balance clean-up, shared static properties eliminated. 2021-04-02 15:12:29 +02:00
Milan Hanajik e4da4929e4 IScaleOrTank.ScaleNr eliminated. 2021-04-02 15:12:29 +02:00
Milan Hanajik 8a846a774f ReadMassesOp eliminated. 2021-04-02 15:12:29 +02:00
Milan Hanajik 51aa0f4e43 Ambient clean-up. 2021-04-02 15:12:22 +02:00
Milan Hanajik 4e9d1c8281 Modbus : Improved scheduling of polling, ticketNo is between 0 .. devsCount-1, DebugMode.Simulation is more complete. 2021-04-02 13:13:16 +02:00
Milan Hanajik 5e790e5d07 Modbus : Fixed sending output messages from the queue. 2021-04-01 15:24:50 +02:00
Milan Hanajik 931a4bcc00 UniCB : Prevent too early sending of data, ver. 3.1.1619 2021-04-01 15:14:15 +02:00
Milan Hanajik d6ae50f4dd Uni : Buffering of the last combined action arguments, ver. 3.1.1618 2021-03-31 16:23:12 +02:00
Milan Hanajik ef004ce92e Manual control of diverters by mouse clicks on a schematic drawing. 2021-03-30 12:49:08 +02:00
Milan Hanajik df6741cf1a iPerlCommmunication : New Q2 correction for Australia. 2021-03-30 12:03:31 +02:00
Milan Hanajik f083fe568e FlyingStartMassCollectionSeq and FlyingStartMassCollProlongedSeq cleanup. 2021-03-30 00:03:35 +02:00
Milan Hanajik a8e808a510 Imperial units, ... 2021-03-29 23:31:21 +02:00
Milan Hanajik 27972aff64 Output.FileWriters.Enhanced with formatted WM subtitles 2021-03-29 23:17:49 +02:00
Milan Hanajik 0468d9abf5 WMPosition saved to SummaryResults, AllResults, column CQ ... 2021-03-29 22:51:56 +02:00
Milan Hanajik bebb5e5909 Refactorization. 2021-03-29 22:42:04 +02:00
Milan Hanajik 71c4f8f32f Refactorization : RegulValve --> RegValve on many places. 2021-03-29 22:34:15 +02:00
Milan Hanajik 1a8ef4f1be (1) UI.Procedures.ProcedureParamsMixedCtrl, (2) Modbus.Novus added, (3) cleanup 2021-03-29 18:25:51 +02:00
Milan Hanajik 6be8af6d63 TBF.Rig.Elde.FlowMeter... components removed 2021-03-29 16:24:11 +02:00
Milan Hanajik 68ca5c4901 Uni.FlowMetersInParallel added, ver. 3.1.1617 2021-03-29 16:23:21 +02:00
Milan Hanajik 79e1fff45e Modbus : Code from StopDevice2( ) moved to StopDevice( ). 2021-03-29 16:17:34 +02:00
Milan Hanajik eb142244e4 SchematicDrawing : Diverter painted correctly, closed-wet images added. 2021-03-29 11:26:59 +02:00
Milan Hanajik baf7f84343 (1) Diverter start/stop transition graph plotted, (2) Diverter ToTank / ToSink buttons, ver. 3.1.1616 2021-03-28 08:38:30 +02:00
Milan Hanajik 0fc8bb4ea0 Route logging changed. 2021-03-24 21:39:37 +01:00
Milan Hanajik 25856496d8 Various.CoverTest component created, few Elde components removed, ver. 3.1.1609 2021-03-24 13:48:05 +01:00
Milan Hanajik ebf7c97bc6 Event.BalanceDone --> Event.ScaleDone, EmergencyStop is route bit #81, ver. 3.1.1608 2021-03-24 09:32:42 +01:00
Milan Hanajik 9bfa70d5c1 Diverter test completed, ver. 3.1.1607 2021-03-23 17:18:49 +01:00
Milan Hanajik 80beb9d54b ShcematicDrawingCtrl : Order of painting changes so that mass is not hidden under water. 2021-03-23 16:39:24 +01:00
Milan Hanajik aff25e307d Pump tandem, ver. 3.1.1606 2021-03-23 16:37:47 +01:00
Milan Hanajik ce6896b584 Waiting before stable mass measurement joined with the mass measurement into one operation. 2021-03-23 13:50:32 +01:00
Milan Hanajik 9b1a427369 Prolonged method evaluation fixed, ver. 3.1.1605 2021-03-23 11:08:33 +01:00
Milan Hanajik 78f9b10255 cBrd.StopPreviousOp( ) ---> cBrd.Stop( ) in FlyingStart.... test sequences, etc., ver. 3.1.1604 2021-03-23 09:52:03 +01:00
Milan Hanajik 061ab99486 Prolonged method fixed, ver. 3.1.1603 2021-03-23 08:50:40 +01:00
Milan Hanajik ef96c06328 Prolonged method fixed, ver. 3.1.1602 2021-03-22 14:02:47 +01:00
Milan Hanajik 8f5291332f Uni.FlyingStartStopTestOp merged with Uni.FlyingStartStopTestWithDivOp, IAdvancedControlBoard. ver. 3.1.1601 2021-03-22 09:08:00 +01:00
Milan Hanajik 747195fc10 UniCB cleanup, simulation improved, locking. 2021-03-20 07:20:36 +01:00
Milan Hanajik 0e8bbec3bc (1) Prolonged method fixed, (2) UniCB simulation mode improved, ver. 3.1.1600 2021-03-20 02:38:41 +01:00
Milan Hanajik 141b9a7b4c (1) DIverter threshold used, (2) UniCB state display can be enabled / disabled, ver. 3.1.1598 2021-03-19 16:22:50 +01:00
Milan Hanajik 595f0c514e In progress 2021-03-19 09:35:41 +01:00
Milan Hanajik e1dfe758cd UniControlBoardTest project removed from the solution. 2021-03-19 07:50:10 +01:00
Milan Hanajik 6eaa9dad90 UniCB : Indication of serial connection, ver. 3.1.1598 2021-03-18 18:22:25 +01:00
Milan Hanajik be9d912489 Route handling rewritten, the order of StopDevice( ) calls reversed. 2021-03-18 16:17:11 +01:00
Milan Hanajik d7e65ff04b Modbus modified, UniCB Init. modified, RunDeviceAfter() called in reversed order, ver. 3.1.1597 2021-03-18 16:16:49 +01:00
Milan Hanajik ff70a11cad RegisterReader simplified, ReadRegisterOp( ) removed from IRegReader, ReadMoreRegistersOp removed. 2021-03-18 03:56:15 +01:00
Milan Hanajik e201c0ea66 PulsesFromUniCB.RegisterReader modified, ReadRegisterOp( ) returns null, ver. 3.1.1643 2021-03-17 17:15:43 +01:00
Milan Hanajik 1c093caff3 More logging: water meter pulses and test time, ver. 3.1.1642 2021-03-17 16:46:57 +01:00
Milan Hanajik 48484e1dbb No ChangeRoute action after 15 s being idle, ver. 3.1.1641 2021-03-17 13:19:35 +01:00
Milan Hanajik 068c51157e uniCB.FlyingStartStopTest...Op.cs test start fixed, ver. 3.1.1640 2021-03-16 15:09:41 +01:00
Milan Hanajik e8e1be644b UniCB.RRoute and SyncRoute( ) implemented, ver. 3.1.1639 2021-03-16 13:05:04 +01:00
Milan Hanajik d971831ab8 Groch.TempMeter impelented, ver. 3.1.1638 2021-03-16 12:14:51 +01:00
Milan Hanajik a432bbb5c6 UniCB.RefPulses implemented and displayed, ver. 3.1.1636 2021-03-16 06:20:09 +01:00
Milan Hanajik 95a0cebcf8 REVERTED commit : BenchInfo : Exception when 2nd instance created, ver. 3.1.1635 2021-03-15 16:09:55 +01:00
Milan Hanajik d22158404d Prolonged test support in Action, OutputMessage, etc., ver. 3.1.1634 2021-03-15 15:52:49 +01:00
Milan Hanajik 4770f3e393 Action.SetFlow is a synchro method, IsSyncMethod=true, ver. 3.1.1633 2021-03-15 14:21:42 +01:00
Milan Hanajik d287902f62 BenchInfo : Exception when 2nd instance created, ver. 3.1.1632 2021-03-15 12:41:28 +01:00
Milan Hanajik f74fff9b51 Uni : MassPulsesCount is equal to TotalPulsesCount for all methods except Prolonged method, ver. 3.1.1631 2021-03-15 11:40:33 +01:00
Milan Hanajik bdefc0b8fa Modbus.TempMeter.Groch in progress 2021-03-14 21:31:26 +01:00
Milan Hanajik afa213f8d5 .AddOperation(cBrd.StartTestOp, ... temporarily disabled in 12 sequences. 2021-03-14 21:29:58 +01:00
Milan Hanajik 7af4e9465c Uni.XyzStartStopTest[WithDiv]Op, etc., AdjustmentSeq and all FlyingStartXyzSeq completed, ver. 3.1.1630 2021-03-14 21:28:41 +01:00
Milan Hanajik 6e1b02ebd5 Cfg.ToString(1) --> Cfg.ToString(-1) in 89 components 2021-03-13 11:04:38 +01:00
Milan Hanajik 93d5398f10 (1) MettlerToledo.Standard simul.mode fixed, (2) Format usage in DoubleBox.ToString() 2021-03-13 11:03:58 +01:00
Milan Hanajik baae5655d4 Uni.RegValveAnalog and Uni.RegValveTandem added, several Elde components removed. 2021-03-12 22:59:11 +01:00
Milan Hanajik b1862e2f02 Support for Statistics off-line mode: change LocalSettings.cs line 244. 2021-03-12 10:00:41 +01:00
Milan Hanajik 3e7ad6c06c StartMeasurementOp, ver. 3.1.1628 2021-03-11 17:57:19 +01:00
Milan Hanajik 768fb69653 Uni.RegValve function simplified, IFlowMeter includes functions from IIDrawingItCmpntWithMeasuredVal, ver. 3.1.1627 2021-03-11 14:55:21 +01:00
Milan Hanajik 21183ca801 Reg. valve stop param, ver. 3.1.1626 2021-03-11 10:46:15 +01:00
Milan Hanajik 13b3aca95f Stop command modified, ver. 3.1.1625 2021-03-10 17:14:19 +01:00
Milan Hanajik a21766b944 Action.IsFromUI, MeasureFlow works OK, SetFlow in progress, ver. 3.1.1624 2021-03-10 16:51:52 +01:00
Milan Hanajik 6f701adb9e SerialStream simulation : Reads characters from a file instead of a serial port. 2021-03-08 18:06:54 +01:00
Milan Hanajik e4c6bf5aa6 DataEntry.iPerl : No CycleEndForm, does not implement IHasCycleEndForm. 2021-03-08 13:10:22 +01:00
Milan Hanajik a1edfcc71a UniCB : Frequency displayed, ver. 3.1.1609 2021-03-05 16:50:18 +01:00
Milan Hanajik e2a8d66e48 UniCB : Flow measurement start fixed, ver. 3.1.1608 2021-03-05 16:12:33 +01:00
Milan Hanajik 6cf3bd6160 Refactorization : BenchControl -> Rig 2021-03-05 16:12:24 +01:00
Milan Hanajik 84c8ec26b6 Uni.FlowMeter requests a measurement after a mose-click, ver. 3.1.1607 2021-03-05 13:22:54 +01:00
Milan Hanajik d27c1b89ad 1. MsrmntAvailableFlags implemented, 2. more UniCB Actions. 2021-03-05 13:22:22 +01:00
Milan Hanajik f87cbe9e54 Cleanup : TBF.Tools removed 2021-03-05 12:35:33 +01:00
Milan Hanajik 2a96af3503 Bug fixes : StartChangeHandler()-s are not called twice, ver. 3.1.1606 2021-03-05 11:47:04 +01:00
Milan Hanajik 1e5e0508e4 1. Route, Action bug fixes 2. More logging 2021-03-05 11:46:50 +01:00
Milan Hanajik 1baba9ee6d Pump power : float -> double 2021-03-05 08:50:06 +01:00
Milan Hanajik 724872eb43 Uni.RegValve SetpointVal, Controlboard.Uni.Action logging, ver. 3.1.1604 2021-03-04 14:11:43 +01:00
Milan Hanajik 69fde570ce Refactorization : IRegValve.position is double, Uni.RegValve.adcChannel properly initialized, ver. 3.1.1603 2021-03-04 13:16:21 +01:00
Milan Hanajik 9495b9f3a3 UniCB and Uni.RegValve functionality, ver. 3.1.1602 2021-03-04 11:28:39 +01:00
Milan Hanajik cdca702738 Uni.CBoard -> Uni.UniCB, 'config', actions, non-conflicting fetching and communication implemented, ver. 3.1.1601 2021-03-04 07:39:31 +01:00
Milan Hanajik f5786ef93d UniCB : Valve control (route) 2021-03-03 08:18:11 +01:00
Milan Hanajik 1c27f0df4c UniCB AltString with usefull info, ver. 3.1.1599 2021-03-02 20:51:27 +01:00
Milan Hanajik 3f9973f8b8 (1) Results.Entities.Batch.ProtocolTitle removed, (2) Munich related stuff removed 2021-03-02 14:20:24 +01:00
Milan Hanajik be07d04f67 DrawingShape for diverter 2021-03-02 07:55:19 +01:00
Milan Hanajik c950cc231c ParamValues() retval IList->ICollection, GetControl() arg. is a list of components, ver. 3.1.1598 2021-03-02 01:10:04 +01:00
Milan Hanajik 8dc45484b0 Cleanup and comment 2021-03-01 21:33:54 +01:00
Milan Hanajik 35815fe78a UniCB DrShp, AltStrings, double Press, new Cfg style, Lbl,Setp,Msrd pos != 0, arrow keys, refactorization, ver. 3.1.1597 2021-03-01 15:22:37 +01:00
Milan Hanajik b5f8d06e5b Database cleanup, columns correctly renamed, DataContainer namespace, etc. 2021-02-24 17:42:50 +01:00
Milan Hanajik a9d6fa631c Various changes done when adding new components (parents, etc.) 2021-02-24 15:27:35 +01:00
Milan Hanajik 878e7be9fa ValveCategory.All removed, RegValve-s are never in ValveCategory.Bench. 2021-02-24 14:36:34 +01:00
Milan Hanajik 4cf4192ebb BenchControl.Uni.Diverter/FlowMeter/RegReader added, etc. (many changes and refactorization). 2021-02-24 14:15:10 +01:00
Milan Hanajik 5325d7f6ee Uni.GeneralData : Unused member variables deleted. 2021-02-23 11:35:28 +01:00
Milan Hanajik f54430ccf6 UniControlBoardTest uses TBF.BenchControl.ControlBoard.Uni component. 2021-02-22 18:06:14 +01:00
Milan Hanajik 71ae636410 ControlBoard.Uni component added. 2021-02-22 18:06:06 +01:00
Milan Hanajik 3732d3255f UniControlBoardTest project added, basic communication works OK. 2021-02-19 16:46:05 +01:00
Milan Hanajik 56a9984626 IControlBoard.SpecifyInvertedValves instead of InitializeComponent 2021-02-19 16:45:55 +01:00
Milan Hanajik 29d64c69eb InfoFlagsStr in Results as an item in WMeterRsltItemSpec. 2021-02-19 11:19:43 +01:00
Milan Hanajik 63a15fc1de Constructors of components : Logging level increased to WARN 2021-02-19 09:50:48 +01:00
Milan Hanajik d2f3a937ec Telegram class moved to Common project. 2021-02-18 13:38:30 +01:00
Milan Hanajik 8c15fe34ee DataEntry.Standard24.CycleBeginningForm : Auto s/n feature. 2021-02-17 10:56:51 +01:00
Milan Hanajik 57793ed382 DeviceTest shutdown bug fix, OptoTelegramRaw comment, ver. 3.1.1593 2021-02-17 10:56:31 +01:00
Milan Hanajik fea9b01922 MettlerToledo.Standard.BalanceDev/Old/NewDev clean-up, units (oz), 1st after draining, etc. 2021-02-16 11:40:14 +01:00
Milan Hanajik a33e4de467 BenchControlPanel : Four main buttons are disabled on TBF start. 2021-02-08 10:16:48 +01:00
Milan Hanajik 5a1d77dd87 Bug fix in MetrologyDlgFlowMeterTab, etc. when ranges are enabled 2021-02-08 10:09:02 +01:00
Milan Hanajik ea05871b19 SensusOracle.Database : (1) ProcedureParams modified, (2) SQL style changes 2021-01-28 13:55:00 +01:00
Milan Hanajik 229c87f920 RealDensity, AtTemperature, Buoyancy are stored in Results DB in Batch table. 2021-01-28 13:33:38 +01:00
Milan Hanajik dd8feaa963 Changes in MainSeq, Procedure, BenchControlPanel, TestProgressControls, etc. 2021-01-25 12:54:16 +01:00
Milan Hanajik 8507511776 (1) FlyingStartMassCollProlonged fixed, (2) Password of day. 2021-01-25 12:54:05 +01:00
Milan Hanajik 1e8d2975f0 PMaxTestSeq and LeakTestSeq.CheckDeviceCaps implemented, ver. 3.1.1578 2021-01-20 12:44:33 +01:00
Milan Hanajik 1fb76a2167 (1) PreviousResultsDlg with filters, (2) Procedure history can be inspected. 2021-01-19 09:28:05 +01:00
Milan Hanajik 34f8bb226f MainSeqUtils.CreateNewBatchResults( ) bug fix. 2021-01-14 09:51:24 +01:00
Milan Hanajik bc3fb0f8a0 Output.FileWriters.Enhanced with formatted WM subtitles 2021-01-14 09:51:24 +01:00
Milan Hanajik 9416b79b38 TracingDB synchronized with Production-Monitoring project. 2021-01-14 09:51:15 +01:00
Milan Hanajik 20171e99a6 Q2 corr.: Correction inside range -0.5 .. 0.5 % 2020-11-27 09:03:50 +01:00
Milan Hanajik 822ef33da8 Saving events to Events DB : Fixed bugs when connection string was not defined. 2020-11-18 10:44:53 +01:00
Milan Hanajik 3bfb34a6ea DB.SensusOracle.Database : (1) Procedure params., (2) S620 support, (3) SensusTestInfo for 620. 2020-11-13 11:57:22 +01:00
Milan Hanajik c28828fcdd Register readers cleanup, IRegReaderPulses added. 2020-11-13 11:55:20 +01:00
Milan Hanajik 889a370f90 iPerlCommunicationForm bug fix : Crash when swithing to Active mode after saving results. 2020-11-13 10:31:30 +01:00
Milan Hanajik a369127850 UI.Procedures.ProceduresCtrl : More column content is optional. 2020-11-13 10:27:09 +01:00
Milan Hanajik 82a3574222 Statistics : IP addresses updated, export in CSV format implemented. 2020-11-13 10:25:00 +01:00
Milan Hanajik f3fc3d3ba4 UI.Procedures.ProcedureDlg 'Copy' a test feature added 2020-11-13 10:23:44 +01:00
Milan Hanajik a5a139aff6 TBF/CameraBinaryFiles2 folder with synchronization for SD v.2.x (!!! file upload NOK). 2020-11-13 10:23:44 +01:00
Milan Hanajik 09da203962 DataEntry.Camera (1) loads next image after 'Enter' key, (2) dealing with test parts fixed. 2020-11-13 10:23:44 +01:00
Milan Hanajik 77ad6a529d MettlerToledo.Standard always reads immediate mass when idle. 2020-11-13 10:23:32 +01:00
Milan Hanajik 54658bdd38 US and English units added. 2020-09-09 09:06:33 +02:00
Milan Hanajik 809897342a Output.EventTriggers.Standard bug fix (E13 cannot be changed). 2020-09-09 09:06:33 +02:00
Milan Hanajik 70767de3fc In all FixedStart methods there is 10s delay after start of a test before the flow regulation starts. 2020-08-12 10:05:46 +02:00
Milan Hanajik d62c1ff106 Heat Meters related fixes. 2020-08-07 14:00:46 +02:00
Milan Hanajik bf583e3061 Camera.CLP1611 : More comments, TODO list 2020-08-05 10:26:26 +02:00
Milan Hanajik 270a46982d (1) Compound WM results displayed correctly, (2) Diverter.flowMtrNr4Cmd for SLM_150. 2020-08-05 10:25:31 +02:00
Milan Hanajik 659315c519 Bug fix in CombinedWithDetectionSeq related to test.Part 2020-08-03 09:07:22 +02:00
Milan Hanajik 04db3f975e ReserBatchNr project added to the solution. 2020-07-31 08:52:26 +02:00
Milan Hanajik c0e18458aa Elde components removed 2020-07-29 13:49:31 +02:00
Milan Hanajik d09316a34a Barcode printing in Output.Printers.Enhanced and Output.Printers.OnePerMeter. 2020-07-29 13:42:43 +02:00
Milan Hanajik 8c0ebcb871 Diverter : 'static int nextIdx' not incremented when DebugLevel == DebugMode.Off 2020-07-09 10:10:16 +02:00
Milan Hanajik fcdf1ea16b German resources the same as in branch 2.26 2020-07-08 10:21:06 +02:00
Milan Hanajik d6261e4d80 (1) Units : Quantity.Enumerated added, (2) LoginDlgWithBenchSelection : List of benches is alphabetically sorted. 2020-06-25 12:11:43 +02:00
Milan Hanajik 9f5c4e7347 ResultsBrowser: 1 WR13 IP addr.updated, 2 default DbType=MySql, 3 changes in progress. 2020-06-24 11:57:36 +02:00
Milan Hanajik 90e58266a9 SchematicDrawing : Intersections of pipes drawn as a bow having darker color. 2020-06-18 22:59:22 +02:00
Milan Hanajik 5b5f0ac41e SchematicDrawing : Dijkstra algorithm uses minimum heap. 2020-06-18 09:38:03 +02:00
Milan Hanajik ddca028eb2 MettlerToledo : Zero instead of Taring, cleanup, ver. 3.1.1495 2020-06-17 13:01:32 +02:00
Milan Hanajik fea7d0dc85 Papouch.CBoard communication change, inputs regularly read, ver. 3.1.1492 2020-06-14 13:04:14 +02:00
Milan Hanajik 1f67899a5c Schematic drawing with live function, bench control by mouse, Dijkstra algo, vacuum, etc. 2020-06-14 13:01:53 +02:00
Milan Hanajik 2945049288 Reconfigured for Juzna-Afrika-NEW 2020-06-02 12:02:37 +02:00
Milan Hanajik 070a76aade SchematicDrawing: Editing completed, TODO: Display 2020-06-02 12:00:45 +02:00
Milan Hanajik 2c100c7150 DataEntryForm can be displayed in transition before a test (FixedStartStopMassCollAdvanced only), ver. 3.1.1473 2020-05-29 13:09:13 +02:00
Milan Hanajik 19b23ea212 FixedStartMassColl(Advanced) bug fix, ver. 3.1.1472 2020-05-26 14:07:27 +02:00
Milan Hanajik e5edb90bfd TestMethods.FlowAdjustment, TestMethods.FixedStartMassCollAdvanced, DataEntry24 changes, ver. 3.1.1471 2020-05-25 14:24:50 +02:00
Milan Hanajik 2ec611964f Changes for Juzna-Afrika-NEW, JUZNA_AFRIKA_NEW symbol, ver. 3.1.1470 2020-05-21 18:57:41 +02:00
Milan Hanajik c007bca797 Modbus: Data receive improved, Meret.TempMeter, Meret.PressureMeter, Danfoss.VLT added, QuidoRS modified. 2020-05-21 18:32:21 +02:00
Milan Hanajik 767796662e Critical bug fix in many sequences - STOP not functioning !!! 2020-05-21 16:43:35 +02:00
Milan Hanajik 7b321abb30 ControlBoards, IControlBoard iface, Devices, test methods. 2020-05-21 15:55:02 +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
Milan Hanajik 7c070fc635 Config project and DB cleanup 2020-01-13 14:24:39 +01:00
Milan Hanajik 4090bd1618 UsersGroups table added to config DB, User and Group have ManyToMany relation, ver. 2.25.1400 2020-01-13 14:24:25 +01:00
Milan Hanajik ab43cabc57 (1) RestClient project added, (2) Testmethods.Q2CorrectionFromHisotry modified. 2020-01-13 14:10:28 +01:00
Milan Hanajik 91461eb2cc .NET Framework 4.7.2 2020-01-13 14:10:20 +01:00
Milan Hanajik aa18b75ef8 CHARACTER SET utf8 COLLATE utf8_unicode-ci after creating/importing a database. 2020-01-13 14:10:13 +01:00
Milan Hanajik f029fdbd2e Publish and Evaluate were added to PTest, are specified in Test profiles. 2020-01-13 14:08:06 +01:00
3912 changed files with 855870 additions and 264114 deletions
+46 -11
View File
@@ -1,5 +1,11 @@
Common/bin/
Common/obj/
Config/bin/
Config/obj/
DataMatrix4Net/bin/
DataMatrix4Net/obj/
DataStreamInterface/bin/
DataStreamInterface/obj/
Decrypt/bin/
Decrypt/obj/
DeviceTest/bin/
@@ -8,27 +14,56 @@ Dirichlet.Numerics/bin
Dirichlet.Numerics/obj
Encrypt/bin/
Encrypt/obj/
GemCard/bin
GemCard/obj
GraphLib/bin
GraphLib/obj
TracingDB/bin
TracingDB/obj
EventViewer/bin/
EventViewer/obj/
FeatureVectorCalculator/bin/
FeatureVectorCalculator/obj/
GemCard/bin/
GemCard/obj/
GenCode128/bin/
GenCode128/obj/
GenericTest/bin/
GenericTest/obj/
GraphLib/bin/
GraphLib/obj/
MergeResultsDBs/bin/
MergeResultsDBs/obj/
OrderManagement/bin/
OrderManagement/obj/
ProductionTracing/bin/
ProductionTracing/obj/
RecordProcessing/bin/
RecordProcessing/obj/
ResetBatchNr/bin/
ResetBatchNr/obj/
RestClient/bin/
RestClient/obj/
Results/bin/
Results/obj/
ResultsBrowser/bin/
ResultsBrowser/obj/
ResultsParser/bin/
ResultsParser/obj/
S640TestApp/bin/
S640TestApp/obj/
SharedDatabase/bin
SharedDatabase/obj
SchematicDrawing/bin
SchematicDrawing/obj
Statistics/bin/
Statistics/obj/
TBF/bin/
TBF/obj/
TBFSetup/Debug/
TBFSetup/Release/
Users/bin/
Users/obj/
ToFirstMonitor/bin/
ToFirstMonitor/obj/
ToSecondMonitor/bin/
ToSecondMonitor/obj/
UserManagement/bin/
UserManagement/obj/
Doc/
WorkflowConfigurator/bin/
WorkflowConfigurator/obj/
Workplace/bin/
Workplace/obj/
.vs/
*.suo
*.bak
+1
View File
@@ -0,0 +1 @@
TBF
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="dataSourceStorageLocal" created-in="RD-241.19072.26">
<data-source name="@localhost" uuid="2f1012d5-a96b-44db-ad21-032f973c657f">
<database-info product="MySQL" version="5.5.39" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="5.5.39" exact-driver-version="8.2">
<extra-name-characters>#@</extra-name-characters>
<identifier-quote-string>`</identifier-quote-string>
</database-info>
<case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
<user-name>root</user-name>
<schema-mapping>
<introspection-scope>
<node kind="schema">
<name qname="@" />
<name qname="jor" />
<name qname="jor-r" />
</node>
</introspection-scope>
</schema-mapping>
</data-source>
</component>
</project>
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="@localhost" uuid="2f1012d5-a96b-44db-ad21-032f973c657f">
<driver-ref>mysql.8</driver-ref>
<synchronize>true</synchronize>
<configured-by-url>true</configured-by-url>
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>
</project>
@@ -0,0 +1,2 @@
#n:information_schema
!<md> [null, 0, null, null, -2147483648, -2147483648]
@@ -0,0 +1,2 @@
#n:jor-r
!<md> [0, 0, null, null, -2147483648, -2147483648]
@@ -0,0 +1,2 @@
#n:jor
!<md> [0, 0, null, null, -2147483648, -2147483648]
@@ -0,0 +1,2 @@
#n:mysql
!<md> [null, 0, null, null, -2147483648, -2147483648]
@@ -0,0 +1,2 @@
#n:performance_schema
!<md> [null, 0, null, null, -2147483648, -2147483648]
+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>
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="vcsConfiguration" value="2" />
</component>
</project>
@@ -0,0 +1,4 @@
<changelist name="Add_combo_box_for_box_input" date="1723454080052" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/Add_combo_box_for_box_input/shelved.patch" />
<option name="DESCRIPTION" value="Add combo box for box input" />
</changelist>
File diff suppressed because one or more lines are too long
@@ -0,0 +1,4 @@
<changelist name="AdjustableMeterTest_cs_unit_Test" date="1708186855829" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/AdjustableMeterTest_cs_unit_Test/shelved.patch" />
<option name="DESCRIPTION" value="AdjustableMeterTest.cs unit Test" />
</changelist>
@@ -0,0 +1,97 @@
Index: TBFTests/Rig/Modbus/Meret/AdjustableScale/AdjustableMeterTest.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBFTests/Rig/Modbus/Meret/AdjustableScale/AdjustableMeterTest.cs b/TBFTests/Rig/Modbus/Meret/AdjustableScale/AdjustableMeterTest.cs
new file mode 100644
--- /dev/null (date 1706131720128)
+++ b/TBFTests/Rig/Modbus/Meret/AdjustableScale/AdjustableMeterTest.cs (date 1706131720128)
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using Config.Entities;
+using JetBrains.Annotations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TBF.Rig.Modbus.Meret.AdjustableScale;
+
+namespace TBFTests.Rig.Modbus.Meret.AdjustableScale
+{
+ [TestClass]
+ [TestSubject(typeof(AdjustableMeter))]
+ public class AdjustableMeterTest
+ {
+
+ /**
+ * new typ of linear correction - limit less from Hi
+ */
+ [TestMethod]
+ public void GetCorrection()
+ {
+
+ double rawValue, expectedVal;
+ IList<MeasurementCorrection> corrections;
+
+ corrections = new List<MeasurementCorrection>(2);
+ MeasurementCorrection Lo, Hi;
+ Lo = new MeasurementCorrection(1);
+ Lo.Measurement = 0.00; //CorrectionValLo;
+ Lo.Correction = 0.0F; //MsrdValLimLo;
+ corrections.Add(Lo);
+ Hi = new MeasurementCorrection(2);
+ Hi.Measurement = 0.22F;//CorrectionValHi;
+ Hi.Correction = 2.0F;//MsrdValLimHi;
+ corrections.Add(Hi);
+
+
+ expectedVal = Lo.Correction;
+ rawValue = Lo.Measurement; //Ampers
+
+ double CorrectionVal = AdjustableMeter.GetCorrectionLimitLessHi(rawValue, corrections);
+ Console.WriteLine("{0} Correction - rawValue: {1} CorrectionVal: {2}", "TEST " + rawValue, rawValue, CorrectionVal);
+ Assert.IsTrue(expectedVal == CorrectionVal);
+
+ expectedVal = Hi.Correction;
+ rawValue = Hi.Measurement; //Ampers
+
+ CorrectionVal = AdjustableMeter.GetCorrectionLimitLessHi(rawValue, corrections);
+ Console.WriteLine("{0} Correction - rawValue: {1} CorrectionVal: {2}", "TEST " + rawValue, rawValue, CorrectionVal);
+ Assert.IsTrue(expectedVal == CorrectionVal);
+
+ double toler = 0.01;
+ expectedVal = Hi.Correction * 2.0;
+ rawValue = Hi.Measurement * 2.0; //Ampers
+
+ CorrectionVal = AdjustableMeter.GetCorrectionLimitLessHi(rawValue, corrections);
+ Console.WriteLine("{0} Correction - rawValue: {1} CorrectionVal: {2}", "TEST " + rawValue, rawValue, CorrectionVal);
+ Assert.IsTrue((expectedVal + toler) >= CorrectionVal && (expectedVal - toler) <= CorrectionVal);
+
+ corrections = new List<MeasurementCorrection>(2);
+ Lo = new MeasurementCorrection(1);
+ Lo.Measurement = 0.04; //CorrectionValLo;
+ Lo.Correction = 0.0F; //MsrdValLimLo;
+ corrections.Add(Lo);
+ Hi = new MeasurementCorrection(2);
+ Hi.Measurement = 0.22F;//CorrectionValHi;
+ Hi.Correction = 2.0F;//MsrdValLimHi;
+ corrections.Add(Hi);
+
+ toler = 0.3;
+ expectedVal = 1.24; //bar
+ rawValue = 0.152; //Ampers
+
+ CorrectionVal = AdjustableMeter.GetCorrectionLimitLessHi(rawValue, corrections);
+ Console.WriteLine("{0} Correction - rawValue: {1} CorrectionVal: {2}", "TEST " + rawValue, rawValue, CorrectionVal);
+ Assert.IsTrue((expectedVal + toler) >= CorrectionVal && (expectedVal - toler) <= CorrectionVal);
+
+ toler = 0.0001;
+ expectedVal = 1.0;
+ rawValue = Lo.Measurement + ((Hi.Measurement - Lo.Measurement) / 2.0); //Ampers 0.129999999403954
+
+ CorrectionVal = AdjustableMeter.GetCorrectionLimitLessHi(rawValue, corrections);
+ Console.WriteLine("{0} Correction - rawValue: {1} CorrectionVal: {2}", "TEST " + rawValue, rawValue, CorrectionVal);
+ Assert.IsTrue((expectedVal + toler) >= CorrectionVal && (expectedVal - toler) <= CorrectionVal);
+ }
+ }
+}
\ No newline at end of file
@@ -0,0 +1,4 @@
<changelist name="DB_test_-_purchase_order" date="1725258409183" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/DB_test_-_purchase_order/shelved.patch" />
<option name="DESCRIPTION" value="DB test - purchase order" />
</changelist>
File diff suppressed because one or more lines are too long
@@ -0,0 +1,4 @@
<changelist name="Frequency_Meter_From_UniCB" date="1708416562473" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/Frequency_Meter_From_UniCB/shelved.patch" />
<option name="DESCRIPTION" value="Frequency Meter From UniCB" />
</changelist>
@@ -0,0 +1,687 @@
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfg.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfg.cs b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfg.cs
new file mode 100644
--- /dev/null (date 1708352606823)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfg.cs (date 1708352606823)
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+ public class RRCfg : ComponentCfgBase, Generic.IChildComponentCfg
+ {
+
+ public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RRCfg) })[0];
+ public override XmlSerializer GetSerializer() { return Serializer; }
+
+ IComponentCfgCtrl IComponentCfg.GetControl(IList<Component> cmpntEntities) { return new RRCfgCtrl(); }
+
+ ///
+ /// Serialized parameters
+ ///
+ public int Position; /// 1..nrWaterMeters
+
+ /// <summary> Procedure parameters </summary>
+ [XmlIgnore]
+ public RRProcParams ProcParams;
+ public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
+ public override IParamsProvider CreateProcParamsProvider() { return new RRProcParams(true); }
+
+ /// Private parameterless constructor invoked by all other (public) constructors
+ RRCfg()
+ {
+ ProcParams = new RRProcParams(true);
+ }
+
+ public RRCfg(string name, IComponentFactory factory)
+ : this()
+ {
+ Name = name;
+ Factory = factory;
+ ParentName = "UniCB";
+ Position = 1;
+ }
+
+ string IComponentCfg.ToString(int i)
+ {
+ return string.Format("Name={0}, Parent={1}, Position={2}",
+ Name,
+ (string.IsNullOrEmpty(ParentName) ? "-" : ParentName),
+ Position);
+ }
+ }
+}
\ No newline at end of file
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.cs b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.cs
new file mode 100644
--- /dev/null (date 1708352608817)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.cs (date 1708352608817)
@@ -0,0 +1,106 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using Common;
+using TBF.Rig.Generic;
+using TBF.UI.Bench.Components;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+ public partial class RRCfgCtrl : UserControl, IComponentCfgCtrl
+ {
+ ComponentParametersDlg parent;
+
+ bool IComponentCfgCtrl.ShowMore { get { return false; } }
+
+ RRCfg config;
+
+ IComponentCfg IComponentCfgCtrl.Config
+ {
+ get { return config as IComponentCfg; }
+ set
+ {
+ config = value as RRCfg;
+ Redraw();
+ }
+ }
+
+ public RRCfgCtrl()
+ {
+ InitializeComponent();
+ }
+
+ private void RegisterReaderCfgCtrl_Load(object sender, EventArgs e)
+ {
+ parent = ParentForm as ComponentParametersDlg;
+ if (parent == null) return;
+
+ if (parent.CmpntEntities != null)
+ {
+ foreach (var cmpnt in parent.CmpntEntities)
+ {
+ if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Uni.Factory)
+ {
+ parentNameComboBox.Items.Add(cmpnt.Name);
+ }
+ }
+ }
+
+ Redraw();
+ }
+
+ void IComponentCfgCtrl.Closing()
+ {
+ }
+
+ void Redraw()
+ {
+ if (config == null) return; /// Control was not loaded, settings were not changed
+
+ componentNameLabel.Text = config.Factory.ClassName;
+ nameTextBox.Text = config.Name;
+ parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
+ positionTextBox.Text = config.Position.ToString();
+ }
+
+ void IComponentCfgCtrl.Unlock()
+ {
+ nameTextBox.Enabled = true;
+ parentNameComboBox.Enabled = true;
+ positionTextBox.Enabled = true;
+ }
+
+ CfgUpdateFlags IComponentCfgCtrl.VerifyCfg(ref string message)
+ {
+ CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+ int dummy;
+ if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
+ {
+ flags |= CfgUpdateFlags.Error;
+ message += Environment.NewLine + "Invalid 'Parent Name'";
+ }
+ if (!int.TryParse(positionTextBox.Text, out dummy) || (dummy < 1))
+ {
+ flags |= CfgUpdateFlags.Error;
+ message += Environment.NewLine + "'Position' should be >= 1";
+ }
+ return flags;
+ }
+
+ CfgUpdateFlags IComponentCfgCtrl.UpdateCfg()
+ {
+ CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+ if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
+
+ config.Name = nameTextBox.Text;
+ config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
+ config.Position = int.Parse(positionTextBox.Text);
+
+ return flags;
+ }
+ }
+}
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.designer.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.designer.cs b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.designer.cs
new file mode 100644
--- /dev/null (date 1708348624609)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.designer.cs (date 1708348624609)
@@ -0,0 +1,133 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+ partial class RRCfgCtrl
+ {
+ /// <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.positionTextBox = new System.Windows.Forms.TextBox();
+ this.positionLabel = new System.Windows.Forms.Label();
+ this.parentNameLabel = new System.Windows.Forms.Label();
+ this.nameTextBox = new System.Windows.Forms.TextBox();
+ this.nameLabel = new System.Windows.Forms.Label();
+ this.componentNameLabel = new System.Windows.Forms.Label();
+ this.parentNameComboBox = new System.Windows.Forms.ComboBox();
+ this.SuspendLayout();
+ //
+ // positionTextBox
+ //
+ this.positionTextBox.Enabled = false;
+ this.positionTextBox.Location = new System.Drawing.Point(136, 119);
+ this.positionTextBox.Name = "positionTextBox";
+ this.positionTextBox.Size = new System.Drawing.Size(46, 20);
+ this.positionTextBox.TabIndex = 6;
+ //
+ // positionLabel
+ //
+ this.positionLabel.AutoSize = true;
+ this.positionLabel.Location = new System.Drawing.Point(26, 122);
+ this.positionLabel.Name = "positionLabel";
+ this.positionLabel.Size = new System.Drawing.Size(44, 13);
+ this.positionLabel.TabIndex = 5;
+ this.positionLabel.Text = "Position";
+ //
+ // parentNameLabel
+ //
+ this.parentNameLabel.AutoSize = true;
+ this.parentNameLabel.Location = new System.Drawing.Point(26, 96);
+ this.parentNameLabel.Name = "parentNameLabel";
+ this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
+ this.parentNameLabel.TabIndex = 3;
+ this.parentNameLabel.Text = "Parent Name";
+ //
+ // nameTextBox
+ //
+ this.nameTextBox.Enabled = false;
+ this.nameTextBox.Location = new System.Drawing.Point(136, 67);
+ this.nameTextBox.Name = "nameTextBox";
+ this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+ this.nameTextBox.TabIndex = 2;
+ //
+ // nameLabel
+ //
+ this.nameLabel.AutoSize = true;
+ this.nameLabel.Location = new System.Drawing.Point(26, 70);
+ this.nameLabel.Name = "nameLabel";
+ this.nameLabel.Size = new System.Drawing.Size(35, 13);
+ this.nameLabel.TabIndex = 1;
+ this.nameLabel.Text = "Name";
+ //
+ // componentNameLabel
+ //
+ this.componentNameLabel.AutoSize = true;
+ this.componentNameLabel.Location = new System.Drawing.Point(133, 43);
+ this.componentNameLabel.Name = "componentNameLabel";
+ this.componentNameLabel.Size = new System.Drawing.Size(83, 13);
+ this.componentNameLabel.TabIndex = 0;
+ this.componentNameLabel.Text = "ComonentName";
+ //
+ // parentNameComboBox
+ //
+ this.parentNameComboBox.Enabled = false;
+ this.parentNameComboBox.FormattingEnabled = true;
+ this.parentNameComboBox.Location = new System.Drawing.Point(136, 93);
+ this.parentNameComboBox.Name = "parentNameComboBox";
+ this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
+ this.parentNameComboBox.TabIndex = 4;
+ //
+ // RegisterReaderCfgCtrl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.parentNameComboBox);
+ this.Controls.Add(this.positionTextBox);
+ this.Controls.Add(this.positionLabel);
+ this.Controls.Add(this.parentNameLabel);
+ this.Controls.Add(this.nameTextBox);
+ this.Controls.Add(this.nameLabel);
+ this.Controls.Add(this.componentNameLabel);
+ this.Name = "RegisterReaderCfgCtrl";
+ this.Size = new System.Drawing.Size(300, 200);
+ this.Load += new System.EventHandler(this.RegisterReaderCfgCtrl_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox positionTextBox;
+ private System.Windows.Forms.Label positionLabel;
+ private System.Windows.Forms.Label parentNameLabel;
+ private System.Windows.Forms.TextBox nameTextBox;
+ private System.Windows.Forms.Label nameLabel;
+ private System.Windows.Forms.Label componentNameLabel;
+ private System.Windows.Forms.ComboBox parentNameComboBox;
+ }
+}
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.resx
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.resx b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.resx
new file mode 100644
--- /dev/null (date 1703243321441)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRCfgCtrl.resx (date 1703243321441)
@@ -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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRProcParams.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRProcParams.cs b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRProcParams.cs
new file mode 100644
--- /dev/null (date 1708352610233)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/RRProcParams.cs (date 1708352610233)
@@ -0,0 +1,132 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Text;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+using TBF.Resources;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+ public class RRProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
+ {
+ public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RRProcParams) })[0];
+ public override XmlSerializer GetSerializer() { return Serializer; }
+
+ public double PulsesPerLtr; /// [l^-1]
+ public int Filter;
+
+ public override void InitializeAll()
+ {
+ PulsesPerLtr = 1.0;
+ Filter = 0;
+ }
+
+ string[] paramNames = new string[]
+ {
+ Strings.PulsesPerLtr,
+ Strings.Filter,
+ };
+ public override string ParamName(int i) { return paramNames[i]; }
+ public override int ParamsCount() { return paramNames.Length; }
+
+ public override string ToString(int i)
+ {
+ switch (i)
+ {
+ case 0: return PulsesPerLtr.ToString();
+ case 1: return Filter.ToString();
+ default: return string.Empty;
+ }
+ }
+
+ /// Retrieves parameters from UI controls
+ CfgUpdateFlags IParamsProvider.UpdateParam(int i, string strValue)
+ {
+ switch (i)
+ {
+ case 0: PulsesPerLtr = Utils.ParseUDouble(strValue); return CfgUpdateFlags.None;
+ case 1: Filter = int.Parse(strValue); return CfgUpdateFlags.None;
+ default: return CfgUpdateFlags.None;
+ }
+ }
+
+ /// Verifies whether strings in UI controls represent valid parameters
+ bool IParamsProvider.ValidateParam(int i, string strValue, out string message)
+ {
+ message = string.Empty;
+
+ double dummy;
+ int idummy;
+ switch (i)
+ {
+ case 0:
+ if (Utils.TryParseUDouble(strValue, out dummy)) return true;
+ break;
+
+ case 1:
+ if (int.TryParse(strValue, out idummy) && (idummy >= 0)) return true;
+ break;
+
+ default:
+ message = "Invalid index";
+ return false;
+ }
+
+ message = ParamName(i) + " is invalid";
+ return false;
+ }
+
+ void CopyContentTo(RRProcParams prms)
+ {
+ prms.PulsesPerLtr = this.PulsesPerLtr;
+ prms.Filter = this.Filter;
+ }
+
+ IParamsProvider IParamsProvider.Clone()
+ {
+ RRProcParams pars = new RRProcParams();
+ CopyContentTo(pars);
+ return pars;
+ }
+
+ public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
+ {
+ if (dbEntity == null) return;
+ try
+ {
+ RRProcParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as RRProcParams;
+
+ procedureParamsEntity = dbEntity;
+ componentName = dbEntity.CmpntName;
+ procedure = dbEntity.Procedure;
+
+ if (tmp != null) tmp.CopyContentTo(this);
+ }
+ catch
+ {
+ }
+ }
+
+
+ public RRProcParams()
+ {
+ }
+
+ public RRProcParams(bool initialize)
+ {
+ if (initialize) InitializeAll();
+ }
+
+ public RRProcParams(ComponentProcedure procedureParamsEntity, string componentName, Procedure procedure)
+ {
+ this.procedureParamsEntity = procedureParamsEntity;
+ this.componentName = componentName;
+ this.procedure = procedure;
+ }
+ }
+}
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/Factory.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/Factory.cs b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/Factory.cs
new file mode 100644
--- /dev/null (date 1708352610236)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/Factory.cs (date 1708352610236)
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using Config.Entities;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+ public class Factory : IComponentFactory
+ {
+ string IComponentFactory.ClassName { get { return GetType().Namespace.Substring(8); } }
+
+ public override string ToString() { return ClassName; }
+
+ IComponent IComponentFactory.DummyComponent() { return new FrequencyRegisterReader(); }
+
+ IComponent IComponentFactory.GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new FrequencyRegisterReader(cfg, components); }
+
+ IComponentCfg IComponentFactory.DefaultConfig() { return new RRCfg("Puls", this); }
+
+ IComponentCfg IComponentFactory.CmpntCfgFromCmpntEntity(Component component)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+}
\ No newline at end of file
Index: TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/FrequencyRegisterReader.cs
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/FrequencyRegisterReader.cs b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/FrequencyRegisterReader.cs
new file mode 100644
--- /dev/null (date 1708352608953)
+++ b/TBF/Rig/RegisterReaders/FrequencyMeterFromUniCB/FrequencyRegisterReader.cs (date 1708352608953)
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using Common;
+using log4net;
+using TBF.Rig.GenericDevices;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+ public class FrequencyRegisterReader : ComponentBase, GenericDevices.IRegReader
+ {
+ private static readonly ILog log = LogManager.GetLogger(typeof(FrequencyRegisterReader));
+
+ public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
+
+ readonly RRCfg rrCfg;
+ readonly TBF.Rig.ControlBoard.IControlBoard cb;
+
+ int IRegReader.Position { get{ return rrCfg.Position; } }
+ Common.RegisterReaderType IRegReader.RegisterReaderType { get { return Common.RegisterReaderType.Pulses; } }
+ double IRegReader.PulsesPerLtr { get { return rrCfg.ProcParams.PulsesPerLtr; } }
+ double IRegReader.LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); ; } }
+ public int Filter { get { return rrCfg.ProcParams.Filter; } }
+
+ int IRegReader.WMPulses { get { return cb.PulsesWM(Position); } }
+ int IRegReader.WMRefPulses { get { return cb.RefPulsesWM(Position); } }
+ double IRegReader.WMVolume { get { return LtrsPerPulse * Convert.ToDouble(WMPulses); } }
+
+ double IRegReader.BeginWMState { get { return 0; } } /// Always 0
+ double IRegReader.EndWMState { get { return WMVolume; } } /// Derived from WMVolume
+
+
+ public FrequencyRegisterReader() { }
+
+ public FrequencyRegisterReader(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
+ : base(cfg)
+ {
+ rrCfg = cfg as RRCfg;
+
+ cb = TbfComponents.FindComponent(cfg.ParentName, components) as TBF.Rig.ControlBoard.IControlBoard;
+ if (cb == null) throw new Exception("Cannot find " + Name + " parent");
+
+ log.Warn(this.ToString());
+ }
+
+ public override void Initialize() { }
+ }
+}
\ No newline at end of file
+4
View File
@@ -0,0 +1,4 @@
<changelist name="NEXT_5_24_2024" date="1716547261313" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/NEXT_5_24_2024/shelved.patch" />
<option name="DESCRIPTION" value="NEXT_5/24/2024" />
</changelist>
File diff suppressed because one or more lines are too long
+4
View File
@@ -0,0 +1,4 @@
<changelist name="Pressure_meter_test" date="1704310942302" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/Pressure_meter_test/shelved.patch" />
<option name="DESCRIPTION" value="Pressure meter test" />
</changelist>
@@ -0,0 +1,156 @@
Index: TBFTests/Rig/Modbus/PressureMeter/AdjustableScale/PressureMeterTests.cs
===================================================================
diff --git a/TBFTests/Rig/Modbus/PressureMeter/AdjustableScale/PressureMeterTests.cs b/TBFTests/Rig/Modbus/PressureMeter/AdjustableScale/PressureMeterTests.cs
deleted file mode 100644
--- a/TBFTests/Rig/Modbus/PressureMeter/AdjustableScale/PressureMeterTests.cs (revision 0ad8bc6d759d868e021fc7087d3db5ba55f6a354)
+++ /dev/null (revision 0ad8bc6d759d868e021fc7087d3db5ba55f6a354)
@@ -1,148 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TBF.Rig.Modbus.PressureMeter.AdjustableScale;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TBF.Rig.Generic;
-using Moq;
-
-
-
-
-namespace TBF.Rig.Modbus.PressureMeter.AdjustableScale.Tests
-{
- [TestClass()]
- public class PressureMeterTests
- {
-
-
-
- [TestMethod()]
- public void ToStringTest()
- {
- Factory factory = new Factory();
- IList<Generic.IComponent> list = new List<Generic.IComponent>();
- list.Add(factory.DummyComponent());
- PressureMeter meter = new PressureMeter(factory.DefaultConfig(), list);
-
- string str = meter.ToString();
- Assert.IsTrue(str == "Modbus.PressureMeter.AdjustableScale(Pr(Modbus) address=49)");
-
- }
-
- /* [TestMethod()]
- public void PressureMeterTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void PressureMeterTest1()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void InitializeTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void RunDeviceBeforeTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void RunDeviceAfterTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void StopDeviceTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void StopDevice2Test()
- {
- Assert.Fail();
- }*/
-
- class PressureMeterSpy : PressureMeter
- {
- public PressureMeterSpy(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
- :base(cfg, components)
- {
-
- }
-
- public new void InitModbus()
- {
- Console.Write("I am here!");
- }
-
- }
-
- [TestMethod()]
- public void ReadPressureTest()
- {
- Factory factory = new Factory();
- IList<Generic.IComponent> list = new List<Generic.IComponent>();
- list.Add(factory.DummyComponent());
-
-
-
- IComponentCfg componentCfg = factory.DefaultConfig();
- PressureMeterCfg pressureMeterCfg = (PressureMeterCfg) componentCfg;
-
- pressureMeterCfg.CorrectionValLo = 0.4;
- pressureMeterCfg.CorrectionValHi = 2.4;
- pressureMeterCfg.MsrdValLimHi = 2.0;
- pressureMeterCfg.MsrdValLimLo = 0.0;
-
- PressureMeterSpy meter = new PressureMeterSpy(componentCfg, list);
-
-
-
- meter.Initialize();
-
- double MeasuredVal = meter.MeasuredVal;
-
-
- double value = meter.ReadPressure();
- Assert.IsTrue(value == 0.0);
-
- }
-
- /*
- [TestMethod()]
- public void ReadPressureOpTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void ReadPressureOpTest1()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void ConditionNameTest()
- {
- Assert.Fail();
- }
-
- [TestMethod()]
- public void ConditionOpTest()
- {
- Assert.Fail();
- }*/
- }
-}
\ No newline at end of file
@@ -0,0 +1,4 @@
<changelist name="TBF_project_configuration_backup" date="1708187009519" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/TBF_project_configuration_backup/shelved.patch" />
<option name="DESCRIPTION" value="TBF project configuration backup" />
</changelist>
@@ -0,0 +1,55 @@
Index: TBF/app.config
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<configuration>\r\n <configSections>\r\n <section name=\"oracle.manageddataaccess.client\"\r\n type=\"OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342\"/>\r\n </configSections>\r\n <startup>\r\n <supportedRuntime version=\"v4.0\" sku=\".NETFramework,Version=v4.7.2\"/>\r\n </startup>\r\n <system.data>\r\n <DbProviderFactories>\r\n <remove invariant=\"Oracle.ManagedDataAccess.Client\"/>\r\n <add name=\"ODP.NET, Managed Driver\" invariant=\"Oracle.ManagedDataAccess.Client\" description=\"Oracle Data Provider for .NET, Managed Driver\"\r\n type=\"Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342\"/>\r\n </DbProviderFactories>\r\n </system.data>\r\n <runtime>\r\n <assemblyBinding xmlns=\"urn:schemas-microsoft-com:asm.v1\">\r\n <dependentAssembly>\r\n <publisherPolicy apply=\"no\"/>\r\n <assemblyIdentity name=\"Oracle.ManagedDataAccess\" publicKeyToken=\"89b483f429c47342\" culture=\"neutral\"/>\r\n <bindingRedirect oldVersion=\"4.121.0.0 - 4.65535.65535.65535\" newVersion=\"4.122.19.1\"/>\r\n </dependentAssembly>\r\n </assemblyBinding>\r\n </runtime>\r\n <oracle.manageddataaccess.client>\r\n <version number=\"*\">\r\n <dataSources>\r\n <dataSource alias=\"SampleDataSource\" descriptor=\"(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) \"/>\r\n </dataSources>\r\n </version>\r\n </oracle.manageddataaccess.client>\r\n</configuration>\r\n
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/TBF/app.config b/TBF/app.config
--- a/TBF/app.config (revision 153d031125d1637c9f23cea9e25ecff9c68bae9b)
+++ b/TBF/app.config (date 1707773182036)
@@ -1,32 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
- <section name="oracle.manageddataaccess.client"
- type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+ <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
</configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
<system.data>
<DbProviderFactories>
- <remove invariant="Oracle.ManagedDataAccess.Client"/>
- <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver"
- type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+ <remove invariant="Oracle.ManagedDataAccess.Client" />
+ <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
</DbProviderFactories>
</system.data>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <publisherPolicy apply="no"/>
- <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral"/>
- <bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.122.19.1"/>
+ <publisherPolicy apply="no" />
+ <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
+ <bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.122.19.1" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<oracle.manageddataaccess.client>
<version number="*">
<dataSources>
- <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) "/>
+ <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
</dataSources>
</version>
</oracle.manageddataaccess.client>
@@ -0,0 +1,4 @@
<changelist name="TBF_project_configuration_backup1" date="1708187045753" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/TBF_project_configuration_backup1/shelved.patch" />
<option name="DESCRIPTION" value="TBF project configuration backup" />
</changelist>
File diff suppressed because one or more lines are too long
@@ -0,0 +1,4 @@
<changelist name="TestPDFSharpToUseGraphics" date="1708186637637" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/TestPDFSharpToUseGraphics/shelved.patch" />
<option name="DESCRIPTION" value="TestPDFSharpToUseGraphics" />
</changelist>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,4 @@
<changelist name="Test_set_all_open,_closed_valves" date="1710251068900" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/Test_set_all_open,_closed_valves/shelved.patch" />
<option name="DESCRIPTION" value="Test set all open, closed valves" />
</changelist>
File diff suppressed because one or more lines are too long
@@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Checkout_at_10_11_2024_10_19_AM_[Changes]" date="1728634772275" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/Uncommitted_changes_before_Checkout_at_10_11_2024_10_19_AM_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Checkout at 10/11/2024 10:19 AM [Changes]" />
</changelist>
File diff suppressed because one or more lines are too long
@@ -0,0 +1,4 @@
<changelist name="Uncommitted_changes_before_Checkout_at_10_11_2024_10_36_AM_[Changes]" date="1728635764918" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/.idea.TBF/.idea/shelf/Uncommitted_changes_before_Checkout_at_10_11_2024_10_36_AM_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Checkout at 10/11/2024 10:36 AM [Changes]" />
</changelist>

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