michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
671 Commits 46 Branches 584 Tags 1.8 GiB
5c48dbf60e
Commit Graph

643 Commits

Author SHA1 Message Date
Milan Hanajik
5cf5fe5eba CycleNr added to LocalSettings, Entities.TestResults, Mappings, is used in sequences (DB change) 2015-01-25 08:11:40 +01:00
Milan Hanajik
3393827653 Configuration of result items for device=harddisk added 2015-01-18 11:22:53 +01:00
Milan Hanajik
ad665e5f0b Combined meters measurement corrections, Q_rise and Q_fall in results 2015-01-17 08:57:50 +01:00
Milan Hanajik
cfd812eab6 Test-Part used when printing results on screen 2015-01-17 08:09:49 +01:00
Milan Hanajik
bd1eb31f37 (1) ResultsConfig bug fixed, (2) UI for setting the Test parameter PumpPower, Parameters tab page 2015-01-17 06:34:24 +01:00
Milan Hanajik
d3532a2796 PumpFM,pumpTandem test parameter Power replaced by parameter Entities.Test.PumpPower, 
all changes done except of UI changes (which can be done in more different ways)
 2015-01-17 04:52:42 +01:00
Milan Hanajik
a0fb8000f0 PumpTandem can also be used as one of pumps in the tandem, PumpTandems can be chained 2015-01-16 07:40:04 +01:00
Milan Hanajik
b1c9e0d3b5 Bugfixes: (1) PumpTandem was missing a Mask to be used as Valve, (2) Column widths in results screen 2015-01-16 07:08:26 +01:00
Milan Hanajik
e07cf3c5d3 PumpTandem implemented for the case of two FM pumps with equal distribution of power 2015-01-16 05:24:34 +01:00
Milan Hanajik
6e75926d0b E_ref, T_amb, P_amb, H_amb were added to possible result items 2015-01-16 03:41:23 +01:00
Milan Hanajik
ade156be5c Column withs on the results screen can be saved and reused for all LIstView-s/watermeters 2015-01-16 03:09:41 +01:00
Milan Hanajik
2b6b569dee Process log format changes: flow with 4 valid digits, Et. -> Ref. 2015-01-16 03:09:39 +01:00
Milan Hanajik
5a2d7f09ce CycleBeginForm is opened earlier, immediately after procedure selection, before purging 2015-01-16 03:09:37 +01:00
Milan Hanajik
bb31cdae56 Make sure CycleBeginForm is closed before the 1st test ends and s/n is in all results 2015-01-15 06:34:36 +01:00
Milan Hanajik
44b1f77b70 Process screen layout changed to fit 6 meter w/o overlaps, no functionality change 2015-01-15 05:45:40 +01:00
Milan Hanajik
11bdb1b2f1 Bugfix in MainSeq (opening EntryForm instead of closing) 2015-01-15 05:03:46 +01:00
Milan Hanajik
49a004d7fe DataEntry dlg at the beginning closes at the end of the 1st test (at the latest) 2015-01-15 03:51:33 +01:00
Milan Hanajik
a697b7a4dc Access levels to procedures and tests changed: TestingSpecialist has access 2015-01-15 03:17:04 +01:00
Milan Hanajik
9c1db2778e Data of all combined meters are used in TestProgressEventArgs, in sequences and the process page 2015-01-15 03:16:14 +01:00
Milan Hanajik
1c3c90e171 CombinedMeters and CombinedWithDetection support SupressTrils bool parameter 
Warnings 'Unreachable code' supressed in DataEntries
 2015-01-14 05:33:51 +01:00
Milan Hanajik
5a4df5593a (1) Passed/Failed with color in the on-screen results 
(2) Error of main and aux. combined watermeters calculated and can be used in results
(3) Bugfix: no zero reference exception when the list of results items is empty
 2015-01-14 03:19:12 +01:00
Milan Hanajik
00b937553c Localization via strings table added to DataEntry.Munich3 (accepts 6 single WM-s) 2015-01-13 09:12:40 +01:00
Milan Hanajik
1f489a481c Entry form DataEntry.Munich modified so that it accepts up to 3 combined WM-s 2015-01-13 08:46:32 +01:00
Milan Hanajik
4ad79d54b0 Configuration of results: UI also for printer. Formatting float with given # of valid digits 2015-01-13 05:00:59 +01:00
Milan Hanajik
f2b4bfe39d Configuration of results: Display on screen completed - to be tested 2015-01-12 17:18:34 +01:00
Milan Hanajik
42fbc501a9 Configuration of results: UI completed 2015-01-12 15:09:09 +01:00
Milan Hanajik
45eb5ac524 Bugfix in Clone method of the MeterTestResult entity 2015-01-12 12:59:30 +01:00
Milan Hanajik
de7a04d689 Bug fix in UI: Process -> Metrology1 -> Emptying 2015-01-12 07:43:54 +01:00
Milan Hanajik
aa1413bc83 More done on configuration of results: enum Source and two delegates 2015-01-12 07:12:01 +01:00
Milan Hanajik
34dc592e59 Timeout while setting the water flow handled correctly: message displayed, test aborted 2015-01-12 05:56:19 +01:00
Milan Hanajik
0829655880 Messages and Errors display is supported, transition messages are displayed now 2015-01-12 04:53:50 +01:00
Milan Hanajik
222887f97d Working on configuration of results form/printout, locking OK, ResultsItemSpec class added 2015-01-12 04:16:48 +01:00
Milan Hanajik
747eb87de9 Reconfigured for Munich 2015-01-11 09:34:32 +01:00
Milan Hanajik
766a3cb2b2 Column Message added to transition steps, DB format changed, not displayed during purging yet 2015-01-11 09:06:54 +01:00
Milan Hanajik
d1cb0a4f43 Fixed problem: FM Pump is switched off when setting the flow, more logging 2015-01-11 08:24:05 +01:00
Milan Hanajik
b79ae4b1aa PumpTandem component added (to be completed), fixes in component config edit controls 2015-01-11 05:06:18 +01:00
Milan Hanajik
5a0c01688a FIxed bug: Not all fields were copied when copying a procedure 2015-01-09 09:01:08 +01:00
Milan Hanajik
11f8343a1d Bug fix in purging sequence when no RV-s 2015-01-08 08:05:23 +01:00
Milan Hanajik
b8fb6ba12c Fuzhou150 component updated, contains MakeExtComm() 2015-01-07 15:56:57 +01:00
Milan Hanajik
a86ad864e1 Reconfigured for Fuzhou150, missing an upgraded component 2015-01-07 10:11:29 +01:00
Milan Hanajik
9fb462b087 Bug fix Null reference exception when starting a test 2015-01-07 10:11:29 +01:00
Milan Hanajik
cd4e894652 Bug fix in UI / Components 2015-01-07 10:11:28 +01:00
Milan Hanajik
580d4330e3 - PidCoef from OutputPath used in flow control, PidCoef regulValve parameter abandoned 
- Part field (int) added to Test and TestResult, shown and processed in UI in ProcedureDlg
 2015-01-04 23:21:12 +01:00
Milan Hanajik
035416b785 Bug fix: Null reference exception when closing a modified procedure 2015-01-04 16:26:54 +01:00
Milan Hanajik
de90a4638a Prepared: PID coefficient of the output path is ready to be used, 
and not the regul.valve parameter. See  // TODO PID: ...  in source code.
 Database: 'PidCoef' float should be added to 'OutputPath' after col.'FlowMeter'
 2015-01-03 21:17:11 +01:00
Milan Hanajik
0160dc965d - RegulValve ADC Open/Close values calibration implemented 
- 'More' button added to ComponentCfgCtrl-s
- Dataflow from ComponentParametersDlg to components: CfgChangeHandler
- Dataflow from components to ComponentParametersDlg: CmdResponseHandler
- Detection of parameter changes and appropriate MesssageBox display:
  1.warning message when component configuration change requires program restart
  2.confirmation message box when any configuration changes would be lost
 2015-01-03 14:45:58 +01:00
Milan Hanajik
d9b1bc8b4a Bug fix: Null reference exception when opening a component properties dialog 2015-01-02 20:22:11 +01:00
Milan Hanajik
f2005bbf56 Boilerplate code reduced from factories, GetComponent() and GetControl() added to cfg-s 2015-01-02 19:14:19 +01:00
Milan Hanajik
94de991bf6 Everything works OK after serious changes: 
- all components, componentCfg-s and parameter providers use base classes
 - less boilerplate code, simpler access to test/procedure parameters from code
 - CreateTestParams(test), CreateProcedureParams(procedure) methods added
 - TestBenchSim class is made static, it is not inheritted by any device anymore
 2015-01-02 12:51:27 +01:00
Milan Hanajik
752719bd62 Getting rid of and suppressing WARNING messages 2014-12-31 13:44:47 +01:00
Milan Hanajik
13f151b39a Support for PT200 Israel added, fixed component for Fuzhou300 (I4 problem) 2014-12-30 13:25:01 +01:00
Milan Hanajik
42c2f88597 Minor and style changes 2014-12-30 00:17:45 +01:00
Milan Hanajik
0ac7ba05d6 Methods CreateDbEntity and CreateFromDbEntity moved from XyzCfg to ComponentCfgBase, factories modified accordingly. 2014-12-29 18:33:27 +01:00
Milan Hanajik
8ef0cea1ff One more change in transition sequences with more RV-s changed in one step 2014-12-28 09:08:39 +01:00
Milan Hanajik
7472040cbc Last minute changes: German, ext-comm flag 2014-12-12 15:05:27 +01:00
Milan Hanajik
4794000f75 Fixed a bug in transition sequences with more RV-s changed in one step 2014-12-12 13:57:24 +01:00
Milan Hanajik
6d6b322fb5 Process screen and Procedure (dlg, DB) changes to suport combined meters, virtual bench. 
TODO: Visualize changes of pump/valve, diverter, tank
 2014-12-12 12:13:43 +01:00
Milan Hanajik
0808351b7a Change so that the component is used as on DN100 in horna skusobna 2014-12-11 12:56:50 +01:00
Milan Hanajik
89ae1bb52f Fixed bug: Wrong test selection when parts of the name match each other (e.g.Q1 and Q10) 2014-12-11 09:04:06 +01:00
Milan Hanajik
1afd6870c3 Time2MassMsrmt implemented, database tables Test and TestResult changed 2014-12-11 08:49:07 +01:00
Milan Hanajik
ea6c9818cf - Tank emptying remaining time indication 
- Bug fixed: When copying a procwdure ItemId was not correctly set, remained 0
- Always create a message log when device initialization is completed successfully
 2014-12-10 22:39:53 +01:00
Milan Hanajik
42c255e40e More changes in VirtualBench drawing on the Process screen 2014-12-10 17:14:03 +01:00
Milan Hanajik
415adba8cf - Tank emptying on start-up implemented, EmptyTimeSec parameter added to Balances 
- added events Event.TimerBusy, Event.ValvesBusy, etc.
- fixed bug in SetValvesOp
- preparing a virtual bench drawing on the Process screen - partly done
 2014-12-10 12:37:05 +01:00
Milan Hanajik
6aada39d97 Reconfigured for 'Munich' installation 2014-12-07 22:32:41 +01:00
Milan Hanajik
b1743662f4 Change that makes it possible to use IDC100 v.8.0.6d 2014-10-15 20:47:04 +02:00
Milan Hanajik
54595c9ebd ROI detection handled separately from (fatal) camera errors 2014-10-13 17:54:15 +02:00
Milan Hanajik
930db8c379 - many process tab page improvements 
- program start and state changes logging improved
- IDC100 measurement related changes: reference pulses in RegisterReader
- etc
 2014-10-02 20:56:24 +02:00
Milan Hanajik
b6bbad66e7 IDC Camera related fixes - to be tested 2014-10-02 18:05:54 +02:00
Milan Hanajik
deb6b90332 VirtualBenchSequences UI completed, delete step is not OK yet 2014-09-28 22:23:41 +02:00
Milan Hanajik
1c34946a6b Bugs in sequences fixed: Missing CheckUiOp 2014-09-26 17:48:55 +02:00
Milan Hanajik
26620f1fd1 First unfinished version with VirtualBenchSequences, requires DB upgrade 2014-09-26 15:01:46 +02:00
Milan Hanajik
9868c41640 Zmeny urobene v ST pri testovani kamery 2014-09-24 19:58:05 +02:00
Milan Hanajik
09affdb1dd Bug fixed in ControlComWrap logging: fmFreq.Length taken into account 2014-09-24 17:03:46 +02:00
Milan Hanajik
fcea95d403 Process screen hides additional watermeters (if their number is < 6). 2014-09-24 15:38:54 +02:00
Milan Hanajik
5bfc348c72 Project reconfigured for DN100 (horna skusobna), no other changes 2014-09-24 12:41:18 +02:00
Milan Hanajik
2f6f24e281 As sent to ST for the last test on Fuzhou300 system 
- new component with VZ15 and modified position of VZ13
- fixed start method evaluation OK
- handling of entry forms cleaned-up
 2014-09-23 13:16:59 +02:00
Milan Hanajik
c3bfe5223b - The update of the 6th watermeter data in ProcessTabPageCtrl fixed 
- Valve/Pump delay evaluation modified: Delays of valves/pums that have not changed
  are not taken into account (faster when there is no valve/pump switching)
 2014-09-17 19:17:05 +02:00
Milan Hanajik
15ab22362e - Number of watermeters increased to 6 for FUZHOU300 
- DB table 'MetersPath' update required
 2014-09-16 21:19:02 +02:00
Milan Hanajik
b1f7730b96 - FixedStartMassCollection method ready to be tested 
- FlyingStart method (without mass collection) flow corrections fixed
- DataEntry/WMStates data entry forms added (used by FixedStartMassCollection method)
- minor changes
 2014-09-16 21:05:54 +02:00
Milan Hanajik
54ef1e1216 - added BenchControl/Operations/ProcessDataLoggingOp.cs (forgotten in previous commits) 
- fixed a bug in displayng results and progress controls when two tests had the same name
- some work on data entry forms for FixedStartMassCollection method - not finished yet
 2014-09-16 16:09:07 +02:00
Milan Hanajik
a79be1e07a - bug fixed when component (class) in the DB does not exist in the code 
- preparing FixedStartMassCollection sequence
 2014-09-16 12:04:08 +02:00
Milan Hanajik
c187dc9abf - FlyingStart with corrections 
- FlowMeterCouple -> FlowMeterTwins
 2014-09-15 22:00:37 +02:00
Milan Hanajik
a919a3e9d6 - FLyngStart sequence (without balances) tested -> OK, Todo: use 
corrections
- totalPulses calculated correctly in case of I11+I12 (use of two flowmeters)
 2014-09-12 07:18:24 +02:00
Milan Hanajik
3559ab0ab3 - Elde.FlowMeterCouple component added 
- LtrPerPulse and LtrPerPulseCorrected property/function added to IFlowMeter and flowmeters
 2014-09-10 13:43:33 +02:00
Milan Hanajik
fcfdfeca41 - COmponent properties 'Position' --> 'Idx0' or 'Idx1' 
- process data logging, RegulVal position logging
- changes for I11+I12, NOK yet
 2014-09-10 12:05:49 +02:00
Milan Hanajik
c3050863a6 - Component update (temp., etc.) 
- Process data logging update (SequenceBase.cs)
 2014-09-09 18:29:01 +02:00
Milan Hanajik
d0ebb62ab3 - Component update (temp.) 
- Process data logging, first trial
 2014-09-09 16:18:23 +02:00
Milan Hanajik
4db4c6e905 New component with Temperatures corrected, other minor/cosmetical changes 2014-09-09 13:06:10 +02:00
Milan Hanajik
354c13853f All PumpsWithFM are controlled when opening pumps at the test start 2014-09-09 09:14:47 +02:00
Milan Hanajik
d14cb175a6 FlowStableSec parameter added to RegulValve 2014-09-08 20:24:46 +02:00
Milan Hanajik
cc2a24cee5 - Fixed a bug in tank emptying 
- Component
 2014-09-08 17:13:51 +02:00
Milan Hanajik
c0d81297f5 Balance empty mass is configurable 2014-09-08 15:39:33 +02:00
Milan Hanajik
9223483115 Early entered text checks in Transitions dialog 2014-09-08 14:48:48 +02:00
Milan Hanajik
6eee83042b PmpWithFM and Transition sequences functionality implemented 2014-09-08 13:16:31 +02:00
Milan Hanajik
d98762aaf8 Transition sequences with PumpsFM[%] are OK in UI and in DB, not yet in the control code 2014-09-07 17:01:30 +02:00
Milan Hanajik
46861530a8 MainWnd size, location and maximized state saved. 2014-09-07 12:36:40 +02:00
Milan Hanajik
99377ce3b9 Size and location of some dialogs saved: Components, Paths, Transitions, Metrology, Procedures, Procedure 2014-09-07 09:34:28 +02:00
Milan Hanajik
f9d2c43d57 - Tank empty threshold changed (increased) 
- Fixed a bug in SequenceBase.LtrPerRefPulse[] initialization
 2014-09-06 18:30:13 +02:00
Milan Hanajik
b8faca784e - ReferenceFlowmeterCalibration method and sequence (ready for tests) 
- FlyingStart method and sequence files prepared for implementation (copies of FlyingStartMassCollection)
 2014-09-06 17:34:26 +02:00
Milan Hanajik
fcd44e7a1a Process screen displays 5 watermeters 2014-09-06 14:57:05 +02:00
Milan Hanajik
36f2842b01 - Fixed a bug in valves inversion 
- Changes in ProcessTabPageCtrl
 2014-09-06 13:32:38 +02:00
Milan Hanajik
a6f5b287c9 Fixed a bug in emptying valves initialization on StateMachine startup 2014-09-06 11:35:10 +02:00
Milan Hanajik
ef8284586e SetValves operation uses Delay of 'Valve', 'Pump' and 'PumpWithFM' 2014-09-06 09:07:45 +02:00
Milan Hanajik
87f42ba291 Delay added to IValve and Pumps, no delay functionality yet 2014-09-06 08:10:08 +02:00
Milan Hanajik
6933442e76 - possibility to invert valves (UI as well as the functionality) 
- UI prepared for the usage of valve delays
 2014-09-06 07:37:27 +02:00
Milan Hanajik
74a6800f9e Changes done on Fuzhou300 system: 
- ControlComDev.SetFMFreq() modifications (array size)
- StatusP and Route logging
- StatusP bit assignments: bit3 -> bit5
- MettlerToledo logging
 2014-09-05 22:14:12 +02:00
Milan Hanajik
1d098f7893 - Modifications for 'StableTime' (ValveMove, RegulValve, etc. 
- SHA1 checksum calculated and displayed in AboutDlg (sample data 'nejaky text')
- Modifications for the Fuzhou300 component
 2014-09-05 14:17:12 +02:00
Milan Hanajik
51530bd088 - Component for Fuzhou300 added 
- all components moved to appropriately named subdirectories
 2014-09-05 11:15:32 +02:00
Milan Hanajik
f01a0d84fe Folder with files for FixedStartMassCollection (copy of FlyingStart..) added to project, builds OK 2014-09-05 09:06:23 +02:00
Milan Hanajik
8ff05bcccf - StartValve added to OutputPath 
- bug fixed in MeterTestResultMap: 'EndState' was not mapped into the database
 2014-09-03 16:55:09 +02:00
Milan Hanajik
229564750f FLow meter position may be 0 (sum of two), flow meter range up to 1600 m3/h 2014-09-03 15:34:44 +02:00
Milan Hanajik
b4a59518c0 Column widths in Paths dialog are stored in LocalSettings 2014-09-03 13:42:46 +02:00
Milan Hanajik
08468e60d6 - reconfigured to use Munich component and 5 watermeters 
- valve categories used in paths, Category property added to IValve
 2014-09-02 18:10:16 +02:00
Milan Hanajik
c767512fad - Camera ROI DebugLevel inheritance fixed/improved, parent can be Off 
- avoid empty lines in logs after SendCommand, SendCalibData, ValveMove logs
 2014-08-15 20:50:42 +02:00
Milan Hanajik
ea59dd0932 FlyingStart...Seq and CombinedMetersSeq sequences cleaned-up: 
- Stop should work OK
- Target flow is tested and config error is shown in case it's NOK
- TestEnd sequence executed on Error
 2014-08-15 14:32:03 +02:00
Milan Hanajik
596667a67e Default action and stopping the FM-controlled pump 
moved to SequenceBase.Transition(sequence, context).
Sequences cleaned-up.
 2014-08-14 09:06:01 +02:00
Milan Hanajik
e128784bb8 Sequences cleaned-up 2014-08-13 16:20:00 +02:00
Milan Hanajik
c56848958e - MessageBoxOp, MesssageBoxForm 
- Configuration error handling in MainSeq
- Paths selection inside MainSeq
 2014-08-12 22:21:26 +02:00
Milan Hanajik
f4e7c7e88d Dnes koncim 2014-08-12 18:22:32 +02:00
Milan Hanajik
38a88e841b - Three tanks, balances, empty valves supported 
- Code cleanup
 2014-08-12 14:52:42 +02:00
Milan Hanajik
d177a4f892 - Fixed bugs in (simultaneous) tank emptying 2014-08-11 21:19:47 +02:00
Milan Hanajik
7cdfad0738 - Bug fix in State.cs 
- Component for DN100 being used
 2014-08-11 18:33:30 +02:00
Milan Hanajik
ffb4d5afb6 Koncim 8.8.14 2014-08-08 16:25:51 +02:00
Milan Hanajik
ae09afef59 More changes - Modeless form for S/N entry ... 2014-08-08 15:22:24 +02:00
Milan Hanajik
5302aee2a1 Modeless form for S/N entry does not prevent test from starting 2014-08-08 12:45:15 +02:00
Milan Hanajik
ea31fc31fe Fixed but in main sequence when there are no scales 2014-08-08 09:37:45 +02:00
Milan Hanajik
a597da1e18 Waits 15sec after setting the initial flow before detection starts 2014-08-01 10:54:38 +02:00
Milan Hanajik
fd2db3e229 As sent to Munich 2014-08-01 08:36:17 +02:00
Milan Hanajik
836daaa5a1 - German translations 
- IBox, FloatBox, IntBox related changes
 2014-07-31 22:17:48 +02:00
Milan Hanajik
66feec63de Koncim: IBox, etc. 2014-07-31 17:04:09 +02:00
Milan Hanajik
9a9a09f16d TolerRed parameter premenovany a pouzity ako Filter 2014-07-31 00:50:42 +02:00
Milan Hanajik
26b2c1f1a9 Simultaneous Tank-Empty op-s possible 2014-07-31 00:03:19 +02:00
Milan Hanajik
4bcffdc3a9 - Fixed bugs in DataEntry-Munich3 forms 
- Troubleshooting camera detection
 2014-07-29 19:25:13 +02:00
Milan Hanajik
8c83965315 ProcedureName added to TestResults entity, Basic writer changes 2014-07-29 15:06:29 +02:00
Milan Hanajik
019e85066f - Data from entry forms copied to test results as well 
- Printed results layout change (subtitles in bold)
 2014-07-29 08:42:19 +02:00
Milan Hanajik
7261d44728 Emergency stop form reactivated 2014-07-29 00:39:43 +02:00
Milan Hanajik
805e66d537 EndState added to MeterTestResult, UpdateTestResults added to EntryForms and IDataEntry 2014-07-28 23:12:43 +02:00
Milan Hanajik
16228800d4 Implemented an entry form for three single watermeters (for Munich) 2014-07-28 22:13:30 +02:00
Milan Hanajik
a4b2c157a1 Upper limit for register reader position number removed. 2014-07-28 15:30:02 +02:00
Milan Hanajik
f968ac8a3f The 1st protocol radio button pre-selected 2014-07-28 14:23:02 +02:00
Milan Hanajik
73d2a22f31 - German translations, 
- Results writer file creation fixed.
 2014-07-28 14:08:13 +02:00
Milan Hanajik
aa3e19a76c Component updated and changed: DN100 --> MUNICH 2014-07-28 10:15:38 +02:00
Milan Hanajik
175a92f633 Initial commit almost identical to SVN-repo rev.340 2014-07-28 09:56:40 +02:00