Compare commits

..
Author SHA1 Message Date
Milan Hanajik bdd9b3a100 Reconfigured for GENESIS 2018-02-19 10:13:32 +01:00
Milan Hanajik 1a82625f39 Output.DB.SaveFlowmeterCorrections completed, ver. 2.18.818 2018-02-19 09:42:20 +01:00
Milan Hanajik bcc54ccd8f ver. 2.18.817 2018-02-16 16:18:41 +01:00
Milan Hanajik 5df13df7fc Big fixes : Ambient ST/EN result items. 2018-02-16 15:32:00 +01:00
Milan Hanajik 47fd6206f6 Minor changes 2018-02-16 14:16:59 +01:00
Milan Hanajik 776f8ed841 SaveFlowmeterCorr : Support for calibration of multiple flow meters and ranges, part 1, UI, ver. 2.18.816 2018-02-16 12:59:24 +01:00
Milan Hanajik cf20ca885e ver. 2.18.815 2018-02-16 09:44:42 +01:00
Milan Hanajik e2e7a091af Changes in program shutdown reverted, ver. 2.18.814 2018-02-16 06:54:14 +01:00
Milan Hanajik 17e605cfd9 UI2BenCmd.Shutdown is re-sent each 3 sec in MainWnd on exit, CheckUIOp and MainSeq modifications, ver. 2.18.813 2018-02-15 16:05:45 +01:00
Milan Hanajik 80999a8573 ErrorFlags E1 and E21 modified, E1 now checks the mean flow, ver. 2.18.812 2018-02-15 14:17:22 +01:00
Milan Hanajik 8deb18fe9c Procedure numbers displayed in procedureComboBox in MainWnd. 2018-02-15 13:52:00 +01:00
Milan Hanajik bb3688bf7a Cleanup, Polish language, ver. 2.18.812 2018-02-15 13:51:40 +01:00
Milan Hanajik d3c7d54466 GraphsTabPageCtrl bug fix : Crash when 'current' node is used, ver. 2.18.811 2018-02-14 19:44:39 +01:00
Milan Hanajik b844aafcf3 Statistics, ProcesData, Plotter, IPlotter, GraphsTabPageCtrl, FlyingStartMassCollection changes 2018-02-14 19:27:11 +01:00
Milan Hanajik 5f17dabb0b (1) IPlotter interface used in Statistics, (2) Plotter class, (3) Start/Stop statistics in all test methods, (4) Flow simulation in FlyingStartMassCollection (DebugMode.Inherit). 2018-02-12 17:50:39 +01:00
Milan Hanajik e0fb7927ed Bug fix in Output.DB.SaveFowmeterCorrections, ver. 2.18.803 2018-02-11 08:18:58 +01:00
Milan Hanajik 567ea533a9 Output.DB.SaveFlowmeterCorrections component completed. 2018-02-11 08:09:32 +01:00
Milan Hanajik cb62b0eb3a (1) Startup after OK, (2) Shutdown rewritten, optionally with tank draining, ver. 2.18.802 2018-02-08 05:06:00 +01:00
Milan Hanajik 069d3865d4 Output.DB.SaveFlowmeterCorrections component added, ver. 2.18.801 2018-02-06 14:33:21 +01:00
Milan Hanajik a40ba5243e ProductionMonitoring ReferenceRecord.Result: 0...OK, >=1 ... Error code, ver. 2.18.800 2018-02-06 11:04:09 +01:00
Milan Hanajik 2c7d1af146 DataEntry.Standard6 supports remarks (batch and watermeters), ver. 2.18.799 2018-02-05 17:41:29 +01:00
Milan Hanajik 6bf5bdce2b Diverter change (PETERSBURG_200). 2018-02-01 23:04:15 +01:00
Milan Hanajik c5c4a571c5 Users management changes, list of users read only once, ver. 2.18.798 2018-02-01 22:18:48 +01:00
Milan Hanajik 9464e3e4e1 Changes for BADGER stredna trat, ver. 2.18.797 2018-01-31 18:05:17 +01:00
Milan Hanajik 03b99f1bbf SampleConfig updated (English, etc.), ver. 2.18.796 2018-01-31 15:46:32 +01:00
Milan Hanajik d2e9b6f582 ver. 2.18.795 2018-01-31 11:49:31 +01:00
Milan Hanajik 2bc8a5629f MettlerToledo.Multi drain valve fixes (BalanceDev, BalanceCfg, etc. changes), ver. 2.18.794 2018-01-31 11:16:29 +01:00
Milan Hanajik 95ad2484ef BADGER-stredna-trat component added, BADGER_STREDNA_TRAT define/if/elif added, ver. 2.18.793 2018-01-30 15:19:23 +01:00
Milan Hanajik 9a8f8722bd TBF.BenchControl.Output.DB.ProductionMonitoring completed, ver. 2.18.792 2018-01-30 12:41:30 +01:00
Milan Hanajik 08cf231dfc ver. 2.18.792 2018-01-30 08:37:31 +01:00
Milan Hanajik 1f13ac3c77 More Output.DB.ProductionMonitoring changes, ver. 2.18.791 2018-01-29 16:18:39 +01:00
Milan Hanajik d9bea4209c ver. 2.18.791 2018-01-29 12:03:32 +01:00
Milan Hanajik 159390c094 ver. 2.18.790 2018-01-29 10:12:21 +01:00
Milan Hanajik 0d3ee53bd5 Refactoring : TestBenchFramework --> TBF ver. 2.18.789 2018-01-29 09:48:01 +01:00
Milan Hanajik 06018303e7 TBF.BenchControl.Output.DB.ProductionMonitoring added. 2018-01-26 13:56:09 +01:00
Milan Hanajik 51e91cdab0 MonitoringDB project (class library) added. 2018-01-26 13:56:06 +01:00
Milan Hanajik 7038c1163f TBF : Required group membership is 'Testers' (merging with Sledovanie_vyroby). 2018-01-25 13:32:13 +01:00
Milan Hanajik 812b5cddcc More users management changes : Localization of user groups. 2018-01-25 13:30:48 +01:00
Milan Hanajik caed4635eb Timing related bug in BenchesDlg when editing database setting on startup fixed. 2018-01-25 10:41:20 +01:00
Milan Hanajik 7043e4e11e Bugs in user management fixed (no DB change), ver. 2.18.788 2018-01-25 10:30:42 +01:00
Milan Hanajik 566dfb7ba8 DB change : 'RangeIx' added to Entities.MeasurementCorrection, Elde.FlowMeter supports multiple correction curves, etc, ver. 2.18.787 2018-01-24 14:28:34 +01:00
Milan Hanajik b0238fc0a3 FlyingStartFirstRepetWithMassColl uses NextTestVolume test parameter. 2018-01-24 14:12:55 +01:00
Milan Hanajik 47ae6ab4ae Genesis : Component upgraded, supports Div time measurement, ADC bug fixes. 2018-01-24 14:07:49 +01:00
Milan Hanajik 14716e4ed1 OuterLoop improvements : Test shown on the screen in correct order, loop start/stop 'test repeats count' can be 1 now, TODO: Make test selection inside the loop possible. 2018-01-24 13:59:20 +01:00
Milan Hanajik 095d4aab2b Cosmetical changes and minor improvements 2018-01-24 13:55:16 +01:00
Milan Hanajik 4144a8970b Genesis : Bug fixes in assignments of ADC-s to regul. valves and flowmeters to diverters. 2018-01-24 13:42:07 +01:00
Milan Hanajik ec3c0aae0a Bug fix in GetResultsTestsAreColumns( ) (2x), ver. 2.17.782 2018-01-24 13:38:54 +01:00
Milan Hanajik b443cab973 Previous results are shown in a modeless dialog, ver. 2.17.777 2018-01-16 17:23:53 +01:00
Milan Hanajik 2e3b120bb1 FlyingStartMassCollProlonged test method, tested OK on Genesis test bench. 2018-01-16 17:23:38 +01:00
Milan Hanajik d640a2f4b6 FlyingStartFirstRepetWithMassColl test method, 'ConstMaster' and 'ErrorMaster' from the 1st rep. used in remaining reps., ver. 2.17.775 2018-01-16 17:22:21 +01:00
Milan Hanajik 5116767ec7 Results.DB change : SessionFactory erased only when the new connection string differs from the previous one. 2018-01-03 13:00:08 +01:00
Milan Hanajik 43412cde9e ver. 2.17.772 2017-12-20 13:28:35 +01:00
Milan Hanajik d225d97863 Component import/export implemented, ver. 2.17.771 2017-12-20 09:14:43 +01:00
Milan Hanajik 7983423e2a RumMob : Component upgraded, 19.12.2017, zmena poradia teplomerov 2017-12-19 16:51:12 +01:00
Milan Hanajik 7859ce582a FlowMeterTriplet (for RumMob) added, ver. 2.17.770 2017-12-18 13:47:02 +01:00
Milan Hanajik 3e1013fc12 Bug fix in StartMeasurementOp, ver. 2.17.769 2017-12-18 12:38:02 +01:00
Milan Hanajik 5f7b4443c2 IFlowMeter.ReadFlow() and IFlowMeter.ReadFrequency() added, ReadFlowOp and SetFlowOp modified, ver. 2.17.768 2017-12-15 13:21:42 +01:00
Milan Hanajik 57977ae8b6 ver. 2.17.767 2017-12-12 11:33:42 +01:00
Milan Hanajik d21d4fb766 iPerl : Q2 correction calculation takes into account ihead.CalibTarget, ver. 2.17.766 2017-12-11 16:47:03 +01:00
Milan Hanajik 298d4a9b17 ver. 2.17.765 2017-12-11 10:15:11 +01:00
Milan Hanajik be82f1fe0e (1) MainSeq : Q1, Q2, Q3 buttons fixed, (2) outer loop error fix, (3) Components can be managed by Administrators only. 2017-12-08 15:12:32 +03:00
Milan Hanajik 459cb5bb4a (1) Progress bars fixes, (2) Fixes in sequences: cBrd.StopPreviousOp() called at the end (also) when isLastRepetition == true. 2017-12-08 15:07:09 +03:00
Milan Hanajik 8d39bf82d2 Camera binary files: rc.local and runmeonce removed, camera loging level change, ver. 2.17.764 2017-12-08 12:33:37 +03:00
Milan Hanajik e762aca7fb Bahrain: Component upgraded (4.12.2017), changes for diverter, faster program shutdown, camera bins changed, ver. 2.17.763 2017-12-08 11:04:46 +03:00
Milan Hanajik ace0bdb2a6 Supports camera upgrade to SD 1.3, ver. 2.17.762 2017-12-08 09:06:27 +03:00
Milan Hanajik f6e44914fa Output.Printers.OnePerMeter can print water meter images. 2017-12-06 14:57:56 +03:00
Milan Hanajik 6b6098164a FixedStartDeferredEvaluationSeq : Simulation mode fixed, copies sample images correctly. 2017-12-06 14:53:35 +03:00
Milan Hanajik 6572623313 Oputput.FileWriters.ImageArchiver fixes and improvements (folder name may use BatchNr). 2017-12-06 14:52:10 +03:00
Milan Hanajik 7f4bbcccf2 DataEntry.Standard6 / 12 / 24 / Camera : CycleEndForm-s consolidated (they were outdated). 2017-12-06 14:50:18 +03:00
Milan Hanajik a49a81cff7 (1) Results.Utils.PassedColorStr() with PASSED/FAILED, (2) WMeterRsltsItemSpec: Formatted_WM_ID, (3) Legalizator for Bahrain, ver. 2.17.761 2017-12-06 09:58:57 +03:00
Milan Hanajik 88fc2d4951 DiscoveryDaemon ver. 1.5. added. 2017-12-06 00:02:07 +03:00
Milan Hanajik 2c64b8905d IDevice and all devices modified, void StopDevice2( ) introduced, makes program exit faster. 2017-12-05 21:26:07 +03:00
Milan Hanajik dda796b929 ProcessTabPageCtrl6,24,48: Prevent conversion Double -> Float -> Double. 2017-12-05 20:49:38 +03:00
Milan Hanajik 4fd332490a Program exit troubleshooted and corrected, TODO: Shutdown of camera threads (2 stage StopDevice ?). 2017-12-04 19:51:59 +03:00
Milan Hanajik be7c433343 All printers enhanced and cleaned up: Template, Footer font, Doc.Name, etc., ver. 2.17.760 2017-12-04 18:53:56 +03:00
Milan Hanajik 6181e6a0f2 List of procedures in 'Procedure' combo box in MainWnd is updated after closing ProceduresDlg using 'x' button. 2017-12-04 18:35:45 +03:00
Milan Hanajik c5453fff5b MainSeq, ITestMethod and all test methods changed, transitions are done in MainSeq (DoTransitions()), no outerLoopCounter, ver. 2.17.757 2017-12-03 18:44:57 +03:00
Milan Hanajik b9b7fc95b4 DataEntry.StandardCamera.TestStartEndForm : Zoom and rotation are saved in arrays separately for each meter, ver. 2.17.755 2017-12-02 18:44:32 +03:00
Milan Hanajik b8a51409ab RUM_MOB component upgraded (10.11.2017), RUM_MOB define processing fixes (I41 etc.), ver. 2.17.754 2017-12-01 15:21:54 +01:00
Milan Hanajik cebaab8e8b iPerl : ConfigStruct erased at the beginning of 'ReadConfiguration', iPerlHead.ClearData() called in MainSeq when procedure selected, ver. 2.17.753 2017-12-01 12:06:24 +01:00
Milan Hanajik 76bef24456 Output.FileWriters.Basic : PrintCaption parameter added, no empty line when there are no common items, ver. 2.17.752 2017-12-01 10:53:11 +01:00
Milan Hanajik 871b95891d DataEntry.StandardCamera.TestStartEndForm : Combination of zoom and rotation fixed. 2017-11-30 21:35:14 +01:00
Milan Hanajik f5ddde647a ErrorFlags : Cosmetical bug fix. 2017-11-26 22:31:51 +01:00
Milan Hanajik d4de7db70d ver. 2.17.751 2017-11-24 16:37:24 +01:00
Milan Hanajik ad858266d5 StandardCamera.TestStartEndForm : Image rotation, ver. 2.17.749 2017-11-23 15:10:01 +01:00
Milan Hanajik 8772004e8e More camera logging, ROI: imgFileNamePrefix, ver. 2.17.748 2017-11-23 13:41:33 +01:00
Milan Hanajik aec3519ec9 All data entry forms have DarkGoldenrod background color. 2017-11-23 09:19:27 +01:00
Milan Hanajik 20bbbc7741 Results.Entities.WaterMeterData.NewQnames mapped to the database (MUNICH only), ver. 2.17 2017-11-23 09:18:04 +01:00
Milan Hanajik 5ee93200ed MainSeq : Deferred test evaluation when single test is executed. 2017-11-23 09:15:25 +01:00
Milan Hanajik 981c399e65 DataEntry.StandardCamera changes: ShowTestEndFormOp uses regReaders, ShowDeferredTestEvalFormOp, etc. 2017-11-22 23:53:41 +01:00
Milan Hanajik 96429a8c7a Simlation mode for Camera.CLP1611, ver. 2.17.746 2017-11-22 21:06:43 +01:00
Milan Hanajik e1fc3e7b82 FixedStartMassCollectionSeq minor bug fixes. 2017-11-22 21:06:00 +01:00
Milan Hanajik 498115637a Framework for deferred test evaluation (e.g. FixedStartDeferredEvaluation method) in MainSeq complete, ITestMethodWith2ndPass added. 2017-11-22 21:05:10 +01:00
Milan Hanajik 2322a145f6 DataEntry.StandardCamera.CycleEndFormMunich and added ProtocolTitle# parameters added. 2017-11-22 13:58:03 +01:00
Milan Hanajik 53bab003bf FixesStartDeferredEvaluation test methods added, based on FixedStartMassCollection, TODO: Change functionality, ver. 2.17.745 2017-11-22 12:12:04 +01:00
Milan Hanajik 97fc922321 Changes : (1) StandardCamera.TestStartEndForm size, (2) FixedStartMassCollectionSeq delay before 1st mass m., (3) German, (4) Reload prev. btn. hidden, ver. 2.17.744 2017-11-22 10:54:51 +01:00
Milan Hanajik 8c32d64f35 DataEntry.Munich3, DataEntry.StandardCamera use FixedStartRegisterReader and RoiForFixedStart procedure parameter PulsesPerLtr. 2017-11-22 01:22:59 +01:00
Milan Hanajik 1dfbf12f46 sensPath.RegisterReaders passed to all TestStartEndform-s, ver. 2.17.743 2017-11-21 22:29:31 +01:00
Milan Hanajik 0f9256325c Krakow component added, KRAKOW_50 symbol added, ver. 2.17.742 2017-11-21 15:12:23 +01:00
Milan Hanajik 93c6ba5e74 More MunichPrintDocument changes, s/n repeated on the 2nd page, ver. 2.17.741 2017-11-21 11:32:42 +01:00
Milan Hanajik 2d3e14fc6c WMeterRsltItemSpec bug fix, ver. 2.17.740 2017-11-21 10:41:36 +01:00
Milan Hanajik 3ad842b02a (1) 'bool NewQnames' added to IWaterMeter, WaterMeters.Munich and elsewhere, (2) German language : Control water temp., Temp lim lo, Temp lim hi. 2017-11-21 10:04:02 +01:00
Milan Hanajik 14cfb65b6b Main window menu items customization. 2017-11-21 09:29:53 +01:00
Milan Hanajik cd926f559d Output.Printers.Munich document has two pages for a large number of tests, ver. 2.17.739 2017-11-21 09:28:53 +01:00
Milan Hanajik cafa247279 RegulValveCoax.SetFlowOp : More logging. 2017-11-20 18:16:59 +01:00
Milan Hanajik e411b80fdc Bugs in RegulValveCoax fixed, ver. 2.17.738 2017-11-20 14:31:47 +01:00
Milan Hanajik ae5e680e35 Many WMeterRsltItemSpec-s added. 2017-11-16 16:29:13 +01:00
Milan Hanajik db684afd84 [dm3] 2017-11-16 16:29:08 +01:00
Milan Hanajik dc2ab14412 Wodomierz -> Obiekt 2017-11-16 16:29:02 +01:00
Milan Hanajik 9e28ca5df3 Printers.Zapiska, OnePerMeter, etc. changes: flow coordinates, content separated from layout, etc. 2017-11-16 16:27:28 +01:00
Milan Hanajik dcfc12a849 Bug fix in v.2.17.730, new ver. 2.17.734 2017-11-15 10:16:12 +01:00
Milan Hanajik ad3f9b53ad ver. 2.17.733 2017-11-14 17:59:05 +01:00
Milan Hanajik e7e0937ae5 Multiple access to files in TBF/CameraBinaryFiles prevented, ver. 2.17.732 2017-11-14 17:34:15 +01:00
Milan Hanajik 0325b0214b Temperature corrected by calibration curve (corrections). 2017-11-14 16:35:46 +01:00
Milan Hanajik 6d616ca4cc Modifications in Output.Printers.Zapiska, multiple-line headers are possible, ver. 2.17.731 2017-11-14 15:55:06 +01:00
Milan Hanajik a2620870ad Changes for Audit, ver. 2.17.730 2017-11-13 16:17:36 +01:00
Milan Hanajik a9ab29fcbb ver. 2.17.729 2017-11-12 15:53:28 +01:00
Milan Hanajik 65f2c4d4a5 Camera.CLP1611: Synchronization of files in camera '/home/tbf/clp' directory and 'TBF/CameraBinaryFiles' project folder. 2017-11-12 15:29:55 +01:00
Milan Hanajik 2ba5c8277d iPerlCommunication bug fix for non-ORACLE_DB test benches, ver. 2.17.728 2017-11-12 15:27:21 +01:00
Milan Hanajik 28f3b3f323 Modifications in Saving previous results, current Oracle DB component settings are loaded, extra info message shown. 2017-11-10 14:03:05 +01:00
Milan Hanajik 607dbaacb1 Oracle DB changes from iPerl-12 branch, WMType_ID/Rev dropped from WaterMeter, CheckBarcodeScanning operation commented out. 2017-11-10 12:50:39 +01:00
Milan Hanajik 656bd36a1d Camera binary files management : Work in progress. 2017-11-09 10:25:09 +01:00
Milan Hanajik 1b83bd22b9 DataEntry.iPerl and DataEntry.Standard48 fixed - start/stop test method, ver. 2.17.727 2017-11-09 10:24:45 +01:00
Milan Hanajik 54eba8509e Modbus and QuidoRS modifications: Messages are send immediately (are not enqueued) if permitted by timing. 2017-11-09 10:17:10 +01:00
Milan Hanajik 996b88cb2e 'iPerl Heads' edit feature and tool strip menu item added, delays after Quido.SetOutputs() increased to 2000ms. 2017-11-09 10:13:34 +01:00
Milan Hanajik 441d950e94 Comments, style changes, etc. 2017-11-09 10:13:21 +01:00
Milan Hanajik 59c2afe0e8 UpgradeSelectionDlg support for 2.12-->2.17, ver. 2.17.722 2017-11-07 11:07:11 +01:00
Milan Hanajik 441cf91ff6 Reference pulses displayed correctly using test when using camera ROI. 2017-10-27 16:29:00 +02:00
Milan Hanajik 41a1b3323f Valve timing changes applied immediately, no program restart required. 2017-10-27 16:06:29 +02:00
Milan Hanajik 4e31493cc8 Camera : TestImagesCount up to 3000, load/save images parameters are volatile (not saved to DB), ver. 2.17.721 2017-10-27 15:05:01 +02:00
Milan Hanajik 8abe8df823 Measurement results via UDP, telenet not used for measurement anymore, Roi supports Simulate mode, ver. 2.17.720 2017-10-27 12:14:05 +02:00
Milan Hanajik 39af5d29c6 Camera.CLP1611 : TestImagesMode itroduced, passed to Measurement command, ver. 2.17.719 2017-10-26 15:20:26 +02:00
Milan Hanajik 52d073cb8c TftpServer removed from project. 2017-10-26 14:23:46 +02:00
Milan Hanajik 65a6854cc0 ver. 2.17.718 2017-10-26 10:36:53 +02:00
Milan Hanajik ec540bcf20 (1) Camera measurement stopped by 'Q', (2) Telnet login timeout increased, (3) going to remove Telnet, (4) default cfg for Camera, Roi, RoiForFixedStart. 2017-10-26 10:28:49 +02:00
Milan Hanajik 4e9748f4dc (1) Opraw DEWY disabled, (2) Upgrade DB 2.16->2.17 button, (3) minor fixes in IPERL related things, ver. 2.17.717 2017-10-24 16:39:30 +02:00
Milan Hanajik 82da9bc2e7 Bug fix in DataEntry.StandardCamera.TestStartEndForm, ver. 2.17.714 2017-10-23 10:53:50 +02:00
Milan Hanajik 4cc9715f57 CameraUICmd and CameraUICmdEventArgs added ti UiBridge 2017-10-20 16:05:51 +02:00
Milan Hanajik 75f72cb04e ResultsBrowser ver. 2.17.712 2017-10-20 15:39:01 +02:00
Milan Hanajik 3d58b8baf2 Camera.CLP1611 component parameters change handler. 2017-10-20 14:05:38 +02:00
Milan Hanajik 0c2839e6c9 Temperature (TempUpMean + TempDownMean) / 2 used for density and volume calculations, ver. 2.17.712 2017-10-19 19:04:13 +02:00
Milan Hanajik 0df833ca8a REM Kepno specific changes (result string, etc.), ver. 2.17.711 2017-10-19 18:05:05 +02:00
Milan Hanajik 82988ce74f (1) DataEntry.StandardCamera.TestStartEndForm image size 640x480, (2) ZOOM implemented, (3) simulation mode, ver. 2.17.710. 2017-10-19 14:27:16 +02:00
Milan Hanajik 32fbb2964e Advanced flow setting algorithm with adaptive behavior, ver. 2.17.709 2017-10-19 10:34:10 +02:00
Milan Hanajik 38d7562bb3 Repettition nr. > 1 can be selected in the main sequence. 2017-10-19 09:19:31 +02:00
Milan Hanajik a8dd8d98cb (1) E15 modified, no E16, (2) Qref_min, Qref_max, Qref_start, Qref_end added to results, ver. 2.17.708 2017-10-19 09:18:50 +02:00
Milan Hanajik 615383f924 Cleanup. 2017-10-18 18:03:54 +02:00
Milan Hanajik 25fa494b7b (1) Output.FileWriters.Basic: header, common, footer, etc., (2) TableRowNr, TableColumnNr in all outputs, ver. 2.17.707 2017-10-18 18:03:40 +02:00
Milan Hanajik 8b321e36db Diverter times saved in SummaryResults and AllResults, timing of 'end' measurement slightly changed, ver. 2.17.706 2017-10-18 12:08:15 +02:00
Milan Hanajik 3822c6f5ab Calculated error limits for heat meter flow measurement testing, ver. 2.17.705 2017-10-18 10:52:15 +02:00
Milan Hanajik 21a329b1d3 Kepno 50 component upgraded (diverter 500ms), dated 18.10.2017 2017-10-18 10:51:50 +02:00
Milan Hanajik 8d669d9f54 Flow selection test wizard uses a Tab-control, bug in ProcedureDlg (causing a non-zero initial Qfrom/Qto) fixed. 2017-10-17 18:25:05 +02:00
Milan Hanajik 9a905c6111 Minor improvements. 2017-10-17 18:22:01 +02:00
Milan Hanajik 239bcddfa2 ReadDiverterTransitionOp implemented, ver. 2.17.704 2017-10-17 16:06:46 +02:00
Milan Hanajik cd5e20a3f4 'Stop backflow valve' support in RoiDetection. 2017-10-17 16:04:42 +02:00
Milan Hanajik 518e87e4f1 Qfrom and Qto shifted 25% toward the center, ver. 2.17.700 2017-10-17 16:04:37 +02:00
Milan Hanajik 6cd0be4c17 TestMethods.SensitivityTest added. 2017-10-17 16:04:33 +02:00
Milan Hanajik 04db65f01f Kepno 50 component upgraded, related changes in IControlCom etc., dated 11.10.2017 and 16.10.2017. 2017-10-17 16:04:12 +02:00
Milan Hanajik aa63fe2cb4 Bug fix in Output.FileWriters.Xml 2017-10-17 11:12:09 +02:00
Milan Hanajik 0593e3484c Error Formula modified. 2017-10-17 11:12:04 +02:00
Milan Hanajik 80bb277386 Resizing of camera pictures using '+' and '-' buttons implemented. TODO: Full screen mode, ver. 2.17.699 2017-10-17 10:14:35 +02:00
Milan Hanajik ec22661e87 TimePumpwStartV and StopBFValve supported in FlyingStart, FixedStart and Adjustment methods. 2017-10-16 10:30:42 +02:00
Milan Hanajik 80cdc2fb95 Component for Bahrain upgraded (dated 11.10.2017) 2017-10-12 22:12:05 +02:00
Milan Hanajik bfedd4d11b Bug fixes : WMeterRsltItemSpec-s for iPerl. 2017-10-11 09:31:44 +02:00
Milan Hanajik f58831f916 iPerl heads (WM positions) can be disabled by a user (port from branch iPerl-12) : Part 2, functional changes, ver. 2.17.697 2017-10-11 09:30:08 +02:00
Milan Hanajik 328d6b7fa7 iPerl heads (WM positions) can be disabled by a user (port from branch iPerl-12) : Part 1, auxiliary changes. 2017-10-11 08:47:36 +02:00
Milan Hanajik 98105cbf21 ver. 2.17.696 2017-10-06 13:31:03 +02:00
Milan Hanajik c9c57db7c1 Output.Printers.OnePagePerMeter.Printer implemented, fixes in Culture configuration, ver. 2.17.695 2017-10-06 13:26:48 +02:00
Milan Hanajik 7d4f1b2a44 ver. 2.17.694 2017-10-06 10:07:44 +02:00
Milan Hanajik 7b7d1994c7 Symbol RUM_MOB processing added, component for the mobile test bench for Romania added, ver. 2.17.693 2017-10-05 12:50:51 +02:00
Milan Hanajik 8b438d8d76 ver. 2.17.692 2017-10-05 11:18:38 +02:00
Milan Hanajik 7a510a98ad Russian translations, ver. 2.17.691 2017-10-05 11:12:40 +02:00
Milan Hanajik 66034de880 ver. 2.17.690 2017-10-04 13:16:31 +02:00
Milan Hanajik b9ca3e6beb PW 2017-10-04 13:08:41 +02:00
Milan Hanajik 9ad0872854 Bug fix: Error flags related bug fixed, ver. 2.17.689 2017-10-04 13:08:28 +02:00
Milan Hanajik e6933922cd ver. 2.17.687 2017-10-04 10:41:59 +02:00
Milan Hanajik d6d6d88e20 Changes in Russion language, ver. 2.17.686 2017-10-04 10:35:00 +02:00
Milan Hanajik 8974d93877 ver. 2.17.685 2017-10-03 14:12:41 +02:00
Milan Hanajik 7e6bef9008 DB upgrade via menu Settings/Upgrade from 2.15 to 2.17 implemented, ver. 2.17.684 2017-10-03 14:11:14 +02:00
Milan Hanajik 1e2711a616 Component 'Copy' implemented. 2017-09-29 15:41:23 +02:00
Milan Hanajik fd81675168 Output.Printers.Zapiska : 'Good only' option implemented, ver. 2.17.681 2017-09-29 15:21:40 +02:00
Milan Hanajik 3dc347c66a Modbus.PressureMeter.Meret : data request sent every 3 seconds, ver. 2.17.681 2017-09-29 13:20:23 +02:00
Milan Hanajik 8a8f4fa563 Component for Kepno-50 upgraded, dated 29.09.2017, cosmetical changes. 2017-09-29 13:11:44 +02:00
Milan Hanajik ed3fc330ab Stopping TBF program optimized, ModelessActivityForm used, rtpListenerThread.Join(.) in Camera shortened to 200 ms, ver. 2.17.680 2017-09-29 08:19:59 +02:00
Milan Hanajik 9fa025caa4 Diverter and start/stop valve switch time logging in ms, ver. 2.17.679 2017-09-28 17:11:41 +02:00
Milan Hanajik b54f938bd5 Modbus.CometAmbient component implemented (Comet and Easytherms are connected to the same Modbus), ver. 2.17.678 2017-09-28 15:24:10 +02:00
Milan Hanajik 4efba80fc6 Measurement of valve open/close time required for E11, E12 evaluation. DiverterStart/DiverterEnd is float in sec., ver. 2.17.677 2017-09-28 12:54:16 +02:00
Milan Hanajik c3eab4820f Zapiska: (1) GapBetweenTableColumns (20 -> 10), (2) multiline item support. 2017-09-28 12:53:37 +02:00
Milan Hanajik a5bb127a1e (1) Zapiska bottom columns fixed, (2) unused WM-s disabled after reloading results, (3) Passed_seals_count, Diverter_start/end_time added, ver. 2.17.675 2017-09-28 09:39:58 +02:00
Milan Hanajik ae1ed99c9f ErrorFlags E15 and E16, Results DB upgraded (int ErrorFlags in WaterMeter table, int DiverterStart, DiverterEnd in TestRslt table), ver. 2.17.674 2017-09-28 00:07:47 +02:00
Milan Hanajik fa36932fbc Network.Camera.Display extended to 12 images. 2017-09-28 00:07:42 +02:00
Milan Hanajik 9ac3dd07b9 WMeterRsltItemSpec cleanup, DblFormat(...) does units conversion. 2017-09-27 21:29:10 +02:00
Milan Hanajik 4ca28941d0 Component for Kepno 50 dated 27.09.2017 upgraded, start/stop valve time measurement added. 2017-09-27 14:56:02 +02:00
Milan Hanajik 4b2e207ddf WMeterRsltItemSpec with a possibility to specify number of significant digits. 2017-09-27 14:55:48 +02:00
Milan Hanajik 88055f1c84 ErrorFlags modifications. 2017-09-27 13:10:55 +02:00
Milan Hanajik 2f68a9444a Bug fix in Output.Printers.Zapiska, ver. 2.16.673 2017-09-27 13:10:20 +02:00
Milan Hanajik 0ccd711b0f (1) CameraPictureCtrl modified, (2) LiveStreamSeq modified, (3) cleanup and more logging. 2017-09-27 13:08:36 +02:00
Milan Hanajik 63a6cb7afe Diverter time logging in FlyingStartMassCollectionSeq, camera commands logging, ver. 2.16.670 2017-09-27 09:11:53 +02:00
Milan Hanajik d9fc5482db E15 and E16 implementation in progress. 2017-09-27 09:11:06 +02:00
Milan Hanajik 4f06438371 Kepno-50 component upgraded, dated 26.09.2017, Pr2 and Pr3 labels swapped. 2017-09-26 22:53:38 +02:00
Milan Hanajik 5afb5f2419 CameraPictureCtrl-s are in FlowLayoutPanel inside PicturesTabPageCtrl. Config button and split container removed. 2017-09-26 19:56:31 +02:00
Milan Hanajik 9f467a23b4 Camera info displayed in PicturesTabPage, PicturesTabPageCtrl and CameraPictureCtrl cleanup, ver. 2.16.669 2017-09-26 18:34:20 +02:00
Milan Hanajik 76dd46b30c Kepno component upgraded: dated 22.09.2017 2017-09-26 14:46:08 +02:00
Milan Hanajik 0c1ddecaf1 Results items 'Passed_meters_count' and 'Failed_meters_count' added. 2017-09-26 14:46:04 +02:00
Milan Hanajik d36d4733ca Zapiska modified. 2017-09-26 14:45:49 +02:00
Milan Hanajik 18dac8fb72 Legalizator (= 2nd user) support, ver. 2.16.667 2017-09-26 09:45:18 +02:00
Milan Hanajik fb1db6df1c Define for SLM_150 fixed. 2017-09-25 22:26:29 +02:00
Milan Hanajik 3fb487b67b (1) E9,E10,E15,E16 implemented, (2)Zapiska: Each WM is in one table row, (3) TableRowNr,TableColumnNr,WMRemark added to RsltItems 2017-09-25 22:25:09 +02:00
Milan Hanajik 2e1d497aad (1) Output.Printers.Zapiska introduced, (2) Kempno component upgraded, dated 13..9.2017 2017-09-21 16:44:33 +02:00
Milan Hanajik 754bd14342 Graphs changes in progress 2017-09-21 16:44:15 +02:00
Milan Hanajik c4026c87ce PlotterDisplayEx with a demo graphs added to GraphsTapPageCtrl. 2017-09-20 13:41:25 +02:00
Milan Hanajik e6b8454a94 'Graphs' menu item and graphsTabPage added to MainWnd and mainTabControl. 2017-09-20 12:51:59 +02:00
Milan Hanajik 98f68d6b45 GraphLib package added, an empty GraphsTabPageCtrl added, no tab control and menu changes in MainWnd, ver. 2.16.661 2017-09-20 10:48:35 +02:00
Milan Hanajik 5ef1bcbdb6 Calibration target introduced in iPerlHead.ProcParams and iPerlhead.IperlHead. CalculateNewCalibFactor( ), ver. 2.16.660 2017-09-18 12:32:39 +02:00
Milan Hanajik 7846239be9 (1) LiveStreamSeq with MessageBoxOP, (2) "-jpg" added to ROI-detection command, (3) IRoi: DetectedImageName -> ImageFileNamePrefix, ver. 2.16.658 2017-09-15 09:30:06 +02:00
Milan Hanajik f8e2d6c86b Network.Camera.Display bug fix. It was not possible to retry ROI-Detection, ver. 2.16.657 2017-09-14 16:00:16 +02:00
Milan Hanajik b06f4a5781 CLP1611.LiveStreamOp modified to issue an appropriate command for MJPEG RTP stream, VLC removed, ver. 2.16.656 2017-09-14 12:58:26 +02:00
Milan Hanajik 968faf9200 CLP1611.Camera live image using MJpeg RTP protocol support implemented. 2017-09-14 11:54:32 +02:00
Milan Hanajik 62ceb13385 FlowStart and FlowEnd saved into TestRslt at the end of each test. 2017-09-13 15:48:31 +02:00
Milan Hanajik bed0046618 (1) More logging, (2) Bug fixes in Statistics, (3) Bug fixes in ErrorFlags.Errors, ver. 2.16.655 2017-09-13 10:54:23 +02:00
Milan Hanajik 8a2287c685 WinSCPnet package replaced by Renci.SshNet, Camera, GrabImagesOp and RoiDetectionOp modified, ver. 2.16.651 2017-09-09 10:42:45 +02:00
Milan Hanajik 3c85440d34 (1) No MessageBox when writing opto-data fails, (2) Read1, Read2, Read3, Read4 added to CommErr enum, ver. 2.16.650 2017-09-06 10:25:22 +02:00
Milan Hanajik 7ed21ff08c SwitchDiverterOp, Diverter sequence conditions, ver. 2.16.647 2017-08-22 16:20:52 +02:00
Milan Hanajik df42ec3d3a Saving ResultCode with RFID and OptoData error code for iPerls implemented, ver. 2.16.646 2017-08-22 09:28:19 +02:00
Milan Hanajik 35b62520c9 TestRslt.ErrorFlagsStr() function added, used in WMeterRsltItemSpec, ver. 2.16.645 2017-08-21 15:38:57 +02:00
Milan Hanajik e6936dc10e ver. 2.16.644 2017-08-21 13:05:20 +02:00
Milan Hanajik d5904fe9fa ErrorFlags implementation completed. TODO: E9, E10, E11, E12, E15, E16. Ver. 2.16.643 2017-08-21 12:36:37 +02:00
Milan Hanajik 20d8fbc389 ErrorFlags component added, Results.Entities.TestRslt upgraded to DB v.2.16, ErrorFlags and ErrorFlagsMd added, used in test methods, ver. 2.16.642 2017-08-20 09:54:42 +02:00
Milan Hanajik 70ccb8b4d8 Statistics support filtering, skipping first samples, etc., ver. 2.15.642 2017-08-19 13:41:49 +02:00
Milan Hanajik 175571072f Cleanup 2017-08-19 13:41:44 +02:00
Milan Hanajik b0e25a35fb Activity during initialization of devices shown in a modeless form, ver. 2.15.641 2017-08-19 13:41:31 +02:00
Milan Hanajik 08e7041bcf EnhancedPrintDocument : SW crash prevented with default configuration of fonts. 2017-08-18 10:02:17 +02:00
Milan Hanajik b58ebcd7a7 ver. 2.15.640 2017-08-17 14:23:09 +02:00
Milan Hanajik 8eb2472171 Big fix for scale s/n communication for iPerl (2 sec StateMachine ticks). 2017-08-16 15:32:05 +02:00
Milan Hanajik f73d89f41b Comments corrected/added, ver. 2.15.639 2017-08-16 13:46:21 +02:00
Milan Hanajik 95848197c5 Components for iPerl, Bahrain PT50 and Kepno PT50 upgraded (14.08.2017), ver. 2.15.638 2017-08-14 15:09:32 +02:00
Milan Hanajik 442ac6969f iPerlCommunication modifications : cfg.seMuxBoards parameter used in the worker thread, MuxBoardNr cannot be 0 anymore, should be 1..4, ver. 2.15.637 2017-08-10 15:06:29 +02:00
Milan Hanajik 3fb2c0aeff TestMethods.iPerlCommunications : UseMuxBoards component configuration parameter added 2017-08-04 17:37:39 +02:00
Milan Hanajik 8ed99092ff Bug fixes in FixedStartMassCollectionSeq, cosmetical changes in DataEntry.StandardCamera, ver. 2.15.634 2017-07-28 17:21:30 +03:00
Milan Hanajik f393709944 Camera.CLP1611.GrabImagesOp can overwrite images, ver. 2.15.633 2017-07-28 14:38:28 +03:00
Milan Hanajik 527da6bcc5 DataEntry.StandardCamera, Camera.RoiForFixedStart and FixedStartMassCollectionSeq changes, etc, ver. 2.15.632 2017-07-28 11:14:20 +03:00
Milan Hanajik 17940d453c DataEntry.Standard24 dead code clean-up (bool SensusExtensions) 2017-07-27 16:56:47 +03:00
Milan Hanajik 8d623ae8fa FirstStartMassCollectionSeq changes in progress 2017-07-27 16:38:46 +03:00
Milan Hanajik c9d3480c58 Network.Camera.RoiForFixedStart component added, IRoiForFixedStart added, supports image grabbing only. 2017-07-27 16:38:29 +03:00
Milan Hanajik e133b68472 Network.Camera.Roi bug fix, comments updated. 2017-07-27 16:38:17 +03:00
Milan Hanajik 9ecfe1e10e DataEntry.Standard24.TestStartEndForm layout changed (RU) 2017-07-27 16:38:13 +03:00
Milan Hanajik 3a38ca6b61 bool UsesCameras() added to IDataEntry and DataEntry components, DataEntry.StandardCamera added. 2017-07-27 16:37:58 +03:00
Milan Hanajik 62cb5cdba7 Elde.RegulValveCoax component added, coax support in Elde.RegulValve dropped, ver. 2.15.631 2017-07-27 10:11:16 +03:00
Milan Hanajik 1cb0345b37 Initialization of ADC open/close values and start/stop % levels for diverters redone/fixed, ver. 2.15.630 2017-07-27 09:14:57 +03:00
Milan Hanajik b3e6a3f157 Default value of water density. 2017-07-26 23:22:13 +03:00
Milan Hanajik 6ed831c968 ver. 2.15.629 2017-07-26 18:33:32 +03:00
Milan Hanajik 3f1d992879 Camera.CLP1611, ImageArchiver and TestMethods.GrabImage.GrabImageSeq changes - works OK, TODO: color jpg, ver. 2.15.628 2017-07-26 13:40:17 +03:00
Milan Hanajik c076ebce6f RoiGfg.ToString() enhanced, displays PreviousRoi 2017-07-25 16:38:21 +03:00
Milan Hanajik 56e006318f Utils.ShowROute() -> Utils.RouteToStr(), dead code Evaluate and Publish removed from all test methods 2017-07-25 16:10:06 +03:00
Milan Hanajik 4867b031b9 TestMethods.GrabImage : ImageFileName etc. added to cfg, GrabImageCfg implemented, interfaces changes, ver. 2.15.627 2017-07-25 15:43:36 +03:00
Milan Hanajik 548973cf11 Bug fixes: (1) Error msg. deleted after selection, (2) pidCoef usage during test, (3) Drain valve always closed in FlyingStartMassCollection. 2017-07-25 11:41:06 +03:00
Milan Hanajik 9c575d7fbf (1) ProcedureDlg layout, (2) DataEntry.Standard12/24.CycleBeginningForm layout, (3) ProcessTabPage6/24 layout (done for RU). 2017-07-25 11:39:05 +03:00
Milan Hanajik feefbeb5b4 (1) TankFullFactor -> 0.95, (2) bit80 calculation for PETERSBURG_200, ver. 2.15.626 2017-07-25 10:06:31 +03:00
Milan Hanajik a4d8081b73 Petersburg PT50 component upgraded, ver. 2.15.625 2017-07-24 22:25:13 +03:00
Milan Hanajik 467e51374d (1) Changes similar to Fuzhou300 done for Petersburg200, (2) Bug in RRoute for 128-bit route fixed, (3) Route display/logging 2017-07-24 22:14:57 +03:00
Milan Hanajik ec27a5843b TestMehods.GrabImage added, in construction, ver. 2.15.624 2017-07-24 22:14:27 +03:00
Milan Hanajik a6a87cccae DB ver. 2. 15 consolidated, Procedure.ProtocolTitle removed 2017-07-24 22:14:10 +03:00
Milan Hanajik 1d7a2e4a0c ValveEx change reverted, RegisterReader-s fixed : Clear() should not be used in default constructor. 2017-07-24 22:14:05 +03:00
Milan Hanajik 9ac237a377 Alternative procedure - UI implemented. 2017-07-23 21:54:03 +03:00
Milan Hanajik 74d5688936 FileWriters.ImageArchiver, FileWriters.OneFilePerMeter and Printers.OnePagePerMeter components added. 2017-07-23 21:51:22 +03:00
Milan Hanajik 534baa7aa3 Camera serial number used in UI, HardwareAddress % 100 used in DetectCamera(...) function call. 2017-07-23 11:47:31 +03:00
Milan Hanajik b11d55c2c7 Basic GrabImage support, ver. 2.14.619 2017-07-23 11:04:27 +03:00
Milan Hanajik 8fb27fc4f1 Petersburg-PT200 component updated (170718), ver. 2.14.618 2017-07-21 16:56:30 +03:00
Milan Hanajik 7332bc2a71 RRoute displayed in the status bar, ver. 2.14.617 2017-07-21 16:40:25 +03:00
Milan Hanajik ae0ebd15f7 (1) RegValveCalib array pre-initialized, (2) Test ID column supressed in ResultsArrangementDlg, (3) ValveEx fixed, ver. 2.14.616 2017-07-21 15:34:28 +03:00
Milan Hanajik b8ade55096 Changes for PETERSBURG_200, ver. 2.14.615 2017-07-21 11:08:16 +03:00
Milan Hanajik acc5b2fecd Communication with scales at the beginning (s/n, command I4) retreded 3 times. 2017-07-21 09:24:01 +03:00
Milan Hanajik e76c2afa08 Camera.Display.DisplayForm.CloseForm(sender, args) added, no conflict with other modeless forms, ver. 2.14.613 2017-07-20 20:05:44 +03:00
Milan Hanajik 8d249a96f4 Fixes in Buoyancy calculation, ver. 2.14.612 2017-07-20 19:54:33 +03:00
Milan Hanajik 229bec30cc Diverter ADC value updated in DiverterCfgCtrl (More button). 2017-07-20 14:49:16 +03:00
Milan Hanajik 5552a28925 ver. 2.14.609 2017-07-19 16:52:29 +03:00
Milan Hanajik 3bd5d0e7d3 MainSeq changes, BenchControlPanel 'disabled btn' color, Russian enum-descriptions, ver. 2.14.608 2017-07-19 16:39:34 +03:00
Milan Hanajik 218a14acca PETERBURG_xy -> PETERSBURG_xy 2017-07-19 16:39:01 +03:00
Milan Hanajik 1f978844c0 Draining can be stopped by drain buttons, not by STOP button. 2017-07-19 16:38:46 +03:00
Milan Hanajik ca80c1e49d BenchControlPanel supports Drain buttons highlighting (3 states). 2017-07-19 08:00:51 +02:00
Milan Hanajik 9bf66f651a Buoyancy is 1.00103, not 1001.03 2017-07-19 07:53:52 +02:00
Milan Hanajik a94ebc747a ver. 2.14.604 2017-07-18 10:00:31 +02:00
Milan Hanajik 77a6aff593 iPerl communication changes (completed as in branch 12 - Greece). 2017-07-18 08:43:16 +02:00
Milan Hanajik f58bc38450 ver. 2.14.603 2017-07-16 19:42:50 +02:00
Milan Hanajik bb962ad3b7 iPerl communication changes (in progress). 2017-07-14 17:13:07 +02:00
Milan Hanajik dbdbda77b3 Something 2017-07-14 17:13:01 +02:00
Milan Hanajik cafdffd647 (1) LU-logging changes, (2) Oracle DB changes for Greece - saving average results from multiple tests. 2017-07-14 16:31:05 +02:00
Milan Hanajik e076410d71 Style and minor changes. 2017-07-14 16:28:55 +02:00
Milan Hanajik 0862b265bd Procedure and Test 'Compare' in progress. 2017-07-14 16:28:18 +02:00
Milan Hanajik 803bea960d Bug fix in MettlerToledo.Standard.GetSerNumOp, ver. 2.14.602 2017-07-14 14:37:12 +02:00
Milan Hanajik 1a2c64db84 ver. 2.14.601 2017-07-12 16:38:35 +02:00
Milan Hanajik 179e673104 ver. 2.14.600 2017-07-06 14:17:53 +02:00
Milan Hanajik 3ba579e4a0 Modifications for BAHRAIN_50 2017-07-04 11:28:02 +02:00
Milan Hanajik 00a2289e92 Evaluation of Results.Entities.TestRslt.TestDone, Results.Entities.Batch.Buoyancy() etc. fixed, ver. 2.14.599 2017-07-04 11:19:05 +02:00
Milan Hanajik 34ad6f040d WMeterRsltItemSpec : Q_rise Q_fall fixed 2017-07-04 05:16:51 +02:00
Milan Hanajik 0c827d7167 Buoyancy WMeterRsltItemSpec fixed, evaluated also for a complete batch, ver. 2.14.598 2017-07-03 12:41:37 +02:00
Milan Hanajik 178af644d0 Camera detection improvement. 2017-07-03 12:40:20 +02:00
Milan Hanajik 2ea5454707 Output.FileWriters.Enhanced uses font properties, ver. 2.14.597 2017-06-30 16:42:30 +02:00
Milan Hanajik f5c5569482 Results config - new tab order, Output.Printer.Enhanced - font properties (UI) 2017-06-30 14:15:26 +02:00
Milan Hanajik a250556f9b Output.FileWriters.Xml does not use separate threads. 2017-06-30 12:43:00 +02:00
Milan Hanajik dac91b094e MainSeq modification : Purging End does not leave a measurement session, ver. 2.14.596 2017-06-30 12:04:55 +02:00
Milan Hanajik 1ef666be9e ver. 2.14.595 2017-06-29 23:10:35 +02:00
Milan Hanajik e71795bfe5 Masses, Buoyancy, Density corr. added to results, Buoyancy -> TestRslt, Dens.corr. -> Batch, MetrologyDlgDensityTab, etc. 2017-06-29 23:04:17 +02:00
Milan Hanajik 0d6a8b272a When saving a new or modified procedure there is a test of the Name uniqueness 2017-06-29 22:57:21 +02:00
Milan Hanajik 5d0b929593 Communication with scales is verified on program startup. 2017-06-29 22:57:16 +02:00
Milan Hanajik 94e5e906b1 Results.Entities.MeterTestRslt.IsPilotRslt() added to control output protocol generation. 2017-06-29 22:57:11 +02:00
Milan Hanajik 38b985c75f DataEntry.Combined.EntryForm fixed, all data entry forms simplified. 2017-06-29 11:37:18 +02:00
Milan Hanajik 49fa937074 MainSeq : CreateNewBatchResults( ) fixed for compound meters, extra checks added. Config.Data changed for BERLIN. 2017-06-29 09:21:22 +02:00
Milan Hanajik 85ead0b69e WMeterRsltItemSpec : iPerl FW Version added. 2017-06-27 14:05:17 +02:00
Milan Hanajik 22c8d6ed9d 'BatchNr' from MySQL DB used in offline mode (IsRealbench = false) 2017-06-27 11:29:52 +02:00
Milan Hanajik 7449456d55 Mettler-Toledo improvements, SerialPort.Encoding = ASCII, etc., ver. 2.14.589 2017-06-26 15:34:31 +02:00
Milan Hanajik 2fb1c44ff2 All scales support GetSerNumOp (however some return null). Reading S/N of all scales on program startup, ver. 2.14.588 2017-06-26 13:22:36 +02:00
Milan Hanajik 71e1cf47df Output.Printers.Enhanced.Printer uses a correct CultureInfo (Torino), etc., ver. 2.14.587 2017-06-23 13:40:44 +02:00
Milan Hanajik 13ddcac646 TestDone and TestPassed results items added, ver. 2.14.586 2017-06-23 12:37:10 +02:00
Milan Hanajik 3a3dc59275 Multiple file writers temporary bug fix, ver. 2.14.585 2017-06-23 10:53:01 +02:00
Milan Hanajik 76a841bc84 Output.PrintersEnhanced.EnhancedPrintDocument updated. 2017-06-23 10:52:02 +02:00
Milan Hanajik 628efe83ca Italian language fixes, ver. 2.14.584 2017-06-23 08:47:39 +02:00
Milan Hanajik 17f6f7c3be XmlSerializers created by XmlSerializer.FromType(new[] {typeof(...)})[0]; This prevents throwing an exception => better debugging. 2017-06-22 21:37:05 +02:00
Milan Hanajik 7ad8c986d7 Multi-threading bug fix in Output.FileWriters. 2017-06-22 21:36:46 +02:00
Milan Hanajik 470fc6fd07 Italian resources added. 2017-06-21 18:55:49 +02:00
Milan Hanajik b1f1c6f932 TestMethods.Adjustment forms have the control box in the upper-right corner hidden. 2017-06-21 18:29:36 +02:00
Milan Hanajik 902d596c63 RsltItems_Screen_xxx lists in ResultsTabPageCtrl initialized earlier (in the constructor), possible Torino50 bug fix). 2017-06-21 18:29:22 +02:00
Milan Hanajik cf5307d2e2 ver. 2.14.582 2017-06-21 16:04:16 +02:00
Milan Hanajik 9c663b34c7 PETERBURG_50 and KEMPNO_50 if / elif-s fixed (20 water meters instead of 6), ver. 2.14.581 2017-06-20 17:11:28 +02:00
Milan Hanajik 2ac97aa809 commonBackColor for ListView-s in ResultsTabPage, CompletedFromTests() method in Results.Entities.WaterMeter 2017-06-16 15:36:27 +02:00
Milan Hanajik ddebe7f8d5 iPerlCommunication/iPerlEnums.cs (enum Q2CorrType) added 2017-06-15 19:08:26 +02:00
Milan Hanajik 6773624cb4 MySQL DB changes for IPERL : FWVersion and FlowMean added, no conflict with FlowMin. 2017-06-15 18:59:05 +02:00
Milan Hanajik 1bf118bdb9 Generic improvements 2017-06-15 18:58:51 +02:00
Milan Hanajik c31c19ba02 Code update for STABLE_MASS_EXTRAS. 2017-06-13 09:05:53 +02:00
Milan Hanajik 05200c437e Kempno_50 component added, if/elif for KEMPNO_50 added, ver. 2.14.577 2017-06-13 08:49:06 +02:00
Milan Hanajik 750122e6ea Easytherm : temperature setpoint = 0 ... not communicated to the Easytherm (= no change) ... is the default value, ver. 2.14.576 2017-06-11 13:13:18 +02:00
Milan Hanajik 8d5c13f6d7 ITempMeter iface added to Modbus.Easytherm.Easytherm, SetReservoirTemp() added to IControlCom and used by Easytherm, Modbus uses queues, sends 1 telegram/s, ver. 2.14.575 2017-06-11 12:07:53 +02:00
Milan Hanajik 1dd399bdb9 Component upgraded : Zavretie VL11 a VL13 pri otvorenom upinaci, etc. 2017-06-11 12:02:16 +02:00
Milan Hanajik beba64242d DB bug fix. 2017-06-08 22:54:30 +02:00
Milan Hanajik 3be28f8a11 Performance improvement of automated renaming of paths and sequences. 2017-06-08 22:49:44 +02:00
Milan Hanajik d2b745dd8e Temperature Tup and Tdown can be checked in Adjustment, Endurance, FlyingStart, FlyingStartMassCollection and FixedStart methods, ver. 2.14.573 2017-06-08 16:55:24 +02:00
Milan Hanajik db55f5b3fd DB entities, mappings and UI added for 'Control water temp.', 'Temp. lim. lo' and 'Temp. lim. hi'. 2017-06-08 16:06:48 +02:00
Milan Hanajik 420c194f04 resources cleanup : Error_ removed, Control_water_temp_chdr, Temp_lim_lo_chdr, Temp_lim_hi_chdr added, etc. 2017-06-08 15:41:18 +02:00
Milan Hanajik 5cb3955903 Code cleanup : Config.Entities.TestResult, Config.Entities.MeterTestResult, ResultsPrinters.Zapiska.Printer, etc. removed. 2017-06-08 15:37:52 +02:00
Milan Hanajik 420d016ee8 Q_from and Q_to removed from three Procedure tabs. 2017-06-08 11:28:10 +02:00
Milan Hanajik f803d27882 More changes, bug fix in ResultsBrowser. 2017-06-08 10:40:52 +02:00
Milan Hanajik 21016a1500 iPerl and iPerlHead separated, iPerl removed (WaterMeter should be used instead). 2017-06-08 09:14:30 +02:00
Milan Hanajik 8a4ad1c2d4 (1) flow calculation for Start/Stop method fixed, (2) iPerl checks the new factor before writing 2017-06-07 16:22:18 +02:00
Milan Hanajik 62e562c245 DB changes : TestRslt table : TestDone, Remark, both FlowMean an FlowMin, ver. 2.14.572 2017-06-07 15:55:47 +02:00
Milan Hanajik d8c389541c Ambient values of a procedure fixed. Mean value calculated using tests times as weights. 2017-06-02 14:48:38 +02:00
Milan Hanajik f13529b339 It is not possible anymore to configure the same FileWriter or ResultsPrinter twice (Torino50 bug fix) 2017-06-01 12:40:03 +02:00
Milan Hanajik 8b195bd6a9 iPerl : signed/unsigned bug-fix : q2CorrRFlow, q2CorrLFlow 2017-06-01 12:39:59 +02:00
Milan Hanajik 082166fc78 Automated renaming of paths and transitions, part 5 (bug fix). 2017-05-30 13:26:44 +02:00
Milan Hanajik be6240bf28 Automated renaming of paths and transitions, parts 2,3,4. 2017-05-29 15:15:03 +02:00
Milan Hanajik c776cbcdf1 Previous results display fixed. 2017-05-25 17:04:13 +02:00
Milan Hanajik 294cc73e36 tstRslt.FlowMin evaluated, saved to Oracle DB only. 2017-05-25 14:06:05 +02:00
Milan Hanajik 3deb24f89a Automated renaming of paths and transition sequences, part 1. 2017-05-25 12:39:24 +02:00
Milan Hanajik 65124248cd Czech BenchControlPanel changes. 2017-05-25 10:39:39 +02:00
Milan Hanajik 750ec031d9 Results items : Tooltips added. 2017-05-24 14:58:35 +02:00
Milan Hanajik 91b750e1a0 On screen results use new style of configuration, part 2: ResultsConfigCtrl added. 2017-05-24 11:35:34 +02:00
Milan Hanajik b92d9f5a9c On screen results use new style of configuration. 2017-05-19 14:41:48 +02:00
Milan Hanajik bcaf1b4830 Old style ResultsPrinters.Basic removed. 2017-05-19 11:25:44 +02:00
Milan Hanajik 71613cba5d Q_ref_mean and many other result items added. 2017-05-19 11:25:24 +02:00
Milan Hanajik d2c21bcca4 Results, ResultsBrowser: iPerl specific results added, Passed item fixed for a water meter (it was correct only for a test). 2017-05-16 19:39:54 +02:00
Milan Hanajik d756af52d8 ver. 2.13.560 2017-05-16 13:22:41 +02:00
Milan Hanajik a6cc2cc325 PETERBURG_200 if/elif/endif-s fixed. 2017-05-16 13:14:44 +02:00
Milan Hanajik ee89de9621 Both components for Peterburg upgraded. 2017-05-16 13:08:45 +02:00
Milan Hanajik e21d9102a2 ComponentsManager: Creation of FlowMeters, TempMeters, PressureMeters, RegisterReaders and WaterMeters from a script file added. 2017-05-16 13:06:48 +02:00
Milan Hanajik c4d736b7cc Bug fix: Missing 'using' for ORACLE_DB 2017-05-16 10:01:08 +02:00
Milan Hanajik 5ed7049900 ComponentsManager : Creation of Valves, RegisterReaders and FixedStartRegisterReaders from a script file. 2017-05-15 14:03:07 +02:00
Milan Hanajik 6f6112a77c ver. 2.13.559 2017-05-12 15:06:54 +02:00
Milan Hanajik cb38a7fe5e ver. 2.13.558 2017-05-11 16:52:02 +02:00
Milan Hanajik 4c1daf55f2 SLM_PT150, PETERBURG_50, PETERBURG_200 symbols, components added, ver. 2.13.557 2017-05-11 16:41:03 +02:00
Milan Hanajik 6cace280c9 SequenceBase.LogProcessDataHeader() added. 2017-05-10 13:54:38 +02:00
Milan Hanajik 847a4d74d6 UpdateTempPressDensAmb(tstRslt) function added to SequenceBase, used by all sequences. 2017-05-10 10:43:33 +02:00
Milan Hanajik 53c3a51b47 German language, etc. 2017-05-10 09:50:16 +02:00
Milan Hanajik b557658760 PrecedureDlg : Protected check box is enabled only for a Metrologist. 2017-05-09 16:55:32 +02:00
Milan Hanajik 7d03fd4674 Procedure.Protected, Procedure.MustBeComplete Procedure.ManualCtrlDisabled, Batch.Dirty and string WaterMeter.Remark added.
ProcedureDlg implements them, ver. 2.13.555.
2017-05-05 22:25:52 +02:00
Milan Hanajik 01ad1993f1 More CoverTest, avoid interference with DataEntry forms, 'bypass' logging. 2017-05-05 22:25:45 +02:00
Milan Hanajik f0140e2bd1 TankDraining sequence conditions added (MettlerToledo scales). 2017-05-05 14:18:49 +02:00
Milan Hanajik ed83ae57c5 Progress bars are not displayed as 'completed' when a test was aborted. 2017-05-05 12:46:37 +02:00
Milan Hanajik e746d0179f BenchControlPanel modifications/layout changes. 2017-05-05 12:46:16 +02:00
Milan Hanajik 6ba2a663b4 More CoverTest (inversion, login dialog when bypasing, default values). 2017-05-05 12:45:25 +02:00
Milan Hanajik 95f14f9879 Bug fixes in: (1) Output.FileWriters, (2) MainSeq and TestProgressControls, more logging in CoverTest. 2017-05-04 22:13:33 +02:00
Milan Hanajik 2933bd24e7 CoverTest introduced. 2017-05-04 17:13:11 +02:00
Milan Hanajik 73eefe6649 Improvement: Prevents to click 'x' on YesNoForm and MessageBoxForm 2017-05-04 16:34:17 +02:00
Milan Hanajik 0f7ff301c4 Output.Printers.Enhanced component added. 2017-05-04 16:34:03 +02:00
Milan Hanajik 17c685148e (1) Flow selection in New Test Wizard extended, (2) MainSeq and BencControlPael modified, etc. 2017-05-03 22:24:25 +02:00
Milan Hanajik 54a6c1e402 ProcedureDlg ROI wizard fixed, creates Roi.ProcedureParams. 2017-05-01 16:03:47 +02:00
Milan Hanajik fa57c51786 ProcedureParams initialization/constructors modified. ProcedureParamsBase modified. 2017-05-01 16:03:45 +02:00
Milan Hanajik 8a9eba9e76 Bug when creating a new Config database fixed. 2017-05-01 11:16:23 +02:00
Milan Hanajik 59392d8bdc MakeSimulated fixed when there are multiple test repetitions, ver. 2.12.555 2017-05-01 10:28:43 +02:00
Milan Hanajik 45d35ec108 'X' button disabled on all DataEntry forms. 2017-04-28 13:04:09 +02:00
Milan Hanajik a773e42fca iPerl type checked after reading Calibration structure. 2017-04-28 12:59:02 +02:00
Milan Hanajik 80697ed65f ver. 2.12.550 2017-04-24 14:22:51 +02:00
Milan Hanajik 43fd99cea6 output.FileWriter.Enhanced copes with WaterMeters.Count==0, etc. 2017-04-24 12:21:12 +02:00
Milan Hanajik eafcf016f3 Setting regulation valves before flow setting disabled, caused porbles all the time, ver. 2.12 549 2017-04-24 11:58:57 +02:00
Milan Hanajik 5a89a5d43f ver. 2.12.548 2017-04-24 11:02:12 +02:00
Milan Hanajik 33715395dc ReadMassOp fixed, was freezing when draining tanks, ver. 2.12.547 2017-04-24 10:49:28 +02:00
Milan Hanajik 05982cc2ff Endurance test method sequence modified. 2017-04-24 09:44:11 +02:00
Milan Hanajik 6706b296c0 ver. 2.12.546 2017-04-24 08:29:51 +02:00
Milan Hanajik e4be90b7bc ver. 2.12.545 2017-04-20 15:59:35 +02:00
Milan Hanajik 9cc9e4b4c9 MainSeq change to Restore a previously saved batch results, ver. 2.12.544 2017-04-20 15:53:11 +02:00
Milan Hanajik 45869401ad BatchNr of restored session fixed, ver. 2.12.544 2017-04-20 11:00:41 +02:00
Milan Hanajik 5a88e8909f Culture parameter added to all Output.FileWriters components, ver. 2.12.543 2017-04-18 15:29:28 +02:00
Milan Hanajik a4dc7435d0 PreviousResultsCtrl modification: Reload/Restore button was hidden. 2017-04-14 11:51:37 +02:00
Milan Hanajik df1689d458 MainSeq changes, CopyContentFrom() added to WaterMeter, TestRslt, MeterTestRslt, ver. 2.12.542 2017-04-13 14:34:58 +02:00
Milan Hanajik 76a54f41a7 Results.DBase added. 2017-04-12 21:43:57 +02:00
Milan Hanajik 89593b1dac 'Custom'/'Oprav DEWY' button added to BenchControlPanel, MainSeq changes 2017-04-12 17:59:48 +02:00
Milan Hanajik dbd6b7a9f7 SeqBase bug fixes. 2017-04-12 17:37:55 +02:00
Milan Hanajik e49fcdebfc ver. 2.12.539 2017-04-11 17:37:04 +02:00
Milan Hanajik 1ccdcf9bd2 Possibility to reload previous results, MainSeq modified - CreateNewBatchResults() and RestoreBatchResults(), ver. 2.12.538 2017-04-11 17:31:48 +02:00
Milan Hanajik 60f5359bd9 Culture invariant procedure import/export, ver. 2.12.537 2017-04-11 12:54:37 +02:00
Milan Hanajik 71cc77bee1 Keithley.Multimeter_2010_RS232.Multimeter shut-down bug fix, ver. 2.12.536 2017-04-10 15:06:56 +02:00
Milan Hanajik 460b40c9cd ver. 2.12.535 2017-04-10 12:04:04 +02:00
Milan Hanajik c2e32c774e RoiDetecion wizard forms added to TestWizard, ver. 2.12.534 2017-04-10 11:53:41 +02:00
Milan Hanajik 796d9fa554 Camera.Display.DisplayForm modifications 2017-04-09 14:10:49 +02:00
Milan Hanajik 8a8c6c9997 Camera measurement speed optimized, ver. 2.12.533 2017-04-09 13:30:30 +02:00
Milan Hanajik 6e420250b4 Possibility to switch off Telnet VirtualTerminal completely, IVirtualTerminal, DummyVT. 2017-04-07 16:04:43 +02:00
Milan Hanajik 4564f0424c Camera ; UDP listener implemented (but disabled) again, ver. 2.12.532 2017-04-07 15:49:14 +02:00
Milan Hanajik 099d635d3e RoiParams, DetectionImagesCount, P1, P2 are procedure parameters, ver. 2.12.531 2017-04-07 12:22:01 +02:00
Milan Hanajik d372a38e7d Camera time read with each sample, calculation : VolumeStart, VolumeEnd, TimestampStart, TimestampEnd used, ver. 2.12.530 2017-04-07 11:29:35 +02:00
Milan Hanajik fc26b95bdb RoiCfg.SaveImages introduced, Program.ImagesDir introduced - directory cleaned or created on program startup. 2017-04-06 23:49:51 +02:00
Milan Hanajik 44735260ce CLP1611 Measurement done only on successfully detected ROI-s, ver. 2.12.530 2017-04-06 23:47:24 +02:00
Milan Hanajik 6aa3cd96a6 RoiDetection : Changes while testing, ver. 2.12.528 2017-04-06 18:00:33 +02:00
Milan Hanajik e1eb582804 RoiDetection : Images/cameras for retry of ROI Detection can be selected, ver. 2.12.527 2017-04-06 16:54:27 +02:00
Milan Hanajik 0ad4847972 Network.Camera.Display and ICameraDisplay added, ver. 2.12.526 2017-04-06 15:17:56 +02:00
Milan Hanajik 323f2ede25 RoiDetectionOp modified : File transfer correctly initiated. 2017-04-06 10:27:21 +02:00
Milan Hanajik a64c547395 Output.FileWriters.Xml modifications, ver. 2.12.525 2017-04-06 08:29:03 +02:00
Milan Hanajik 40f5079846 MeasurementOp.cs deleted, MeasurementOp in Network/Camera/CLP1611/Camera.cs 2017-04-05 22:22:41 +02:00
Milan Hanajik 464dfc6dd1 FlyingStartMassCollection : 'Next' button can be used to stop the test. 2017-04-05 22:01:21 +02:00
Milan Hanajik c1b3cdde6d Camera bug fix 2017-04-05 22:00:01 +02:00
Milan Hanajik e688c4ba25 Speisung -> Wasserzulauf 2017-04-05 20:32:39 +02:00
Milan Hanajik 592823aa10 Program shutdown cleaned-up : StopOperations(), StopDevice() called appropriately. 2017-04-05 19:45:21 +02:00
Milan Hanajik 5ad871a7e0 Procedure 'Export' / 'Import' implemented, ver. 2.12.524 2017-04-03 14:24:35 +02:00
Milan Hanajik 049bbc8655 DEWA Q2 correction modified, Results.Entities.WaterMeter columns added (iPerl only). 2017-03-31 14:17:18 +02:00
Milan Hanajik dcf6df293f Changes agreed with Mr. Kolesnik in BWB, ver. 2.12.521 2017-03-30 12:38:50 +02:00
Milan Hanajik 0dd2245fe6 Berlin component upgraded 2017-03-29 12:45:14 +02:00
Milan Hanajik cd750cca2f Bug in DataEntry.Standard6.CycleEndForm fixed (end states, Berlin), ver. 2.12.520 2017-03-29 11:54:07 +02:00
Milan Hanajik 5f2da63339 Drain valve removed from Output path, outPath.Scale.DrainValve used instead of outPath.DrainValve, wait for Event. BalanceDone before 2nd mass measurement in FlyingStartMassCollection, ver. 2.12.519 2017-03-29 09:22:39 +02:00
Milan Hanajik d420128b4b Draining modified, in BERLIN done always before flow setting, ver. 2.12.518 2017-03-28 23:54:52 +02:00
Milan Hanajik 2ca5eec8e1 MassMethod : bool -> enum 2017-03-28 21:46:38 +02:00
Milan Hanajik 214a570ca6 Drain valves are specified as component parameters, tank draining on startup fixed, WaitTankEmptyOp, basic TankDraining management, etc, ver. 2.12.517 2017-03-28 12:50:09 +02:00
Milan Hanajik 8fb021da4c Draining management under construction 2017-03-27 23:05:02 +02:00
Milan Hanajik 439d98f99d ReadStableMassOp uses MassRepeats, MassSpread and MassMethod parameters, ver. 2.12.515 2017-03-27 18:32:28 +02:00
Milan Hanajik 3c4fe34c1d Test_volume_exceeds_the_scale_capacity situation handled correctly, no Error state. 2017-03-27 14:08:53 +02:00
Milan Hanajik 641353585c ResultsBrowser : Crash when using statistics for the first time on a new PC fixed, ver. 2.12.514 2017-03-27 12:35:17 +02:00
Milan Hanajik de9a47c2a1 Watermeter supports old and new Q names, Break button visible in German versions. 2017-03-27 11:51:11 +02:00
Milan Hanajik e902dd7c07 Results screen : 'Previous resuts' button always visible, ver.2.12.514 2017-03-27 10:37:59 +02:00
Milan Hanajik ac7076ee0f ver. 2.12.513 2017-03-27 09:15:50 +02:00
Milan Hanajik b5f218b657 OptoTelegramRaw simplified, ver. 2.12.512 2017-03-25 17:31:54 +01:00
Milan Hanajik c468854a76 ver. 2.12.511 2017-03-24 15:38:26 +01:00
Milan Hanajik 1037a68d96 Saving to Oracle DB bug fix, Opto-data processing bug fix, ver. 2.12.510 2017-03-24 15:31:50 +01:00
Milan Hanajik 9e84d894a7 ver. 2.12.507 2017-03-23 08:52:24 +01:00
Milan Hanajik dbbe11cbbc ver. 2.12.506 2017-03-22 14:03:13 +01:00
Milan Hanajik 8d287351b7 Saving to Oracle DB uses a list of tests extracted from VT_PRUEFPUNKT_SOLL_SD, required for DEWA water meters, ver. 2.12.505 2017-03-22 13:59:21 +01:00
Milan Hanajik 724869948f Coping with overflows in OptoData fixed (volume, timestamp). 2017-03-20 22:05:43 +01:00
Milan Hanajik 0497693968 Bug fix in UI when copying ListViewEx cell data into cels in the column below by the right-click, ver. 2.12.503 2017-03-20 21:28:47 +01:00
Milan Hanajik de90477276 ver. 2.12.502 2017-03-20 17:48:44 +01:00
Milan Hanajik 8d4af6f347 Bug in iPerl IRegisterReader usage by FlyingStartMassCollectionSeq fixed, ver. 2.12.501 2017-03-20 17:44:28 +01:00
Milan Hanajik 64cb33cdfd ver. 2.12.500 2017-03-20 13:43:57 +01:00
Milan Hanajik 042488ba79 try-catch when copying remote users to the local database, ver. 2.12.499 2017-03-20 09:14:00 +01:00
Milan Hanajik cd50494141 TestMethods.iPerlCommunication.iPerlCommunicationForm.WriteQ2CorrectionAlt() added. 2017-03-19 22:03:31 +01:00
Milan Hanajik f12b2c38f7 Logging well tested, fixed no 'remote' user DB, way of authorization indicated, copy all remote users, etc., ver. 2.12.498 2017-03-19 18:53:07 +01:00
Milan Hanajik dbfc06960f Invalid components are displayed in ComponentsManagerDlg (up/down bug fixed), etc. 2017-03-18 16:46:03 +01:00
Milan Hanajik 861aae753e User Management cleanup, bool showLocalExtensions added, UserManagement use from TBF fixed. 2017-03-17 13:03:20 +01:00
Milan Hanajik ccf99a3105 User number added to EditSelectedUser form. 2017-03-17 09:45:39 +01:00
Milan Hanajik e245ec80c6 Many changes, Config depends on Users, not vice versa. 2017-03-16 21:53:12 +01:00
Milan Hanajik 7564ed7ba6 UserManagement.DatabaseSettingsDlg and LocalSettings added 2017-03-16 11:09:38 +01:00
Milan Hanajik 721bfdf5c8 Users.Forms.EditUsers --> Users.Forms.UserManagementDlg 2017-03-15 13:52:44 +01:00
Milan Hanajik f3d9fdca7f UserManagement project added 2017-03-15 13:31:33 +01:00
Milan Hanajik 2b78f46efe gitignore and clean.bat changed - UserManagement 2017-03-15 13:31:19 +01:00
Milan Hanajik 77555aeebf 'EditUsers', 'EditSelectedUser' and 'LoginDlg' moved to 'Users' library 2017-03-15 12:56:53 +01:00
Milan Hanajik 58d34023b7 'Repeat password' field added, entered passwords are verified. 2017-03-15 08:11:54 +01:00
Milan Hanajik 42ac833091 All Output.FileWriters.* : Writing to files done in separate threads. 2017-03-15 07:37:42 +01:00
Milan Hanajik 94eb2909bc Oracle database selection includes 'None', component Simulate mode not required anymore, ver. 2.12.497 2017-03-14 13:31:03 +01:00
Milan Hanajik c46dea3ae7 ver. 2.12.496 2017-03-14 09:46:43 +01:00
Milan Hanajik 3160bfd43c TaskSelector State initialization : digital inputs read 3s after start-up, SelectTankOp fixed, ver. 2.12.495 2017-03-10 21:15:25 +01:00
Milan Hanajik e1f54cc49f Gnesis component updated 2017-03-10 17:06:18 +01:00
Milan Hanajik 8b297ba8a6 TankSelector reads CB digital inputs, detemines initial state and detects NoTankSelected, ver. 2.12.493 2017-03-10 16:55:36 +01:00
Milan Hanajik dcca6d9215 'NoStartEnd' DataEntry components added, ready to test FixedStartStopMethod with pulses. 2017-03-10 14:59:29 +01:00
Milan Hanajik 0d2099af10 IRegisterReader includes BeginWMState and EndWMState (both double). DataEnty.WMStartState and WMEndState are also double. 2017-03-10 14:31:08 +01:00
Milan Hanajik ff4dcc39db Component updated - displays pump power in %, crash when closing opto-serial port avoided, etc., ver. 2.12.492 2017-03-10 13:47:23 +01:00
Milan Hanajik 87bc0131cf Tests when test volume exceeds the tank capacity cannot be executed, an error message appears. 2017-03-10 13:10:57 +01:00
Milan Hanajik 20fce538de More TankSelector modifications, ver. 2.12.491 2017-03-10 12:54:18 +01:00
Milan Hanajik d2bed417f1 Emergency stop invokes STOP button press in BenchControlPanel. 2017-03-10 09:50:20 +01:00
Milan Hanajik 8d572a650a (1) Easytherm: proc. params, (2) TankSelector: no. proc. params, seq. conditions added., SetQuidoBitOp, SelectTankOp, UnselectTankOp, ver. 2.12.490 2017-03-09 21:36:44 +01:00
Milan Hanajik efc3efcbfb Munich : 'Drucker' removed from ProcedureDlg ... Process parameters controls 2017-03-09 16:38:59 +01:00
Milan Hanajik 56f8d64fc8 AskYesNoForm, AskYesNoOp, MessageBoxForm and MessageBoxOp fixed, bug was introduced when measuring the string length. 2017-03-09 15:24:10 +01:00
Milan Hanajik e93a817d4d Balance crash on program shut-down avoided. 2017-03-09 15:03:42 +01:00
Milan Hanajik f9c8c22d5e Tank selector: (1) temperature controllers added, (2) procedure parameters added, ver. 2.12.489 2017-03-09 15:03:31 +01:00
Milan Hanajik e423562806 Genesis : Well separated iPerl and Oracle DB support, ver. 2.12.487 2017-03-09 13:12:32 +01:00
Milan Hanajik aa47ce24f4 Modbus Easytherm modifications, SetTemperature works OK, ver. 2.12.487 2017-03-09 07:54:51 +01:00
Milan Hanajik 3c51b92e5e Serious bug in saving/printing results for compound meters fixed, ver. 2.12.486 2017-03-08 10:35:08 +01:00
Milan Hanajik 697b0b3538 Munich : ResultsBrowser prints the bench name, ver. 2.12.485 2017-03-08 07:26:03 +01:00
Milan Hanajik 08b47776ec German only text when a camera was not detected on startup. 2017-03-08 06:52:18 +01:00
Milan Hanajik 0370d1f582 TestStartEndForm (and IHasWMStatesForm interface) added to DataEntry.Munich3 2017-03-07 19:01:49 +01:00
Milan Hanajik fa5b427d4d Simulated mode for FixedStartMassCollection method, Bug fix in DataEntry.Standard6.TestStartEndForm, ver. 2.12.485 2017-03-07 19:00:36 +01:00
Milan Hanajik 21102bb991 Compound meter result items added, ver. 2.12.484 2017-03-07 11:53:29 +01:00
Milan Hanajik b00b6e8412 Munich : Printer clean-up and fixes, ver. 2.12.483 2017-03-07 09:45:00 +01:00
Milan Hanajik 5b4a9c0129 Network.Camera.CLP1611 : IP address can be specified. 2017-03-06 13:21:10 +01:00
Milan Hanajik dc2b945230 Some progress on Easytherm communication. 2017-03-06 00:33:44 +01:00
Milan Hanajik 9ff58c9e0b ver. 2.12.482 2017-03-02 14:12:14 +01:00
Milan Hanajik df0a38e3c6 MettlerToledo.TankDraining, ITankDrainingCfg, ITankDraining class/interfaces added, EmptyValve --> DrainValve 2017-03-02 09:17:22 +01:00
Milan Hanajik 33b349e333 ComponentsManagerDlg : Up and down button implemented. 2017-02-28 22:39:56 +01:00
Milan Hanajik ab14866575 'AskYesNoForm' and 'MessageBoxForm' widths are calculated from the text width. 2017-02-28 13:50:17 +01:00
Milan Hanajik 0f6a3ffa80 Width of the form with "Test bench framework program is closing" is calculated from the text width. 2017-02-28 13:49:18 +01:00
Milan Hanajik fde4b8b16f Resources cleanup 2017-02-28 12:35:41 +01:00
Milan Hanajik c450eaf339 Logging into TBF program in case central users server is not running (and login fails) is fixed, ver. 2.12.481 2017-02-28 11:09:09 +01:00
Milan Hanajik 30819bbacd Output.FileWriters.Enhanced : Bug fix for Badger Meter, ver. 2.12.479 2017-02-22 20:39:22 +01:00
Milan Hanajik fce6e65218 ResultsBrowser released, ver. 2.12.478 2017-02-22 20:24:01 +01:00
Milan Hanajik 9550f97f8e Badger specific modification of Output.FileWriters.Enhanced, ver. 2.12.478 2017-02-22 19:25:41 +01:00
Milan Hanajik bb9c2b13e5 Badger : More logging in RegisterReader,ver. 2.12.477 2017-02-22 18:26:16 +01:00
Milan Hanajik aafcf77004 Output.FileWriters.Enhanced and Output.FileWriters.Xml fixed, ver. 2.12.476 2017-02-22 16:32:19 +01:00
Milan Hanajik 89c9e69a03 ToolTips temporarily disabled. 2017-02-22 14:49:23 +01:00
Milan Hanajik 6a072b7814 ResultsConfigDlg modifications : TabControl with three TreeViews, ver. 2.12.475 2017-02-22 14:07:20 +01:00
Milan Hanajik 4515f0fc13 FlyingStartMassCollectionSeq modified : Valves/pumps are closed immediately after the test only when there are no subsequent test repeats. 2017-02-21 10:45:26 +01:00
Milan Hanajik e7723c108d Bug fix : iPerl RFID comm. evaluation in case RegisterReaders are not complete fixed, ver. 2.12.475 2017-02-21 10:33:08 +01:00
Milan Hanajik 970fc886c6 FlyingStartMassCollectionSeq : If transitionAfter is not used, the valves/pumps are closed immediately after the test before the 2nd mass measurement, ver. 2.12.472 2017-02-17 10:51:30 +01:00
Milan Hanajik 7b093a5623 MettlerToledo..BalanceNewDev : Scale 'overload' does not update 'mass' and static 'Masses[balanceNr]' variables, ver. 2.12 471 2017-02-17 10:11:34 +01:00
Milan Hanajik 9a2e7ea72b Network.Camera.CLP1611.GrabImageOp added. 2017-02-17 08:50:19 +01:00
Milan Hanajik 8b188c9c75 LiveStreamOp : VLC start modified. 2017-02-16 21:38:01 +01:00
Milan Hanajik 4aed5c15a0 Network.Camera.CLP1611.LiveStreamOp added, ver. 2.12.470 2017-02-16 18:45:30 +01:00
Milan Hanajik 305d99d654 WinSCP image transfer integrated into Network.CLP1611.Camera and Roi detection. 2017-02-16 14:57:37 +01:00
Milan Hanajik 1029308b2c Network.Telnet and Network.CLP1611.Camera : Skip the first line in the VT terminal when logging on, ver. 2.12.468 2017-02-16 11:42:15 +01:00
Milan Hanajik 463e3fd0aa MettlerToledo.all and Ambient.Comet : Fixed bugs in serial port handling when closing the program, ver. 2.12.467 2017-02-16 09:55:49 +01:00
Milan Hanajik 3ee6e16592 Output.FileWriters.Xml component for BWB added. 2017-02-16 09:15:44 +01:00
Milan Hanajik 2b7ad1ef7d Output.FileWriters.Enhanced : (1) Old style ResultsConfigDlg removed, (2) Configuration change handling, ver. 2 12.466 2017-02-16 09:15:35 +01:00
Milan Hanajik 4c66ba4038 German 2017-02-16 09:15:24 +01:00
Milan Hanajik eb1ff6ddda ver. 2.12.465 2017-02-15 12:36:11 +01:00
Milan Hanajik ff837fc076 ver. 2.12.464 2017-02-15 12:14:33 +01:00
Milan Hanajik 5cbddcaaf4 Results.WMeterRsltItemSpec bug fix : Serialization in ToStrArray() and FromStrArray() was not language independent. 2017-02-15 11:48:47 +01:00
Milan Hanajik 24884de4e4 German translations I. 2017-02-15 10:58:43 +01:00
Milan Hanajik efc4668200 Only relevant units are displayed by ComboBox when using ResultsConfigDlg 2017-02-15 10:57:37 +01:00
Milan Hanajik a90ba0c546 Camera.CLP1611: (1) 'AutoDetect' feature works OK, (2) UI: TestImagesCount value not checked when UseTestImages=false, ver. 2.12.463 2017-02-14 16:49:59 +01:00
Milan Hanajik d039df5361 (1) iPerl RFID comm. evaluation in case RegisterReaders are not complete fixed
(2) Procedure copy UI bug fixed
(3) Genesis : A bug when using TankSelector via Modbus and closing the program fixed.
2017-02-14 15:52:44 +01:00
Milan Hanajik 8d4910fcb0 Symbols: introduced IPERL, ORACLE_DB, HEAT_METERS, TURA_IPERL, TURA_SPECIAL
abandoned IPERLST, IPERLSTSPECIAL, HEAT_METERS_SUPPORT
2017-02-14 13:42:22 +01:00
Milan Hanajik f30d785fb3 TankSelector.SelectTankOp added, TransitionStep: StepCondition EndCondition --> string EndCondition, etc. 2017-02-11 22:32:43 +01:00
Milan Hanajik efdd138379 DigitalInputs uint --> ulong 2017-02-11 10:12:10 +01:00
Milan Hanajik 115f83aeb0 ISequenceCondition interface added 2017-02-11 09:11:11 +01:00
Milan Hanajik b93eaadfc2 Compound meters : Process screens '24' and '48' modified as well, ver. 2.12.460 2017-02-10 18:29:07 +01:00
Milan Hanajik 1233f17dc4 Genesis : Process screen '6' for compound meters fixed, ver. 2.12.459 2017-02-10 18:12:22 +01:00
Milan Hanajik 2a2dbcca83 Genesis : Component upgraded, more logging in registerReader, ver. 2.12.458 2017-02-10 17:47:39 +01:00
Milan Hanajik e9070e5cc3 Modbus.Easytherm component added, QuidoRS.TankSelector --> TankSelector, ver. 2.12.457 2017-02-10 14:29:15 +01:00
Milan Hanajik 7319a9aee4 MassStart, MassEnd added to (old) results items, ver. 2.12.456 2017-02-10 10:20:07 +01:00
Milan Hanajik 93513100eb QuidoRS : Watchdog is optional, configurable, ver. 2 12.455 2017-02-09 20:59:00 +01:00
Milan Hanajik 46cc618300 TankSelector component added 2017-02-09 20:58:04 +01:00
Milan Hanajik 7ac1f2d431 Genesis specific changes, error messages fixed, smalled branch scale fixed, ver.2.12.455 2017-02-09 12:34:36 +01:00
Milan Hanajik d96f124bb3 IPAddress and TcpipPortNr added to WaterMeters.iPerl configuration and UI. 2017-02-06 18:34:32 +01:00
Milan Hanajik 3fd56531da (1) Genesis component upgraded, (2) FixedStartMassCollectionSeq : Opening start/stop valve in 2nd repetition fixed, ver. 2.12.453 2017-02-06 17:44:13 +01:00
Milan Hanajik 83fa635ee9 Polish resources dated 31.01.2017 imported into solution. 2017-02-06 17:25:17 +01:00
Milan Hanajik be8dededff Component for Warsaw upgraded, ver. 2.12.452 2017-01-31 00:44:08 +01:00
Milan Hanajik f318cfe6f0 Network.Camera bug fixes, Operations.ReturnGivenEventOp added, usefull for debuging, ver.2.12.451 2017-01-27 16:37:09 +01:00
Milan Hanajik 3f311d8603 Camera ROI modified for the use of 'periods', ver. 2.12.450 2017-01-27 14:34:17 +01:00
Milan Hanajik 3b13756db9 Measured data extracted from Telnet data, ver.2.12.449 2017-01-27 12:47:32 +01:00
Milan Hanajik 20b3840445 Komponent pre Berlin upgraded. 2017-01-27 09:57:54 +01:00
Milan Hanajik 2a4d95bd7b MersurementOp presunuta do Camera komponentu. 2017-01-27 09:56:58 +01:00
Milan Hanajik e8966f6705 Camera : Logging of incoming measurement datagrams, ver. 2.12.448 2017-01-26 16:18:09 +01:00
Milan Hanajik a20edf7890 Processing 'measurement' datagrams implemented. 2017-01-26 15:45:42 +01:00
Milan Hanajik f1d73421c8 Changes to make it possible to test with dummy components. 2017-01-25 17:59:26 +01:00
Milan Hanajik 97611369c4 Dummy.RegulValve and Dummy.FlowMeter components added. 2017-01-25 17:29:12 +01:00
Milan Hanajik 5ca265fef7 Berlin component upgraded 2017-01-25 17:29:11 +01:00
Milan Hanajik 38c199f6f9 Interfaces between Camera and Roi and sequences finalized, TODO: network communication, ver. 2.12.446
Sequences more robust for debugging, T and Pr-meters checked for null
2017-01-25 17:28:57 +01:00
Milan Hanajik 02ce6bf7c0 Russian resources added, ver. 2.12.443 2017-01-24 16:14:12 +01:00
Milan Hanajik fc3cef37d2 Bug fix : Berlin global defines 2017-01-24 15:47:38 +01:00
Milan Hanajik d9021ea140 Component version logged. 2017-01-24 15:19:11 +01:00
Milan Hanajik ebf03af9c1 Global defines clean-up 2017-01-24 15:06:45 +01:00
Milan Hanajik 044e53f2b2 Changes under construction : ROI registration to Cameras, ver. 2.12.441 2017-01-24 12:34:52 +01:00
Milan Hanajik 01ebd94073 Import of temperature coefficients fixed, ver. 2.12.440 2017-01-23 16:15:18 +01:00
Milan Hanajik e9c7430a48 BenchId conversion for WR9...WR16 in Results.Utils. 2017-01-23 15:38:15 +01:00
Milan Hanajik 2150ced11f Propagation of ROI parameters between ROI-s and Cameras implemented, ver. 2.12.438 2017-01-22 20:40:12 +01:00
Milan Hanajik ada96d3d83 Camera.CLP1611 and Camera.Roi : UseTestImages and TestImagesCount parameters added. 2017-01-22 19:38:16 +01:00
Milan Hanajik 5b4a797719 Bug fix in DeviceTest. 2017-01-22 19:37:02 +01:00
Milan Hanajik 18cf0b5de3 ROI help text modified/corrected. 2017-01-18 16:59:17 +01:00
Milan Hanajik cf876aabd2 Changes done in Munich : Roi CfgChangeHandler, new component, new Headpic, etc. 2017-01-17 16:49:47 +01:00
Milan Hanajik 2ced1417ed Hot bug fixes, ver. 2.12.436 2017-01-16 21:42:59 +01:00
Milan Hanajik 6d45b2c878 RoiDetectionSeq modified, ready to be tested. 2017-01-16 15:51:34 +01:00
Milan Hanajik f5d1014b89 MeasurementOp moved to camera 2017-01-16 14:21:18 +01:00
Milan Hanajik 13d00ee18e Telnet terminal window closing issue fixed, ver.2.12.435 2017-01-16 13:49:30 +01:00
Milan Hanajik c73cf7002f Camera.Roi.MeasurementOp added, UDP listener added, PulsesPerLtr (and ProcedureParams) added, etc. 2017-01-16 13:49:29 +01:00
Milan Hanajik 739759ddc3 Component/Device name displayed in case of an exception during components loading or devices initialization. 2017-01-16 13:49:28 +01:00
Milan Hanajik e34fc6a1f2 Cleanup : IdcCamera and RoI archaic code removed. 2017-01-14 21:09:57 +01:00
Milan Hanajik 6e9bfb61cc DeviceTest extended to 4 components (= parent + 3 components) 2017-01-14 21:09:56 +01:00
Milan Hanajik 5634931cc2 PreviousRoi parameter added to RoiCfg, masks prepared at the very last moment in RoiDetectionOp, Event.RoiDetectionPreviousFailed added. 2017-01-14 21:08:42 +01:00
Milan Hanajik a7c8b90e9f RoI --> Roi 2017-01-14 14:23:32 +01:00
Milan Hanajik 8e058cebbb RoI detection fixed : parses the command line response, returns Event.RoiDetectionPassed or Event.RoiDetectionFailed. 2017-01-13 19:12:28 +01:00
Milan Hanajik 08acc5778a RoI : RoiDetectionOp in progress 2017-01-13 18:36:12 +01:00
Milan Hanajik 2199679d28 DeviceTest extended to 3 components. 2017-01-13 18:35:08 +01:00
Milan Hanajik e730ee1541 Camera.HRLiveStreamOp operation added, RoiDetectionOp moved to RoI component, etc. 2017-01-13 15:27:17 +01:00
Milan Hanajik 7c1d0be9c9 Language resources exported 2017-01-11 12:45:38 +01:00
Milan Hanajik 5ba9352576 pw, ver. 2.12.434 2017-01-11 12:44:57 +01:00
Milan Hanajik 21ee6b7a65 Stop devices that were already started in case of an exception when starting devices --> avoid problems when closing the program. 2017-01-06 13:58:32 +01:00
Milan Hanajik dd85f03328 RoiDetectionOp added, etc. 2017-01-06 00:49:38 +01:00
Milan Hanajik 254afc3978 Network.Adapter, Network.Camera.CLP1611, Network.Camera.RoI Network.Tftp and Network.Telnet components added. Camera detection and live strean work OK. 2017-01-05 19:59:26 +01:00
Milan Hanajik ad51719d92 DeviceTest : logging added, bug fix in saving settings 2017-01-05 19:58:30 +01:00
Milan Hanajik e43e0a6850 Minor fixes, ver. 2.12.433 2016-12-29 12:29:37 +01:00
Milan Hanajik 535af59860 Number of 'Empty tank' buttons in BenchControlPanel 2 or 3 (automatically switched), ver. 2.12.432 2016-12-22 15:38:56 +01:00
Milan Hanajik 3f08036139 ver. 2.12.431 2016-12-22 12:02:11 +01:00
Milan Hanajik 7f31a84000 iPerlST (Special) : idBenutzer = 6 always when writing into Oracle DB, ver. 2.12.430 2016-12-22 08:24:31 +01:00
Milan Hanajik c672a49146 Genesis (UInt128) bug fix, ver. 2.12.429 2016-12-21 17:51:27 +01:00
Milan Hanajik e84f87fcda Bug fix in TBF.Forms.DatabaseSettingsDlg 2016-12-21 15:19:00 +01:00
Milan Hanajik 070f435a23 Login method selection is saved in local settings. 2016-12-21 14:54:38 +01:00
Milan Hanajik 2fcdfabd3c System login : Changes allowing usage of (1) short name, (2) full name, (3) user number. 2016-12-21 14:23:39 +01:00
Milan Hanajik 12053b4531 Login dialogs moved to TBF.Forms namesspace. 2016-12-21 08:06:42 +01:00
Milan Hanajik 1a0b2ee975 Generic bug fix : Procedure crashes when there is no test at all. 2016-12-21 07:56:37 +01:00
Milan Hanajik 13b80de703 Config.IUser interface added, etc. 2016-12-21 07:56:26 +01:00
Milan Hanajik 9bd409e672 Config.Entities.User.CurrentUser --> Config.Data.CurrentUser
Config.Entities.User.LastAuthorization --> Config.Data.lastAuthorization
2016-12-20 14:22:56 +01:00
Milan Hanajik 435e47707d ver. 2.12.426 2016-12-20 13:16:58 +01:00
Milan Hanajik 4da0717729 (1) Transition sequences can be debugged using NEXT, (2) Route using Uint128 fixed. 2016-12-20 13:13:17 +01:00
Milan Hanajik 98fe6223b4 One more change related to Users DB. 2016-12-20 10:16:08 +01:00
Milan Hanajik b4e84c36b8 Users DB added into DatabaseSettings and the related form. 2016-12-19 14:39:28 +01:00
Milan Hanajik bf92f677fe Separate Users DB added. 2016-12-19 13:58:57 +01:00
Milan Hanajik 62f26719ba iPerl bug fixes. 2016-12-19 13:52:00 +01:00
Milan Hanajik beff091699 Databases : Minor improvements, ver. 2.12.424 2016-12-19 13:01:25 +01:00
Milan Hanajik 72debd397f ver. 2.12.423 2016-12-19 10:59:48 +01:00
Milan Hanajik 89901c75f7 Revert "Elde.FlowMeterTwins bug-fix in calculation of ref. pulses and flow."
This reverts commit be52e2df96.
2016-12-16 13:07:54 +01:00
Milan Hanajik 8a73968f41 SLM-END : Component upgraded, ver. 2.12.421 2016-12-16 13:04:19 +01:00
Milan Hanajik eb2c3d00ce Berlin component added, defines for Berlin added, ver. 2.12.420 2016-12-14 11:09:23 +01:00
Milan Hanajik dd62310e59 ulong --> UInt128 in all 'route' related variables, ver. 2.12.419 2016-12-12 17:39:12 +01:00
Milan Hanajik a782d3960a .gitignore and clean.bat updated after Dirichlet.Numerics addition. 2016-12-12 16:43:05 +01:00
Milan Hanajik d5f91e9bab 'Route' type changes from uint to Dirichlet.Numerics.UInt128 2016-12-12 16:43:05 +01:00
Milan Hanajik be52e2df96 Elde.FlowMeterTwins bug-fix in calculation of ref. pulses and flow. 2016-12-12 16:43:04 +01:00
Milan Hanajik 72418d802c UInt128 type added - Dirichlet.Numerics project/namespace 2016-12-12 16:42:55 +01:00
Milan Hanajik 534361b540 Puchong-PT200 component updated (dated 07.11.2016) 2016-12-12 12:09:03 +01:00
Milan Hanajik 77782a8729 sensus a xylem brand logo in AboutDlg, ver. 2.12.417 2016-12-12 10:29:02 +01:00
Milan Hanajik 7dc42fb900 EnduranceDataLogging - initial version, ver. 2.12.416 2016-12-12 00:01:25 +01:00
Milan Hanajik da4b5a50a7 Import of temperature coefficients, ver. 2.12.415 2016-12-10 17:33:14 +01:00
Milan Hanajik c8c411aebc TestMethods.OuterLoop.Start/End UI changes, ver. 2.12.414 2016-12-10 16:27:51 +01:00
Milan Hanajik 8b4890560e Warsaw-END component updated, FW upgrade is required !!!, ver. 2.12.413 2016-12-10 15:12:47 +01:00
Milan Hanajik 216e08d57c Execute(...) arguments changed everywhere, repetitionNr usage depends on outerLoopMode, outerLoopCounter, ver. 2.12.412 2016-12-10 13:03:35 +01:00
Milan Hanajik f9888a2108 TestMethods.OuterLoop.Start and TestMethods.OuterLoop.End added. 2016-12-10 12:13:45 +01:00
Milan Hanajik f3b178473c Outer loop logic added, TODO: (1) Begin-block and End-block test methods, (2) support in test method sequences 2016-12-10 11:33:31 +01:00
Milan Hanajik 20c7b07cb9 Endurance : Switching test : Progress bar update and statistics added. 2016-12-10 11:33:30 +01:00
Milan Hanajik 5e4da449ad Endurance TestParams disabled. 2016-12-10 11:33:30 +01:00
Milan Hanajik c8d0c647b7 Endurance : uint[3] cBrd.WMeterCont added, ver. 2.12.411 2016-12-10 11:33:18 +01:00
Milan Hanajik e1eedb039c Warsaw-END, SLM-END : Number of water meters changed to 10, ver. 2.12.410 2016-12-09 19:44:20 +01:00
Milan Hanajik c30043d4fc Warsaw-END, Endurance : Component updated, CycleStepsCtrl UI fixed, ver. 2.12.408 2016-12-09 18:06:14 +01:00
Milan Hanajik 58a3340f53 Endurance : cBrd.CyclePar usage change, ver. 2.12.407 2016-12-09 16:37:25 +01:00
Milan Hanajik 1143fa79ae Dummy.Diverter component added 2016-12-09 12:20:35 +01:00
Milan Hanajik 56217a68ce Dummy.Valve component added 2016-12-09 12:20:23 +01:00
Milan Hanajik 6df36659ab Dummy.Balance component added 2016-12-09 12:13:59 +01:00
Milan Hanajik 6f599d55c5 Endurance : Bux fixes 2016-12-09 10:57:27 +01:00
Milan Hanajik b91888213b ExecuteCommandOp added (Endurance). 2016-12-08 14:36:51 +01:00
Milan Hanajik 10221d636c Endurance cycle UI: duration in 10ms steps, message disabled, Uint32 used, other minor changes. 2016-12-08 10:58:09 +01:00
Milan Hanajik 5c9adba751 Endurance cycle steps dialog added. 2016-12-07 20:57:32 +01:00
Milan Hanajik d2af4f224e ver. 2.12.404 2016-12-07 15:44:50 +01:00
Milan Hanajik 3a029432f8 Start- and End-volume for the fixed start method can be saved/printed in results. 2016-12-07 15:44:26 +01:00
Milan Hanajik 72a5385c57 TempMeter has 'Default temperature' parameter which specifies a value for simulated mode. 2016-12-05 23:22:33 +01:00
Milan Hanajik 1028866721 Initial version of a component for Genesis (the previous one was the one for Puchong). 2016-12-05 13:27:09 +01:00
Milan Hanajik 9bd37c2980 Components management : fix of UI behavior. 2016-12-05 13:25:24 +01:00
Milan Hanajik 00e0bc5ab7 Warsaw-END : (1) FMFreq[] array size changed to 4, (2) Component upgraded (component 161202-2), ver. 2.12.399 2016-12-02 15:01:44 +01:00
Milan Hanajik e69836b03c TBF : Type-safe structured queries used everywhere, ver. 2.12.397 2016-12-02 12:52:30 +01:00
Milan Hanajik ae8ba80f67 (1) Test wizard includes 'Heat meters' step only when HEAT_METERS_SUPPORT defined, (2) type-safe queries. 2016-12-02 11:04:33 +01:00
Milan Hanajik 1f3a2af043 (1) Component wrapper modified for endurance tests (uint CyclePar[]), (2) Warsaw-END line size. 2016-12-02 09:48:47 +01:00
Milan Hanajik 4917b0c0c4 TestMethods.Endurance test method added. 2016-12-02 09:10:17 +01:00
Milan Hanajik cec1816f82 Components can be deleted, component ItemNr-s are updated before saving to DB, ver. 2.12.396 2016-11-30 14:16:51 +01:00
Milan Hanajik 1bc3137d20 ver. 2.12.395 2016-11-28 14:13:09 +01:00
Milan Hanajik ed416e5237 Cevak : Changes in printing, PrintDocumentCevak.cs in Results.Output.Printers only. 2016-11-28 14:12:56 +01:00
Milan Hanajik 37d61658d4 ResultsBrowser : Print -> Drucken, ver. 2.12.393 2016-11-28 10:13:29 +01:00
Milan Hanajik 9d67343e2e Endurance components updated (SLM, Warsaw) 2016-11-28 09:49:27 +01:00
Milan Hanajik 7477a536da ResultsBrowser : Printing a table with statistics, ver. 2.12.392 2016-11-23 14:07:04 +01:00
Milan Hanajik 59c0f73dd2 ver. 2.12.292 2016-11-21 12:38:36 +01:00
Milan Hanajik 02c7ac37f5 Support for WARSAW_END added (define WARSAW_END; LANG_PL) 2016-11-21 11:17:00 +01:00
Milan Hanajik 5114f5f1eb ResultsBrowser : Printing statistics in progress. 2016-11-21 11:03:44 +01:00
Milan Hanajik 0a1966d7bd ResultsBrowser : (1) More safe StatisticsOptionsDlg, (2) ResultsConfigDlg initializes 'Caption', ver. 2.12.392 2016-11-19 00:41:56 +01:00
Milan Hanajik 9b457299ea (1) German : Mounting : 'S' --> 'STR', (2) bug fix in ResultsBrowser Statistics, ver. 2.12.391 2016-11-18 15:46:50 +01:00
Milan Hanajik 8b8c0c09df ResultsBrowser : Time range display function added, ver.2.12.390 2016-11-18 15:18:21 +01:00
Milan Hanajik eb5f3465c8 ResultsBrowser : Statistics : rows and columns are combinations of two items, ver. 2.12.390 2016-11-18 14:15:54 +01:00
Milan Hanajik 1487e7889b ResultsBrowser : (1) clean-up, (2) bug in statistics fixed, (3) captions used to select statistics, ver. 2.12.389 2016-11-18 11:56:22 +01:00
Milan Hanajik 2c0914baf8 PMaxTest, LeakTest : Minor modifications in pressure adjustment steps. 2016-11-18 11:03:44 +01:00
Milan Hanajik b75a8105de MunichPrintDocument : (1) Water pressure in bar, (2) Aux meter data bug fixed, ver. 2.12.388 2016-11-17 11:12:43 +01:00
Milan Hanajik 0a827e0eb6 German translations, LANG_DE introduced, ver. 2.12.387 2016-11-17 10:24:07 +01:00
Milan Hanajik 98a773700e Bug fix related to PressMtrDelta, ver. 2.12.386 2016-11-17 08:48:52 +01:00
Milan Hanajik 2189c2150e Munich3 entry form (single) with 'Disabled' check boxes, ver. 2.12.385 2016-11-17 06:51:15 +01:00
Milan Hanajik 92f77bf6d6 Some localization to German 2016-11-16 22:13:48 +01:00
Milan Hanajik a5799290c9 ResultsBrowser : Synchronized with branch 2.9, ver. 2.12.384 2016-11-16 15:57:23 +01:00
Milan Hanajik 16d471f12e Munich : Previous results form : 'Show' button localization, etc. 2016-11-16 15:28:02 +01:00
Milan Hanajik ec0eecde50 ver. 2.12.384 2016-11-16 13:21:15 +01:00
Milan Hanajik b649c282e8 iPerlST : Modification in writing calibration factors via RFID. 2016-11-10 14:09:02 +01:00
Milan Hanajik 3e6243a8b7 Puchong component upgraded, component date: 27.07.2016 2016-11-04 14:52:49 +01:00
Milan Hanajik 02b29d9553 LU Logging : KorrFehlerXy parameter correctly written to logs. 2016-11-02 13:46:50 +01:00
Milan Hanajik 04cec33bf6 iPerlCommunication : "Normalize calibration factor" activity added. 2016-11-02 13:34:04 +01:00
Milan Hanajik eee5e5dc8c Bug fixes in DataEntry.HeatMeters12 2016-10-29 20:35:48 +02:00
Milan Hanajik 09166ae73c Bug fix in DataEntry.HeatMeters6 2016-10-29 20:31:08 +02:00
Milan Hanajik 52d0c1907f DataEntry.HeatMeters6 and FixedStartMassCollectionSeq bug fixes, ver. 2.12.380 2016-10-28 18:45:43 +02:00
Milan Hanajik 5620ba61fa SensusOracle.Database : Minor changes in LU logging, Utils.DoubleToStr() modifications. 2016-10-27 14:54:37 +02:00
Milan Hanajik 63b5507f78 iPerlCommunication : 250ms delayafter writes, more logging, Opto-Data indication using pictureBoxes fixed. 2016-10-27 14:30:12 +02:00
Milan Hanajik 1ad8a69717 SLM-END component added, master branch modifications for SLM_END and WARSAW_END, ver. 2.12.378 2016-10-26 19:43:56 +02:00
Milan Hanajik 8be072ca52 ver. 2.11.375 2016-10-24 09:11:19 +02:00
Milan Hanajik cdea0e96b6 Malta WSD25 component upgraded, colors of valves changed. 2016-10-19 11:38:52 +02:00
Milan Hanajik bab677c5c2 PressMtrDelta added to BenchPath, PressDeltaXyz added to TestRslt, test methods modified, ver. 2.12.373 2016-10-18 19:14:01 +02:00
Milan Hanajik d1fb0e0f0a T warm/cold lo/hi renamed to T hi/lo min/max 2016-10-18 17:27:24 +02:00
Milan Hanajik 08d854f6f8 Modbus.PressureMeter.Meret implemented, ver. 2.11.372 2016-10-18 17:27:22 +02:00
Milan Hanajik 93e8328940 IModbus and Modbus modification : Supports receiving telegrams from multiple devices. 2016-10-18 17:27:08 +02:00
Milan Hanajik b608fb77b9 DeviceTest saves settings of both components, it's PERFECT !!! 2016-10-18 17:26:48 +02:00
Milan Hanajik 03c027ab33 LogProcessDataHeatMeters, ver. 2.11.371 2016-10-18 11:49:32 +02:00
Milan Hanajik 14de767c52 Modbus.Common.Modbus.SendMessage(byte deviceAddress, byte function, ...) function added. 2016-10-18 11:31:17 +02:00
Milan Hanajik 9e90d3a93f DeviceTest program functional, runs operation Modbus.PressureMeter.Meret.ReadPressureOp(...) 2016-10-18 11:30:02 +02:00
Milan Hanajik 97fbcbbf58 Malta WSD25 : Bug fix for reference flowmeter with idx = 8 (EtCalib[] array size increased to 9), ver. 2.11.370 2016-10-17 16:06:50 +02:00
Milan Hanajik 1b77c903f7 Component for Malta upgraded, ver. 2.11.369 2016-10-17 08:48:58 +02:00
Milan Hanajik 844a743c6b Device test works OK, initializes and runs 2 devices. 2016-10-16 22:43:55 +02:00
Milan Hanajik d4cbec50ba Reference temperatures (Hi and Lo) added to results. 2016-10-14 16:54:19 +02:00
Milan Hanajik 588d16caf9 ver. 2.11.368 2016-10-14 16:17:56 +02:00
Milan Hanajik fc3512a23a Config.Units and Results.WMeterRsltItemSpec changes under construction 2016-10-14 16:07:45 +02:00
Milan Hanajik f8f08fb8ce DeviceTest changes under construction. 2016-10-14 16:07:34 +02:00
Milan Hanajik 790364832d Transition sequences can be renamed and deleted. 2016-10-13 18:06:13 +02:00
Milan Hanajik 0fb3a74879 Feeding regulation valves functionality implemented, ver. 2.11.367 2016-10-13 16:08:29 +02:00
Milan Hanajik 45e0f50562 Elde.RegulValve supports 'ReTryCommands' parameter (default = false), ver. 2.11.365 2016-10-13 16:08:15 +02:00
Milan Hanajik caf43fedb3 IRegulValve change, regulation valves support Category, Category saved in settings, used in Feeding Paths UI, not used in tests yet, ver. 2.11.364 2016-10-12 15:47:45 +02:00
Milan Hanajik 1388f459fe Malta WSD25 : Component upgraded, ver. 2.10.363 2016-10-12 09:55:44 +02:00
Milan Hanajik dddfc4bed5 Bug-fixes in FlyingStart and FlyingStartMassCollection heat meters, T ref warm and T ref cold statistics, ver. 2.10.362 2016-10-12 01:23:38 +02:00
Milan Hanajik 2057cc6b73 Malta WSD25 component upgraded, MERET addresses array size changed to 12, ver. 2.10.361 2016-10-11 17:01:33 +02:00
Milan Hanajik 4e29e88b02 DeviceTest project added. 2016-10-11 16:57:53 +02:00
Milan Hanajik aff7961a4e Users 2016-10-11 16:18:11 +02:00
Milan Hanajik 76dbf4e216 Length of array for MERET addresses is 11. 2016-10-11 15:24:18 +02:00
Milan Hanajik 1fc129117f Output.FileWriters.Basic.HeatMeters 2016-10-11 14:55:16 +02:00
Milan Hanajik f866f5fb2c Output.FileWriters.Enhanced.HeatMeters 2016-10-11 14:27:28 +02:00
Milan Hanajik 38d6016aec DataEntry.HeatMeters6 component added. 2016-10-11 13:05:40 +02:00
Milan Hanajik b3a2c3a0fc FlyingStart, FlyingStartMassCollection and CombinedWithDetection methods support Simulation mode, ver. 2.10.360 2016-10-11 12:53:17 +02:00
Milan Hanajik c84fd8089a FlyingStart and FlyingStartMassCollection methods: 'Begin cycle' dialog closed before 'Heat meters prompt message' is displayed. 2016-10-11 09:10:33 +02:00
Milan Hanajik 2e4c59d3b5 Keithley Multimeter supports simulation mode. 2016-10-11 09:09:04 +02:00
Milan Hanajik 5f21b5ab26 ErrorLimitHi, ErrorLimitLo, EvaluateVolume test parameters added to all heat meters methods. 2016-10-10 14:35:59 +02:00
Milan Hanajik f8331c1c1c Heat meters : Prompt message does not stop the sequence, disappears when conditions met, ver. 2.10.359 2016-10-10 14:23:20 +02:00
Milan Hanajik 3c15dbab9e Bug fixes in heat meter testing using pulses, Flying start and Flying start mass collection methods, ver. 2.10.358 2016-10-10 11:35:45 +02:00
Milan Hanajik d5eb20854f Displaying heat meter test results on screen fixed, ver. 2.10.357 2016-10-07 18:19:17 +02:00
Milan Hanajik 438028506e Flows are internally stored and processed in double variables (except of Qfrom, Qto, flowmeter nominal flow) 2016-10-07 16:22:36 +02:00
Milan Hanajik 010afcd1e4 Temperatures are internally stored and processed in double variables (except of ambient temp.). 2016-10-07 15:41:27 +02:00
Milan Hanajik 7df9333fba Statistics return doubles instead of float, casting is done just when writing to entities. 2016-10-07 14:46:14 +02:00
Milan Hanajik 4160420844 Masses are stored in double variables everywhere. 2016-10-07 14:06:54 +02:00
Milan Hanajik 9f2e8407a0 Modbus.PressureMeter.Meter component added, ver. 2.10.357 2016-10-07 11:59:13 +02:00
Milan Hanajik 45c64ae44b Modbus does not use an extra worker thread. 2016-10-07 11:55:44 +02:00
Milan Hanajik e8748bab70 (1) QuidoRS dead code clean-up, (2) Elde.PressureMeter units conversion clean-up. 2016-10-07 11:55:03 +02:00
Milan Hanajik c30f905893 SLM50 : Bugfix in energy calculation in FlyingStart and FlyingStartMassCollection methods, ver. 2.10.356 2016-10-07 10:09:38 +02:00
Milan Hanajik 8932c232e2 Malta : Another minor change, ver. 2.10.355 2016-10-06 14:26:08 +02:00
Milan Hanajik 295e96098c Malta : Minor changes, extended range of Id-s for flow meters and pressure meters, ver.2.10.354 2016-10-06 14:02:16 +02:00
Milan Hanajik dff3a1aff7 Changes in 'master' for Malta-WSD25, ver. 2.10.353 2016-10-06 11:54:38 +02:00
Milan Hanajik c497c02ef9 Heat meters support for measurement with pulses, change in ResultsDB.MeterTestRslt, ver. 2.10.352 2016-10-06 10:11:13 +02:00
Milan Hanajik f51360c23d Upgraded to NHibernate 4.0.4, IesiCollections 4.0.0, FluentNHibernate 2.0.3, MySQL.Data, all are using.Net 4.0 now, ver. 2.10.351 2016-10-05 11:23:06 +02:00
Milan Hanajik 2286877fad Test method names cleaned up. 2016-09-26 11:08:16 +02:00
Milan Hanajik a1810baffa ver. 2.10.350 2016-09-23 15:51:12 +02:00
Milan Hanajik 6bb45ccc25 Support for GENESIS added, ver. 2.10.349 2016-09-22 08:50:22 +02:00
Milan Hanajik 5f7c0c82e7 Bug fix: summaryResults, allResults: ambient pressure in mbar, water pressure in kPa. 2016-09-14 13:05:26 +02:00
Milan Hanajik 1d964e5fcc Czech resources added to ResultsBrowser. 2016-09-08 08:33:44 +02:00
Milan Hanajik 85ca2420bd Bugs in printers caused by a change of ambient pressure representation fixed. 2016-09-07 18:29:25 +02:00
Milan Hanajik c835fe5551 Keithley.TempMeter resistance 0 < R < 2000 Ohm 2016-08-26 11:36:42 +02:00
Milan Hanajik 9563dbdb6f Using ITS-27 coefficients possible as well. 2016-08-25 17:36:27 +02:00
Milan Hanajik 3666752414 Some Keithley.TempMeter parameters (ITS-90, certificate) are accessible through Bench -> Metrology dialog. 2016-08-25 15:54:21 +02:00
Milan Hanajik c842c50361 Heat meters evaluation added to FlyingStartMassCollectionSeq and FlyingStartSeq, ver. 2.10.345 2016-08-24 18:30:00 +02:00
Milan Hanajik 49c6ebf9c7 FileWriter or Printer crash handled, different writers/printers do not interfere with each other and results are always saved to DB. 2016-08-24 15:46:43 +02:00
Milan Hanajik 5824564e25 TestBenchSim modification. 2016-08-24 15:46:41 +02:00
Milan Hanajik e484697f60 Heat meters reference temperature measurement during Data entry form before the test starts. 2016-08-24 15:46:39 +02:00
Milan Hanajik 9d53d7aaa8 Bug fix in Keitheley.TempMeter TempMeterCfgCtrl, minor change in Keithley.Multimeter_2010_RS232. 2016-08-24 15:46:37 +02:00
Milan Hanajik 1feb3215e5 Keithley.TempMeter uses ITS90 forms for Platinum resistance thermometer, ver. 2.10.344 2016-08-24 10:49:52 +02:00
Milan Hanajik 581819de9f DataEntry.HeatMeters12 checks the entered data using 2x error limits. 2016-08-24 10:49:50 +02:00
Milan Hanajik 8cc0f3ceb4 Bug fix : STOP button not functional when emptying the tank, checking the weight. 2016-08-24 10:49:49 +02:00
Milan Hanajik 456687478d Parse .. Double functions added to Utils. 2016-08-24 10:49:47 +02:00
Milan Hanajik 618f0b1bca Modification of sequences to use ProcessData.TempRefWarm(Cold)1(2) and ReadTempOp operations, ver. 2.10.343 2016-08-23 15:21:33 +02:00
Milan Hanajik 700b9b3122 Keithley modifications. 2016-08-23 15:21:17 +02:00
Milan Hanajik fc0bdda553 DataEntry.HeatMeters12 keeps the 'Units' selection while the software is running, restores default on start-up, ver. 2.01.342 2016-08-22 16:14:40 +02:00
Milan Hanajik 1dbe9890f3 Units of energy MJ and MWh added. 2016-08-22 16:01:34 +02:00
Milan Hanajik 0f7790e538 Prompt message box at the beginning of each heat meters test. 2016-08-22 16:00:48 +02:00
Milan Hanajik 9c0430a0d8 Adjustment component class name changed to TestMethods.Adjustment.Single 2016-08-22 15:59:37 +02:00
Milan Hanajik df7631eb3a Units of energy can be selected in DataEntry.HeatMeters12.TestStartEndForm. 2016-08-22 13:55:28 +02:00
Milan Hanajik 4ce613a82d Bug fix: Settings of Output.FileWriters.Enhanced after upgrade wizard. 2016-08-22 10:55:48 +02:00
Milan Hanajik d8bb450a2e VolumeForEnergy calculated in [l], ver. 2.10.341 2016-08-22 09:58:27 +02:00
Milan Hanajik 774d47a86f More changes and fixes for heat measurement. 2016-08-21 22:07:20 +02:00
Milan Hanajik e3318179c1 More changes for heat meters testing, DataEntry form completed. 2016-08-19 17:19:09 +02:00
Milan Hanajik 74738ff78c Heat meters results items. 2016-08-19 15:48:54 +02:00
Milan Hanajik 53ead401d0 FixedStartMassCollection : Changes for heat metetrs 2016-08-19 15:37:16 +02:00
Milan Hanajik 0426d2510a Energy and RefEnergy added to ResultsDB, First/Last/Min/Max of all three ambient values added to TestRslt, ver. 2.10.340 2016-08-19 15:37:00 +02:00
Milan Hanajik ef5bbe737c Sequences.FloatStatistics -> Sequences.Statistics: use double internally, provide double Sum property. 2016-08-19 14:33:32 +02:00
Milan Hanajik 50194001d9 There is only one ListViewEx in Results.Forms now. 2016-08-19 11:50:19 +02:00
Milan Hanajik f696d20060 It is possible to run the 2nd instance of TBF program in off-line mode, ver. 2.9.339 2016-08-19 10:16:47 +02:00
Milan Hanajik 83ddb7c8bf Waiting loop for temperature stability check in heat meters tests. 2016-08-17 18:11:34 +02:00
Milan Hanajik 7d8c23d014 DataEntry.HeatMeters12 data entry form component added. 2016-08-17 18:10:48 +02:00
Milan Hanajik 011219d491 Heat meters test parameters updated. 2016-08-17 16:32:07 +02:00
Milan Hanajik d4b20876b2 All FixedStart, FlyingStart and FlyingStartMassCollection methods reorganised, common sequences used, ver. 2.9.337 2016-08-17 15:38:09 +02:00
Milan Hanajik 785aae3b73 HeatMetersPath modifications, DB change. 2016-08-17 10:32:03 +02:00
Milan Hanajik 91cb245f84 ResultsBrowser : ../Cfg directory used for configuration instead of AppData/Local/..., ver. 2.9.336 2016-08-17 09:44:50 +02:00
Milan Hanajik 0859dd28d5 PMAxTest, LeakTest, pressure in bar internally, ver. 2.9.335 2016-08-16 08:32:55 +02:00
Milan Hanajik df91e435bb Upgrade for internal pressure interpretation change, ver. 2.9.334 2016-08-15 17:31:37 +02:00
Milan Hanajik 15f96e86ac iPerlST : Workaround for Q3 with multiple parts, ver. 2.9.333 2016-08-15 13:44:18 +02:00
Milan Hanajik a49912bdb1 Mouse right-click handler for ListViewEx implemented, copying the content to all cells below implemented in Paths, Transitions, Metrology corrections, process and test parameters. 2016-08-15 13:35:00 +02:00
Milan Hanajik f7a7987831 Configs.NameOnly.TestMethodCfg[Ctrl] introduced and reused by Adjustment, FixedStartAdvanced, ...
... FixedStartCombinedMeters, FixedStartMassCollection, FlyingStart, FlyingStartMassCollection, ReferenceFlowMeterCalibration.
2016-08-15 10:14:14 +02:00
Milan Hanajik 8dae45e10e IComponentCfg and IComponentFactory interfaces and all derived classes modified. 2016-08-05 14:32:36 +02:00
Milan Hanajik 4d616939ad TestWizard.HeatMetersSelection added. 2016-08-04 16:47:21 +02:00
Milan Hanajik e5ad1ac93b HeatMeters test method, ver.2.9.333 2016-08-04 15:46:17 +02:00
Milan Hanajik faffa8a270 Heat meters path modified, ver. 2.9.332 2016-08-04 14:01:54 +02:00
Milan Hanajik 4a2342c015 ver. 2.9.331 2016-08-03 10:31:31 +02:00
Milan Hanajik 283a9ebaa1 Upgrade menu item and UpgradeSelectionDlg added. 2016-08-03 09:59:55 +02:00
Milan Hanajik a07aa13358 Oracle DB change : VT_PRUEFDURCHFLUSS_PD, ver. 2.9.330 2016-08-02 23:08:16 +02:00
Milan Hanajik b3ceb6f300 Style change 2016-08-02 23:06:53 +02:00
Milan Hanajik 111e3d8647 Minimum and maximum (reference) flow during a test calculated and saved to Results.Entities.TestRslt. 2016-08-02 14:48:18 +02:00
Milan Hanajik 606c74f3dc All pressures are stored in bar instead of mbar. Units are not localized, (concatenated in localized texts). 2016-08-02 14:46:30 +02:00
Milan Hanajik c88ac1fcab Pressure up and Pressure down stored in mbar, not in kPa. Display in process data screens fixed. 2016-08-02 10:47:51 +02:00
Milan Hanajik b9ea2087de 'open' valves in paths and sequences are displayed with 'LightGray' background for easy reading, ver. 2.9.330 2016-08-01 17:41:43 +02:00
Milan Hanajik dcadd29791 Label printer modification for Israel PT200. 2016-08-01 15:41:46 +02:00
Milan Hanajik 69f7e62e4e Generic results items improvement: enum values used to create result items to guarantee uniqueness. 2016-08-01 15:41:07 +02:00
Milan Hanajik 63abe74aed Upgrade wizard for Output.FileWriters.Enhanced components. Test items from local settings are used. 2016-08-01 13:46:21 +02:00
Milan Hanajik 68c6111377 Larger component configuration controls and ComponentParametersDlg, ver. 2.9.329 2016-08-01 11:22:59 +02:00
Milan Hanajik 32a8b95c32 Multiple running instances of TBF program tested. 2016-07-19 10:13:57 +02:00
Milan Hanajik 687bc3ed0c New user has number 6 for IPERLST as well as for IPERLST_SPECIAL. 2016-07-12 22:42:29 +02:00
Milan Hanajik c71626adaf SLM-50 component updated. 2016-07-11 19:28:22 +02:00
Milan Hanajik c0c46a1181 ver. 2.9.328 2016-07-11 13:10:25 +02:00
Milan Hanajik f0bd10bb12 ver. 2.9.327 2016-07-11 12:57:36 +02:00
Milan Hanajik 92787ccd4f 'Break' in BenchControlPanel is visible by default (invisible in German). 2016-07-11 12:55:04 +02:00
Milan Hanajik 4794e73994 Qfrom, Qto removed from MetersPath, ver. 2.9.326 2016-07-11 10:20:50 +02:00
Milan Hanajik fd69bc6376 Heat coefficient for water implemented in Formulas class, ver. 2.9.323 2016-07-08 16:10:04 +02:00
Milan Hanajik d8e8156cc9 Heat meter sensors UI bug fix. 2016-07-08 09:29:20 +02:00
Milan Hanajik fa2896d755 Enthalpy calculation (1st ver.), heat meters path modifications (incl. UI) 2016-07-07 16:02:57 +02:00
Milan Hanajik a7571a6bb7 All temperature meters implement ReadTemp() function. 2016-07-07 11:08:01 +02:00
Milan Hanajik 19dc994616 Heat meters path checked when a test with heat meters is started. 2016-07-07 09:52:54 +02:00
Milan Hanajik a1a0e319ce iPerlSpecial component 2016-07-06 16:01:31 +02:00
Milan Hanajik 0ac1fe2b4e HeatMetersPath, UI, etc., HEAT_METERS_SUPPORT symbol introduced
ProcedureDlg modifications: (1) localization by TBF.Resources.Strings, (2) Heat meters support
FlyingStartMassCollection and CombinedMeters methods with similar sequences
2016-07-06 15:59:28 +02:00
Milan Hanajik 7cbbb2270b Heat meters, ver. 2.9.322 2016-07-01 09:44:03 +02:00
Milan Hanajik ac1bdbe476 Bug fix: Updating water meter results in case of a test with parts, copes also with single meters/multiple lines. 2016-06-30 14:03:51 +02:00
Milan Hanajik 799fda63e9 Bug fix : Updating water meters results in case of test with 'parts'. 2016-06-30 12:55:35 +02:00
Milan Hanajik 9d56836c80 Procedure number displayed in ProceduresDlg (the list of procedures).
Deleting a procedure modified, confirmed by a question, change applied to the DB immediately,
Localization to DE, CS, ...  pressure test and leak test, etc.
2016-06-28 15:09:32 +02:00
Milan Hanajik 91dff782a3 Puchong PT200: NOK --> NG in all protocols, ver. 2.8.315 2016-06-27 16:47:23 +02:00
Milan Hanajik 8a3a0ca6ef (1) iPerlCommunicationForm displays green/red rectangle as opto-data indication, (2) ProcedureDlg displays date and time of changes, ver. 2.8.314 2016-06-27 15:45:35 +02:00
Milan Hanajik d393a519f3 statusP displayed in the status bar. 2016-06-27 13:31:21 +02:00
Milan Hanajik 4dcd018642 Keithley.RS232 and Keithley.TempMeter components added, ver. 2.8.313 2016-06-23 18:07:53 +02:00
Milan Hanajik accd439be8 ver. 2.8.312 2016-06-23 15:19:11 +02:00
Milan Hanajik 799c7b6fdb DataEntry.Standard12.CycleBeginningForm shows WM result only at the end, not at the beginning, ver.2.8.311 2016-06-23 13:01:47 +02:00
Milan Hanajik 550be3f8a3 Zmeny do mastera pre SLM-50 2016-06-23 09:47:02 +02:00
Milan Hanajik 264e5d9cd0 Displaying previous results: Window size saved and restored correctly, ver. 2.8.310 2016-06-22 16:35:38 +02:00
Milan Hanajik 448dbcdf2f Max 8 characters for an iPerl purchase order, ver.2.8.309 2016-06-22 12:29:30 +02:00
Milan Hanajik 284673c200 DataEntry.Standard12 changes - Sensus extensions, ver.2.7.308 2016-06-20 15:31:22 +02:00
Milan Hanajik 887fde3620 Auto S/N button added to DataEntry.Standard12.CycleBeginningForm. 2016-06-20 11:30:40 +02:00
Milan Hanajik b909c82b28 DataEntry.Standard12 modified, Results.Entities modified (WaterMeter.ResultCode, Batch.Remark), DB changed, ver.2.8.308 2016-06-20 09:58:26 +02:00
Milan Hanajik 0c3ed1e1bf TBF.BenchControl.DataEntry.Standard12 extensions - start of changes 2016-06-17 13:37:42 +02:00
Milan Hanajik 4b8f9e031e (1) ResultConfigDlg does not close on Enter, (2) wider 'purchase order' field in PreviousresultsCtrl, ver.2.7.307 2016-06-16 17:28:31 +02:00
Milan Hanajik 1337fff2dc Fixed: (1) STOP button does not function in FlyingStart and FlyingStartMassCollection methods, (2) Results.Entities.WaterMeterData.Equals(.) 2016-06-15 17:04:25 +02:00
Milan Hanajik e6d38040e0 Previous results display after changing the window size uses a timer, ver.2.7.306 2016-06-13 11:08:32 +02:00
Milan Hanajik cbf6b286db ResultsScreen restored t ooriginal state without BatchResultsCtrl use. 2016-06-10 18:23:22 +02:00
Milan Hanajik 6fe2e01026 Pop-up dialog with previous results tested - fixed - is OK. 2016-06-10 18:21:06 +02:00
Milan Hanajik 147fb6fb30 Possibility to display previous results ('Show' button), ver.2.7.305 2016-06-10 16:30:29 +02:00
Milan Hanajik d439d94645 DataEntry.StandardXX : EnterSerialNrsAtTheEnd and SensusExtensions supported in all StandardXX, ver.2.7.303 2016-06-10 13:03:00 +02:00
Milan Hanajik 2c0e8c90ed TBF Refactoring: DataEntry.Standard --> DataEntry.Standard6 2016-06-10 12:08:08 +02:00
Milan Hanajik 08945212c7 iPerlST : OracleDB : WM flow bug fix. 2016-06-06 16:01:31 +02:00
Milan Hanajik 8a91d60c46 ResultsBrowser: Results displayed in the window can be configured, items and column widths are saved together with filters., ver.2.7.303 2016-06-06 15:33:22 +02:00
Milan Hanajik 5e78d54cea enum Publish descriptions in three languages, ver.2.7.303 2016-06-06 11:23:07 +02:00
Milan Hanajik 175d5b8d7f ResultBrowser: Result items in statistics localized (! units), ver.2.7.302 2016-06-05 21:11:36 +02:00
Milan Hanajik e5e6083c49 DE fixed, ver.2.7.301 2016-06-03 15:33:51 +02:00
Milan Hanajik 0a44598fb7 ResultBrowser: ListView behavior fixed, ver.2.7.300 2016-06-03 15:20:03 +02:00
Milan Hanajik acd614a20d Munich: Unused buttons are hidden 2016-06-03 14:35:47 +02:00
Milan Hanajik b36a965678 German language (Publish, Evaluate, Always, Never, OnScreen, Internal), ver.2.7.301 2016-06-03 14:30:44 +02:00
Milan Hanajik 59fc7e30d8 ResultsBrowser: Statistics implemented (NOK yet), user options saved in LocalSettings. 2016-06-03 14:03:12 +02:00
Milan Hanajik 52f600cb94 ResultsBrowser: Protocol and Qn filter added. 2016-06-03 10:34:41 +02:00
Milan Hanajik 0bcfb489af ResultsBrowser: MunichPrinter, Resources, Language, etc. 2016-06-03 10:06:13 +02:00
Milan Hanajik 18234bb713 ResultsBrowser: Query implemented. 2016-06-03 00:19:23 +02:00
Milan Hanajik ebffe9b1cb ResultsBrowser: Serialization works fine. 2016-06-02 23:10:13 +02:00
Milan Hanajik b0137f9384 Munich: resources, SatusP and Route in MainWnd, cleanup, etc., ver.2.7.300 2016-06-02 15:17:43 +02:00
Milan Hanajik 8bb227393e Fixes in resources. 2016-06-02 13:42:56 +02:00
Milan Hanajik cd671f9e77 Munich: Possibility to print the protocol again, ver.2.7.299 2016-06-02 12:56:18 +02:00
Milan Hanajik f65fefe1ff Dr ob., Dr un. --> Dr ein, Dr aus 2016-06-02 11:32:30 +02:00
Milan Hanajik cfcce08047 Munich: AsYesNoForm wider to accomodate German text, ver.2.7.298 2016-06-02 10:10:25 +02:00
Milan Hanajik aa6c12e388 ResultsBrowser: ResultsBrowserWnd and Filters folder/controls added. 2016-06-02 10:04:22 +02:00
Milan Hanajik b34b031fcf Bug fix: SetFlowOp for coaxial regulation valve. 2016-05-31 11:32:02 +02:00
Milan Hanajik 19dff40664 Logging change 2016-05-31 11:07:11 +02:00
Milan Hanajik 2935bc2c77 Many localisation improvements, ver.2.7.297 2016-05-29 23:17:48 +02:00
Milan Hanajik 1a4d20b6e2 Localization of Results.ItemSpec (+German). 2016-05-28 13:40:27 +02:00
Milan Hanajik 5c93b55f58 iPerlSpecial: Changes done on the system while testing Output.FileWriters.Enhanced protocol, ver.2.7.296 2016-05-26 17:14:55 +02:00
Milan Hanajik 6e418b1fc4 Output.FileWrites.Enhanced uses a list of commonItems, etc. (localization). 2016-05-26 14:02:12 +02:00
Milan Hanajik f81dcc1d82 ResultsConfigDlg moved to Results assembly. 2016-05-26 10:38:43 +02:00
Milan Hanajik 63de7b9aa8 Fixes for iPerls after modifications done in Munich. 2016-05-25 15:22:12 +02:00
Milan Hanajik 49ef7436b2 Component upgraded, RV feedback fixed. 2016-05-25 14:13:18 +02:00
Milan Hanajik 5ac9e40575 Writing into the OraDB fixed: new pruefindex is max. of pix-s from VT_ZAEHLER_PD and VT_ZAEHLER_PINDEX_PD + 1. 2016-05-25 13:18:34 +02:00
Milan Hanajik 00619ab2c6 Otput.FileWriters.Enhanced modified, makes 2 copies, filename can be formatter, header and footer added, ver.2.7.293 2016-05-25 11:00:18 +02:00
Milan Hanajik 5ebef2d27f Cleanup 2016-05-25 10:58:05 +02:00
Milan Hanajik 695a725b5f Implementing backward compatibility to WMeterRsltItemSpec, Units added to some ItemSpec column headers. 2016-05-25 10:57:30 +02:00
Milan Hanajik 6fda6dcabc ResultsWriters.Basic removed from the project 2016-05-24 17:21:55 +02:00
Milan Hanajik ef824531b8 More ControlComWrap logging as in iPerlST ver.2.4.292 2016-05-24 17:11:52 +02:00
Milan Hanajik 483218ef02 Output.FileWriter.Enhanced: (1) support for compound meters, (2) better localization, ver.2.7.291 2016-05-22 14:11:37 +02:00
Milan Hanajik 4ea85a0644 ResultsBrowser: Bench names can be configured. 2016-05-20 13:04:07 +02:00
Milan Hanajik 03a992d480 Munich printer process parameters removed, ver.2.7.290 2016-05-20 12:27:49 +02:00
Milan Hanajik 4a25dac8ff Preparation for DB migration Munich. 2016-05-20 11:02:54 +02:00
Milan Hanajik 1bcbe382d7 Munich: Changes in YearOfProduction (Eichjahr), Zaehlertyp, Pruefvorlage, etc., ver.2.7.289 2016-05-20 10:39:12 +02:00
Milan Hanajik 4ae4ba15cf DataEntry.Munich.CycleBeginningForm 'Height' fixed. 2016-05-20 08:53:30 +02:00
Milan Hanajik 775d3c67a4 WaterMeters.Munich with the smallest nr. of process parameters added. 2016-05-20 00:10:16 +02:00
Milan Hanajik ec82370934 Munich: Bug fixes after simulated tests. 2016-05-19 22:40:40 +02:00
Milan Hanajik baf87f63cc ProtocolTitle form Munich entry forms is saved in Batch data and used by Munich.Printer, ver.2.7.288 2016-05-19 21:22:17 +02:00
Milan Hanajik 4c2ef35ac1 Eichjahr (Year of production) can be changed in Munich CycleEnd forms. 2016-05-19 20:56:15 +02:00
Milan Hanajik 1b3fe413cb Munich specific changes. 2016-05-19 20:54:35 +02:00
Milan Hanajik 1af6a65a9f Munich component without 'Zobrazit Sim'. 2016-05-19 18:22:57 +02:00
Milan Hanajik cf57f3ab01 Bugfixes in: (1) DataEntry.Munich.EntryForm, (2) Screens.ProcessTabPage6,24,48, (3) DataEntry.Munich3 (cosmetical), ver.2.7.287 2016-05-19 17:29:02 +02:00
Milan Hanajik af0de8734a Munich.EntryForms support 4 protocols, ver.2.7.286 2016-05-19 15:51:06 +02:00
Milan Hanajik cd43aa2f42 Results screen fixed for compound meters, ver.2.7.285 2016-05-19 13:12:31 +02:00
Milan Hanajik be76fb4001 Munich/CycleBeginningForm localization modified. 2016-05-19 12:44:56 +02:00
Milan Hanajik 7c7f330a0b Progress bar fixed for Pressure and Leak test. 2016-05-19 12:43:45 +02:00
Milan Hanajik 3d844390e7 ProcessTabPageCtrl6 layout changes to cope with German texts, ver.2.7.285 2016-05-19 10:43:11 +02:00
Milan Hanajik ea7adb31a6 Changes done on the test bench GWZ-2. 2016-05-19 10:35:18 +02:00
Milan Hanajik 8a563a7729 Minor changes, ver.2.7.284 2016-05-19 09:54:41 +02:00
Milan Hanajik 78bcf73f13 ProcessTabPageCtrl6 localized via Strings.xy 2016-05-19 09:53:56 +02:00
Milan Hanajik b5b15b2988 Localization to German, other minor changes. 2016-05-18 19:19:31 +02:00
Milan Hanajik 1eee432993 Fixes for compound water meter results printing, results DB change, ver.2.7.283 2016-05-18 16:48:13 +02:00
Milan Hanajik dc5afadd53 Munich, ver.2.6.282 2016-05-18 11:23:52 +02:00
Milan Hanajik 643699161a Bug fix 2016-05-04 22:11:25 +02:00
Milan Hanajik ed996cc27e iPerlSpecial : Serial numbers can be entered at the end of the cycle, ver.2.6.281 2016-05-04 15:42:28 +02:00
Milan Hanajik 7a544495f2 Output.FileWriters.Basic appends to a file, iPerlSpecial bug fixes, ver.2.6.280 2016-05-04 15:16:14 +02:00
Milan Hanajik f44713eec3 ResultsConfigDlg : Up and Down buttons added, ver.2.6.279 2016-05-04 11:03:59 +02:00
Milan Hanajik dcd795b778 Description attribute for enums, Output.FileWriters.Basic: FileNameFormat, SaveGoodOnly, 2 destination folders, etc. 2016-05-03 19:00:15 +02:00
Milan Hanajik 08a404beab Output.FileWriter.Basic : Support for two destination folders. 2016-05-03 15:05:37 +02:00
Milan Hanajik 63099d27c5 ProcedureDlg fixes: support for two printers and four file writers, ver.2.6.278 2016-05-03 14:07:26 +02:00
Milan Hanajik 28b78c1345 Units for DN and L added (mm, cm, m, inch), WMeterRsltsItemSpec-s for many new output values added. 2016-05-02 15:26:14 +02:00
Milan Hanajik 6a4dff5cbc Added to IWaterMeter and Results.Entities.WaterMeterData: TempClass, MAP, Certificate, DN, L, Q4, Text1..5, etc, ver.2.6.277 2016-05-02 14:53:45 +02:00
Milan Hanajik 5239ed6d15 (1) formated date/time information in output items, (2) support for two printers and four file writers in procedure spec. 2016-05-02 10:19:26 +02:00
Milan Hanajik 7b878be87d iPerlSpecial: protocol changes, Results.Entities.WaterMeterData: Qn + Q3 -> Q3_Qn, ver.2.6.276 2016-05-01 10:04:05 +02:00
Milan Hanajik f746c9cd8f Output.FileWriter.Enhanced added to the project. 2016-04-29 17:21:23 +02:00
Milan Hanajik 25b8bd8469 Support for two file writers. 2016-04-29 17:10:17 +02:00
Milan Hanajik d1eb7b21d1 iPerlSpecial: Output.FileWriters.Basic rewritten to handle one water meter in one row (incl. fetch of test results). 2016-04-29 16:57:41 +02:00
Milan Hanajik 4ea8d66330 Bug fix: Output.FileWriters.Basic.WriterCfgCtrl: Selected items not updated. 2016-04-28 13:07:45 +02:00
Milan Hanajik ca0bcc49ac Calibration certificate nr., date, validity, etc. added to Metrology UI, FlowMeterCfg, ver.2.5.276 2016-04-28 12:47:23 +02:00
Milan Hanajik d516441ff8 Calibration certificate nr., date, validity, etc. added to Metrology UI, BalanceCfg, ver.2.5.275 2016-04-25 15:25:23 +02:00
Milan Hanajik df58d05b84 Buoyancy parameters added to the UI: Metrology tabs, BalanceCfg, BalanceDev. 2016-04-25 12:28:21 +02:00
Milan Hanajik ca2705421b Results.FileWriters.Basic added, ver.2.5.274 2016-04-24 18:49:14 +02:00
Milan Hanajik 291bb72cf5 iPerlCommunicationForm resized depending on the number of iPerl-s, gray color, ver.2.5.273 2016-04-23 14:32:15 +02:00
Milan Hanajik 7f3d1bb199 iPerlSpecial: MettlerToledo.Standard.BalanceDev bug fix, ver.2.5.272 2016-04-22 11:13:52 +02:00
Milan Hanajik a41d0517d2 Bug fixes in resources, ano/ne usage, etc., ver.2.5.271 2016-04-20 17:45:18 +02:00
Milan Hanajik d09921ee5b MettlerToledo.Standard.BalanceOld added, no response to "T<cr><lf>" command, ver.2.5.270 2016-04-20 16:16:55 +02:00
Milan Hanajik e88c34e2f4 iPerlSpecial: larger scale (WT1) serial protocol fix, TODO: fix WT2 serial protocol. 2016-04-20 15:07:25 +02:00
Milan Hanajik e09aad2a6d iPerlSpecial bug fix 2016-04-20 15:03:18 +02:00
Milan Hanajik 9500bc4656 More logging in RegulValve.SetFlowOp, ver.2.5.269. 2016-04-20 12:44:57 +02:00
Milan Hanajik a13c6a37fa iPerlSpecial component updated. 2016-04-19 12:32:51 +02:00
Milan Hanajik 1d924d7d40 iPerlSpecial modifications: RFID ports defined by watermeters, no Quido used, ver.2.5.268. 2016-04-19 10:10:51 +02:00
Milan Hanajik b1e0e74d8a iPerlSpecial modifications 2016-04-18 13:38:13 +02:00
Milan Hanajik c58f639346 (1) iPerlSpecial : WaterMeter/iPerl : RfidComPortNr added, (2) Comp. parameters dialog is unlocked when adding a component, (3) ValveCfgCtrl for 2s tick 2016-04-18 13:24:29 +02:00
Milan Hanajik f0e9b74132 New way of mass calculation temporarily disabled, bug fix in ResultsTabPageCtrl, ver.2.5.267. 2016-04-18 09:56:27 +02:00
Milan Hanajik 9a725de4a9 Stable mass measurement rewritten, it can use immediate measurement, DB change, ver.2.5.265. 2016-04-14 17:03:33 +02:00
Milan Hanajik 6efa998532 Logging of a STOP command, ver.2.4.264. 2016-04-14 12:29:14 +02:00
Milan Hanajik 2d877877e2 iPerlST: Limits for Q when saving WM test result into Oracle DB introduced, ver.2.4.264. 2016-04-14 12:01:50 +02:00
Milan Hanajik e037720115 iPerlST: Logging of a STOP command via UI. 2016-04-14 09:16:20 +02:00
Milan Hanajik fdd4036797 iPerlST bug fix: User number = 6 when a new user is created, ver.2.4.262. 2016-04-11 12:28:40 +02:00
Milan Hanajik e001d01f15 ver.2.4.261. 2016-04-11 11:45:45 +02:00
Milan Hanajik efad9eb0d9 Bug fixed in continuation of the cycle after a STOP. 2016-04-11 09:39:02 +02:00
Milan Hanajik f6169c962d Czech BenchControlPanel. 2016-04-11 08:50:48 +02:00
Milan Hanajik b073e322d4 iPerlST: Component updated, RV state in SetFlowOp re-enabled. 2016-04-10 21:30:24 +02:00
Milan Hanajik f901367817 iPerl ST component, symbol IPERLST_SPECIAL, etc. added to the project, ver. 2.4.260. 2016-04-07 15:37:49 +02:00
Milan Hanajik e94443ad8a Possibility to continue in the cycle when selecting a test, ver.2.4.259. 2016-04-07 14:53:34 +02:00
Milan Hanajik 2d20ea1196 (1) power users obtain nr.6 on startup, (2) maxBatchNr from DB detected and used, (3) more logging, ver. 2.4.258. 2016-04-07 13:52:57 +02:00
Milan Hanajik a275a911f6 Oracle DB changes, language resources exported, etc., ver.2.4.257. 2016-04-06 14:15:17 +02:00
Milan Hanajik 1f08cf0b81 Corrects a bug in iPerlST component (?), ver.2.4.256. 2016-04-04 21:52:08 +02:00
Milan Hanajik 2a3f76c3dc iPerlST component dated 160304, ver.2.4.255. 2016-04-04 11:26:12 +02:00
Milan Hanajik 45c6c10755 ver.2.4.254. 2016-03-23 11:24:42 +01:00
Milan Hanajik 5a265d4ef6 ResultsBrowser: Three benches are supported, ParseAllFields() function. 2016-03-18 18:17:15 +08:00
Milan Hanajik 63c12958f7 ResultsBrowser: RBrowserWnd added, ver. RB2.4.250. 2016-03-18 15:53:33 +08:00
Milan Hanajik 809c16e1e1 ver.2.4.253. 2016-03-18 14:25:09 +08:00
Milan Hanajik dc9b72f487 ver.2.4.252. 2016-03-18 13:42:33 +08:00
Milan Hanajik 2bf0ab226f Bug fixes in DB mapping, ver.2.4.251. 2016-03-18 13:16:53 +08:00
Milan Hanajik 0c2c9bb1e2 User.UserNumber and BenchPath.StopFBValve introduced and used, database 2.4 2016-03-18 12:44:25 +08:00
Milan Hanajik b006e36d52 Stop Backflow Valve added, used in FlyingStartMassCollection method, ver.2.4.248. 2016-03-18 10:36:33 +08:00
Milan Hanajik 2392bfa2a7 FlyingStartCollectionMethod timing modified, start valve used, ver.2.3.245. 2016-03-17 13:02:25 +08:00
Milan Hanajik 16ef6bde34 Czech translations 2016-03-16 23:51:10 +08:00
Milan Hanajik 933909c1e9 try-catch in ProcesstabPageCtrlXX handlers 2016-03-16 21:36:44 +08:00
Milan Hanajik a9c7e1fa25 Chinese translations, part 2 2016-03-16 21:23:49 +08:00
Milan Hanajik aee1990243 Chinese translations, part 1 2016-03-16 20:47:10 +08:00
Milan Hanajik 88caba317b ver.2.3.243. 2016-03-16 07:52:52 +08:00
Milan Hanajik 3843b16587 Bug fix: Results were not redrawn after a test automatically. 2016-03-16 07:49:51 +08:00
Milan Hanajik b86ca9fac8 Active FM pump is switched off in 'default action' after test (not when transition sequences are used), ver.2.3.242. 2016-03-15 19:29:47 +08:00
Milan Hanajik 1fb82dad92 Sequence before test modification: Test paths (input, bench, output) are applied after the last step. 2016-03-15 16:06:44 +08:00
Milan Hanajik b879245df2 Fuzhou: All three components updated. 2016-03-15 15:31:58 +08:00
Milan Hanajik 224c9c4372 Fuzhou: Bug-fix in results printers when tests do not fit onto one page, ver.2.3.241. 2016-03-15 15:31:32 +08:00
Milan Hanajik c16964c1de iPerlST: Pressure added to LU logging, ver. 2.3.240. 2016-03-15 11:17:49 +08:00
Milan Hanajik 1d52047559 The correct Fuzhou PT150 component restored, ver.2.3.238. 2016-03-15 09:58:26 +08:00
Milan Hanajik 0b9fd8712a Language resources exported, ver.2.3.237. 2016-03-14 15:51:09 +08:00
Milan Hanajik edf53a91f9 Fuzhou 50, ver. 2.3.236. 2016-03-14 11:11:40 +08:00
Milan Hanajik 5884f282e4 LU logging bug fix, ver.2.3.235. 2016-03-10 10:12:15 +01:00
Milan Hanajik b6e368938d iPerl component 151109 used. 2016-03-07 09:28:41 +01:00
Milan Hanajik e7fa371c1b iPerl component 151124 used. 2016-03-07 09:16:06 +01:00
Milan Hanajik 270c3b0aae LU logging modification 2016-03-07 09:08:32 +01:00
Milan Hanajik 27e0cd3b53 iPerlST component updated 2016-03-07 08:59:23 +01:00
Milan Hanajik 8ff2ff0c38 Puchong component upgraded, ver.2.3.234. 2016-03-03 19:47:19 +01:00
Milan Hanajik 6c0c89a0dc Torino, ver.2.3.233. 2016-03-03 15:09:49 +01:00
Milan Hanajik e264f3b3dd DIFF2HZ8HZ limitted to range -99 .. +99 before writing into OraDB, ver.2.3.232. 2016-03-03 14:43:11 +01:00
Milan Hanajik e3605b647c LU logging fixed, ver.2.3.231. 2016-03-02 20:02:30 +01:00
Milan Hanajik 25eff13c41 Bug fix in iPerl communication when L1 only or L2 only used. 2016-03-01 18:57:36 +01:00
Milan Hanajik d2493b0331 Bug fix: padlo v Active mode na konci cyklu, ver.2.3.230. 2016-03-01 16:22:49 +01:00
Milan Hanajik 82cede65ef CEVAK component upgraded, ver.2.3.229. 2016-03-01 11:05:26 +01:00
Milan Hanajik 3549376f34 RersultsPrinter.Basic, RersultsPrinter.Cevak and ResultsWriter.Basic modified to print only Publish.Always tests. Publish.None --> Publish.Never. 2016-02-29 19:03:17 +01:00
Milan Hanajik 7b61f7cb86 Type of 'Publish' changed to sbyte, ver.2.3.228. 2016-02-29 15:44:30 +01:00
Milan Hanajik 87b5c36e6a Working on Ajustment, ver.2.3.227. 2016-02-29 15:31:22 +01:00
Milan Hanajik 5c48dbf60e Basic results printer modified as well. 2016-02-24 22:55:40 +01:00
Milan Hanajik cc789ee7e0 Cevak results printer modifications, ver. 2.2.227. 2016-02-23 21:12:17 +01:00
Milan Hanajik 087870b1ec Prebuildovane pre Puchong, ver.2.2.226. 2016-02-19 18:32:44 +01:00
Milan Hanajik 393bc99d9b Viac Previous results - 25 batchov, ver. 2.2.225. 2016-02-19 18:28:41 +01:00
Milan Hanajik 93b40740b5 SafeMode for Save previous results, version 2.2.224. 2016-02-19 17:53:43 +01:00
Milan Hanajik 140ec13626 CEVAK bug fixes, version 2.2.223. 2016-02-19 15:20:44 +01:00
Milan Hanajik 2cab985bd0 ResultsPrinter.Cevak implemented, bug fixes in ResultsPrinter.Basic. Bug fixes in EntryForms (Purchase order via UpdateTestResultss(..)), version 2.2.222. 2016-02-19 14:25:59 +01:00
Milan Hanajik 4ab889b43e Publish, Evaluate test parameters of the Flying start mass collection method excluded. 2016-02-19 10:43:42 +01:00
Milan Hanajik cd52a11d0e BenchInfoPL ==> BenchInfoEx, ResultsPrinter.Cevak added, version 2.2.221. 2016-02-19 09:55:37 +01:00
Milan Hanajik 014ec3924f LU logger bug fix. version 2.2.220. 2016-02-18 01:51:54 +01:00
Milan Hanajik a62ce451c4 LU iPearl logging implemented, version 2.2.219. 2016-02-18 01:08:14 +01:00
Milan Hanajik 7badb8ef7b Released for Puchong, version 2.2.218 2016-02-16 18:01:27 +01:00
Milan Hanajik 4d39805ef4 Bug fixes: (1) in MainSeq when starting iPearlCommForm, (2) in SetActiveMode (config struct was null), version 2.2.217. 2016-02-16 17:25:01 +01:00
Milan Hanajik 4b1a684d69 2Hz correction related changes: iPerlCommunication: 'Reset 2Hz correction', 'Write 2Hz correction' + OraDB changes. 2016-02-16 14:44:10 +01:00
Milan Hanajik a22b4de1b6 FlyingStart measurement during test simplified similarly to FlyingStartMassCollection, version 2.1.215. 2016-02-16 12:28:36 +01:00
Milan Hanajik 462ed568de Bug fixes: (1) simulation, (2) when BenchInfo==null, (3) ProcessData.RefPulses updated, (4) ProcessTabPages, etc. 2016-02-15 22:48:44 +01:00
Milan Hanajik 92bcd46549 Working on 2Hz correction 2016-02-15 15:16:44 +01:00
Milan Hanajik e22d58101c Correct start-up message when there is no CB component, version 2.1.214 2016-02-14 23:17:02 +01:00
Milan Hanajik 193ede3d55 Changes for Puchong PT200 test bench added. 2016-02-14 16:35:41 +01:00
Milan Hanajik edc4d59f90 Process data screen update when test completed, version 2.1.213. 2016-02-13 19:28:33 +01:00
Milan Hanajik 56e38831f1 TestResult2CsvLine(..) format reverted to the original one (place for diverter data). 2016-02-13 17:45:19 +01:00
Milan Hanajik 6a159f773e WMPulses[], WMRefPulses[], WMTimes[] removed from SequenceBase, operations, etc., clean-up. 2016-02-13 17:39:38 +01:00
Milan Hanajik e94e16c9e6 Use of ProcessData.RegisterReaders in iPerlCommunicationForm. 2016-02-13 16:40:26 +01:00
Milan Hanajik e70e5f7cb4 WMVolumes[], WMErrors[] eliminated from SequenceBase, etc. 2016-02-13 15:53:21 +01:00
Milan Hanajik 3946d26cb4 IRegisterReader extended, ReadReferenceForRegisterOp removed, ReadRegisteOp integrated into RegisterReader class, ProcessTabPages updated. 2016-02-13 15:02:10 +01:00
Milan Hanajik 7534fc7c24 Removed WMPulses and WMRefPulses logs. 2016-02-13 08:11:50 +01:00
Milan Hanajik 766562fb7d iPearlST OraDB bug fix, version 2.1.212. 2016-02-10 22:20:15 +01:00
Milan Hanajik 2c1e4e7d26 Process data display : many changes, TODO: Meter data and the end of test. 2016-02-10 19:24:10 +01:00
Milan Hanajik 3775913a33 Reconfigured for iPerlST, ProcessDataEventArgs related modifictions. 2016-02-10 16:52:59 +01:00
Milan Hanajik 42a9ecda27 iPearl ST: More PreviousResultsDlg changes, Test database can be used, etc. 2016-02-09 15:04:18 +01:00
Milan Hanajik eafa88258f Change in logging levels. 2016-02-09 14:33:34 +01:00
Milan Hanajik 9a143bd266 iPearl ST: OraDB: More logging and bugfix, version 2 1 211. 2016-02-09 14:30:21 +01:00
Milan Hanajik b6c9c8cf22 PreviousResultsDlg and related changes, version 2.1.211 2016-02-09 08:31:14 +01:00
Milan Hanajik f31843f665 ProcessDataEventArgs added. 2016-02-08 23:33:23 +01:00
Milan Hanajik 6e2bf48b43 (1) State of the RegulValve checked after ValveMove (#, position, ...), (2) RFID results are saved only when SimultWithPrevious == true. 2016-02-08 17:49:49 +01:00
Milan Hanajik 1278a2365d LU logging added to SensusOracle DB (content of logging to be completed). 2016-02-08 16:34:37 +01:00
Milan Hanajik 3407b51c27 All changes done for Badger-velka-trat merged into this branch, version 2.1.210. 2016-02-07 22:55:48 +01:00
Milan Hanajik adb37826a5 Mettler-Toledo Multi protocol change as in v.2.0.195 (Badger), Immediate meas. works, TODO: stable meas. 2016-01-26 13:43:47 +01:00
Milan Hanajik 0fdcbffcae Minor changes: (1) introductory logging, (2) simulation for Badger velka trat. 2016-01-26 13:39:51 +01:00
Milan Hanajik d575220aec Bug fix in relative transitions UI, PumpPower with 1 decimal digit (Badger velka trat). 2016-01-26 13:34:19 +01:00
Milan Hanajik 69de3b038a Badger bug fixes: coax. reg. valve (index out of range), novy komponent. 2016-01-26 13:26:03 +01:00
Milan Hanajik 773a1f2d15 Oracle DB hotfix as in ver. 2.1.194. 2016-01-26 13:19:55 +01:00
Milan Hanajik a4331c8267 Fixes occasional problem/crash for an iPearl test with Parts when iPearls are activated after 'End', version 2.1.190. 2016-01-19 21:12:35 +01:00
Milan Hanajik bfa506911c ResultsBrowser ver.2.1.189: Purchase order read from the Oracle DB. 2016-01-19 13:02:06 +01:00
unknown a2432927ee Bug fixes: ResultsBrowser: open cursors, query procedure, etc, TBF: Saving to disk. version 2.1.188. 2016-01-16 16:58:41 +01:00
Milan Hanajik 126a0e2663 ResultsBrowser bug fix 2016-01-15 00:28:55 +01:00
Milan Hanajik f3f6ad4291 ResultsBrowser changes, ver. 2.1.187 2016-01-14 23:59:53 +01:00
Milan Hanajik ffc70efaf4 Writing Q2 correction into Oracle DB fixed (MaxPruefindex w/o %100), version 2.1.187. 2016-01-14 21:50:39 +01:00
Milan Hanajik 951a62ad06 ResultsBrowser rewritten for the new Results DB, version 2.1.186. 2016-01-13 23:38:18 +01:00
Milan Hanajik d8d8f24843 Bug fix in Progress display for a test with parts, version 2.1.186. 2016-01-12 20:46:37 +01:00
Milan Hanajik c75e88c871 Bug fix in Results for tests with Parts, mappings were removed, version 2.1.185. 2016-01-12 20:21:17 +01:00
Milan Hanajik 47af8c11d3 Code to modify 'Publish' and 'Evaluate' properties of iPearl tests added, version 2.1.184. 2016-01-11 13:39:43 +01:00
Milan Hanajik 6c85732748 Minor change: OracleDB saved first, then results are written to HDD. 2016-01-10 14:13:33 +01:00
Milan Hanajik 8cd3b6a7b0 Bug fix: Procedure parameters were not loaded early enough. 2016-01-10 13:15:14 +01:00
Milan Hanajik d1ef582349 Bug fix: WMTypeId and WMTypeRev in Results.Entities.WaterMeterData were not initialized. 2016-01-10 13:02:26 +01:00
Milan Hanajik 6d47789708 Procedure settings conversion code (to be completed). 2016-01-10 12:40:15 +01:00
Milan Hanajik 66a31fc1e9 Serious iPearl bug fix, flow setting timeout time increased, version 2.1.183. 2016-01-10 12:39:20 +01:00
Milan Hanajik d84c3ca4d8 Cosmetical changes (progress for modeless form sometimes not completed) 2016-01-10 01:44:28 +01:00
Milan Hanajik 98c8b0e7a8 iPearl debugging, progress management, OracleDB simulation, etc, version 2.1.182 2016-01-09 20:06:59 +01:00
Milan Hanajik 68c4bf5956 Separate string SerialNrAux and int SerialNrEx in Results. Other fixes. Version 2.1.180 2016-01-08 17:10:05 +01:00
Milan Hanajik b131ba01a8 Batch results written into the built in Results database. 2016-01-08 13:51:54 +01:00
Milan Hanajik f5642a2676 OracleDB modified for new Results, other changes and fixes, version 2.1.172. 2016-01-08 10:23:36 +01:00
Milan Hanajik 1585066b57 DB.SensusOracle: saving to disk re-implemented, other minor changes and fixes. TODO: Oracle DB. 2016-01-06 22:37:19 +01:00
Milan Hanajik 1ee5724082 All printers modified for new Results, other fixes and changes. 2016-01-06 21:39:52 +01:00
Milan Hanajik 511d86a186 Results on screen modified to accept new Results. ItemSpec introduced. 2016-01-04 23:39:28 +01:00
Milan Hanajik d91ca4b56b All entry forms modified to use Result.Entities.WaterMeter, EndStateAux introduced. TODO: display, saving, printing. 2016-01-04 17:55:39 +01:00
Milan Hanajik e14dc37060 TestCompletedEventArgs modification 2016-01-04 16:03:17 +01:00
Milan Hanajik 1e058726d4 Adjustment modified to use the new Results. 2016-01-04 15:24:16 +01:00
Milan Hanajik 26982a5729 Many changes, new results used, all test sequences modified, simulated tests rewritten. 2016-01-04 13:53:45 +01:00
Milan Hanajik 494c6edf76 Results.BatchResults.NewFromProcedure(...) added, BenchId -> TestBenchId, BenchName -> TestBenchName, etc. 2016-01-02 19:21:43 +01:00
Milan Hanajik 61bfa51fa7 Uncertainty used when evaluating tests, in TestWizard, UI, etc., version 2.1.171. 2016-01-02 11:11:45 +01:00
Milan Hanajik 81fe244c23 Test.Publish and Test.Evaluate added, other Results DB related changes. 2016-01-02 00:54:21 +01:00
Milan Hanajik 98f74fa971 Many fixes, Results.Entities.Components added, builds OK, creates the results DB. 2016-01-01 20:27:59 +01:00
Milan Hanajik bb260426c9 Database settings changes 2015-12-31 22:48:22 +01:00
Milan Hanajik 02b31634f8 DBTypes to Config.Entities.Enums.cs 2015-12-31 18:20:03 +01:00
Milan Hanajik 35c449bd0c Results.Entities and Mappings added, Results.DB (based on FluentCommon). 2015-12-31 16:45:59 +01:00
Milan Hanajik 2b7f6a8dac Fluent common database bugfix. 2015-12-31 16:45:55 +01:00
Milan Hanajik 2a4eeb2d77 One more fix. 2015-12-29 19:03:22 +01:00
Milan Hanajik a08be1ee73 ResultsBrowser: query by BatchNr range added. 2015-12-21 20:32:36 +01:00
Milan Hanajik 21390eaba6 Fixes a bug in Badger on 21.12.2015 when saving results, version 2.0.170 2015-12-21 12:21:47 +01:00
Milan Hanajik 5f0c56b19f Measured flow into OptoTelegramRaw bugfix, version 2.0.169. 2015-12-21 10:09:44 +01:00
Milan Hanajik 714780d0b6 StopPreviousOp modified to re-send command if necessary. 2015-12-20 22:14:18 +01:00
Milan Hanajik d852e390b3 Flow measured by reference flowmeter into OptoTelegramRaw and opto-data logs. 2015-12-20 21:12:00 +01:00
Milan Hanajik bb2087c002 ProcessData base class with 'public static' process data introduced. 2015-12-20 20:48:50 +01:00
Milan Hanajik 15ac3608c4 Default values of 'Publish' and 'Evaluate' = yes, program version shown in LoginDlg title. 2015-12-20 13:52:26 +01:00
Milan Hanajik e4e8c97cfd SensusOracleDatabase code cleanup, version 2.0.168 2015-12-20 11:59:25 +01:00
Milan Hanajik 3ef8674caf ResultsBrowser used to generate report for the customer for 179 watermeters, TBF v. 2.0.167, Results v.2.0.2. 2015-12-18 17:43:38 +01:00
Milan Hanajik 58a2be10aa Decimal numbers in OptoData logfiles use commas instead of dots, Delta time fixed, test start/end labels added. 2015-12-17 14:38:46 +01:00
Milan Hanajik bcae594b3f WaterMeterResults -> Results, etc. 2015-12-17 09:31:41 +01:00
Milan Hanajik 763acec379 Way of querying serial numbers form Oracle DB changed. 2015-12-16 10:51:35 +01:00
Milan Hanajik 12bd4e80dd Many various changes. 2015-12-15 04:16:53 +01:00
Milan Hanajik 4f456e0c40 DataDeposit and WaterMeterResult added. Procedure selection criteria added. 2015-12-15 01:57:52 +01:00
Milan Hanajik c6ef378bc9 MySQL query works OK. 2015-12-14 19:19:48 +01:00
Milan Hanajik 9689080387 ResultsBrowser works, MySQL DB opens, Oracle DB in TBF works in 64-bit OS, TBF v.2.0.165. 2015-12-13 09:37:48 +01:00
Milan Hanajik 6ecddf07f6 ResultsBrowser re-created. 2015-12-12 23:54:22 +01:00
Milan Hanajik 89ecf478ba ResultsBrowser changes (does not run correctly). 2015-12-10 22:17:47 +01:00
Milan Hanajik d9e7efa15a TestBenchFramework project, resources changes 2015-12-10 22:16:38 +01:00
Milan Hanajik 6e6edde77f (1) MunichPrintDocument fixed for three single water meters: 3 pages printed. (2) Cycle end form fixed (end state). (3) DE 2015-12-09 16:12:06 +01:00
Milan Hanajik b2c944f9b1 Change of logic for 'disabled' water meters in LabelPrinter, version 2.0.164. 2015-12-09 14:31:40 +01:00
Milan Hanajik 852ffd0602 LabelPrinter component clean-up, disabled single watermeters are not printed. 2015-12-09 00:31:59 +01:00
Milan Hanajik a06fe00440 Label printer added, version 2.0.163. 2015-12-08 23:44:52 +01:00
Milan Hanajik 8c1c5ed4f0 Bugfix in FixedStartCombinedMeters test method and Combined/EntryForm, version 2.0.162. 2015-12-08 17:59:25 +01:00
Milan Hanajik 123187aa8a Version 2.0.159. 2015-12-08 11:16:19 +01:00
Milan Hanajik 644c26355c iPerl opto data file name setting bug fix (FlyingStartSeq). 2015-12-08 10:48:06 +01:00
Milan Hanajik 432b288c34 DB works OK, project changes, MessageBox when database cannot be open. 2015-12-06 21:26:42 +01:00
Milan Hanajik f6cec9d769 'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158. 2015-12-05 14:18:36 +01:00
Milan Hanajik 29ece2f91c iPerl opto data logging: calculated data added, TODO: (1) ref.flow, (2) start/end mark. 2015-12-04 13:52:00 +01:00
Milan Hanajik e3aa3f6721 Water meter data cleared at the beginning of each cycle. 2015-12-04 12:24:55 +01:00
Milan Hanajik b1ccdcb5c1 Procedure combo box and progress bar in MainWnd stretched. 2015-12-03 23:37:14 +01:00
Milan Hanajik a541ac4945 'Counter' value added to opto data logging, version 1.6.154. 2015-12-03 20:58:54 +01:00
Milan Hanajik 38cbcb6430 iPerl opto data logging format changed, version 1.6.153. 2015-12-02 18:03:37 +01:00
Milan Hanajik c593ed903e Diverter ADC calibration values used to initialize RegValveCalib[,] array, version 1.6.152. 2015-12-02 14:10:54 +01:00
Milan Hanajik d488f62648 Initial version for Fuzhou PT40, component, defines, etc. 2015-12-02 13:25:40 +01:00
1953 changed files with 236286 additions and 70901 deletions
+20 -3
View File
@@ -1,8 +1,25 @@
TestBenchFramework/bin/
TestBenchFramework/obj/
Config/bin/
Config/obj/
DeviceTest/bin/
DeviceTest/obj/
Dirichlet.Numerics/bin
Dirichlet.Numerics/obj
GraphLib/bin
GraphLib/obj
MonitoringDB/bin
MonitoringDB/obj
Results/bin/
Results/obj/
ResultsBrowser/bin/
ResultsBrowser/obj/
TBF/bin/
TBF/obj/
TBFSetup/Debug/
TBFSetup/Release/
Users/bin/
Users/obj/
UserManagement/bin/
UserManagement/obj/
Doc/
*.suo
*.suo
*.bak
+146
View File
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Config</RootNamespace>
<AssemblyName>Config</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;GENESIS;IPERL;LANG_DE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;GENESIS;IPERL;LANG_DE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentNHibernate">
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
</Reference>
<Reference Include="Iesi.Collections">
<HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="MySql.Data">
<HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="NHibernate">
<HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite">
<HintPath>..\packages\System.Data.SQLite.1.0.90.0\lib\net40\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.Linq">
<HintPath>..\packages\System.Data.SQLite.1.0.90.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Data.cs" />
<Compile Include="DatabaseSettings.cs" />
<Compile Include="Entities\BenchPath.cs" />
<Compile Include="Entities\Component.cs" />
<Compile Include="Entities\ComponentProcedure.cs" />
<Compile Include="Entities\ComponentTest.cs" />
<Compile Include="Entities\Enums.cs" />
<Compile Include="Entities\FeedingPath.cs" />
<Compile Include="Entities\Group.cs" />
<Compile Include="Entities\HeatMetersPath.cs" />
<Compile Include="Entities\IHasItemNr.cs" />
<Compile Include="Entities\IHasName.cs" />
<Compile Include="Entities\IHasValves.cs" />
<Compile Include="Entities\MeasurementCorrection.cs" />
<Compile Include="Entities\MetersPath.cs" />
<Compile Include="Entities\OutputPath.cs" />
<Compile Include="Entities\Procedure.cs" />
<Compile Include="Entities\ProcedureHistory.cs" />
<Compile Include="Entities\Test.cs" />
<Compile Include="Entities\TransitionSequence.cs" />
<Compile Include="Entities\TransitionStep.cs" />
<Compile Include="Entities\User.cs" />
<Compile Include="Entities\VirtualBenchSequence.cs" />
<Compile Include="Entities\VirtualBenchStep.cs" />
<Compile Include="Entities\Watermeter.cs" />
<Compile Include="Entities\WMType.cs" />
<Compile Include="FluentCommon.cs" />
<Compile Include="Mappings\BenchPathMap.cs" />
<Compile Include="Mappings\ComponentMap.cs" />
<Compile Include="Mappings\ComponentProcedureMap.cs" />
<Compile Include="Mappings\ComponentTestMap.cs" />
<Compile Include="Mappings\FeedingPathMap.cs" />
<Compile Include="Mappings\GroupMap.cs" />
<Compile Include="Mappings\HeatMetersPathMap.cs" />
<Compile Include="Mappings\MeasurementCorrectionMap.cs" />
<Compile Include="Mappings\MetersPathMap.cs" />
<Compile Include="Mappings\OutputPathMap.cs" />
<Compile Include="Mappings\ProcedureMap.cs" />
<Compile Include="Mappings\TestMap.cs" />
<Compile Include="Mappings\TransitionSequenceMap.cs" />
<Compile Include="Mappings\TransitionStepMap.cs" />
<Compile Include="Mappings\UserMap.cs" />
<Compile Include="Mappings\VirtualBenchSequenceMap.cs" />
<Compile Include="Mappings\VirtualBenchStepMap.cs" />
<Compile Include="Mappings\WatermeterMap.cs" />
<Compile Include="Mappings\WMTypeMap.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resources\Strings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Strings.resx</DependentUpon>
</Compile>
<Compile Include="Units.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Strings.cs.resx" />
<EmbeddedResource Include="Resources\Strings.de.resx" />
<EmbeddedResource Include="Resources\Strings.it.resx" />
<EmbeddedResource Include="Resources\Strings.pl.resx" />
<EmbeddedResource Include="Resources\Strings.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\Strings.ru.resx" />
<EmbeddedResource Include="Resources\Strings.zh-CN.resx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Users\Users.csproj">
<Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
<Name>Users</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
+84
View File
@@ -0,0 +1,84 @@
using System;
namespace Config
{
public class Data : Users.GlobalData
{
public const string AdminUsername = "admin";
public const string AdminPassword = "staratura";
public const string SQLiteDbFName = "SQLite.db";
#if MUNICH
public const int WMsCount = 3;
public const int LineSize = 1;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 3;
#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT
public const int WMsCount = 3;
public const int LineSize = 3;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif FUZHOU300 || FUZHOU150 || PT200IL || PUCHONG_PT200 || GENESIS || SLM_150 || PETERSBURG_200
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 3;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 3;
#elif TORINO50 || BADGER_MALA_TRAT || BERLIN
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 1;
#elif TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50
public const int WMsCount = 20;
public const int LineSize = 10;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif RUM_MOB
public const int WMsCount = 8;
public const int LineSize = 8;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TURA_IPERL
public const int WMsCount = 40;
public const int LineSize = 20;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif TURA_SPECIAL
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#elif SLM_50
public const int WMsCount = 12;
public const int LineSize = 12;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 6;
public const int MaxPartNr = WMsCount / LineSize;
#elif SLM_END || WARSAW_END
public const int WMsCount = 10;
public const int LineSize = 5;
public const int CompoundWMsCount = 1;
public const int HeatMetersCount = 0;
public const int MaxPartNr = 4;
#elif MALTA_WSD25
public const int WMsCount = 6;
public const int LineSize = 6;
public const int CompoundWMsCount = 0;
public const int HeatMetersCount = 0;
public const int MaxPartNr = WMsCount / LineSize;
#endif
///
/// Database related: This object reference is set after a successful user login
///
public static DatabaseSettings CurrentBench;
}
}
+54
View File
@@ -0,0 +1,54 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Text;
using System.Xml.Serialization;
namespace Config
{
/// <summary>
/// Test bench database settings, contains bench name and settings od several databases
/// </summary>
public class DatabaseSettings : ICloneable
{
// Public fields
public string BenchName;
public bool IsRealBench;
public Users.DBSettings ProceduresDBSettings; /// Config database settings
public Users.DBSettings WaterMetersDBSettings; /// Results database settings
public Users.DBSettings UsersDBSettings; /// Users database settings
// Constructor
public DatabaseSettings()
{
BenchName = String.Empty; /// Empty string (avoid null)
IsRealBench = false;
ProceduresDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
WaterMetersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
UsersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
}
public object Clone()
{
DatabaseSettings result = new DatabaseSettings();
result.BenchName = BenchName;
result.IsRealBench = IsRealBench;
result.ProceduresDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
result.WaterMetersDBSettings = (Users.DBSettings)WaterMetersDBSettings.Clone();
result.UsersDBSettings = (Users.DBSettings)ProceduresDBSettings.Clone();
return result;
}
public override string ToString()
{
return string.Format("{0} config={1} results={2} users={3}",
BenchName,
ProceduresDBSettings.ConnectionString,
WaterMetersDBSettings.ConnectionString,
UsersDBSettings.ConnectionString);
}
}
}
+61
View File
@@ -0,0 +1,61 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace Config.Entities
{
public class BenchPath : IHasName, IHasItemNr, IHasValves
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual string TempMtrUp { get; set; }
public virtual string TempMtrDown { get; set; }
public virtual string PressMtrUp { get; set; }
public virtual string PressMtrDown { get; set; }
public virtual string PressMtrDelta { get; set; }
public virtual string StopBFValve { get; set; }
/// Valves
public virtual string ValvesOpen { get; set; }
public virtual string ValvesClose { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public BenchPath()
{
ValvesOpen = string.Empty;
ValvesClose = string.Empty;
}
public BenchPath(string name, int itemNr)
: this()
{
Name = name;
ItemNr = itemNr;
}
public virtual BenchPath Clone(string name, int itemNr)
{
BenchPath result = new BenchPath(name, itemNr);
result.Qfrom = Qfrom;
result.Qto = Qto;
result.TempMtrUp = TempMtrUp;
result.TempMtrDown = TempMtrDown;
result.PressMtrUp = PressMtrUp;
result.PressMtrDown = PressMtrDown;
result.PressMtrDelta = PressMtrDelta;
result.StopBFValve = StopBFValve;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
return result;
}
}
}
+129
View File
@@ -0,0 +1,129 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
namespace Config.Entities
{
public class Component : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string ClassName { get; set; }
public virtual string ParentName { get; set; }
public virtual DebugMode Mode { get; set; }
public virtual LogLevel Logging { get; set; }
public virtual string Parameters { get; set; }
public virtual IList<MeasurementCorrection> Corrections { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public Component()
{
Corrections = new List<MeasurementCorrection>();
}
public static Component CreateFromCfg(string name, string className, string parentName, int itemNr,
DebugMode debugLevel, LogLevel logLevel, string parameters)
{
Component result = new Component();
result.ItemNr = itemNr;
result.Name = name;
result.ClassName = className;
result.ParentName = parentName;
result.Mode = debugLevel;
result.Logging = logLevel;
result.Parameters = parameters;
return result;
}
// Makes a new copy of this object (not just a reference)
public virtual Component Clone()
{
Component result = new Component();
result.ItemNr = ItemNr;
result.Name = Name;
result.ClassName = ClassName;
result.ParentName = ParentName;
result.Mode = Mode;
result.Logging = Logging;
result.Parameters = Parameters;
return result;
}
public virtual void Export(StreamWriter output)
{
output.WriteLine(Name);
output.WriteLine(ClassName);
output.WriteLine(ParentName);
output.WriteLine(Mode.ToString());
output.WriteLine(Logging.ToString());
output.Write(Parameters);
output.Close();
}
public static Component Import(StreamReader input)
{
Component result = new Component();
result.Name = input.ReadLine();
result.ClassName = input.ReadLine();
result.ParentName = input.ReadLine();
string line = input.ReadLine();
if (line.Equals(DebugMode.DetectedOff.ToString())) result.Mode = DebugMode.DetectedOff;
else if (line.Equals(DebugMode.DetectedOn.ToString())) result.Mode = DebugMode.DetectedOn;
else if (line.Equals(DebugMode.Normal.ToString())) result.Mode = DebugMode.Normal;
else if (line.Equals(DebugMode.AutoDetect.ToString())) result.Mode = DebugMode.AutoDetect;
else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation;
else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off;
else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record;
else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply;
else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate;
else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit;
line = input.ReadLine();
if (line.Equals(LogLevel.Off.ToString())) result.Logging = LogLevel.Off;
else if (line.Equals(LogLevel.Fatal.ToString())) result.Logging = LogLevel.Fatal;
else if (line.Equals(LogLevel.Error.ToString())) result.Logging = LogLevel.Error;
else if (line.Equals(LogLevel.Warn.ToString())) result.Logging = LogLevel.Warn;
else if (line.Equals(LogLevel.Info.ToString())) result.Logging = LogLevel.Info;
else if (line.Equals(LogLevel.Debug.ToString())) result.Logging = LogLevel.Debug;
else if (line.Equals(LogLevel.All.ToString())) result.Logging = LogLevel.All;
result.Parameters = string.Empty;
line = input.ReadLine();
while (line != null)
{
result.Parameters += line;
result.Parameters += Environment.NewLine;
line = input.ReadLine();
}
return result;
}
public virtual string ToString(string indent)
{
string result = string.Empty;
result += indent + "ItemNr = " + (ItemNr + 1).ToString() + Environment.NewLine;
result += indent + "Name = " + Name + Environment.NewLine;
result += indent + "ClassName = " + ClassName + Environment.NewLine;
if (ParentName != null)
{
result += indent + "ParentName = " + ParentName + Environment.NewLine;
}
result += indent + "DebugLevel = " + Mode.ToString() + Environment.NewLine;
result += indent + "LogLevel = " + Logging.ToString() + Environment.NewLine;
result += indent + "Parameters = " + Parameters + Environment.NewLine;
return result;
}
}
}
+44
View File
@@ -0,0 +1,44 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.IO;
namespace Config.Entities
{
public class ComponentProcedure
{
public virtual int Id { get; protected set; }
public virtual string CmpntName { get; set; } /// Component name
public virtual string Parameters { get; set; }
public virtual Procedure Procedure { get; set; }
public virtual ComponentProcedure Clone(Procedure newProcedure)
{
ComponentProcedure result = new ComponentProcedure();
result.CmpntName = CmpntName;
result.Parameters = Parameters;
result.Procedure = newProcedure;
return result;
}
public virtual void Export(StreamWriter output)
{
output.WriteLine(CmpntName);
output.WriteLine(Parameters.Replace(Environment.NewLine, "~"));
}
public static ComponentProcedure Import(StreamReader input, Procedure newProcedure)
{
string firstLine = input.ReadLine();
if (string.IsNullOrEmpty(firstLine)) return null;
ComponentProcedure result = new ComponentProcedure();
result.CmpntName = firstLine;
result.Parameters = input.ReadLine().Replace("~", Environment.NewLine);
result.Procedure = newProcedure;
return result;
}
}
}
+44
View File
@@ -0,0 +1,44 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.IO;
namespace Config.Entities
{
public class ComponentTest
{
public virtual int Id { get; protected set; }
public virtual string CmpntName { get; set; } /// Component name
public virtual string Parameters { get; set; }
public virtual Test Test { get; set; }
public virtual ComponentTest Clone()
{
ComponentTest result = new ComponentTest();
result.CmpntName = CmpntName;
result.Parameters = Parameters;
result.Test = Test;
return result;
}
public virtual void Export(StreamWriter output)
{
output.WriteLine(CmpntName);
output.WriteLine(Parameters.Replace(Environment.NewLine, "~"));
}
public static ComponentTest Import(StreamReader input, Test newTest)
{
string firstLine = input.ReadLine();
if (string.IsNullOrEmpty(firstLine)) return null;
ComponentTest result = new ComponentTest();
result.CmpntName = firstLine;
result.Parameters = input.ReadLine().Replace("~", Environment.NewLine);
result.Test = newTest;
return result;
}
}
}
+420
View File
@@ -0,0 +1,420 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Reflection;
namespace Config.Entities
{
/// <summary>
/// Helper class to assign descriptions to enum values
/// </summary>
public class Description : Attribute
{
public string Text;
public Description(string t)
{
Text = t;
}
}
public static class GetDescription
{
/// Extension method for enum-s
public static string ToDescription(this Enum en)
{
Type type = en.GetType();
MemberInfo[] memInfo = type.GetMember(en.ToString());
if (memInfo != null && memInfo.Length > 0)
{
object[] attrs = memInfo[0].GetCustomAttributes(typeof(Description), false);
if (attrs != null && attrs.Length > 0)
return ((Description)attrs[0]).Text;
}
return en.ToString(); /// Return ToString() value in case there is no description
}
}
public enum ProcedureState
{
Active,
History,
Count,
}
/// <summary> Kind of meters for the procedure / test </summary>
public enum MetersKind
{
#if LANG_DE
[Description("Wasserzähler")] Single,
[Description("Verbundwasserzähler")] Combined,
[Description("Wärmezähler")] HeatMeter,
#elif LANG_CS
[Description("Vodoměry")] Single,
[Description("Kombinované vodoměry")] Combined,
[Description("Měřiče tepla")] HeatMeter,
#elif LANG_RU
[Description("Счетчик")] Single,
[Description("Комбинированный счетчик")] Combined,
[Description("Счетчик тепла")] HeatMeter,
#else
[Description("Water meters")] Single,
[Description("Compound water meters")] Combined,
[Description("Heat meters")] HeatMeter,
#endif
}
public enum CompoundMeterId : byte
{
Single,
CompoundMain,
CompoundAux,
Compound,
HeatMeterVolume,
HeatMeterEnergy,
SingleOrCompound, /// Only used when querying results
}
public enum Medium
{
[Description("")] NotSpecified,
ColdWater,
HotWater,
Count
}
public enum Mounting
{
[Description("")] NotSpecified,
#if LANG_DE
[Description("H")] H, /// horizontal
[Description("V")] V, /// vertical
[Description("STR")] S, /// standrohre
[Description("F")] F, /// fall
#else
[Description("H")] H, /// horizontal
[Description("V")] V, /// vertical
[Description("S")] S, /// steig
[Description("F")] F, /// fall
#endif
Count
}
public enum TemperatureClass
{
[Description("")] NotSpecified,
[Description("T30")] T30,
[Description("T50")] T50,
[Description("T70")] T70,
[Description("T90")] T90,
[Description("T130")] T130,
[Description("T180")] T180,
[Description("T30/70")] T30_70,
[Description("T30/90")] T30_90,
[Description("T30/130")] T30_130,
[Description("T30/180")] T30_180,
[Description("30")] t30,
[Description("50")] t50,
[Description("70")] t70,
[Description("90")] t90,
[Description("130")] t130,
[Description("180")] t180,
Count
}
public enum FlowProfileSensitivityClass
{
[Description("")] NotSpecified,
[Description("U0")] U0, /// ?
[Description("D0")] D0, /// ?
Count
}
public enum PressureLossClass
{
[Description("")] NotSpecified,
[Description("dp63")] dp63, /// 0.063 MPa = 0.63 bar, TODO: Change to "Δp63"
[Description("dp40")] dp40, /// 0.040 MPa = 0.40 bar
[Description("dp25")] dp25, /// 0.025 MPa = 0.25 bar
[Description("dp16")] dp16, /// 0.016 MPa = 0.16 bar
[Description("dp10")] dp10, /// 0.010 MPa = 0.10 bar
Count
}
/// <summary> Maximum Admissible Pressure </summary>
public enum MaxAdmissiblePressure
{
[Description("")] NotSpecified,
[Description("MAP6")] MAP6,
[Description("MAP10")] MAP10,
[Description("MAP16")] MAP16,
[Description("MAP25")] MAP25,
[Description("MAP40")] MAP40,
Count
}
/// <summary> Transition step is finished when this condition is fulfilled </summary>
public enum StepCondition
{
None,
Scale1Empty,
Scale2Empty,
Scale3Empty,
AllScalesEmpty,
Count
}
public enum Publish : sbyte
{
#if LANG_DE
/// german
[Description("nie")] Never = 0,
[Description("immer")] Always = 1,
[Description("Bildschirm")] OnScreen = 2,
[Description("intern")] Internal = 3,
#elif LANG_CS
/// czech
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interně")] Internal = 3,
#elif LANG_SK
/// slovak
[Description("nikdy")] Never = 0,
[Description("vždy")] Always = 1,
[Description("na obrazovku")] OnScreen = 2,
[Description("interne")] Internal = 3,
#elif LANG_PL
/// polish
[Description("nigdy")] Never = 0,
[Description("zawsze")] Always = 1,
[Description("na ekranie")] OnScreen = 2,
[Description("wewnętrznie")] Internal = 3,
#elif LANG_RU
/// russian
[Description("никогда")] Never = 0,
[Description("всегда")] Always = 1,
[Description("толька экран")] OnScreen = 2,
[Description("внутренно")] Internal = 3,
#else
/// english
[Description("Never")] Never = 0,
[Description("Always")] Always = 1,
[Description("On screen")] OnScreen = 2,
[Description("Internal")] Internal = 3,
#endif
Count
}
public enum MassMethod : byte
{
#if LANG_DE
/// nemecky
[Description("Waage")] Scale,
[Description("Spanne")] Spread,
[Description("Standardabw.")] StdDev,
#elif LANG_CS
/// cesky
[Description("váhou")] Scale,
[Description("max.rozdíl")] Spread,
[Description("std.dev.")] StdDev,
#else
[Description("Scale")] Scale,
[Description("Spread")] Spread,
[Description("Std.dev.")] StdDev,
#endif
Count
}
public enum TestRedType
{
Fix,
/// etc.
Count,
}
public enum FQC1
{
FQC1,
FQP1,
Count,
}
public enum Progress
{
JustStarted,
TransitionBefore,
SwitchingFlowDetection,
FlowSetting,
Aborted, /// Use as an argument when a test was aborted
Test,
TransitionAfter,
Completed,
Count,
}
public enum Device
{
Screen,
Printer,
Disk,
}
public enum PageOrientation
{
Portrait,
Landscape,
Count,
}
public enum ItemCategory
{
#if LANG_DE
[Description("Allgemein")] Other,
[Description("Prüfstanddaten")] BenchData,
[Description("Prüfstandergebnisse")] BenchResult,
[Description("Prüfpunktdaten")] TestData,
[Description("Prüfpunktergebnisse")] TestResult,
[Description("Wasserzelledaten")] MeterData,
[Description("Wasserzelleergebnisse")] MeterResult,
#else
[Description("Other")] Other,
[Description("Bench data")] BenchData,
[Description("Bench result")] BenchResult,
[Description("Test data")] TestData,
[Description("Test result")] TestResult,
[Description("Meter data")] MeterData,
[Description("Meter result")] MeterResult,
#endif
Count,
}
/// <summary> Possible modes of operation of components and devices. </summary>
public enum DebugMode
{
#if LANG_DE
[Description("Erkennen-aus")] DetectedOff = -2,
[Description("Erkennen-ein")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
[Description("Auto-erkennen")] AutoDetect, /// The component (device) will be auto-detected
[Description("Fehler")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Aus")] Off, /// The component is off
[Description("Aufzeichnen")] Record,
[Description("Reply")] Reply,
[Description("Simuliert")] Simulate, /// Test bench simulation, this mode does not require any hardware
[Description("Geerbt")] Inherit,
#else
[Description("Detected off")] DetectedOff = -2,
[Description("Detected on")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
[Description("Auto detect")] AutoDetect, /// The component (device) will be auto-detected
[Description("Run-time error")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Off")] Off, /// The component is off
[Description("Record")] Record,
[Description("Reply")] Reply,
[Description("Simulate")] Simulate, /// Test bench simulation, this mode does not require any hardware
[Description("Inherit")] Inherit,
#endif
Count,
}
public enum LogLevel
{
#if LANG_DE
[Description("Aus")] Off,
[Description("Schwerwiegend")] Fatal,
[Description("Fehler")] Error,
[Description("Warnung")] Warn,
[Description("Info")] Info,
[Description("Debug")] Debug,
[Description("Alles")] All,
#else
[Description("Off")] Off,
[Description("Fatal")] Fatal,
[Description("Error")] Error,
[Description("Warn")] Warn,
[Description("Info")] Info,
[Description("Debug")] Debug,
[Description("All")] All,
#endif
Count,
}
/// <summary> Arrangement of tests </summary>
public enum TestsArrangement
{
Rows,
Columns,
}
/// <summary> Arrangement of meters </summary>
public enum MetersArrangement
{
Vertically,
Horizontally,
}
public enum Alignment
{
#if LANG_DE
[Description("links")] Left,
[Description("zentriert")] Center,
[Description("rechts")] Right,
[Description("angepasst")] Justified,
#else
[Description("Left")] Left,
[Description("Center")] Center,
[Description("Right")] Right,
[Description("Justified")] Justified,
#endif
Count
}
public enum ImageRotation
{
[Description("0 deg")] None,
[Description("90 deg")] Deg90,
[Description("180 deg")] Deg180,
[Description("270 deg")] Deg270,
Count
}
public enum CameraDisplayResolution
{
Small,
Medium,
Large,
// FullScreen,
Count,
}
public enum ErrorFlagsMode : sbyte
{
#if LANG_DE
[Description("aus")] Off,
[Description("info")] Info,
[Description("ein")] On,
#elif LANG_CS
[Description("vypnuto")] Off,
[Description("info")] Info,
[Description("zapnuto")] On,
#elif LANG_RU
[Description("выкл")] Off,
[Description("инфо")] Info,
[Description("вкл")] On,
#elif LANG_PL
[Description("nie")] Off,
[Description("info")] Info,
[Description("tak")] On,
#else // LANG_EN
[Description("off")] Off,
[Description("info")] Info,
[Description("on")] On,
#endif
Count
}
}
+53
View File
@@ -0,0 +1,53 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace Config.Entities
{
public class FeedingPath : IHasName, IHasItemNr, IHasValves
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual string Pump { get; set; }
public virtual string RegulValvesPct { get; set; } /// Positions of regulation valves in % separated by ';'
/// Valves
public virtual string ValvesOpen { get; set; }
public virtual string ValvesClose { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public FeedingPath()
{
ValvesOpen = string.Empty;
ValvesClose = string.Empty;
}
public FeedingPath(string name, int itemNr)
: this()
{
Name = name;
ItemNr = itemNr;
}
public virtual FeedingPath Clone(string name, int itemNr)
{
FeedingPath result = new FeedingPath(name, itemNr);
result.Qfrom = Qfrom;
result.Qto = Qto;
result.Pump = Pump;
result.RegulValvesPct = RegulValvesPct;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
return result;
}
}
}
+24
View File
@@ -0,0 +1,24 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
namespace Config.Entities
{
public class Group
{
public virtual int Id { get; protected set; }
public virtual int Gid { get; set; }
public virtual string Name { get; set; }
public Group()
{
}
public Group(int gid, string name)
{
Gid = gid;
Name = name;
}
}
}
+65
View File
@@ -0,0 +1,65 @@
///
/// Copyright (c) 2016-2017 Sensus Metering Systems
///
using System;
namespace Config.Entities
{
public class HeatMetersPath : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float TempWarmFrom { get; set; } /// Warm temperature range from [°C]
public virtual float TempWarmTo { get; set; } /// Warm temperature range to [°C]
public virtual float TempColdFrom { get; set; } /// Cold temperature range from [°C]
public virtual float TempColdTo { get; set; } /// Cold temperature renge to [°C]
public virtual string TMeterRefWarm1 { get; set; }
public virtual string TMeterRefWarm2 { get; set; }
public virtual string TMeterRefCold1 { get; set; }
public virtual string TMeterRefCold2 { get; set; }
public virtual string TMeterWorkWarm1 { get; set; }
public virtual string TMeterWorkWarm2 { get; set; }
public virtual string TMeterWorkCold1 { get; set; }
public virtual string TMeterWorkCold2 { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public HeatMetersPath()
{
}
public HeatMetersPath(string name, int itemNr)
: this()
{
Name = name;
ItemNr = itemNr;
}
public virtual HeatMetersPath Clone(string name, int itemNr)
{
HeatMetersPath result = new HeatMetersPath(name, itemNr);
result.TempWarmFrom = TempWarmFrom;
result.TempWarmTo = TempWarmTo;
result.TempColdFrom = TempColdFrom;
result.TempColdTo = TempColdTo;
result.TMeterRefWarm1 = TMeterRefWarm1;
result.TMeterRefWarm2 = TMeterRefWarm2;
result.TMeterRefCold1 = TMeterRefCold1;
result.TMeterRefCold2 = TMeterRefCold2;
result.TMeterWorkWarm1 = TMeterWorkWarm1;
result.TMeterWorkWarm2 = TMeterWorkWarm2;
result.TMeterWorkCold1 = TMeterWorkCold1;
result.TMeterWorkCold2 = TMeterWorkCold2;
return result;
}
}
}
@@ -1,9 +1,9 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF.Entities
namespace Config.Entities
{
interface IHasItemNr
public interface IHasItemNr
{
int Id { get; }
int ItemNr { get; set; }
+11
View File
@@ -0,0 +1,11 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
namespace Config.Entities
{
public interface IHasName
{
int Id { get; }
string Name { get; set; }
}
}
@@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF.Entities
namespace Config.Entities
{
public interface IHasValves
{
+22
View File
@@ -0,0 +1,22 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
namespace Config.Entities
{
public class MeasurementCorrection
{
public virtual int Id { get; protected set; }
public virtual int RangeIx { get; set; } /// 0..5
public virtual float Measurement { get; set; }
public virtual float Correction { get; set; }
public MeasurementCorrection() { }
public MeasurementCorrection(int rangeIx)
{
RangeIx = rangeIx;
}
}
}
@@ -1,18 +1,17 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace TBF.Entities
namespace Config.Entities
{
public class MetersPath : IHasItemNr
public class MetersPath : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual string OriName { get; set; } /// Not mapped to database
/// Sensors
public virtual string Sensor1 { get; set; }
@@ -35,7 +34,6 @@ namespace TBF.Entities
public virtual string Sensor18 { get; set; }
public virtual string Sensor19 { get; set; }
public virtual string Sensor20 { get; set; }
#if IPERLST
public virtual string Sensor21 { get; set; }
public virtual string Sensor22 { get; set; }
public virtual string Sensor23 { get; set; }
@@ -56,7 +54,6 @@ namespace TBF.Entities
public virtual string Sensor38 { get; set; }
public virtual string Sensor39 { get; set; }
public virtual string Sensor40 { get; set; }
#endif
/// ------------- Additional stuff not mapped into the database -------------
@@ -71,62 +68,9 @@ namespace TBF.Entities
ItemNr = itemNr;
}
public MetersPath(BenchControl.MetersPath path)
: this(path.Name, path.ItemNr)
{
Qfrom = path.Qfrom;
Qto = path.Qto;
Sensor1 = (path.RegisterReaders[0] != null) ? path.RegisterReaders[0].Cfg.Name : null;
#pragma warning disable
if (Program.WMsCount >= 2) Sensor2 = (path.RegisterReaders[1] != null) ? path.RegisterReaders[1].Cfg.Name : null;
if (Program.WMsCount >= 3) Sensor3 = (path.RegisterReaders[2] != null) ? path.RegisterReaders[2].Cfg.Name : null;
if (Program.WMsCount >= 4) Sensor4 = (path.RegisterReaders[3] != null) ? path.RegisterReaders[3].Cfg.Name : null;
if (Program.WMsCount >= 5) Sensor5 = (path.RegisterReaders[4] != null) ? path.RegisterReaders[4].Cfg.Name : null;
if (Program.WMsCount >= 6) Sensor6 = (path.RegisterReaders[5] != null) ? path.RegisterReaders[5].Cfg.Name : null;
if (Program.WMsCount >= 7) Sensor7 = (path.RegisterReaders[6] != null) ? path.RegisterReaders[6].Cfg.Name : null;
if (Program.WMsCount >= 8) Sensor8 = (path.RegisterReaders[7] != null) ? path.RegisterReaders[7].Cfg.Name : null;
if (Program.WMsCount >= 9) Sensor9 = (path.RegisterReaders[8] != null) ? path.RegisterReaders[8].Cfg.Name : null;
if (Program.WMsCount >= 10) Sensor10 = (path.RegisterReaders[9] != null) ? path.RegisterReaders[9].Cfg.Name : null;
if (Program.WMsCount >= 11) Sensor11 = (path.RegisterReaders[10] != null) ? path.RegisterReaders[10].Cfg.Name : null;
if (Program.WMsCount >= 12) Sensor12 = (path.RegisterReaders[11] != null) ? path.RegisterReaders[11].Cfg.Name : null;
if (Program.WMsCount >= 13) Sensor13 = (path.RegisterReaders[12] != null) ? path.RegisterReaders[12].Cfg.Name : null;
if (Program.WMsCount >= 14) Sensor14 = (path.RegisterReaders[13] != null) ? path.RegisterReaders[13].Cfg.Name : null;
if (Program.WMsCount >= 15) Sensor15 = (path.RegisterReaders[14] != null) ? path.RegisterReaders[14].Cfg.Name : null;
if (Program.WMsCount >= 16) Sensor16 = (path.RegisterReaders[15] != null) ? path.RegisterReaders[15].Cfg.Name : null;
if (Program.WMsCount >= 17) Sensor17 = (path.RegisterReaders[16] != null) ? path.RegisterReaders[16].Cfg.Name : null;
if (Program.WMsCount >= 18) Sensor18 = (path.RegisterReaders[17] != null) ? path.RegisterReaders[17].Cfg.Name : null;
if (Program.WMsCount >= 19) Sensor19 = (path.RegisterReaders[18] != null) ? path.RegisterReaders[18].Cfg.Name : null;
if (Program.WMsCount >= 20) Sensor20 = (path.RegisterReaders[19] != null) ? path.RegisterReaders[19].Cfg.Name : null;
#if IPERLST
if (Program.WMsCount >= 21) Sensor21 = (path.RegisterReaders[20] != null) ? path.RegisterReaders[20].Cfg.Name : null;
if (Program.WMsCount >= 22) Sensor22 = (path.RegisterReaders[21] != null) ? path.RegisterReaders[21].Cfg.Name : null;
if (Program.WMsCount >= 23) Sensor23 = (path.RegisterReaders[22] != null) ? path.RegisterReaders[22].Cfg.Name : null;
if (Program.WMsCount >= 24) Sensor24 = (path.RegisterReaders[23] != null) ? path.RegisterReaders[23].Cfg.Name : null;
if (Program.WMsCount >= 25) Sensor25 = (path.RegisterReaders[24] != null) ? path.RegisterReaders[24].Cfg.Name : null;
if (Program.WMsCount >= 26) Sensor26 = (path.RegisterReaders[25] != null) ? path.RegisterReaders[25].Cfg.Name : null;
if (Program.WMsCount >= 27) Sensor27 = (path.RegisterReaders[26] != null) ? path.RegisterReaders[26].Cfg.Name : null;
if (Program.WMsCount >= 28) Sensor28 = (path.RegisterReaders[27] != null) ? path.RegisterReaders[27].Cfg.Name : null;
if (Program.WMsCount >= 29) Sensor29 = (path.RegisterReaders[28] != null) ? path.RegisterReaders[28].Cfg.Name : null;
if (Program.WMsCount >= 30) Sensor30 = (path.RegisterReaders[29] != null) ? path.RegisterReaders[29].Cfg.Name : null;
if (Program.WMsCount >= 31) Sensor31 = (path.RegisterReaders[30] != null) ? path.RegisterReaders[30].Cfg.Name : null;
if (Program.WMsCount >= 32) Sensor32 = (path.RegisterReaders[31] != null) ? path.RegisterReaders[31].Cfg.Name : null;
if (Program.WMsCount >= 33) Sensor33 = (path.RegisterReaders[32] != null) ? path.RegisterReaders[32].Cfg.Name : null;
if (Program.WMsCount >= 34) Sensor34 = (path.RegisterReaders[33] != null) ? path.RegisterReaders[33].Cfg.Name : null;
if (Program.WMsCount >= 35) Sensor35 = (path.RegisterReaders[34] != null) ? path.RegisterReaders[34].Cfg.Name : null;
if (Program.WMsCount >= 36) Sensor36 = (path.RegisterReaders[35] != null) ? path.RegisterReaders[35].Cfg.Name : null;
if (Program.WMsCount >= 37) Sensor37 = (path.RegisterReaders[36] != null) ? path.RegisterReaders[36].Cfg.Name : null;
if (Program.WMsCount >= 38) Sensor38 = (path.RegisterReaders[37] != null) ? path.RegisterReaders[37].Cfg.Name : null;
if (Program.WMsCount >= 39) Sensor39 = (path.RegisterReaders[38] != null) ? path.RegisterReaders[38].Cfg.Name : null;
if (Program.WMsCount >= 40) Sensor40 = (path.RegisterReaders[39] != null) ? path.RegisterReaders[39].Cfg.Name : null;
#endif
#pragma warning restore
}
public virtual MetersPath Clone(string name, int itemNr)
{
MetersPath result = new MetersPath(name, itemNr);
result.Qfrom = Qfrom;
result.Qto = Qto;
result.Sensor1 = Sensor1;
result.Sensor2 = Sensor2;
result.Sensor3 = Sensor3;
@@ -147,7 +91,6 @@ namespace TBF.Entities
result.Sensor18 = Sensor18;
result.Sensor19 = Sensor19;
result.Sensor20 = Sensor20;
#if IPERLST
result.Sensor21 = Sensor21;
result.Sensor22 = Sensor22;
result.Sensor23 = Sensor23;
@@ -168,7 +111,7 @@ namespace TBF.Entities
result.Sensor38 = Sensor38;
result.Sensor39 = Sensor39;
result.Sensor40 = Sensor40;
#endif
return result;
}
@@ -195,7 +138,6 @@ namespace TBF.Entities
else if (i == 17) return Sensor18;
else if (i == 18) return Sensor19;
else if (i == 19) return Sensor20;
#if IPERLST
else if (i == 20) return Sensor21;
else if (i == 21) return Sensor22;
else if (i == 22) return Sensor23;
@@ -216,7 +158,6 @@ namespace TBF.Entities
else if (i == 37) return Sensor38;
else if (i == 38) return Sensor39;
else if (i == 39) return Sensor40;
#endif
else return null;
}
@@ -243,7 +184,6 @@ namespace TBF.Entities
else if (i == 17) Sensor18 = cmpntName;
else if (i == 18) Sensor19 = cmpntName;
else if (i == 19) Sensor20 = cmpntName;
#if IPERLST
else if (i == 20) Sensor21 = cmpntName;
else if (i == 21) Sensor22 = cmpntName;
else if (i == 22) Sensor23 = cmpntName;
@@ -264,7 +204,6 @@ namespace TBF.Entities
else if (i == 37) Sensor38 = cmpntName;
else if (i == 38) Sensor39 = cmpntName;
else if (i == 39) Sensor40 = cmpntName;
#endif
}
}
}
+66
View File
@@ -0,0 +1,66 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace Config.Entities
{
public class OutputPath : IHasName, IHasItemNr, IHasValves
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string OriName { get; set; } /// Not mapped to database
public virtual float Qfrom { get; set; } /// Water flow in [m3/h]
public virtual float Qto { get; set; } /// Water flow in [m3/h]
public virtual string RegulValve { get; set; }
public virtual string FlowMeter { get; set; }
public virtual float PidCoef { get; set; } /// PID coefficient for the regulation path
public virtual string StartValve { get; set; }
public virtual string Diverter { get; set; }
public virtual string TempDiv { get; set; }
public virtual string Scale { get; set; }
public virtual string EmptyTankValve { get; set; } /// Not used anywhere
/// Valves
public virtual string ValvesOpen { get; set; }
public virtual string ValvesClose { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public OutputPath()
{
ValvesOpen = string.Empty;
ValvesClose = string.Empty;
}
public OutputPath(string name, int itemNr)
: this()
{
Name = name;
ItemNr = itemNr;
}
public virtual OutputPath Clone(string name, int itemNr)
{
OutputPath result = new OutputPath(name, itemNr);
result.Name = Name;
result.Qfrom = Qfrom;
result.Qto = Qto;
result.RegulValve = RegulValve;
result.FlowMeter = FlowMeter;
result.PidCoef = PidCoef;
result.StartValve = StartValve;
result.Diverter = Diverter;
result.TempDiv = TempDiv;
result.Scale = Scale;
result.EmptyTankValve = EmptyTankValve;
result.ValvesOpen = ValvesOpen;
result.ValvesClose = ValvesClose;
return result;
}
}
}
+233
View File
@@ -0,0 +1,233 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
namespace Config.Entities
{
/// <summary>
/// Stores one test procedure, supports revisions and history log
/// </summary>
public class Procedure : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string Description { get; set; } /// Short description
public virtual string CreationUser { get; set; } /// Name of the user who has created or changed this procedure
public virtual DateTime CreationTime { get; set; } /// Date and time of the creation or change
public virtual string LastChgUser { get; set; } /// Name of the user who has created or changed this procedure
public virtual DateTime LastChgTime { get; set; } /// Date and time of the creation or change
public virtual string LongDescription { get; set; } /// Long description (notes)
public virtual ProcedureState ProcedureState { get; set; }
public virtual int Revision { get; set; }
public virtual int PredecessorId { get; set; }
public virtual bool ObtainedByCopy { get; set; } /// Initial version of this procedure was a copy of another procedure
///
public virtual MetersKind MetersKind { get; set; } /// single / compound / heat meters
public virtual string Watermeters { get; set; } /// Water meter name or Id
public virtual bool Protected { get; set; } /// true = procedure cannot be changed by a testing specialist
public virtual bool MustBeComplete { get; set; } /// true = procedure can be finished just when all tests were finished
public virtual bool ManualCtrlDisabled { get; set; } /// true = manual control of valves, etc. is disabled
public virtual string DataEntry { get; set; } /// Component to use for data entry
public virtual string ResultsPrinter { get; set; } /// Component to use for printing the results
public virtual string ResultsWriter { get; set; } /// Component to use for saving the results into the file
public virtual string TransitionStart { get; set; }
public virtual string TransitionEnd { get; set; }
public virtual string AltProcName { get; set; } /// Alternative procedure name (null or string.Empty = no alt. procedure)
public virtual int AltProcPeriod { get; set; } /// Period of alternative procedures (0 = no alt. procedure)
public virtual IList<ComponentProcedure> MoreParams { get; set; }
public virtual IList<Test> Tests { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public Procedure()
{
MoreParams = new List<ComponentProcedure>();
Tests = new List<Test>();
///
/// Default values
///
CreationUser = (Users.GlobalData.CurrentUser != null) ? Users.GlobalData.CurrentUser.UserName : null;
CreationTime = DateTime.Now;
LastChgUser = CreationUser;
LastChgTime = CreationTime;
MetersKind = Entities.MetersKind.Single;
Watermeters = string.Empty;
Description = string.Empty;
LongDescription = string.Empty;
}
public Procedure(string name, int itemNr)
: this()
{
Name = name;
ItemNr = itemNr;
}
public virtual Procedure Clone()
{
Procedure result = new Procedure();
result.ItemNr = ItemNr;
result.Name = Name;
result.Description = Description;
result.CreationUser = CreationUser;
result.CreationTime = CreationTime;
result.LastChgUser = LastChgUser;
result.LastChgTime = LastChgTime;
result.LongDescription = LongDescription;
result.ProcedureState = ProcedureState;
result.Revision = Revision;
result.PredecessorId = Id;
result.ObtainedByCopy = ObtainedByCopy;
result.MetersKind = MetersKind;
result.Watermeters = Watermeters;
result.Protected = Protected;
result.MustBeComplete = MustBeComplete;
result.ManualCtrlDisabled = ManualCtrlDisabled;
result.DataEntry = DataEntry;
result.ResultsPrinter = ResultsPrinter;
result.ResultsWriter = ResultsWriter;
result.TransitionStart = TransitionStart;
result.TransitionEnd = TransitionEnd;
foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone(result)); }
foreach (var test in Tests) { result.Tests.Add(test.Clone()); }
return result;
}
public virtual void Export(StreamWriter output)
{
output.WriteLine(ItemNr.ToString(CultureInfo.InvariantCulture));
output.WriteLine(Name);
output.WriteLine(Description);
output.WriteLine(CreationUser);
output.WriteLine(CreationTime.ToString(CultureInfo.InvariantCulture));
output.WriteLine(LastChgUser);
output.WriteLine(LastChgTime.ToString(CultureInfo.InvariantCulture));
output.WriteLine(MetersKind.ToString());
output.WriteLine(Watermeters);
output.WriteLine(Protected.ToString());
output.WriteLine(MustBeComplete.ToString());
output.WriteLine(ManualCtrlDisabled.ToString());
output.WriteLine(DataEntry);
output.WriteLine(ResultsPrinter);
output.WriteLine(ResultsWriter);
output.WriteLine(TransitionStart);
output.WriteLine(TransitionEnd);
foreach (var prms in MoreParams) { prms.Export(output); }
output.WriteLine();
foreach (var test in Tests) { test.Export(output); }
output.WriteLine();
output.Close();
}
public static Procedure Import(StreamReader input)
{
Procedure result = new Procedure();
result.ItemNr = int.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
result.Name = input.ReadLine();
result.Description = input.ReadLine();
result.CreationUser = input.ReadLine();
result.CreationTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
result.LastChgUser = input.ReadLine();
result.LastChgTime = DateTime.Parse(input.ReadLine(), CultureInfo.InvariantCulture);
string line = input.ReadLine();
result.MetersKind = line.Equals(MetersKind.Single.ToString()) ? MetersKind.Single : (line.Equals(MetersKind.Combined.ToString()) ? MetersKind.Combined : MetersKind.HeatMeter);
result.Watermeters = input.ReadLine();
result.Protected = bool.Parse(input.ReadLine());
result.MustBeComplete = bool.Parse(input.ReadLine());
result.ManualCtrlDisabled = bool.Parse(input.ReadLine());
result.DataEntry = input.ReadLine();
result.ResultsPrinter = input.ReadLine();
result.ResultsWriter = input.ReadLine();
result.TransitionStart = input.ReadLine();
result.TransitionEnd = input.ReadLine();
while(true)
{
ComponentProcedure prms = ComponentProcedure.Import(input, result);
if (prms == null)
break;
else
result.MoreParams.Add(prms);
}
while (true)
{
Test tst = Test.Import(input, result);
if (tst == null)
break;
else
result.Tests.Add(tst);
}
return result;
}
public virtual string Compare(StreamReader inp)
{
System.Text.StringBuilder diff = new System.Text.StringBuilder();
const string fmt = "{0} = {1}\r\n (in the file {2})\r\n";
string ln;
ln = inp.ReadLine(); /// skip ItemNr
ln = inp.ReadLine(); if (ln != Name) { diff.AppendFormat(fmt, "Name", Name, ln); };
ln = inp.ReadLine(); if (ln != Description) { diff.AppendFormat(fmt, "Description", Description, ln); };
ln = inp.ReadLine(); /// skip CreationUser
ln = inp.ReadLine(); /// skip CreationTime
ln = inp.ReadLine(); /// skip LastChgUser
ln = inp.ReadLine(); /// skip LastChgTime
ln = inp.ReadLine(); if (ln != MetersKind.ToString()) { diff.AppendFormat(fmt, "MetersKind", MetersKind, ln); };
ln = inp.ReadLine(); if (ln != Watermeters) { diff.AppendFormat(fmt, "Watermeters", Watermeters, ln); };
ln = inp.ReadLine(); if (ln != Protected.ToString()) { diff.AppendFormat(fmt, "Protected", Protected, ln); };
ln = inp.ReadLine(); if (ln != MustBeComplete.ToString()) { diff.AppendFormat(fmt, "MustBeComplete", MustBeComplete, ln); };
ln = inp.ReadLine(); if (ln != ManualCtrlDisabled.ToString()) { diff.AppendFormat(fmt, "ManualCtrlDisabled", ManualCtrlDisabled, ln); };
ln = inp.ReadLine(); if (ln != DataEntry) { diff.AppendFormat(fmt, "DataEntry", DataEntry, ln); };
ln = inp.ReadLine(); if (ln != ResultsPrinter) { diff.AppendFormat(fmt, "ResultsPrinter", ResultsPrinter, ln); };
ln = inp.ReadLine(); if (ln != ResultsWriter) { diff.AppendFormat(fmt, "ResultsWriter", ResultsWriter, ln); };
ln = inp.ReadLine(); if (ln != TransitionStart) { diff.AppendFormat(fmt, "TransitionStart", TransitionStart, ln); };
ln = inp.ReadLine(); if (ln != TransitionEnd) { diff.AppendFormat(fmt, "TransitionEnd", TransitionEnd, ln); };
/// TODO Compare componentprocedure-s
while (ComponentProcedure.Import(inp, null) != null)
{
}
//foreach (var test in Tests)
//{
// string testDiff = test.Compare(inp);
// if (testDiff.Contains(
//}
//bool extraTestsInFile = true;
//while (Test.Import(inp, null) != null) { extraTestsInFile = true; }
return diff.ToString();
}
public override string ToString()
{
return string.Format("{0}, rev.{1}", Name, Revision);
}
}
}
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
namespace TBF.Entities
namespace Config.Entities
{
public class ProcedureHistory
{
+360
View File
@@ -0,0 +1,360 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
namespace Config.Entities
{
/// <summary>
/// Test, consisting of one or more repetitions of the test 'SingleTest'.
/// </summary>
public class Test : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual int Part { get; set; } /// Part=0 ... test of all WM-s
/// Part>0 ... part of a set of tests with the same Name: subset of WM-s is given by MetersPath
public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
public virtual bool DoEvaluate { get; set; }
public virtual float Qfrom { get; set; } /// Water flow low limit in [m3/h]
public virtual float Qto { get; set; } /// Water flow high limit in [m3/h]
public virtual float Volume { get; set; } /// Test volume (target) in [l]
public virtual float TstTime { get; set; } /// Test time (estimate) in [s]
public virtual string Method { get; set; }
public virtual float ErrLimLo { get; set; } /// in [%] (usually < 0) or 1=class1, 2=class2, 3=class3
public virtual float ErrLimHi { get; set; } /// in [%] (usually > 0) or -Qn in m3/h
public virtual float Uncertainty { get; set; } /// int [%] makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
public virtual int Repeats { get; set; }
public virtual bool DoDraining { get; set; }
public virtual bool DoZeroing { get; set; }
public virtual bool DoControlWaterTemp { get; set; }
public virtual float TempLimLo { get; set; } /// Lower limit for the controlled temperature
public virtual float TempLimHi { get; set; } /// Upper limit for the controlled temperature
public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
public virtual int MassRepeats { get; set; } /// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
public virtual float MassSpread { get; set; } /// Max spread of mass. measurements at the beginning/end of test, 0 = default
public virtual MassMethod MassMethod { get; set; } /// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
public virtual int TimeBeforeFlow { get; set; } /// Delay time before the start of flow control in [s]
public virtual int TimeFlow2Mass { get; set; } /// Delay time from the flow stable to the 1st mass measurement in [s]
public virtual int TimePump2StartV { get; set; } /// Delay time from the start of the pump to opening the start valve in [s]
public virtual int TimeStop2Mass { get; set; } /// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
public virtual double TolerRed { get; set; } /// = Filter
public virtual TestRedType RedType { get; set; }
public virtual string FeedingPath { get; set; }
public virtual string BenchPath { get; set; }
public virtual string OutputPath { get; set; }
public virtual string MetersPath { get; set; }
#if HEAT_METERS
public virtual string HeatMetersPath { get; set; }
#endif
public virtual string RelTransBefore { get; set; }
public virtual string RelTransBetween { get; set; }
public virtual string RelTransAfter { get; set; }
public virtual string TransitionAfter { get; set; }
public virtual IList<ComponentTest> MoreParams { get; set; }
public virtual Procedure Procedure { get; set; }
/// ------------- Additional stuff not mapped into the database -------------
public Test()
{
MoreParams = new List<ComponentTest>();
///
/// Default values
///
Publish = (sbyte)Config.Entities.Publish.Always;
DoEvaluate = true;
Repeats = 1;
DoDraining = false;
DoZeroing = false;
DoControlWaterTemp = false;
TempLimLo = 15.0f;
TempLimHi = 25.0f;
ErrLimLo = -2.0f; /// [%] lower error limit
ErrLimHi = 2.0f; /// [%] upper error limit
Uncertainty = 0;
PumpPower = 60.0f; /// [%]
MassRepeats = 0; /// default
MassSpread = 0; /// default
MassMethod = MassMethod.Scale; /// default
TimeBeforeFlow = 10; /// [s] time before the start of flow control in [s]
TimeFlow2Mass = 5; /// [s] time from the flow stable to the 1st mass measurement in [s]
TimePump2StartV = 1; /// [s] time from the 1st mass measurement to the test start in [s]
TimeStop2Mass = 5; /// [s] between the test end and the final mass measurement
TolerRed = 0; /// = Filter parameter
RelTransBefore = string.Empty;
RelTransBetween = string.Empty;
RelTransAfter = string.Empty;
TransitionAfter = string.Empty;
}
public Test(string name, int itemNr, Procedure procedure)
: this()
{
Name = name;
ItemNr = itemNr;
Procedure = procedure;
}
// Makes a new copy of this object (not just a reference)
public virtual Test Clone()
{
Test result = new Test(Name, ItemNr, Procedure);
result.Part = Part;
result.Publish = Publish;
result.DoEvaluate = DoEvaluate;
result.Qfrom = Qfrom;
result.Qto = Qto;
result.Volume = Volume;
result.TstTime = TstTime;
result.Method = Method;
result.ErrLimLo = ErrLimLo;
result.ErrLimHi = ErrLimHi;
result.Uncertainty = Uncertainty;
result.Repeats = Repeats;
result.DoDraining = DoDraining;
result.DoZeroing = DoZeroing;
result.DoControlWaterTemp = DoControlWaterTemp;
result.TempLimLo = TempLimLo;
result.TempLimHi = TempLimHi;
result.PumpPower = PumpPower;
result.MassRepeats = MassRepeats;
result.MassSpread = MassSpread;
result.MassMethod = MassMethod;
result.TimeBeforeFlow = TimeBeforeFlow;
result.TimeFlow2Mass = TimeFlow2Mass;
result.TimePump2StartV = TimePump2StartV;
result.TimeStop2Mass = TimeStop2Mass;
result.TolerRed = TolerRed;
result.RedType = RedType;
result.FeedingPath = FeedingPath;
result.BenchPath = BenchPath;
result.OutputPath = OutputPath;
result.MetersPath = MetersPath;
#if HEAT_METERS
result.HeatMetersPath = HeatMetersPath;
#endif
result.RelTransBefore = RelTransBefore;
result.RelTransBetween = RelTransBetween;
result.RelTransAfter = RelTransAfter;
result.TransitionAfter = TransitionAfter;
foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
return result;
}
public virtual void Export(StreamWriter output)
{
CultureInfo ci = CultureInfo.InvariantCulture;
output.WriteLine(Name);
output.WriteLine(Part.ToString(ci));
output.WriteLine(Publish.ToString(ci));
output.WriteLine(DoEvaluate.ToString());
output.WriteLine(Qfrom.ToString(ci));
output.WriteLine(Qto.ToString(ci));
output.WriteLine(Volume.ToString(ci));
output.WriteLine(TstTime.ToString(ci));
output.WriteLine(Method);
output.WriteLine(ErrLimLo.ToString(ci));
output.WriteLine(ErrLimHi.ToString(ci));
output.WriteLine(Uncertainty.ToString(ci));
output.WriteLine(Repeats.ToString(ci));
output.WriteLine(DoDraining.ToString());
output.WriteLine(DoZeroing.ToString());
output.WriteLine(DoControlWaterTemp.ToString());
output.WriteLine(TempLimLo.ToString(ci));
output.WriteLine(TempLimHi.ToString(ci));
output.WriteLine(PumpPower.ToString(ci));
output.WriteLine(MassRepeats.ToString(ci));
output.WriteLine(MassSpread.ToString(ci));
output.WriteLine(((byte)MassMethod).ToString(ci));
output.WriteLine(TimeBeforeFlow.ToString(ci));
output.WriteLine(TimeFlow2Mass.ToString(ci));
output.WriteLine(TimePump2StartV.ToString(ci));
output.WriteLine(TimeStop2Mass.ToString(ci));
output.WriteLine(FeedingPath);
output.WriteLine(BenchPath);
output.WriteLine(OutputPath);
output.WriteLine(MetersPath);
output.WriteLine(RelTransBefore);
output.WriteLine(RelTransBetween);
output.WriteLine(RelTransAfter);
output.WriteLine(TransitionAfter);
foreach (var prms in MoreParams) { prms.Export(output); }
output.WriteLine();
}
public static Test Import(StreamReader input, Procedure newProcedure)
{
string firstLine = input.ReadLine();
if (string.IsNullOrEmpty(firstLine))
{
return null;
}
CultureInfo ci = CultureInfo.InvariantCulture;
Test tst = new Test();
tst.Name = firstLine;
tst.Part = int.Parse(input.ReadLine(), ci);
tst.Publish = sbyte.Parse(input.ReadLine(), ci);
tst.DoEvaluate = bool.Parse(input.ReadLine());
tst.Qfrom = float.Parse(input.ReadLine(), ci);
tst.Qto = float.Parse(input.ReadLine(), ci);
tst.Volume = float.Parse(input.ReadLine(), ci);
tst.TstTime = float.Parse(input.ReadLine(), ci);
tst.Method = input.ReadLine();
tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
tst.Uncertainty = float.Parse(input.ReadLine(), ci);
tst.Repeats = int.Parse(input.ReadLine(), ci);
tst.DoDraining = bool.Parse(input.ReadLine());
tst.DoZeroing = bool.Parse(input.ReadLine());
tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
tst.TempLimLo = float.Parse(input.ReadLine(), ci);
tst.TempLimHi = float.Parse(input.ReadLine(), ci);
tst.PumpPower = float.Parse(input.ReadLine(), ci);
tst.MassRepeats = int.Parse(input.ReadLine(), ci);
tst.MassSpread = float.Parse(input.ReadLine(), ci);
tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
tst.TimeBeforeFlow = int.Parse(input.ReadLine(), ci);
tst.TimeFlow2Mass = int.Parse(input.ReadLine(), ci);
tst.TimePump2StartV = int.Parse(input.ReadLine(), ci);
tst.TimeStop2Mass = int.Parse(input.ReadLine(), ci);
tst.FeedingPath = input.ReadLine();
tst.BenchPath = input.ReadLine();
tst.OutputPath = input.ReadLine();
tst.MetersPath = input.ReadLine();
tst.RelTransBefore = input.ReadLine();
tst.RelTransBetween = input.ReadLine();
tst.RelTransAfter = input.ReadLine();
tst.TransitionAfter = input.ReadLine();
while (true)
{
ComponentTest prms = ComponentTest.Import(input, tst);
if (prms == null)
break;
else
tst.MoreParams.Add(prms);
}
tst.Procedure = newProcedure;
return tst;
}
public virtual string Compare(StreamReader inp)
{
System.Text.StringBuilder diff = new System.Text.StringBuilder();
string fmt = string.Format("Test {0} : ", Name) + "{0} = {1}\r\n (in the file {2})\r\n";
string ln;
CultureInfo ci = CultureInfo.InvariantCulture;
string firstLine = inp.ReadLine();
if (string.IsNullOrEmpty(firstLine)) return string.Format("Test {0} is missing in the file\r\n", Name);
if (Name != firstLine) { diff.AppendFormat(fmt, "Name", Name, firstLine); };
ln = inp.ReadLine(); if (ln != Part.ToString(ci)) { diff.AppendFormat(fmt, "Part", Part.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Publish.ToString(ci)) { diff.AppendFormat(fmt, "Publish", Publish.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoEvaluate.ToString(ci)) { diff.AppendFormat(fmt, "Evaluate", DoEvaluate.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci)) { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Qto.ToString(ci)) { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Volume.ToString(ci)) { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TstTime.ToString(ci)) { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Method) { diff.AppendFormat(fmt, "Method", Method, ln); };
ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci)) { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci)) { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Uncertainty.ToString(ci)) { diff.AppendFormat(fmt, "Uncertainty", Uncertainty.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != Repeats.ToString(ci)) { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci)) { diff.AppendFormat(fmt, "Draining", DoDraining.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoZeroing.ToString(ci)) { diff.AppendFormat(fmt, "Zeroing", DoZeroing.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString()) { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci)) { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci)) { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci)) { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci)) { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci)) { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != ((byte)MassMethod).ToString(ci)) { diff.AppendFormat(fmt, "MassMethod", ((byte)MassMethod).ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TimeBeforeFlow.ToString(ci)) { diff.AppendFormat(fmt, "TimeBeforeFlow", TimeBeforeFlow.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TimeFlow2Mass.ToString(ci)) { diff.AppendFormat(fmt, "TimeFlow2Mass", TimeFlow2Mass.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TimePump2StartV.ToString(ci)) { diff.AppendFormat(fmt, "TimePump2StartV", TimePump2StartV.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TimeStop2Mass.ToString(ci)) { diff.AppendFormat(fmt, "TimeStop2Mass", TimeStop2Mass.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != FeedingPath) { diff.AppendFormat(fmt, "FeedingPath", FeedingPath, ln); };
ln = inp.ReadLine(); if (ln != BenchPath) { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
ln = inp.ReadLine(); if (ln != OutputPath) { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
ln = inp.ReadLine(); if (ln != MetersPath) { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
ln = inp.ReadLine(); if (ln != RelTransBefore) { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
ln = inp.ReadLine(); if (ln != RelTransBetween) { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
ln = inp.ReadLine(); if (ln != RelTransAfter) { diff.AppendFormat(fmt, "RelTransAfter", RelTransAfter, ln); };
ln = inp.ReadLine(); if (ln != TransitionAfter) { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
return diff.ToString();
}
public virtual float GetErrLimLo(float flow)
{
if (ErrLimLo <= ErrLimHi)
{
return ErrLimLo; /// Error limit of a water meter
}
else
{
/// Metrological class and nominal flow of a heat meter
int metrClass = (int)Math.Round(ErrLimLo);
float Qp = Math.Abs(ErrLimHi);
float Q = Math.Max(flow, 0.00001f); /// to avoid division by zero
/// Calculate the error limit of a heat meter
switch (metrClass)
{
default:
case 1: return -Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
case 2: return -Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
case 3: return -Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
}
}
}
public virtual float GetErrLimHi(float flow)
{
if (ErrLimLo <= ErrLimHi)
{
return ErrLimHi; /// Error limit of a water meter
}
else
{
/// Metrological class and nominal flow of a heat meter
int metrClass = (int)Math.Round(ErrLimLo);
float Qp = Math.Abs(ErrLimHi);
float Q = Math.Max(flow, 0.00001f); /// to avoid division by zero
/// Calculate the error limit of a heat meter
switch (metrClass)
{
default:
case 1: return +Math.Min(3.5f, 1.0f + 0.01f * Qp / Q);
case 2: return +Math.Min(5.0f, 2.0f + 0.02f * Qp / Q);
case 3: return +Math.Min(5.0f, 3.0f + 0.05f * Qp / Q);
}
}
}
public override string ToString()
{
string partStr = (Part > 0) ? string.Format(", part {0}", Part) : string.Empty;
return string.Format("{0}(P.{1},{2}){3}", Name, ((Publish)Publish).ToString(), DoEvaluate ? "E" : "-", partStr);
}
}
}
@@ -3,17 +3,18 @@
///
using System.Collections.Generic;
namespace TBF.Entities
namespace Config.Entities
{
/// <summary>
/// Stores one transition sequence containing a list of transition steps
/// </summary>
public class TransitionSequence : IHasItemNr
public class TransitionSequence : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string Description { get; set; } /// Short description
public virtual string OriName { get; set; } /// Not mapped to database
public virtual string Description { get; set; } /// Short description
public virtual IList<TransitionStep> TransitionSteps { get; set; }
public TransitionSequence()
@@ -1,10 +1,10 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2015, 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace TBF.Entities
namespace Config.Entities
{
public class TransitionStep : IHasItemNr, IHasValves
{
@@ -12,7 +12,7 @@ namespace TBF.Entities
public virtual int ItemNr { get; set; } /// Order of the preparation step
public virtual int Duration { get; set; } /// Duration in seconds
public virtual string Message { get; set; } /// Message
public virtual StepCondition EndCondition { get; set; } /// Condition when transition step is finished (next to the duration)
public virtual string EndCondition { get; set; } /// Condition when transition step is finished (next to the duration)
public virtual string ValvesOpen { get; set; } /// List of valves to be opened
public virtual string ValvesClose { get; set; } /// List of valves to be closed
public virtual string RegulValvesPct { get; set; } /// Positions of regulation valves in % separated by ';'
@@ -24,8 +24,8 @@ namespace TBF.Entities
public TransitionStep()
{
Duration = 5; /// sec.
EndCondition = (int)StepCondition.None;
Duration = 5; /// sec.
EndCondition = "None";
}
public TransitionStep(int itemNr, TransitionSequence sequence)
@@ -54,11 +54,11 @@ namespace TBF.Entities
result += indent + "ItemNr = " + ItemNr.ToString() + ", ";
result += indent + "Duration = " + Duration.ToString() + ", ";
result += indent + "Message = " + Message + ", ";
result += indent + "EndCondition = " + EndCondition.ToString() + ", ";
result += indent + "ValvesOpen = " + ValvesOpen.ToString() + ", ";
result += indent + "ValvesClose = " + ValvesClose.ToString() + ", ";
result += indent + "RegulValvesPct = " + RegulValvesPct.ToString() + ", ";
result += indent + "PumpsWithFMPct = " + RegulValvesPct.ToString() + Environment.NewLine;
result += indent + "EndCondition = " + EndCondition + ", ";
result += indent + "ValvesOpen = " + ValvesOpen + ", ";
result += indent + "ValvesClose = " + ValvesClose + ", ";
result += indent + "RegulValvesPct = " + RegulValvesPct + ", ";
result += indent + "PumpsWithFMPct = " + PumpWithFMPcts + Environment.NewLine;
return result;
}
}
+43
View File
@@ -0,0 +1,43 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
namespace Config.Entities
{
public class User
{
public virtual int Id { get; protected set; }
public virtual string UserName { get; set; } /// = name, alias, abbreviation
public virtual string FullName { get; set; } /// = description
public virtual int Number { get; set; }
public virtual string Password { get; set; }
public virtual DateTime LastPwChange { get; set; }
public virtual IList<Group> Groups { get; set; } //User can be a member of a list of groups
public User()
{
Groups = new List<Group>();
}
/// <summary>
/// Adds a group to the user.
/// </summary>
/// <param name="group">Group to be added</param>
public virtual void AddGroup(Group group)
{
Groups.Add(group);
}
/// <summary>
/// Encrypts and sets users password.
/// </summary>
/// <param name="password">Unencrypted password</param>
public virtual void SetPassword(string password)
{
Password = Users.Entities.User.getHash(password);
LastPwChange = DateTime.Now;
}
}
}
@@ -4,14 +4,15 @@
using System;
using System.Collections.Generic;
namespace TBF.Entities
namespace Config.Entities
{
public class VirtualBenchSequence : IHasItemNr
public class VirtualBenchSequence : IHasName, IHasItemNr
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string Description { get; set; } /// Short description
public virtual string OriName { get; set; } /// Not mapped to database
public virtual string Description { get; set; } /// Short description
public virtual IList<VirtualBenchStep> VirtualBenchSteps { get; set; }
public VirtualBenchSequence()
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
namespace TBF.Entities
namespace Config.Entities
{
public class VirtualBenchStep : IHasItemNr
{
@@ -9,7 +9,7 @@ using System.Text;
/// This class holds the watermeter type specific data
/// that have all watermaters of the same type in common
namespace TBF.Entities
namespace Config.Entities
{
public class WMType
{
@@ -41,7 +41,7 @@ namespace TBF.Entities
WMType procedure = new WMType()
{
CreateTime = DateTime.Now,
CreateUserName = User.CurrentUser.Name,
CreateUserName = Users.GlobalData.CurrentUser.UserName,
CreateDescription = "A default water meter created.",
Name = "Watermeter",
PulseRate = 1000,
@@ -6,11 +6,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using TBF;
using NHibernate;
using FluentNHibernate;
namespace TBF.Entities
namespace Config.Entities
{
public class Watermeter
{
@@ -30,7 +29,7 @@ namespace TBF.Entities
/// </summary>
public static Watermeter LoadBySerialnr(string SerialNr)
{
IList<Watermeter> ListOfWatermeters = FluentCommon.CreateSession(Database.WaterMeters)
IList<Watermeter> ListOfWatermeters = FluentCommon.CreateSession(Users.Entities.DBKind.Results)
.CreateQuery("FROM Watermeter WHERE Serial = :SerialNrParameter")
.SetParameter("SerialNrParameter", SerialNr)
.List<Watermeter>();
+242
View File
@@ -0,0 +1,242 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using System.Windows.Forms;
using FluentNHibernate.Cfg;
using FluentNHibernate.Cfg.Db;
using NHibernate;
using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl;
using Config.Resources;
namespace Config
{
public static class FluentCommon
{
/// <summary>
/// Session factories for regular sessions.
/// </summary>
public static ISessionFactory[] SessionFactories = new ISessionFactory[(int)Users.Entities.DBKind.Count];
/// <summary>
/// NHibernate session factory (to create the database session 'SessionFactory')
/// </summary>
/// <returns>A database session</returns>
static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database)
{
Users.Entities.DBType dbType;
string connectionString;
switch (database)
{
default:
case Users.Entities.DBKind.Config:
dbType = Data.CurrentBench.ProceduresDBSettings.DbType;
connectionString = Data.CurrentBench.ProceduresDBSettings.ConnectionString;
break;
case Users.Entities.DBKind.Results:
dbType = Data.CurrentBench.WaterMetersDBSettings.DbType;
connectionString = Data.CurrentBench.WaterMetersDBSettings.ConnectionString;
break;
}
return CreateSessionFactory(database, dbType, connectionString, false);
}
/// <summary>
/// NHibernate session factory (to create the database session 'SessionFactory')
/// </summary>
/// <returns>A database session</returns>
public static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database, Users.Entities.DBType dbType, string connectionString, bool createDB)
{
try
{
FluentConfiguration cfg = Fluently.Configure();
switch (dbType)
{
default:
case Users.Entities.DBType.SQLite:
cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
break;
case Users.Entities.DBType.MySql:
cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
break;
}
switch (database)
{
default:
case Users.Entities.DBKind.Config:
cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
break;
case Users.Entities.DBKind.Results:
cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
break;
}
if (createDB)
{
return cfg.ExposeConfiguration(BuildSchemaCreate).BuildSessionFactory();
}
else
{
return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory();
}
}
catch (Exception exc)
{
MessageBox.Show(string.Format(Strings.Cannot_open_DB_Cause_0, exc.Message),
Strings.Error,
MessageBoxButtons.OK,
MessageBoxIcon.Error);
return null;
}
}
public delegate void BuildSchemaDlgt(Configuration config);
static void BuildSchema(Configuration config)
{
/// This NHibernate tool takes a configuration (with mapping info in)
/// and exports a database schema from it
new SchemaExport(config).SetOutputFile("db_schema");
}
static void BuildSchemaCreate(Configuration config)
{
/// This NHibernate tool takes a configuration (with mapping info in)
/// and exports a database schema from it
new SchemaExport(config).Create(true, true);
}
/// Create a NHibernate session for the given database
public static ISession CreateSession(Users.Entities.DBKind database)
{
int ix = (int)database;
if (ix < 0 || ix >= (int)Users.Entities.DBKind.Count) return null;
if (SessionFactories[ix] == null) SessionFactories[ix] = CreateSessionFactory(database);
return SessionFactories[ix].OpenSession();
}
public static void SaveToDb(Users.Entities.DBKind database, object obj)
{
SaveToDb(CreateSession(database), obj);
}
public static void SaveToDb(ISession session, object obj)
{
using (var transaction = session.BeginTransaction())
{
try
{
session.SaveOrUpdate(obj);
transaction.Commit();
}
catch
{
transaction.Rollback();
}
}
}
public static void DeleteFromDb(Users.Entities.DBKind database, object obj)
{
DeleteFromDb(CreateSession(database), obj);
}
public static void DeleteFromDb(ISession session, object obj)
{
using (var transaction = session.BeginTransaction())
{
session.Delete(obj);
transaction.Commit();
}
}
/// <summary>
/// Create an empty users database.
/// Database contains only the user 'admin' and the control board component 'CB'.
/// </summary>
/// <param name="dbType">DBType.SQLite or DBType.MySql</param>
/// <param name="connectionString">Connection string</param>
/// <returns>true=success, false=error</returns>
public static bool CreateEmptyConfigDB(Users.Entities.DBType dbType, string connectionString)
{
ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
if (sessionFactory == null) return false;
/// Populate the database
using (var session = sessionFactory.OpenSession())
{
using (var transaction = session.BeginTransaction())
{
///
/// Prepare all groups
///
var testers = new Config.Entities.Group((int)Users.Grp.GID.Testers, Strings.Tester);
var testingSpecialists = new Config.Entities.Group((int)Users.Grp.GID.TestingSpecialists, Strings.Testing_Specialist);
var headOfLab = new Config.Entities.Group((int)Users.Grp.GID.HeadOfLab, Strings.Head_of_Lab);
var maintenanceSpecialists = new Config.Entities.Group((int)Users.Grp.GID.MaintenanceSpecialists, Strings.Maintenance_Specialist);
var metrologists = new Config.Entities.Group((int)Users.Grp.GID.Metrologists, Strings.Metrologist);
var calibrationSpecialists = new Config.Entities.Group((int)Users.Grp.GID.CalibrationSpecialists, Strings.Calibration_Specialist);
var administrators = new Config.Entities.Group((int)Users.Grp.GID.Administrators, Strings.Administrator);
/// Create the user 'admin' add his groups
var admin = new Config.Entities.User
{
UserName = Data.AdminUsername,
FullName = Strings.Administrator,
LastPwChange = DateTime.Now
};
admin.SetPassword(Data.AdminPassword);
admin.AddGroup(testers);
admin.AddGroup(testingSpecialists);
admin.AddGroup(headOfLab);
admin.AddGroup(maintenanceSpecialists);
admin.AddGroup(metrologists);
admin.AddGroup(calibrationSpecialists);
admin.AddGroup(administrators);
session.SaveOrUpdate(admin);
///// Create the control board component
//var cmpnt = (new BenchControl.Elde.ControlBoardCfg(new BenchControl.Elde.ControlBoardFactory())).CreateDbEntity();
//session.SaveOrUpdate(cmpnt);
transaction.Commit();
}
}
return true;
}
/// <summary>
/// Create an empty water meters database
/// </summary>
/// <param name="dbType">DBType.SQLite or DBType.MySql</param>
/// <param name="connectionString">Connection string</param>
/// <returns>true=success, false=error</returns>
public static bool CreateEmptyResultsDB(Users.Entities.DBType dbType, string connectionString)
{
ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Results, dbType, connectionString, true);
if (sessionFactory == null) return false;
/// Populate the database
//using (var session = sessionFactory.OpenSession())
//{
// using (var transaction = session.BeginTransaction())
// {
// /// Create one component
// var cmpnt = (new BenchControl.Elde.ControlBoardCfg("CB", 1)).CreateDbEntity();
// session.SaveOrUpdate(cmpnt);
// transaction.Commit();
// }
//}
return true;
}
}
}
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class BenchPathMap : ClassMap<BenchPath>
{
@@ -15,10 +15,12 @@ namespace TBF.Mappings
Map(x => x.Name);
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.TempIn);
Map(x => x.TempOut);
Map(x => x.PressIn);
Map(x => x.PressOut);
Map(x => x.TempMtrUp).Column("TempIn");
Map(x => x.TempMtrDown).Column("TempOut");
Map(x => x.PressMtrUp).Column("PressIn");
Map(x => x.PressMtrDown).Column("PressOut");
Map(x => x.PressMtrDelta);
Map(x => x.StopBFValve);
Map(x => x.ValvesOpen)
.CustomType("StringClob")
.CustomSqlType("varchar(8000)");
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class ComponentMap : ClassMap<Component>
{
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class ComponentProcedureMap : ClassMap<ComponentProcedure>
{
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class ComponentTestMap : ClassMap<ComponentTest>
{
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class FeedingPathMap : ClassMap<FeedingPath>
{
@@ -16,6 +16,7 @@ namespace TBF.Mappings
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.Pump);
Map(x => x.RegulValvesPct);
Map(x => x.ValvesOpen)
.CustomType("StringClob")
.CustomSqlType("varchar(8000)");
@@ -3,7 +3,7 @@
///
using FluentNHibernate.Mapping;
namespace TBF.Mappings
namespace Config.Mappings
{
class GroupMap : ClassMap<Entities.Group>
{
+35
View File
@@ -0,0 +1,35 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using Config.Entities;
namespace Config.Mappings
{
#if HEAT_METERS
class HeatMetersPathMap : ClassMap<HeatMetersPath>
{
public HeatMetersPathMap()
{
Id(x => x.Id);
Map(x => x.ItemNr);
Map(x => x.Name);
Map(x => x.TempWarmFrom);
Map(x => x.TempWarmTo);
Map(x => x.TempColdFrom);
Map(x => x.TempColdTo);
Map(x => x.TMeterRefWarm1);
Map(x => x.TMeterRefWarm2);
Map(x => x.TMeterRefCold1);
Map(x => x.TMeterRefCold2);
Map(x => x.TMeterWorkWarm1);
Map(x => x.TMeterWorkWarm2);
Map(x => x.TMeterWorkCold1);
Map(x => x.TMeterWorkCold2);
}
}
#endif
}
@@ -1,16 +1,17 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class MeasurementCorrectionMap : ClassMap<MeasurementCorrection>
{
public MeasurementCorrectionMap()
{
Id(x => x.Id);
Map(x => x.RangeIx);
Map(x => x.Measurement);
Map(x => x.Correction);
}
+61
View File
@@ -0,0 +1,61 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using Config.Entities;
namespace Config.Mappings
{
class MetersPathMap : ClassMap<MetersPath>
{
public MetersPathMap()
{
Id(x => x.Id);
Map(x => x.ItemNr);
Map(x => x.Name);
#pragma warning disable
if (Config.Data.WMsCount >= 1) Map(x => x.Sensor1);
if (Config.Data.WMsCount >= 2) Map(x => x.Sensor2);
if (Config.Data.WMsCount >= 3) Map(x => x.Sensor3);
if (Config.Data.WMsCount >= 4) Map(x => x.Sensor4);
if (Config.Data.WMsCount >= 5) Map(x => x.Sensor5);
if (Config.Data.WMsCount >= 6) Map(x => x.Sensor6);
if (Config.Data.WMsCount >= 7) Map(x => x.Sensor7);
if (Config.Data.WMsCount >= 8) Map(x => x.Sensor8);
if (Config.Data.WMsCount >= 9) Map(x => x.Sensor9);
if (Config.Data.WMsCount >= 10) Map(x => x.Sensor10);
if (Config.Data.WMsCount >= 11) Map(x => x.Sensor11);
if (Config.Data.WMsCount >= 12) Map(x => x.Sensor12);
if (Config.Data.WMsCount >= 13) Map(x => x.Sensor13);
if (Config.Data.WMsCount >= 14) Map(x => x.Sensor14);
if (Config.Data.WMsCount >= 15) Map(x => x.Sensor15);
if (Config.Data.WMsCount >= 16) Map(x => x.Sensor16);
if (Config.Data.WMsCount >= 17) Map(x => x.Sensor17);
if (Config.Data.WMsCount >= 18) Map(x => x.Sensor18);
if (Config.Data.WMsCount >= 19) Map(x => x.Sensor19);
if (Config.Data.WMsCount >= 20) Map(x => x.Sensor20);
if (Config.Data.WMsCount >= 21) Map(x => x.Sensor21);
if (Config.Data.WMsCount >= 22) Map(x => x.Sensor22);
if (Config.Data.WMsCount >= 23) Map(x => x.Sensor23);
if (Config.Data.WMsCount >= 24) Map(x => x.Sensor24);
if (Config.Data.WMsCount >= 25) Map(x => x.Sensor25);
if (Config.Data.WMsCount >= 26) Map(x => x.Sensor26);
if (Config.Data.WMsCount >= 27) Map(x => x.Sensor27);
if (Config.Data.WMsCount >= 28) Map(x => x.Sensor28);
if (Config.Data.WMsCount >= 29) Map(x => x.Sensor29);
if (Config.Data.WMsCount >= 30) Map(x => x.Sensor30);
if (Config.Data.WMsCount >= 31) Map(x => x.Sensor31);
if (Config.Data.WMsCount >= 32) Map(x => x.Sensor32);
if (Config.Data.WMsCount >= 33) Map(x => x.Sensor33);
if (Config.Data.WMsCount >= 34) Map(x => x.Sensor34);
if (Config.Data.WMsCount >= 35) Map(x => x.Sensor35);
if (Config.Data.WMsCount >= 36) Map(x => x.Sensor36);
if (Config.Data.WMsCount >= 37) Map(x => x.Sensor37);
if (Config.Data.WMsCount >= 38) Map(x => x.Sensor38);
if (Config.Data.WMsCount >= 39) Map(x => x.Sensor39);
if (Config.Data.WMsCount >= 40) Map(x => x.Sensor40);
#pragma warning restore
}
}
}
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class OutputPathMap : ClassMap<OutputPath>
{
@@ -21,7 +21,8 @@ namespace TBF.Mappings
Map(x => x.StartValve);
Map(x => x.Diverter);
Map(x => x.TempDiv);
Map(x => x.Balance);
Map(x => x.Scale)
.Column("Balance");
Map(x => x.EmptyTankValve);
Map(x => x.ValvesOpen)
.CustomType("StringClob")
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class ProcedureMap : ClassMap<Procedure>
{
@@ -28,12 +28,19 @@ namespace TBF.Mappings
Map(x => x.MetersKind);
Map(x => x.Watermeters);
Map(x => x.ProtocolTitle);
Map(x => x.DataEntry);
Map(x => x.Protected);
Map(x => x.MustBeComplete);
Map(x => x.ManualCtrlDisabled);
Map(x => x.DataEntry);
Map(x => x.ResultsPrinter);
Map(x => x.ResultsWriter);
Map(x => x.TransitionStart);
Map(x => x.TransitionEnd);
Map(x => x.AltProcName);
Map(x => x.AltProcPeriod);
////Map(x => x.MetrologicalClass);
////HasOne(x => x.WMType);
HasMany(x => x.MoreParams)
@@ -1,11 +1,10 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Author: Milan Hanajik
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class TestMap : ClassMap<Test>
{
@@ -15,29 +14,46 @@ namespace TBF.Mappings
Map(x => x.ItemNr);
Map(x => x.Name);
Map(x => x.Part);
Map(x => x.Publish);
Map(x => x.DoEvaluate)
.Column("Evaluate");
Map(x => x.Qfrom);
Map(x => x.Qto);
Map(x => x.Volume);
Map(x => x.TstTime);
Map(x => x.Repeats);
Map(x => x.Emptying);
Map(x => x.Zeroing);
Map(x => x.DoDraining)
.Column("Emptying");
Map(x => x.DoZeroing)
.Column("Zeroing");
Map(x => x.DoControlWaterTemp);
Map(x => x.TempLimLo);
Map(x => x.TempLimHi);
Map(x => x.PumpPower);
Map(x => x.MassRepeats);
Map(x => x.MassSpread);
Map(x => x.MassMethod)
.CustomType<byte>();
Map(x => x.TimeBeforeFlow);
Map(x => x.TimeFlow2Mass);
Map(x => x.TimeMass2Start);
Map(x => x.TimePump2StartV)
.Column("TimeMass2Start");
Map(x => x.TimeStop2Mass);
Map(x => x.Method);
Map(x => x.ErrLimLo);
Map(x => x.ErrLimHi);
Map(x => x.Uncertainty);
Map(x => x.TolerRed); /// ???
Map(x => x.RedType); /// ???
Map(x => x.TolerRed)
.Column("TolerRed"); /// ???
Map(x => x.RedType); /// ???
Map(x => x.FeedingPath);
Map(x => x.BenchPath);
Map(x => x.OutputPath);
Map(x => x.MetersPath);
Map(x => x.RelTransBefore);
#if HEAT_METERS
Map(x => x.HeatMetersPath);
#endif
Map(x => x.RelTransBefore);
Map(x => x.RelTransBetween);
Map(x => x.RelTransAfter);
Map(x => x.TransitionAfter);
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class TransitionSequenceMap : ClassMap<TransitionSequence>
{
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class TransitionStepMap : ClassMap<TransitionStep>
{
@@ -3,16 +3,17 @@
///
using FluentNHibernate.Mapping;
namespace TBF.Mappings
namespace Config.Mappings
{
class UserMap : ClassMap<Entities.User>
{
public UserMap()
{
Id(x => x.Id);
Map(x => x.Name);
Map(x => x.Password);
Map(x => x.Description);
Map(x => x.UserName).Column("Name");
Map(x => x.Number);
Map(x => x.Password);
Map(x => x.FullName).Column("Description");
Map(x => x.LastPwChange);
HasMany(x => x.Groups)
.Cascade.All();
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class VirtualBenchSequenceMap : ClassMap<VirtualBenchSequence>
{
@@ -2,9 +2,9 @@
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using FluentNHibernate.Mapping;
using TBF.Entities;
using Config.Entities;
namespace TBF.Mappings
namespace Config.Mappings
{
class VirtualBenchStepMap : ClassMap<VirtualBenchStep>
{
@@ -3,7 +3,7 @@
///
using FluentNHibernate.Mapping;
namespace TBF.Mappings
namespace Config.Mappings
{
class WMTypeMap : ClassMap<Entities.WMType>
{
@@ -3,7 +3,7 @@
///
using FluentNHibernate.Mapping;
namespace TBF.Mappings
namespace Config.Mappings
{
class WatermeterMap : ClassMap<Entities.Watermeter>
{
+36
View File
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Config")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sensus")]
[assembly: AssemblyProduct("Config")]
[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko a.s.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("3fc3ff67-7386-4aff-9855-bef33d5fa0d3")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.797.0")]
[assembly: AssemblyFileVersion("2.18.797.0")]
+164
View File
@@ -0,0 +1,164 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Config.Resources {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Strings {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Strings() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Config.Resources.Strings", typeof(Strings).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to Administrator.
/// </summary>
internal static string Administrator {
get {
return ResourceManager.GetString("Administrator", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Calibration Specialist.
/// </summary>
internal static string Calibration_Specialist {
get {
return ResourceManager.GetString("Calibration_Specialist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Cannot open DB Cause 0.
/// </summary>
internal static string Cannot_open_DB_Cause_0 {
get {
return ResourceManager.GetString("Cannot_open_DB_Cause_0", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Error.
/// </summary>
internal static string Error
{
get
{
return ResourceManager.GetString("Error", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Failed.
/// </summary>
internal static string Failed {
get {
return ResourceManager.GetString("Failed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Head of Lab.
/// </summary>
internal static string Head_of_Lab {
get {
return ResourceManager.GetString("Head_of_Lab", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Maintenance Specialist.
/// </summary>
internal static string Maintenance_Specialist {
get {
return ResourceManager.GetString("Maintenance_Specialist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Metrologist.
/// </summary>
internal static string Metrologist {
get {
return ResourceManager.GetString("Metrologist", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Passed.
/// </summary>
internal static string Passed {
get {
return ResourceManager.GetString("Passed", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tester.
/// </summary>
internal static string Tester {
get {
return ResourceManager.GetString("Tester", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Testing Specialist.
/// </summary>
internal static string Testing_Specialist {
get {
return ResourceManager.GetString("Testing_Specialist", resourceCulture);
}
}
}
}
@@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Activity" xml:space="preserve">
<value>Attività</value>
<data name="Error" xml:space="preserve">
<value>Chyba</value>
</data>
</root>
@@ -117,34 +117,37 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Activity" xml:space="preserve">
<value>活动 / Activity</value>
<data name="Administrator" xml:space="preserve">
<value>Administrator</value>
</data>
<data name="Ambient_humidity_" xml:space="preserve">
<value>空气温度 / Ambient humidity :</value>
<data name="Calibration_Specialist" xml:space="preserve">
<value>Kalibriertechniker</value>
</data>
<data name="Ambient_pressure_" xml:space="preserve">
<value>大气压强 / Ambient pressure :</value>
<data name="Head_of_Lab" xml:space="preserve">
<value>Laborleiter</value>
</data>
<data name="Ambient_temperature_" xml:space="preserve">
<value>空气温度 / Ambient temperature :</value>
<data name="Maintenance_Specialist" xml:space="preserve">
<value>Wartungstechniker</value>
</data>
<data name="Approval_" xml:space="preserve">
<value>审核 / Approval :</value>
<data name="Metrologist" xml:space="preserve">
<value>Messtechniker</value>
</data>
<data name="Date_and_time_" xml:space="preserve">
<value>日期及时间 / Date and time :</value>
<data name="Tester" xml:space="preserve">
<value>Prüfer</value>
</data>
<data name="Page" xml:space="preserve">
<value>页面 / Page </value>
<data name="Testing_Specialist" xml:space="preserve">
<value>Prüftechniker</value>
</data>
<data name="Procedure_" xml:space="preserve">
<value>测试程序 / Procedure :</value>
<data name="Failed" xml:space="preserve">
<value>NiO</value>
</data>
<data name="Purchase_order_" xml:space="preserve">
<value>采购订单 / Purchase order :</value>
<data name="Passed" xml:space="preserve">
<value>iO</value>
</data>
<data name="Tester_" xml:space="preserve">
<value>测试者 / Tester :</value>
<data name="Error" xml:space="preserve">
<value>Fehler</value>
</data>
<data name="Cannot_open_DB_Cause_0" xml:space="preserve">
<value>Datenbank kann nicht geöffnet.\\r\\nUrsache:\\r\\n{0}</value>
</data>
</root>
+153
View File
@@ -0,0 +1,153 @@
<?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>
<data name="Administrator" xml:space="preserve">
<value>Amministratore</value>
</data>
<data name="Calibration_Specialist" xml:space="preserve">
<value>esperto in calibrazione</value>
</data>
<data name="Head_of_Lab" xml:space="preserve">
<value>capo di laboratorio</value>
</data>
<data name="Maintenance_Specialist" xml:space="preserve">
<value>esperto di manutenzione</value>
</data>
<data name="Metrologist" xml:space="preserve">
<value>metrologo</value>
</data>
<data name="Tester" xml:space="preserve">
<value>tester</value>
</data>
<data name="Testing_Specialist" xml:space="preserve">
<value>esperto di prove </value>
</data>
<data name="Failed" xml:space="preserve">
<value>NOK</value>
</data>
<data name="Passed" xml:space="preserve">
<value>ok</value>
</data>
<data name="Cannot_open_DB_Cause_0" xml:space="preserve">
<value>Impossibile aprire il database\\r\\nCause:\\r\\n{0}</value>
</data>
<data name="Error" xml:space="preserve">
<value>Errore</value>
</data>
</root>
+153
View File
@@ -0,0 +1,153 @@
<?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>
<data name="Administrator" xml:space="preserve">
<value>Administrator</value>
</data>
<data name="Calibration_Specialist" xml:space="preserve">
<value>Specjalista ds. kalibracji</value>
</data>
<data name="Head_of_Lab" xml:space="preserve">
<value>Kierownik Laboratorium</value>
</data>
<data name="Maintenance_Specialist" xml:space="preserve">
<value>Konserwator</value>
</data>
<data name="Metrologist" xml:space="preserve">
<value>Metrolog</value>
</data>
<data name="Tester" xml:space="preserve">
<value>Pracownik przeprowadzający testy</value>
</data>
<data name="Testing_Specialist" xml:space="preserve">
<value>Specjalista ds. testów</value>
</data>
<data name="Failed" xml:space="preserve">
<value>Niepowodzenie</value>
</data>
<data name="Passed" xml:space="preserve">
<value>OK</value>
</data>
<data name="Cannot_open_DB_Cause_0" xml:space="preserve">
<value>Nie można otworzyć \\r\\nCause:\\r\\n{0}</value>
</data>
<data name="Error" xml:space="preserve">
<value>Błąd</value>
</data>
</root>
@@ -117,29 +117,37 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 13</value>
<data name="Administrator" xml:space="preserve">
<value>Administrator</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Benutzername</value>
<data name="Calibration_Specialist" xml:space="preserve">
<value>Calibration Specialist</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 13</value>
<data name="Head_of_Lab" xml:space="preserve">
<value>Head of Lab</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>Passwort</value>
<data name="Maintenance_Specialist" xml:space="preserve">
<value>Maintenance Specialist</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 13</value>
<data name="Metrologist" xml:space="preserve">
<value>Metrologist</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Prüfstand</value>
<data name="Tester" xml:space="preserve">
<value>Tester</value>
</data>
<data name="cancelButton.Text" xml:space="preserve">
<value>Abbrechen</value>
<data name="Testing_Specialist" xml:space="preserve">
<value>Testing Specialist</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Anmelden am Prüfstand</value>
<data name="Failed" xml:space="preserve">
<value>NOK</value>
</data>
<data name="Passed" xml:space="preserve">
<value>OK</value>
</data>
<data name="Cannot_open_DB_Cause_0" xml:space="preserve">
<value>Cannot open database.\\r\\nCause:\\r\\n{0}</value>
</data>
<data name="Error" xml:space="preserve">
<value>Error</value>
</data>
</root>
+153
View File
@@ -0,0 +1,153 @@
<?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>
<data name="Administrator" xml:space="preserve">
<value>Администратор</value>
</data>
<data name="Calibration_Specialist" xml:space="preserve">
<value>Специалист по калибровке</value>
</data>
<data name="Head_of_Lab" xml:space="preserve">
<value>Руководитель лаборатории</value>
</data>
<data name="Maintenance_Specialist" xml:space="preserve">
<value>Специалист по техобслуживанию</value>
</data>
<data name="Metrologist" xml:space="preserve">
<value>Метролог</value>
</data>
<data name="Tester" xml:space="preserve">
<value>Контролер</value>
</data>
<data name="Testing_Specialist" xml:space="preserve">
<value>Специалист по тестированию</value>
</data>
<data name="Failed" xml:space="preserve">
<value>NOK</value>
</data>
<data name="Passed" xml:space="preserve">
<value>OK</value>
</data>
<data name="Cannot_open_DB_Cause_0" xml:space="preserve">
<value>Не удается открыть БД.\\r\\nCause:\\r\\n{0}</value>
</data>
<data name="Error" xml:space="preserve">
<value>Ошибка</value>
</data>
</root>
+128
View File
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 1.3
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">1.3</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1">this is my long string</data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
[base64 mime encoded serialized .NET Framework object]
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
[base64 mime encoded string representing a byte array form of the .NET Framework object]
</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.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:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<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" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</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>1.3</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Administrator" xml:space="preserve">
<value>管理员</value>
</data>
<data name="Calibration_Specialist" xml:space="preserve">
<value>校准专员</value>
</data>
<data name="Failed" xml:space="preserve">
<value>NOK</value>
</data>
<data name="Head_of_Lab" xml:space="preserve">
<value>实验室负责人</value>
</data>
<data name="Maintenance_Specialist" xml:space="preserve">
<value>维护专员</value>
</data>
<data name="Metrologist" xml:space="preserve">
<value>计量者</value>
</data>
<data name="Passed" xml:space="preserve">
<value>好</value>
</data>
<data name="Tester" xml:space="preserve">
<value>测试仪</value>
</data>
<data name="Testing_Specialist" xml:space="preserve">
<value>测试专员</value>
</data>
</root>
+403
View File
@@ -0,0 +1,403 @@
///
/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
///
using System;
using System.Reflection;
using Config.Entities;
namespace Config
{
public enum Unit
{
[Description("---")] None,
[Description("l")] l, /// * 1 liter
[Description("dm3")] dm3, /// 1 dm3 = 1 liter
[Description("m3")] m3, /// 1000 l
[Description("gal(UK)")] gal_UK, /// 1 gal(UK) = 4.54609 l
[Description("gal(US)")] gal_US, /// 1 gal(US) = 3.78541178 l
[Description("l/h")] lph, /// 1 liter/h
[Description("m3/h")] m3ph, /// * 1 m3/h = 1000 l/h
[Description("g")] g, /// 0.001 kg
[Description("kg")] kg, /// * 1 kilogram
[Description("t")] t, /// 1000 kg
[Description("lb")] lb, /// 0.45359237 kg
[Description("s")] s, /// * 1 second
[Description("min")] min, /// 1 min = 60 s
[Description("hr")] hour, /// 1 hour = 60 min = 3600 s
[Description("ms")] ms, /// 1 ms = 0.001 s
[Description("°C")] C, /// * degree Celsius (°C)
[Description("°F")] F, /// degree Fahrenheit
[Description("K")] K, /// degree Kelvin
[Description("Pa")] Pa, /// 1 Pa = 0.01 hPa
[Description("hPa")] hPa, /// 1 hPa = 100 Pa
[Description("kPa")] kPa, /// 1 kPa = 10 HPa
[Description("MPa")] MPa, /// 1 MPa = 10000 hPa
[Description("mbar")] mbar, /// 1 mbar = 1 hPa = 100 Pa
[Description("bar")] bar, /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
[Description("inHg")] inHg, /// 1 inHg = 33.864 hPa
[Description("R%")] RPct, /// * 1 R%
[Description("%")] Pct, /// * 1 %
[Description("promile")] Promile, /// 1 promile = 0.1 %
[Description("mm")] mm, /// * 1 millimeter
[Description("cm")] cm, /// 1 cm = 10 mm
[Description("m")] m, /// 1 m = 1000 mm
[Description("in")] inch, /// 1 inch = 25.4 mm
[Description("kg/m3")] kgpm3, /// * 1 kg/m3 = 0.001 kg/l
[Description("kg/l")] kgpl, /// 1 kg/l = 1000 kg/m3
[Description("J")] J, /// * 1 Joul
[Description("kJ")] kJ, /// 1 kJ = 1000 J
[Description("MJ")] MJ, /// 1 MJ = 1000000 J
[Description("Wh")] Wh, /// 1 Wh = 3600 J
[Description("kWh")] kWh, /// 1 kWh = 3600000 J
[Description("MWh")] MWh, /// 1 MWh = 3600000000 J
[Description("pulse/l")] ppl, /// * 1 pulse/l
///
[Description("pulse/kWh")] ppkWh, /// * 1 pulse/kWh
Count
}
public enum Quantity
{
/// Quantities with units and conversions (double -> double)
#if LANG_DE
[Description("Volumen")] Volume,
[Description("Durchfluss")] Flow,
[Description("Masse")] Mass,
[Description("Zeit")] Time,
[Description("Temperatur")] Temperature,
[Description("Druck")] Pressure,
[Description("Feuchtigkeit")] Humidity,
[Description("Fehler")] Error,
[Description("Länge")] Length,
[Description("Dichte")] Density,
[Description("Energie")] Energy,
[Description("Impulse/l")] PulsePerLtr,
[Description("Impulse/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Nummer")] Number,
[Description("Text")] String,
[Description("Boolean")] Boolean,
[Description("Datum und Uhrzeit")] DateTime,
#elif LANG_PL
[Description("Objętość")] Volume,
[Description("Przepływ")] Flow,
[Description("Masa")] Mass,
[Description("Czas")] Time,
[Description("Temperatura")] Temperature,
[Description("Ciśnienie")] Pressure,
[Description("Wilgotność")] Humidity,
[Description("Błąd")] Error,
[Description("Długość")] Length,
[Description("Gęstość")] Density,
[Description("Energia")] Energy,
[Description("Impulsy/litr")] PulsePerLtr,
[Description("Impulsy/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Numer")] Number,
[Description("Tekst")] String,
[Description("Boolean")] Boolean,
[Description("Data i czas")] DateTime,
#elif LANG_CS
[Description("Objem")] Volume,
[Description("Průtok")] Flow,
[Description("Hmotnost")] Mass,
[Description("Čas")] Time,
[Description("Teplota")] Temperature,
[Description("Tlak")] Pressure,
[Description("Vlhkost")] Humidity,
[Description("Chyba")] Error,
[Description("Délka")] Length,
[Description("Hustota")] Density,
[Description("Energie")] Energy,
[Description("Pulzy/litr")] PulsePerLtr,
[Description("Pulzy/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Počet")] Number,
[Description("Text")] String,
[Description("Boolean")] Boolean,
[Description("Datum a čas")] DateTime,
#else
[Description("Volume")] Volume,
[Description("Flow")] Flow,
[Description("Mass")] Mass,
[Description("Time")] Time,
[Description("Temperature")] Temperature,
[Description("Pressure")] Pressure,
[Description("Humidity")] Humidity,
[Description("Error")] Error,
[Description("Length")] Length,
[Description("Density")] Density,
[Description("Energy")] Energy,
[Description("Pulses/liter")] PulsePerLtr,
[Description("Pulses/kWh")] PulsePerKWh,
/// Quantities without units and conversions
[Description("Number")] Number,
[Description("String")] String,
[Description("Boolean")] Boolean,
[Description("Date and time")] DateTime,
#endif
Count,
}
public static class Units
{
public static bool IsUnitless(Quantity quantity)
{
return quantity >= Quantity.Number;
}
public static bool IsDefaultUnit(Unit unit)
{
return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C || unit == Unit.bar || unit == Unit.RPct ||
unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 || unit == Unit.J || unit == Unit.ppl || unit == Unit.ppkWh;
}
public static bool IsQuantity(Unit units, Quantity quantity)
{
return (quantity == GetQuantity(units));
}
public static Quantity GetQuantity(Unit units)
{
switch (units)
{
case Unit.l:
case Unit.dm3:
case Unit.m3:
case Unit.gal_UK:
case Unit.gal_US:
return Config.Quantity.Volume;
case Unit.lph:
case Unit.m3ph:
return Config.Quantity.Flow;
case Unit.g:
case Unit.kg:
case Unit.t:
case Unit.lb:
return Config.Quantity.Mass;
case Unit.s:
case Unit.min:
case Unit.hour:
case Unit.ms:
return Config.Quantity.Time;
case Unit.C:
case Unit.F:
case Unit.K:
return Config.Quantity.Temperature;
case Unit.Pa:
case Unit.hPa:
case Unit.mbar:
case Unit.kPa:
case Unit.bar:
case Unit.MPa:
case Unit.inHg:
return Config.Quantity.Pressure;
case Unit.RPct:
return Config.Quantity.Humidity;
case Unit.Pct:
case Unit.Promile:
return Config.Quantity.Error;
case Unit.mm:
case Unit.cm:
case Unit.m:
case Unit.inch:
return Config.Quantity.Length;
case Unit.kgpm3:
case Unit.kgpl:
return Config.Quantity.Density;
case Unit.J:
case Unit.kJ:
case Unit.MJ:
case Unit.Wh:
case Unit.kWh:
case Unit.MWh:
return Config.Quantity.Energy;
case Unit.ppl:
return Config.Quantity.PulsePerLtr;
case Unit.ppkWh:
return Config.Quantity.PulsePerKWh;
default:
return Config.Quantity.Number;
}
}
public static bool IsVolume(Unit units) { return IsQuantity(units, Config.Quantity.Volume); }
public static bool IsFlow(Unit units) { return IsQuantity(units, Config.Quantity.Flow); }
public static bool IsMass(Unit units) { return IsQuantity(units, Config.Quantity.Mass); }
public static bool IsTime(Unit units) { return IsQuantity(units, Config.Quantity.Time); }
public static bool IsTemperature(Unit units) { return IsQuantity(units, Config.Quantity.Temperature); }
public static bool IsPressure(Unit units) { return IsQuantity(units, Config.Quantity.Pressure); }
public static bool IsHumidity(Unit units) { return IsQuantity(units, Config.Quantity.Humidity); }
public static bool IsError(Unit units) { return IsQuantity(units, Config.Quantity.Error); }
public static bool IsLength(Unit units) { return IsQuantity(units, Config.Quantity.Length); }
public static bool IsDensity(Unit units) { return IsQuantity(units, Config.Quantity.Density); }
public static bool IsEnergy(Unit units) { return IsQuantity(units, Config.Quantity.Energy); }
public static bool IsPulsePerLtr(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerLtr); }
public static bool IsPulsePerKWh(Unit units) { return IsQuantity(units, Config.Quantity.PulsePerKWh); }
public static double ConvertTo(Unit units, double v)
{
switch (units)
{
/// Volume: internal representation in l
case Unit.dm3:
case Unit.l: return v; /// 1 liter
case Unit.m3: return 0.001 * v; /// 1 m3 = 1000 l
case Unit.gal_UK: return 0.21996925 * v; /// 1 gal(UK) = 4.54609 l
case Unit.gal_US: return 0.26417205 * v; /// 1 gal(US) = 3.78541178 l
/// Flow: internal representation in m3/h
case Unit.lph: return 1000 * v; /// 1 liter/h
case Unit.m3ph: return v; /// 1 m3/h = 1000 l/h
/// Mass: internal representation in kg
case Unit.g: return 1000 * v; /// 1 g = 0.001 kg
case Unit.kg: return v; /// 1 kilogram
case Unit.t: return 0.001 * v; /// 1 t = 1000 kg
case Unit.lb: return 2.2046226 * v; /// 1 lb = 0.45359237 kg
/// Time or duration: internal representation in seconds [s]
case Unit.s: return v;
case Unit.min: return v / 60;
case Unit.hour: return v / 3600;
case Unit.ms: return 1000 * v;
/// Temperature: internal representation in °C
case Unit.C: return v; /// degree Celsius (°C)
case Unit.F: return 1.8 * v + 32; /// degree Fahrenheit
case Unit.K: return v + 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 100000 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 1000 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 1000 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 100 * v; /// 1 kPa = 10 HPa
case Unit.bar: return v; /// 1 bar = 1000 mbar = 100000 Pa
case Unit.MPa: return 0.1 * v; /// 1 MPa = 10000 hPa
case Unit.inHg: return 29.53 * v; /// 1 inHg = 33.864 hPa
/// Error: internal representation in %
case Unit.Pct: return v; /// 1 %
case Unit.Promile: return 10 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.mm: return v; /// 1 mm
case Unit.cm: return 0.1 * v; /// 1 cm = 10 mm
case Unit.m: return 0.001 * v; /// 1 m = 1000 mm
case Unit.inch: return v / 25.4; /// 1 inch = 25.4 mm
/// Density: internal representation in kg/m3
case Unit.kgpm3: return v;
case Unit.kgpl: return 0.001 * v;
/// Energy, internal representation in Joul
case Unit.J: return v; /// 1 Joul
case Unit.kJ: return 0.001 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 0.000001 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return v / 3600.0; /// 1 Wh = 3600 J
case Unit.kWh: return v / 3600000.0; /// 1 kWh = 3600000 J
case Unit.MWh: return v / 3600000000.0;/// 1 MWh = 3600000000 J
default: return v;
}
}
public static double ConvertFrom(Unit units, double v)
{
switch (units)
{
/// Volume: internal representation in l
case Unit.dm3:
case Unit.l: return v; /// 1 liter
case Unit.m3: return 1000 * v; /// 1000 l
case Unit.gal_UK: return 4.54609 * v; /// 1 gal(UK) = 4.54609 l
case Unit.gal_US: return 3.78541178 * v; /// 1 gal(US) = 3.78541178 l
/// Flow: internal representation in m3/h
case Unit.lph: return 0.001 * v; /// 1 liter/h
case Unit.m3ph: return v; /// 1 m3/h = 1000 l/h
/// Mass: internal representation in kg
case Unit.g: return 0.001 * v; /// 1 g = 0.001 kg
case Unit.kg: return v; /// 1 kilogram
case Unit.t: return 1000 * v; /// 1 t = 1000 kg
case Unit.lb: return 0.45359237 * v; /// 1 lb = 0.45359237 kg
/// Time or duration: internal representation in seconds [s]
case Unit.s: return v;
case Unit.min: return 60 * v;
case Unit.hour: return 3600 * v;
case Unit.ms: return v / 1000;
/// Temperature: internal representation in °C
case Unit.C: return v; /// degree Celsius (°C)
case Unit.F: return 5 * (v-32) / 9; /// degree Fahrenheit
case Unit.K: return v - 273.15; /// degree Kelvin
/// Pressure: internal representation in bar = 0.1 MPa
case Unit.Pa: return 0.00001 * v; /// 1 hPa = 100 Pa
case Unit.hPa: return 0.001 * v; /// 1 hPa = 100 Pa
case Unit.mbar: return 0.001 * v; /// 1 mbar = 1 hPa = 100 Pa
case Unit.kPa: return 0.01 * v; /// 1 kPa = 10 HPa
case Unit.bar: return v; /// 1 bar = 1000 mbar = 100000 Pa
case Unit.MPa: return 10 * v; /// 1 MPa = 10000 hPa
case Unit.inHg: return 0.033864 * v; /// 1 inHg = 33.864 hPa
/// Error: internal representation in %
case Unit.Pct: return v; /// 1 %
case Unit.Promile: return 0.1 * v; /// 1 promile = 0.1 %
/// Diameter, length: internal representation in mm
case Unit.mm: return v; /// 1 mm
case Unit.cm: return 10 * v; /// 1 cm = 10 mm
case Unit.m: return 1000 * v; /// 1 m = 1000 mm
case Unit.inch: return 25.4 * v; /// 1 inch = 25.4 mm
/// Density: internal representation in kg/m3
case Unit.kgpm3: return v;
case Unit.kgpl: return 1000 * v;
/// Energy, internal representation in Joul
case Unit.J: return v; /// 1 Joul
case Unit.kJ: return 1000 * v; /// 1 kJ = 1000 J
case Unit.MJ: return 1000000 * v; /// 1 kJ = 1000000 J
case Unit.Wh: return 3600 * v; /// 1 Wh = 3600 J
case Unit.kWh: return 3600000 * v; /// 1 kWh = 3600000 J
case Unit.MWh: return 3600000000 * v; /// 1 kWh = 3600000000 J
default: return v;
}
}
}
}
+108
View File
@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6D3384DC-4638-4A92-91A8-F39D900377C6}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DeviceTest</RootNamespace>
<AssemblyName>DeviceTest</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject>DeviceTest.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="DeviceTestDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DeviceTestDlg.Designer.cs">
<DependentUpon>DeviceTestDlg.cs</DependentUpon>
</Compile>
<Compile Include="LocalSettings.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="DeviceTestDlg.resx">
<DependentUpon>DeviceTestDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Config\Config.csproj">
<Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
<Name>Config</Name>
</ProjectReference>
<ProjectReference Include="..\TBF\TBF.csproj">
<Project>{8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48}</Project>
<Name>TBF</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
+584
View File
@@ -0,0 +1,584 @@
namespace DeviceTest
{
partial class DeviceTestDlg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.parentClassNameComboBox = new System.Windows.Forms.ComboBox();
this.classLabel = new System.Windows.Forms.Label();
this.nameLabel = new System.Windows.Forms.Label();
this.parentNameTextBox = new System.Windows.Forms.TextBox();
this.configureParentButton = new System.Windows.Forms.Button();
this.startButton = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.configureComponent1Button = new System.Windows.Forms.Button();
this.componentNameTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.component1ClassNameComboBox = new System.Windows.Forms.ComboBox();
this.radioButton4 = new System.Windows.Forms.RadioButton();
this.radioButton3 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton0 = new System.Windows.Forms.RadioButton();
this.stopButton = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.configureComponent2Button = new System.Windows.Forms.Button();
this.component2NameTextBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.component2ClassNameComboBox = new System.Windows.Forms.ComboBox();
this.radioButton24 = new System.Windows.Forms.RadioButton();
this.radioButton23 = new System.Windows.Forms.RadioButton();
this.radioButton22 = new System.Windows.Forms.RadioButton();
this.radioButton21 = new System.Windows.Forms.RadioButton();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.radioButton34 = new System.Windows.Forms.RadioButton();
this.radioButton33 = new System.Windows.Forms.RadioButton();
this.radioButton32 = new System.Windows.Forms.RadioButton();
this.radioButton31 = new System.Windows.Forms.RadioButton();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.configureComponent3Button = new System.Windows.Forms.Button();
this.component3NameTextBox = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.component3ClassNameComboBox = new System.Windows.Forms.ComboBox();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox5.SuspendLayout();
this.SuspendLayout();
//
// parentClassNameComboBox
//
this.parentClassNameComboBox.FormattingEnabled = true;
this.parentClassNameComboBox.Location = new System.Drawing.Point(77, 19);
this.parentClassNameComboBox.Name = "parentClassNameComboBox";
this.parentClassNameComboBox.Size = new System.Drawing.Size(299, 21);
this.parentClassNameComboBox.TabIndex = 0;
//
// classLabel
//
this.classLabel.AutoSize = true;
this.classLabel.Location = new System.Drawing.Point(11, 22);
this.classLabel.Name = "classLabel";
this.classLabel.Size = new System.Drawing.Size(32, 13);
this.classLabel.TabIndex = 1;
this.classLabel.Text = "Class";
//
// nameLabel
//
this.nameLabel.AutoSize = true;
this.nameLabel.Location = new System.Drawing.Point(11, 47);
this.nameLabel.Name = "nameLabel";
this.nameLabel.Size = new System.Drawing.Size(35, 13);
this.nameLabel.TabIndex = 2;
this.nameLabel.Text = "Name";
//
// parentNameTextBox
//
this.parentNameTextBox.Enabled = false;
this.parentNameTextBox.Location = new System.Drawing.Point(77, 44);
this.parentNameTextBox.Name = "parentNameTextBox";
this.parentNameTextBox.Size = new System.Drawing.Size(299, 20);
this.parentNameTextBox.TabIndex = 3;
//
// configureParentButton
//
this.configureParentButton.Location = new System.Drawing.Point(395, 19);
this.configureParentButton.Name = "configureParentButton";
this.configureParentButton.Size = new System.Drawing.Size(73, 45);
this.configureParentButton.TabIndex = 4;
this.configureParentButton.Text = "Configure";
this.configureParentButton.UseVisualStyleBackColor = true;
this.configureParentButton.Click += new System.EventHandler(this.configureParentButton_Click);
//
// startButton
//
this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.startButton.Location = new System.Drawing.Point(520, 19);
this.startButton.Name = "startButton";
this.startButton.Size = new System.Drawing.Size(73, 45);
this.startButton.TabIndex = 7;
this.startButton.Text = "Start";
this.startButton.UseVisualStyleBackColor = true;
this.startButton.Click += new System.EventHandler(this.startButton_Click);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.configureParentButton);
this.groupBox1.Controls.Add(this.parentNameTextBox);
this.groupBox1.Controls.Add(this.nameLabel);
this.groupBox1.Controls.Add(this.classLabel);
this.groupBox1.Controls.Add(this.parentClassNameComboBox);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(486, 75);
this.groupBox1.TabIndex = 8;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Parent component";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.configureComponent1Button);
this.groupBox2.Controls.Add(this.componentNameTextBox);
this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.component1ClassNameComboBox);
this.groupBox2.Location = new System.Drawing.Point(12, 93);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(486, 75);
this.groupBox2.TabIndex = 9;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Component 1";
//
// configureComponentButton
//
this.configureComponent1Button.Location = new System.Drawing.Point(395, 19);
this.configureComponent1Button.Name = "configureComponentButton";
this.configureComponent1Button.Size = new System.Drawing.Size(73, 45);
this.configureComponent1Button.TabIndex = 4;
this.configureComponent1Button.Text = "Configure";
this.configureComponent1Button.UseVisualStyleBackColor = true;
this.configureComponent1Button.Click += new System.EventHandler(this.configureComponent1Button_Click);
//
// componentNameTextBox
//
this.componentNameTextBox.Enabled = false;
this.componentNameTextBox.Location = new System.Drawing.Point(77, 44);
this.componentNameTextBox.Name = "componentNameTextBox";
this.componentNameTextBox.Size = new System.Drawing.Size(299, 20);
this.componentNameTextBox.TabIndex = 3;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(11, 47);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(35, 13);
this.label1.TabIndex = 2;
this.label1.Text = "Name";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(11, 22);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(32, 13);
this.label2.TabIndex = 1;
this.label2.Text = "Class";
//
// componentClassNameComboBox
//
this.component1ClassNameComboBox.FormattingEnabled = true;
this.component1ClassNameComboBox.Location = new System.Drawing.Point(77, 19);
this.component1ClassNameComboBox.Name = "componentClassNameComboBox";
this.component1ClassNameComboBox.Size = new System.Drawing.Size(299, 21);
this.component1ClassNameComboBox.TabIndex = 0;
//
// radioButton4
//
this.radioButton4.AutoSize = true;
this.radioButton4.Location = new System.Drawing.Point(13, 118);
this.radioButton4.Name = "radioButton4";
this.radioButton4.Size = new System.Drawing.Size(51, 17);
this.radioButton4.TabIndex = 9;
this.radioButton4.TabStop = true;
this.radioButton4.Text = "spare";
this.radioButton4.UseVisualStyleBackColor = true;
this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton4_CheckedChanged);
//
// radioButton3
//
this.radioButton3.AutoSize = true;
this.radioButton3.Location = new System.Drawing.Point(13, 95);
this.radioButton3.Name = "radioButton3";
this.radioButton3.Size = new System.Drawing.Size(51, 17);
this.radioButton3.TabIndex = 8;
this.radioButton3.TabStop = true;
this.radioButton3.Text = "spare";
this.radioButton3.UseVisualStyleBackColor = true;
this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton3_CheckedChanged);
//
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Location = new System.Drawing.Point(13, 72);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(51, 17);
this.radioButton2.TabIndex = 7;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "spare";
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
//
// radioButton1
//
this.radioButton1.AutoSize = true;
this.radioButton1.Location = new System.Drawing.Point(13, 49);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(106, 17);
this.radioButton1.TabIndex = 6;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "ReadPressureOp";
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
//
// radioButton0
//
this.radioButton0.AutoSize = true;
this.radioButton0.Location = new System.Drawing.Point(13, 26);
this.radioButton0.Name = "radioButton0";
this.radioButton0.Size = new System.Drawing.Size(94, 17);
this.radioButton0.TabIndex = 5;
this.radioButton0.TabStop = true;
this.radioButton0.Text = "Stop operation";
this.radioButton0.UseVisualStyleBackColor = true;
this.radioButton0.CheckedChanged += new System.EventHandler(this.radioButton0_CheckedChanged);
//
// stopButton
//
this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.stopButton.Location = new System.Drawing.Point(520, 77);
this.stopButton.Name = "stopButton";
this.stopButton.Size = new System.Drawing.Size(73, 45);
this.stopButton.TabIndex = 10;
this.stopButton.Text = "Stop";
this.stopButton.UseVisualStyleBackColor = true;
this.stopButton.Click += new System.EventHandler(this.stopButton_Click);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.configureComponent2Button);
this.groupBox3.Controls.Add(this.component2NameTextBox);
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Controls.Add(this.label4);
this.groupBox3.Controls.Add(this.component2ClassNameComboBox);
this.groupBox3.Location = new System.Drawing.Point(12, 174);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(486, 75);
this.groupBox3.TabIndex = 11;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Component 2";
//
// configureComponent2Button
//
this.configureComponent2Button.Location = new System.Drawing.Point(395, 19);
this.configureComponent2Button.Name = "configureComponent2Button";
this.configureComponent2Button.Size = new System.Drawing.Size(73, 45);
this.configureComponent2Button.TabIndex = 4;
this.configureComponent2Button.Text = "Configure";
this.configureComponent2Button.UseVisualStyleBackColor = true;
this.configureComponent2Button.Click += new System.EventHandler(this.configureComponent2Button_Click);
//
// component2NameTextBox
//
this.component2NameTextBox.Enabled = false;
this.component2NameTextBox.Location = new System.Drawing.Point(77, 44);
this.component2NameTextBox.Name = "component2NameTextBox";
this.component2NameTextBox.Size = new System.Drawing.Size(299, 20);
this.component2NameTextBox.TabIndex = 3;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(11, 47);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(35, 13);
this.label3.TabIndex = 2;
this.label3.Text = "Name";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(11, 22);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(32, 13);
this.label4.TabIndex = 1;
this.label4.Text = "Class";
//
// component2ClassNameComboBox
//
this.component2ClassNameComboBox.FormattingEnabled = true;
this.component2ClassNameComboBox.Location = new System.Drawing.Point(77, 19);
this.component2ClassNameComboBox.Name = "component2ClassNameComboBox";
this.component2ClassNameComboBox.Size = new System.Drawing.Size(299, 21);
this.component2ClassNameComboBox.TabIndex = 0;
//
// radioButton24
//
this.radioButton24.AutoSize = true;
this.radioButton24.Location = new System.Drawing.Point(212, 118);
this.radioButton24.Name = "radioButton24";
this.radioButton24.Size = new System.Drawing.Size(51, 17);
this.radioButton24.TabIndex = 9;
this.radioButton24.TabStop = true;
this.radioButton24.Text = "spare";
this.radioButton24.UseVisualStyleBackColor = true;
this.radioButton24.CheckedChanged += new System.EventHandler(this.radioButton24_CheckedChanged);
//
// radioButton23
//
this.radioButton23.AutoSize = true;
this.radioButton23.Location = new System.Drawing.Point(212, 95);
this.radioButton23.Name = "radioButton23";
this.radioButton23.Size = new System.Drawing.Size(51, 17);
this.radioButton23.TabIndex = 8;
this.radioButton23.TabStop = true;
this.radioButton23.Text = "spare";
this.radioButton23.UseVisualStyleBackColor = true;
this.radioButton23.CheckedChanged += new System.EventHandler(this.radioButton23_CheckedChanged);
//
// radioButton22
//
this.radioButton22.AutoSize = true;
this.radioButton22.Location = new System.Drawing.Point(212, 72);
this.radioButton22.Name = "radioButton22";
this.radioButton22.Size = new System.Drawing.Size(51, 17);
this.radioButton22.TabIndex = 7;
this.radioButton22.TabStop = true;
this.radioButton22.Text = "spare";
this.radioButton22.UseVisualStyleBackColor = true;
this.radioButton22.CheckedChanged += new System.EventHandler(this.radioButton22_CheckedChanged);
//
// radioButton21
//
this.radioButton21.AutoSize = true;
this.radioButton21.Location = new System.Drawing.Point(212, 49);
this.radioButton21.Name = "radioButton21";
this.radioButton21.Size = new System.Drawing.Size(106, 17);
this.radioButton21.TabIndex = 6;
this.radioButton21.TabStop = true;
this.radioButton21.Text = "ReadPressureOp";
this.radioButton21.UseVisualStyleBackColor = true;
this.radioButton21.CheckedChanged += new System.EventHandler(this.radioButton21_CheckedChanged);
//
// groupBox4
//
this.groupBox4.Controls.Add(this.radioButton34);
this.groupBox4.Controls.Add(this.radioButton33);
this.groupBox4.Controls.Add(this.radioButton32);
this.groupBox4.Controls.Add(this.radioButton31);
this.groupBox4.Controls.Add(this.radioButton24);
this.groupBox4.Controls.Add(this.radioButton4);
this.groupBox4.Controls.Add(this.radioButton23);
this.groupBox4.Controls.Add(this.radioButton0);
this.groupBox4.Controls.Add(this.radioButton22);
this.groupBox4.Controls.Add(this.radioButton3);
this.groupBox4.Controls.Add(this.radioButton21);
this.groupBox4.Controls.Add(this.radioButton1);
this.groupBox4.Controls.Add(this.radioButton2);
this.groupBox4.Location = new System.Drawing.Point(12, 349);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(581, 145);
this.groupBox4.TabIndex = 12;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Operations";
//
// radioButton34
//
this.radioButton34.AutoSize = true;
this.radioButton34.Location = new System.Drawing.Point(405, 118);
this.radioButton34.Name = "radioButton34";
this.radioButton34.Size = new System.Drawing.Size(51, 17);
this.radioButton34.TabIndex = 13;
this.radioButton34.TabStop = true;
this.radioButton34.Text = "spare";
this.radioButton34.UseVisualStyleBackColor = true;
this.radioButton34.CheckedChanged += new System.EventHandler(this.radioButton34_CheckedChanged);
//
// radioButton33
//
this.radioButton33.AutoSize = true;
this.radioButton33.Location = new System.Drawing.Point(405, 95);
this.radioButton33.Name = "radioButton33";
this.radioButton33.Size = new System.Drawing.Size(51, 17);
this.radioButton33.TabIndex = 12;
this.radioButton33.TabStop = true;
this.radioButton33.Text = "spare";
this.radioButton33.UseVisualStyleBackColor = true;
this.radioButton33.CheckedChanged += new System.EventHandler(this.radioButton33_CheckedChanged);
//
// radioButton32
//
this.radioButton32.AutoSize = true;
this.radioButton32.Location = new System.Drawing.Point(405, 72);
this.radioButton32.Name = "radioButton32";
this.radioButton32.Size = new System.Drawing.Size(51, 17);
this.radioButton32.TabIndex = 11;
this.radioButton32.TabStop = true;
this.radioButton32.Text = "spare";
this.radioButton32.UseVisualStyleBackColor = true;
this.radioButton32.CheckedChanged += new System.EventHandler(this.radioButton32_CheckedChanged);
//
// radioButton31
//
this.radioButton31.AutoSize = true;
this.radioButton31.Location = new System.Drawing.Point(405, 49);
this.radioButton31.Name = "radioButton31";
this.radioButton31.Size = new System.Drawing.Size(106, 17);
this.radioButton31.TabIndex = 10;
this.radioButton31.TabStop = true;
this.radioButton31.Text = "ReadPressureOp";
this.radioButton31.UseVisualStyleBackColor = true;
this.radioButton31.CheckedChanged += new System.EventHandler(this.radioButton31_CheckedChanged);
//
// groupBox5
//
this.groupBox5.Controls.Add(this.configureComponent3Button);
this.groupBox5.Controls.Add(this.component3NameTextBox);
this.groupBox5.Controls.Add(this.label5);
this.groupBox5.Controls.Add(this.label6);
this.groupBox5.Controls.Add(this.component3ClassNameComboBox);
this.groupBox5.Location = new System.Drawing.Point(12, 255);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(486, 75);
this.groupBox5.TabIndex = 13;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Component 3";
//
// configureComponent3Button
//
this.configureComponent3Button.Location = new System.Drawing.Point(395, 19);
this.configureComponent3Button.Name = "configureComponent3Button";
this.configureComponent3Button.Size = new System.Drawing.Size(73, 45);
this.configureComponent3Button.TabIndex = 4;
this.configureComponent3Button.Text = "Configure";
this.configureComponent3Button.UseVisualStyleBackColor = true;
this.configureComponent3Button.Click += new System.EventHandler(this.configureComponent3Button_Click);
//
// component3NameTextBox
//
this.component3NameTextBox.Enabled = false;
this.component3NameTextBox.Location = new System.Drawing.Point(77, 44);
this.component3NameTextBox.Name = "component3NameTextBox";
this.component3NameTextBox.Size = new System.Drawing.Size(299, 20);
this.component3NameTextBox.TabIndex = 3;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(11, 47);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(35, 13);
this.label5.TabIndex = 2;
this.label5.Text = "Name";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(11, 22);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(32, 13);
this.label6.TabIndex = 1;
this.label6.Text = "Class";
//
// component3ClassNameComboBox
//
this.component3ClassNameComboBox.FormattingEnabled = true;
this.component3ClassNameComboBox.Location = new System.Drawing.Point(77, 19);
this.component3ClassNameComboBox.Name = "component3ClassNameComboBox";
this.component3ClassNameComboBox.Size = new System.Drawing.Size(299, 21);
this.component3ClassNameComboBox.TabIndex = 0;
//
// DeviceTestDlg
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(613, 502);
this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox4);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.stopButton);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.startButton);
this.Controls.Add(this.groupBox1);
this.Name = "DeviceTestDlg";
this.Text = "Device test";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DeviceTestDlg_FormClosing);
this.Load += new System.EventHandler(this.DeviceTestDlg_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.ComboBox parentClassNameComboBox;
private System.Windows.Forms.Label classLabel;
private System.Windows.Forms.Label nameLabel;
private System.Windows.Forms.TextBox parentNameTextBox;
private System.Windows.Forms.Button configureParentButton;
private System.Windows.Forms.Button startButton;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button configureComponent1Button;
private System.Windows.Forms.TextBox componentNameTextBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox component1ClassNameComboBox;
private System.Windows.Forms.RadioButton radioButton4;
private System.Windows.Forms.RadioButton radioButton3;
private System.Windows.Forms.RadioButton radioButton2;
private System.Windows.Forms.RadioButton radioButton1;
private System.Windows.Forms.RadioButton radioButton0;
private System.Windows.Forms.Button stopButton;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.RadioButton radioButton24;
private System.Windows.Forms.RadioButton radioButton23;
private System.Windows.Forms.RadioButton radioButton22;
private System.Windows.Forms.RadioButton radioButton21;
private System.Windows.Forms.Button configureComponent2Button;
private System.Windows.Forms.TextBox component2NameTextBox;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.ComboBox component2ClassNameComboBox;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Button configureComponent3Button;
private System.Windows.Forms.TextBox component3NameTextBox;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.ComboBox component3ClassNameComboBox;
private System.Windows.Forms.RadioButton radioButton34;
private System.Windows.Forms.RadioButton radioButton33;
private System.Windows.Forms.RadioButton radioButton32;
private System.Windows.Forms.RadioButton radioButton31;
}
}
+835
View File
@@ -0,0 +1,835 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Text;
using System.Threading;
using System.Windows.Forms;
using TBF.BenchControl;
using TBF.BenchControl.Generic;
using TBF.BenchControl.GenericDevices;
using System.Xml.Serialization;
namespace DeviceTest
{
public partial class DeviceTestDlg : Form
{
IList<string> compClasses;
IComponentFactory parentFactory;
IComponentFactory component1Factory;
IComponentFactory component2Factory;
IComponentFactory component3Factory;
IComponentCfg parentCfg;
IComponentCfg component1Cfg;
IComponentCfg component2Cfg;
IComponentCfg component3Cfg;
static IList<TBF.BenchControl.Generic.IDevice> tbfDevices;
static IList<TBF.BenchControl.Generic.IComponent> tbfComponents;
static TBF.BenchControl.Generic.IComponent tbfComponent1forOp;
static TBF.BenchControl.Generic.IComponent tbfComponent2forOp;
static TBF.BenchControl.Generic.IComponent tbfComponent3forOp;
static Thread workerThread;
static bool workerThreadRunning;
static int activeOperationId;
static IOperation operation1;
static IOperation operation2;
static IOperation operation3;
static IOperation operation4;
static IOperation operation21;
static IOperation operation22;
static IOperation operation23;
static IOperation operation24;
static IOperation operation31;
static IOperation operation32;
static IOperation operation33;
static IOperation operation34;
static TBF.Boxes.FloatBox floatBox;
static Event evnt;
static DeviceTestDlg()
{
floatBox = new TBF.Boxes.FloatBox();
floatBox.Format = "F2";
}
public DeviceTestDlg()
{
InitializeComponent();
compClasses = new List<string>();
radioButton0.Checked = true;
stopButton.Enabled = false;
foreach (var componentFactory in TbfComponents.Factories)
{
compClasses.Add(componentFactory.ClassName);
}
tbfComponents = new List<TBF.BenchControl.Generic.IComponent>();
tbfDevices = new List<IDevice>();
}
private void DeviceTestDlg_Load(object sender, EventArgs e)
{
foreach (var clName in compClasses)
{
parentClassNameComboBox.Items.Add(clName);
component1ClassNameComboBox.Items.Add(clName);
component2ClassNameComboBox.Items.Add(clName);
component3ClassNameComboBox.Items.Add(clName);
}
try
{
if (!string.IsNullOrEmpty(Program.LocalSettings.ParentClassName) &&
!string.IsNullOrEmpty(Program.LocalSettings.ParentName) &&
!string.IsNullOrEmpty(Program.LocalSettings.ParentSettings))
{
FactoryFromClassName(Program.LocalSettings.ParentClassName, ref parentFactory);
using (var reader = new StringReader(Program.LocalSettings.ParentSettings))
{
IComponentCfg config = (IComponentCfg)(new XmlSerializer(parentFactory.DefaultConfig().GetType())).Deserialize(reader);
config.Name = Program.LocalSettings.ParentName;
config.ParentName = string.Empty;
config.ItemNr = 0;
config.DebugLevel = Config.Entities.DebugMode.Normal;
config.LogLevel = Config.Entities.LogLevel.Debug;
config.Corrections = null;
config.Factory = parentFactory;
parentCfg = config;
}
parentClassNameComboBox.Text = Program.LocalSettings.ParentClassName;
parentNameTextBox.Text = Program.LocalSettings.ParentName;
}
}
catch
{
parentFactory = null;
parentCfg = null;
parentClassNameComboBox.Text = string.Empty;
parentNameTextBox.Text = string.Empty;
}
try
{
if (!string.IsNullOrEmpty(Program.LocalSettings.ComponentClassName) &&
!string.IsNullOrEmpty(Program.LocalSettings.ComponentName) &&
!string.IsNullOrEmpty(Program.LocalSettings.ComponentSettings))
{
FactoryFromClassName(Program.LocalSettings.ComponentClassName, ref component1Factory);
using (var reader = new StringReader(Program.LocalSettings.ComponentSettings))
{
IComponentCfg config = (IComponentCfg)(new XmlSerializer(component1Factory.DefaultConfig().GetType())).Deserialize(reader);
config.Name = Program.LocalSettings.ComponentName;
config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.ComponentParentName) ? string.Empty : Program.LocalSettings.ComponentParentName;
config.ItemNr = 1;
config.DebugLevel = Config.Entities.DebugMode.Normal;
config.LogLevel = Config.Entities.LogLevel.Debug;
config.Corrections = null;
config.Factory = component1Factory;
component1Cfg = config;
}
component1ClassNameComboBox.Text = Program.LocalSettings.ComponentClassName;
componentNameTextBox.Text = Program.LocalSettings.ComponentName;
UpdateOperations(component1ClassNameComboBox.Text);
}
}
catch
{
component1Factory = null;
component1Cfg = null;
component1ClassNameComboBox.Text = string.Empty;
componentNameTextBox.Text = string.Empty;
}
try
{
if (!string.IsNullOrEmpty(Program.LocalSettings.Component2ClassName) &&
!string.IsNullOrEmpty(Program.LocalSettings.Component2Name) &&
!string.IsNullOrEmpty(Program.LocalSettings.Component2Settings))
{
FactoryFromClassName(Program.LocalSettings.Component2ClassName, ref component2Factory);
using (var reader = new StringReader(Program.LocalSettings.Component2Settings))
{
IComponentCfg config = (IComponentCfg)(new XmlSerializer(component2Factory.DefaultConfig().GetType())).Deserialize(reader);
config.Name = Program.LocalSettings.Component2Name;
config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component2ParentName) ? string.Empty : Program.LocalSettings.Component2ParentName;
config.ItemNr = 2;
config.DebugLevel = Config.Entities.DebugMode.Normal;
config.LogLevel = Config.Entities.LogLevel.Debug;
config.Corrections = null;
config.Factory = component2Factory;
component2Cfg = config;
}
component2ClassNameComboBox.Text = Program.LocalSettings.Component2ClassName;
component2NameTextBox.Text = Program.LocalSettings.Component2Name;
UpdateOperations2(component2ClassNameComboBox.Text);
}
}
catch
{
component2Factory = null;
component2Cfg = null;
component2ClassNameComboBox.Text = string.Empty;
component2NameTextBox.Text = string.Empty;
}
try
{
if (!string.IsNullOrEmpty(Program.LocalSettings.Component3ClassName) &&
!string.IsNullOrEmpty(Program.LocalSettings.Component3Name) &&
!string.IsNullOrEmpty(Program.LocalSettings.Component3Settings))
{
FactoryFromClassName(Program.LocalSettings.Component3ClassName, ref component3Factory);
using (var reader = new StringReader(Program.LocalSettings.Component3Settings))
{
IComponentCfg config = (IComponentCfg)(new XmlSerializer(component3Factory.DefaultConfig().GetType())).Deserialize(reader);
config.Name = Program.LocalSettings.Component3Name;
config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component3ParentName) ? string.Empty : Program.LocalSettings.Component3ParentName;
config.ItemNr = 3;
config.DebugLevel = Config.Entities.DebugMode.Normal;
config.LogLevel = Config.Entities.LogLevel.Debug;
config.Corrections = null;
config.Factory = component3Factory;
component3Cfg = config;
}
component3ClassNameComboBox.Text = Program.LocalSettings.Component3ClassName;
component3NameTextBox.Text = Program.LocalSettings.Component3Name;
UpdateOperations3(component3ClassNameComboBox.Text);
}
}
catch
{
component3Factory = null;
component3Cfg = null;
component3ClassNameComboBox.Text = string.Empty;
component3NameTextBox.Text = string.Empty;
}
}
void SaveSettings()
{
Program.LocalSettings.ParentClassName = parentClassNameComboBox.Text;
Program.LocalSettings.ParentName = parentNameTextBox.Text;
Program.LocalSettings.ParentSettings = (parentCfg != null) ? parentCfg.CreateDbEntity().Parameters : string.Empty;
Program.LocalSettings.ComponentClassName = component1ClassNameComboBox.Text;
Program.LocalSettings.ComponentName = componentNameTextBox.Text;
Program.LocalSettings.ComponentParentName = (component1Cfg != null) ? component1Cfg.ParentName : string.Empty;
Program.LocalSettings.ComponentSettings = (component1Cfg != null) ? component1Cfg.CreateDbEntity().Parameters : string.Empty;
Program.LocalSettings.Component2ClassName = component2ClassNameComboBox.Text;
Program.LocalSettings.Component2Name = component2NameTextBox.Text;
Program.LocalSettings.Component2ParentName = (component2Cfg != null) ? component2Cfg.ParentName : string.Empty;
Program.LocalSettings.Component2Settings = (component2Cfg != null) ? component2Cfg.CreateDbEntity().Parameters : string.Empty;
Program.LocalSettings.Component3ClassName = component3ClassNameComboBox.Text;
Program.LocalSettings.Component3Name = component3NameTextBox.Text;
Program.LocalSettings.Component3ParentName = (component3Cfg != null) ? component3Cfg.ParentName : string.Empty;
Program.LocalSettings.Component3Settings = (component3Cfg != null) ? component3Cfg.CreateDbEntity().Parameters : string.Empty;
Program.LocalSettings.Save();
}
void UpdateOperations(string className)
{
if (className == "Keithley.TempMeter") radioButton1.Text = "ReadPressureOp";
else if (className == "Network.Camera.CLP1611") radioButton1.Text = "Livestream";
else if (className == "Network.Camera.Roi") radioButton1.Text = "RoiDetection";
else if (className == "Modbus.Easytherm")
{
radioButton1.Text = "SetTemperature(10)";
radioButton2.Text = "SetTemperature(20)";
}
else if (className == "Modbus.TankSelector")
{
radioButton1.Text = "SelectTank 1";
radioButton2.Text = "SelectTank 2";
radioButton3.Text = "SelectTank 3";
radioButton4.Text = "SelectTank -";
}
else radioButton1.Text = "spare";
}
///
void UpdateOperations2(string className)
{
if (className == "Keithley.TempMeter") radioButton21.Text = "ReadPressureOp";
else if (className == "Network.Camera.CLP1611") radioButton21.Text = "Livestream";
else if (className == "Network.Camera.Roi") radioButton21.Text = "RoiDetection";
else if (className == "Modbus.Easytherm")
{
radioButton21.Text = "SetTemperature(10)";
radioButton22.Text = "SetTemperature(20)";
}
else if (className == "Modbus.TankSelector")
{
radioButton21.Text = "SelectTank 1";
radioButton22.Text = "SelectTank 2";
radioButton23.Text = "SelectTank 3";
radioButton24.Text = "SelectTank -";
}
else radioButton21.Text = "spare";
}
///
void UpdateOperations3(string className)
{
if (className == "Keithley.TempMeter") radioButton31.Text = "ReadPressureOp";
else if (className == "Network.Camera.CLP1611") radioButton31.Text = "Livestream";
else if (className == "Network.Camera.Roi") radioButton31.Text = "RoiDetection";
else if (className == "Modbus.Easytherm")
{
radioButton31.Text = "SetTemperature(10)";
radioButton32.Text = "SetTemperature(20)";
}
else if (className == "Modbus.TankSelector")
{
radioButton31.Text = "SelectTank 1";
radioButton32.Text = "SelectTank 2";
radioButton33.Text = "SelectTank 3";
radioButton34.Text = "SelectTank -";
}
else radioButton31.Text = "spare";
}
int GetActiveOperationId()
{
if (radioButton1.Checked) { return 1; }
else if (radioButton2.Checked) { return 2; }
else if (radioButton3.Checked) { return 3; }
else if (radioButton4.Checked) { return 4; }
else if (radioButton21.Checked) { return 21; }
else if (radioButton22.Checked) { return 22; }
else if (radioButton23.Checked) { return 23; }
else if (radioButton24.Checked) { return 24; }
else if (radioButton31.Checked) { return 31; }
else if (radioButton32.Checked) { return 32; }
else if (radioButton33.Checked) { return 33; }
else if (radioButton34.Checked) { return 34; }
else return 0; /// stopOperationRadioButton.Checked
}
private void radioButton0_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton1_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton2_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton3_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton4_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
///
private void radioButton21_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton22_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton23_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton24_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
///
private void radioButton31_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton32_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton33_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
private void radioButton34_CheckedChanged(object sender, EventArgs e) { activeOperationId = GetActiveOperationId(); }
/// <summary>
/// Updates component factory
/// </summary>
/// <param name="className">Component class name</param>
/// <param name="factory">Reference to a factory</param>
/// <returns>true when factory changed</returns>
bool FactoryFromClassName(string className, ref IComponentFactory factory)
{
foreach (var fac in TbfComponents.Factories)
{
if (className == fac.ClassName)
{
if (factory != fac)
{
factory = fac;
return true;
}
else
{
return false;
}
}
}
if (factory != null)
{
factory = null;
return true;
}
return false;
}
private void configureParentButton_Click(object sender, EventArgs e)
{
bool factoryChanged = FactoryFromClassName(parentClassNameComboBox.Text, ref parentFactory);
if (parentFactory == null)
{
MessageBox.Show("Invalid parent class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (factoryChanged || parentCfg == null)
{
parentCfg = parentFactory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = parentCfg.GetControl();
cfgControl.Config = parentCfg;
cfgControl.Config.ItemNr = 0;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
cfgForm.TbfComponents = new List<Config.Entities.Component>();
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;
parentNameTextBox.Text = parentCfg.Name;
}
private void configureComponent1Button_Click(object sender, EventArgs e)
{
bool factoryChanged = FactoryFromClassName(component1ClassNameComboBox.Text, ref component1Factory);
if (component1Factory == null)
{
MessageBox.Show("Invalid component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (factoryChanged || component1Cfg == null)
{
component1Cfg = component1Factory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
cfgControl.Config = component1Cfg;
cfgControl.Config.ItemNr = 1;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
cfgForm.TbfComponents = compEntities;
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;
componentNameTextBox.Text = component1Cfg.Name;
UpdateOperations(component1ClassNameComboBox.Text);
}
private void configureComponent2Button_Click(object sender, EventArgs e)
{
bool factoryChanged = FactoryFromClassName(component2ClassNameComboBox.Text, ref component2Factory);
if (component2Factory == null)
{
MessageBox.Show("Invalid component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (factoryChanged || component2Cfg == null)
{
component2Cfg = component2Factory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
cfgControl.Config = component2Cfg;
cfgControl.Config.ItemNr = 1;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
cfgForm.TbfComponents = compEntities;
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;
component2NameTextBox.Text = component2Cfg.Name;
UpdateOperations2(component2ClassNameComboBox.Text);
}
private void configureComponent3Button_Click(object sender, EventArgs e)
{
bool factoryChanged = FactoryFromClassName(component3ClassNameComboBox.Text, ref component3Factory);
if (component3Factory == null)
{
MessageBox.Show("Invalid component class", "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
if (factoryChanged || component3Cfg == null)
{
component3Cfg = component3Factory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
cfgControl.Config = component3Cfg;
cfgControl.Config.ItemNr = 1;
TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
if (component2Factory != null && component2Cfg != null) compEntities.Add(component2Cfg.CreateDbEntity());
cfgForm.TbfComponents = compEntities;
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;
component3NameTextBox.Text = component3Cfg.Name;
UpdateOperations3(component3ClassNameComboBox.Text);
}
private void startButton_Click(object sender, EventArgs e)
{
tbfComponents.Clear();
tbfDevices.Clear();
tbfComponent1forOp = null;
operation1 = null;
operation2 = null;
operation3 = null;
operation4 = null;
tbfComponent2forOp = null;
operation21 = null;
operation22 = null;
operation23 = null;
operation24 = null;
tbfComponent3forOp = null;
operation31 = null;
operation32 = null;
operation33 = null;
operation34 = null;
workerThreadRunning = false;
string initializedDeviceName = "none";
try
{
if (parentFactory != null && parentCfg != null)
{
TBF.BenchControl.Generic.IComponent component = parentFactory.GetComponent(parentCfg, tbfComponents);
tbfComponents.Add(component);
IDevice dev = component as IDevice;
if (dev != null)
{
initializedDeviceName = dev.Name;
dev.Initialize();
tbfDevices.Add(dev);
}
}
if (component1Factory != null && component1Cfg != null)
{
TBF.BenchControl.Generic.IComponent component = component1Factory.GetComponent(component1Cfg, tbfComponents);
tbfComponents.Add(component);
tbfComponent1forOp = component;
IDevice dev = component as IDevice;
if (dev != null)
{
initializedDeviceName = dev.Name;
dev.Initialize();
tbfDevices.Add(dev);
}
}
if (component2Factory != null && component2Cfg != null)
{
TBF.BenchControl.Generic.IComponent component2 = component2Factory.GetComponent(component2Cfg, tbfComponents);
tbfComponents.Add(component2);
tbfComponent2forOp = component2;
IDevice dev = component2 as IDevice;
if (dev != null)
{
initializedDeviceName = dev.Name;
dev.Initialize();
tbfDevices.Add(dev);
}
}
if (component3Factory != null && component3Cfg != null)
{
TBF.BenchControl.Generic.IComponent component3 = component3Factory.GetComponent(component3Cfg, tbfComponents);
tbfComponents.Add(component3);
tbfComponent3forOp = component3;
IDevice dev = component3 as IDevice;
if (dev != null)
{
initializedDeviceName = dev.Name;
dev.Initialize();
tbfDevices.Add(dev);
}
}
if (tbfComponents.Count == 0) throw new Exception("There are no components");
SaveSettings(); /// Save settings after successful initialization
workerThread = new Thread(Worker);
workerThread.CurrentCulture = Thread.CurrentThread.CurrentCulture;
workerThread.CurrentUICulture = Thread.CurrentThread.CurrentUICulture;
workerThreadRunning = true;
workerThread.Start();
startButton.Enabled = false;
stopButton.Enabled = true;
configureComponent2Button.Enabled = false;
configureComponent1Button.Enabled = false;
configureParentButton.Enabled = false;
}
catch (Exception exc)
{
workerThreadRunning = false;
workerThread = null;
MessageBox.Show(exc.Message,
string.Format("'{0}' initialization failed", initializedDeviceName),
MessageBoxButtons.OK,
MessageBoxIcon.Exclamation);
foreach (var dev in tbfDevices) dev.StopDevice();
tbfDevices.Clear();
startButton.Enabled = true;
stopButton.Enabled = false;
configureComponent2Button.Enabled = true;
configureComponent1Button.Enabled = true;
configureParentButton.Enabled = true;
}
}
static void Worker()
{
int activeOperationLocal = 0;
int previousOperation = 0;
if (tbfComponent1forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
{
operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
}
else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
{
operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
operation2 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
}
else if (tbfComponent1forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
{
operation1 = (tbfComponent1forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
}
else if (tbfComponent1forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
{
operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
}
else if (tbfComponent1forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
{
//operation1 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
//operation2 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
//operation3 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
//operation4 = (tbfComponent1forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
}
if (tbfComponent2forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
{
operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
}
else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
{
operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
operation22 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
}
else if (tbfComponent2forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
{
operation21 = (tbfComponent2forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
}
else if (tbfComponent2forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
{
operation21 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
operation22 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
}
else if (tbfComponent2forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
{
//operation21 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
//operation22 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
//operation23 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
//operation24 = (tbfComponent2forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
}
if (tbfComponent3forOp is TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter)
{
operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.PressureMeter.Meret.PressureMeter).ReadPressureOp(ref floatBox);
}
else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.CLP1611.Camera)
{
operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(false);
operation33 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.CLP1611.Camera).LiveStreamOp(true);
}
else if (tbfComponent3forOp is TBF.BenchControl.Network.Camera.Roi.Roi)
{
operation31 = (tbfComponent3forOp as TBF.BenchControl.Network.Camera.Roi.Roi).RoiDetectionOp();
}
else if (tbfComponent3forOp is TBF.BenchControl.Modbus.Easytherm.Easytherm)
{
operation31 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(10);
operation32 = (tbfComponent1forOp as TBF.BenchControl.Modbus.Easytherm.Easytherm).SetTemperatureOp(20);
}
else if (tbfComponent3forOp is TBF.BenchControl.Modbus.TankSelector.TankSelector)
{
//operation31 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(1);
//operation32 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(2);
//operation33 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(3);
//operation34 = (tbfComponent3forOp as TBF.BenchControl.Modbus.TankSelector.TankSelector).SelectTankOp(0);
}
while (workerThreadRunning)
{
Thread.Sleep(1000);
if (workerThreadRunning)
{
foreach (var d in tbfDevices) d.RunDeviceBefore();
if (tbfComponent1forOp != null)
{
previousOperation = activeOperationLocal;
activeOperationLocal = activeOperationId;
if (previousOperation == 0 && activeOperationLocal != 0)
{
switch (activeOperationLocal)
{
case 1: if (operation1 != null) operation1.Start(); Debug.WriteLine("op1.Start()"); break;
case 2: if (operation2 != null) operation2.Start(); Debug.WriteLine("op2.Start()"); break;
case 3: if (operation3 != null) operation3.Start(); Debug.WriteLine("op3.Start()"); break;
case 4: if (operation4 != null) operation4.Start(); Debug.WriteLine("op4.Start()"); break;
case 21: if (operation21 != null) operation21.Start(); Debug.WriteLine("op21.Start()"); break;
case 22: if (operation22 != null) operation22.Start(); Debug.WriteLine("op22.Start()"); break;
case 23: if (operation23 != null) operation23.Start(); Debug.WriteLine("op23.Start()"); break;
case 24: if (operation24 != null) operation24.Start(); Debug.WriteLine("op24.Start()"); break;
case 31: if (operation31 != null) operation31.Start(); Debug.WriteLine("op31.Start()"); break;
case 32: if (operation32 != null) operation32.Start(); Debug.WriteLine("op32.Start()"); break;
case 33: if (operation33 != null) operation33.Start(); Debug.WriteLine("op33.Start()"); break;
case 34: if (operation34 != null) operation34.Start(); Debug.WriteLine("op34.Start()"); break;
}
}
else if (previousOperation == activeOperationLocal && activeOperationLocal != 0)
{
switch (activeOperationLocal)
{
case 1: if (operation1 != null) evnt = operation1.Run(); Debug.WriteLine("op1.Run() -> {0}", evnt); break;
case 2: if (operation2 != null) evnt = operation2.Run(); Debug.WriteLine("op2.Run() -> {0}", evnt); break;
case 3: if (operation3 != null) evnt = operation3.Run(); Debug.WriteLine("op3.Run() -> {0}", evnt); break;
case 4: if (operation4 != null) evnt = operation4.Run(); Debug.WriteLine("op4.Run() -> {0}", evnt); break;
case 21: if (operation21 != null) evnt = operation21.Run(); Debug.WriteLine("op21.Run() -> {0}", evnt); break;
case 22: if (operation22 != null) evnt = operation22.Run(); Debug.WriteLine("op22.Run() -> {0}", evnt); break;
case 23: if (operation23 != null) evnt = operation23.Run(); Debug.WriteLine("op23.Run() -> {0}", evnt); break;
case 24: if (operation24 != null) evnt = operation24.Run(); Debug.WriteLine("op24.Run() -> {0}", evnt); break;
case 31: if (operation31 != null) evnt = operation31.Run(); Debug.WriteLine("op31.Run() -> {0}", evnt); break;
case 32: if (operation32 != null) evnt = operation32.Run(); Debug.WriteLine("op32.Run() -> {0}", evnt); break;
case 33: if (operation33 != null) evnt = operation33.Run(); Debug.WriteLine("op33.Run() -> {0}", evnt); break;
case 34: if (operation34 != null) evnt = operation34.Run(); Debug.WriteLine("op34.Run() -> {0}", evnt); break;
default: evnt = Event.None; break;
}
}
else if (previousOperation != 0 && activeOperationLocal == 0)
{
switch (previousOperation)
{
case 1: if (operation1 != null) operation1.Stop(); Debug.WriteLine("op1.Stop()"); break;
case 2: if (operation2 != null) operation2.Stop(); Debug.WriteLine("op2.Stop()"); break;
case 3: if (operation3 != null) operation3.Stop(); Debug.WriteLine("op3.Stop()"); break;
case 4: if (operation4 != null) operation4.Stop(); Debug.WriteLine("op4.Stop()"); break;
case 21: if (operation21 != null) operation21.Stop(); Debug.WriteLine("op21.Stop()"); break;
case 22: if (operation22 != null) operation22.Stop(); Debug.WriteLine("op22.Stop()"); break;
case 23: if (operation23 != null) operation23.Stop(); Debug.WriteLine("op23.Stop()"); break;
case 24: if (operation24 != null) operation24.Stop(); Debug.WriteLine("op24.Stop()"); break;
case 31: if (operation31 != null) operation31.Stop(); Debug.WriteLine("op31.Stop()"); break;
case 32: if (operation32 != null) operation32.Stop(); Debug.WriteLine("op32.Stop()"); break;
case 33: if (operation33 != null) operation33.Stop(); Debug.WriteLine("op33.Stop()"); break;
case 34: if (operation34 != null) operation34.Stop(); Debug.WriteLine("op34.Stop()"); break;
}
}
}
foreach (var d in tbfDevices) d.RunDeviceAfter();
}
}
foreach (var d in tbfDevices) d.StopDevice();
}
private void stopButton_Click(object sender, EventArgs e)
{
Cursor = Cursors.WaitCursor;
workerThreadRunning = false;
workerThread.Join(5000);
workerThread = null;
Cursor = Cursors.Default;
startButton.Enabled = true;
stopButton.Enabled = false;
configureParentButton.Enabled = true;
configureComponent1Button.Enabled = true;
configureComponent2Button.Enabled = true;
configureComponent3Button.Enabled = true;
}
private void DeviceTestDlg_FormClosing(object sender, FormClosingEventArgs e)
{
Cursor = Cursors.WaitCursor;
if (workerThread != null)
{
workerThreadRunning = false;
workerThread.Join(3000);
workerThread = null;
}
Cursor = Cursors.Default;
SaveSettings();
Cursor = Cursors.Default;
}
}
}
+126
View File
@@ -0,0 +1,126 @@
using System;
using System.IO;
using System.Text;
using System.Xml.Serialization;
namespace DeviceTest
{
/// <summary>
/// Class to be serialized to an XML file...
/// </summary>
[XmlRootAttribute("DeviceTest")]
public class LocalSettings
{
public string ParentClassName;
public string ParentName;
public string ParentSettings;
public string ComponentClassName;
public string ComponentName;
public string ComponentParentName;
public string ComponentSettings;
public string Component2ClassName;
public string Component2Name;
public string Component2ParentName;
public string Component2Settings;
public string Component3ClassName;
public string Component3Name;
public string Component3ParentName;
public string Component3Settings;
public LocalSettings()
{
}
/// <summary>
/// Load public fields of this class from the XML file.
/// </summary>
/// <returns>LocalSettings object or null when Load() fails</returns>
public static LocalSettings Load(string fileName)
{
try
{
using (TextReader reader = new StreamReader(fileName))
{
LocalSettings ls = (new XmlSerializer(typeof(LocalSettings))).Deserialize(reader) as LocalSettings;
// Copy the settings just in case De-serialize() completes OK
return ls;
}
}
catch (Exception e)
{
string msg = e.Message;
return null;
}
}
/// <summary>
/// Save public fields of this class to the XML file.
/// </summary>
public void Save()
{
try
{
using (TextWriter writer = new StreamWriter(Program.LocalSettingsFileName))
{
(new XmlSerializer(typeof(LocalSettings))).Serialize(writer, this);
}
}
catch (Exception e)
{
string msg = e.Message;
}
}
/// <summary>
/// Updates history stored in a string array by a new latest string.
/// </summary>
/// <param name="lastStrValue">Last entered string</param>
/// <returns>true = updated and saved</returns>
public bool UpdateHistory(string lastStrValue, ref string[] history)
{
const int MaxHistoryLen = 10;
if (string.IsNullOrEmpty(lastStrValue)) return false;
int currentHistoryLength = (history != null) ? history.Length : 0;
int match = -1;
for (int i = 0; i < currentHistoryLength; i++)
{
if (history[i] == lastStrValue)
{
match = i;
break;
}
}
if (match >= 0 || currentHistoryLength >= MaxHistoryLen)
{
/// History does not have to be extended (because of a match) or should not be extended (because of the lenght)
if (match < 0) match = currentHistoryLength - 1;
for (int j = match; j > 0; j--)
{
history[j] = history[j - 1];
}
history[0] = lastStrValue;
}
else
{
/// History will be extended, new item inserted at the beginning
string[] newHistory = new string[currentHistoryLength + 1];
newHistory[0] = lastStrValue;
for (int j = 1; j <= currentHistoryLength; j++)
{
newHistory[j] = history[j - 1];
}
history = newHistory;
}
Save();
return true;
}
}
}
+111
View File
@@ -0,0 +1,111 @@
///
/// Copyright (c) 2016-2017 Sensus Metering Systems
///
using System;
using System.IO;
using System.Windows.Forms;
using log4net;
namespace DeviceTest
{
static class Program
{
/// Program information
public static string Version; /// version string
public static DateTime BuildDateTime; /// date and time of program build
/// log4net
static ILog log;
const string log4netConfigFName = "log4netConfig.xml";
/// Local settings
public static readonly string LocAppDataDir;
public static readonly string LocalSettingsFileName;
public static readonly string LocalSettingsBackupName;
public static LocalSettings LocalSettings;
static Program()
{
/// Program version string
System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
Version ver = thisAssembly.GetName().Version;
Version = string.Format("{0}.{1}.{2}", ver.Major, ver.Minor, ver.Build);
BuildDateTime = new System.IO.FileInfo(thisAssembly.Location).LastWriteTime;
/// Local program configuration directory including the trailing backslash
LocAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) +
Path.DirectorySeparatorChar + "TestBenchFramework" + Path.DirectorySeparatorChar;
LocalSettingsFileName = LocAppDataDir + "DeviceTest.xml";
LocalSettingsBackupName = LocAppDataDir + "DeviceTest.backup.xml";
}
/// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
{
///
/// Load the local settings
///
Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsFileName);
if (Program.LocalSettings == null)
{
/// Loading local seetings from regular config file failed. Use the backup
Program.LocalSettings = LocalSettings.Load(Program.LocalSettingsBackupName);
if (Program.LocalSettings == null)
{
MessageBox.Show("Na tomto počítači nebol tento program ani raz spustený.\r\nPoužijú sa základné nastavenia.", "Upozornenie", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
Program.LocalSettings = new LocalSettings();
Directory.CreateDirectory(LocAppDataDir);
Program.LocalSettings.Save();
}
else
{
LocalSettings.Save(); /// Save the settings to overwrite the wrong file
}
}
else
{
/// Loading local seetings from the regular config file was successful. Update the backup
File.Copy(Program.LocalSettingsFileName, Program.LocalSettingsBackupName, true);
}
/// Configure and start logging
log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(LocAppDataDir + log4netConfigFName));
log = LogManager.GetLogger(typeof(Program));
log.Fatal("--------------------------------------------------------------------------------");
log.Fatal(string.Format("TBF ver.{0}", Version));
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
try
{
DeviceTestDlg dlg = new DeviceTestDlg();
Application.Run(dlg);
}
catch (Exception exc)
{
LogException(log, "Exception in Application.Run(DeviceTestDlg)", exc);
MessageBox.Show("Program havaroval:" +
Environment.NewLine + Environment.NewLine + exc.Message +
((exc.InnerException == null) ? string.Empty : (Environment.NewLine + exc.InnerException.Message)) +
Environment.NewLine + exc.StackTrace,
"Pozor!", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
}
}
static void LogException(ILog log, string description, Exception e)
{
log.FatalFormat("---------------( {0} )---------------", description);
log.FatalFormat("Message : {0}", e.Message);
if (e.InnerException != null)
{
log.FatalFormat("InnerMessage : {0}", e.InnerException.Message);
}
log.FatalFormat("StackTrace : {0}{1}", Environment.NewLine, e.StackTrace);
log.Fatal("--------------------------------------");
}
}
}
+36
View File
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DeviceTest")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DeviceTest")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a3e8ad92-6617-4f5c-88ce-346d28120fb7")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+63
View File
@@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DeviceTest.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DeviceTest.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}
+117
View File
@@ -0,0 +1,117 @@
<?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.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: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" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</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" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DeviceTest.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
}
}
+3
View File
@@ -0,0 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{439D0878-C76E-452B-B17D-209A89E91D36}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dirichlet.Numerics</RootNamespace>
<AssemblyName>Dirichlet.Numerics</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Numerics" />
</ItemGroup>
<ItemGroup>
<Compile Include="Int128.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UInt128.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Dirichlet.Numerics")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Dirichlet.Numerics")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a588abc0-c631-4475-9eab-4163d9f81fed")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
File diff suppressed because it is too large Load Diff
+13
View File
@@ -0,0 +1,13 @@
Copyright 2014 Rick Sladkey
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+87
View File
@@ -0,0 +1,87 @@
using System;
using System.Drawing;
/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
namespace GraphLib
{
public class BackBuffer
{
private Graphics graphics;
private Bitmap memoryBitmap;
private int width;
private int height;
public BackBuffer()
{
width = 0;
height = 0;
}
public bool Init(Graphics g, int width, int height)
{
if (memoryBitmap != null)
{
memoryBitmap.Dispose();
memoryBitmap = null;
}
if (graphics != null)
{
graphics.Dispose();
graphics = null;
}
if (width == 0 || height == 0)
return false;
if ((width != this.width) || (height != this.height) || graphics == null)
{
this.width = width;
this.height = height;
memoryBitmap = new Bitmap(width, height);
graphics = Graphics.FromImage(memoryBitmap);
}
return true;
}
public void Render(Graphics g)
{
if (memoryBitmap != null)
{
g.DrawImage(memoryBitmap,
new Rectangle(0, 0, width, height),
0, 0, width, height,
GraphicsUnit.Pixel);
}
}
public bool CanDoubleBuffer() { return graphics != null; }
public Graphics Graphics { get { return graphics; } }
}
}
+254
View File
@@ -0,0 +1,254 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.ComponentModel;
using System.Drawing;
/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
namespace GraphLib
{
public class DataSource
{
public delegate String OnDrawXAxisLabelEvent(DataSource src, int idx);
public delegate String OnDrawYAxisLabelEvent(DataSource src, float value);
public OnDrawXAxisLabelEvent OnRenderXAxisLabel = null;
public OnDrawYAxisLabelEvent OnRenderYAxisLabel = null;
private PointF[] samples = null;
private int length = 0;
private String name = String.Empty;
private int downSample = 1;
private Color color = Color.Black;
public float VisibleDataRange_X = 0;
public float DY = 0;
public float YD0 = -200;
public float YD1 = 200;
public float Cur_YD0 = -200;
public float Cur_YD1 = 200;
public float grid_distance_y = 200; // grid distance in units ( draw a horizontal line every 200 units )
public float off_Y = 0;
public float grid_off_y = 0;
public bool yFlip = true;
public bool Active = true;
public float XAutoScaleOffset = 100;
public float CurGraphHeight = 1.0f;
public float CurGraphWidth = 1.0f;
private bool autoScaleY = false;
private bool autoScaleX = false;
public bool AutoScaleY
{
get { return autoScaleY; }
set { autoScaleY = value; }
}
public bool AutoScaleX
{
get { return autoScaleX; }
set { autoScaleX = value; }
}
public PointF[] Samples
{
get { return samples; }
set
{
samples = value;
length = samples.Length;
}
}
public float XMin
{
get
{
float x_min = float.MaxValue;
if (samples != null && samples.Length > 0)
{
foreach (PointF p in samples) if (p.X < x_min) x_min=p.X;
}
return x_min;
}
}
public float XMax
{
get
{
float x_max = float.MinValue;
if (samples != null && samples.Length > 0)
{
foreach (PointF p in samples) if (p.X > x_max) x_max = p.X;
}
return x_max;
}
}
public float YMin
{
get
{
float y_min = float.MaxValue;
if (samples != null && samples.Length > 0)
{
foreach (PointF p in samples) if (p.Y < y_min) y_min = p.Y;
}
return y_min;
}
}
public float YMax
{
get
{
float y_max = float.MinValue;
if (samples.Length > 0)
{
foreach (PointF p in samples) if (p.Y > y_max) y_max = p.Y;
}
return y_max;
}
}
public void SetDisplayRangeY(float y_start, float y_end)
{
YD0 = y_start;
YD1 = y_end;
}
public void SetGridDistanceY(float grid_dist_y_units)
{
grid_distance_y = grid_dist_y_units;
}
public void SetGridOriginY(float off_y)
{
grid_off_y = off_y;
}
/// <summary>
/// Load Samples from a file. Returns loaded points count.
/// </summary>
/// <param name="pathName">File pathname</param>
/// <returns>Loaded points count</returns>
public int LoadSamples(string pathName, out float yMin, out float yMax)
{
yMin = float.MaxValue;
yMax = float.MinValue;
try
{
Int64 size = new FileInfo(pathName).Length;
if ((size % 8) != 0) return 0;
int samplesCount = (int)(size / 8L) - 1;
if (samplesCount <= 0) return 0;
PointF[] newSamples = new PointF[samplesCount];
using (BinaryReader reader = new BinaryReader(File.Open(pathName, FileMode.Open)))
{
for (int i = 0; i < samplesCount; i++)
{
newSamples[i].X = reader.ReadSingle();
newSamples[i].Y = reader.ReadSingle();
}
yMin = reader.ReadSingle();
yMax = reader.ReadSingle();
}
Samples = newSamples;
return samplesCount;
}
catch (Exception exc)
{
return 0;
}
}
[Category("Properties")] // Take this out, and you will soon have problems with serialization;
[DefaultValue(typeof(string), "")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public String Name
{
get { return name; }
set { name = value; }
}
[Category("Properties")] // Take this out, and you will soon have problems with serialization;
[DefaultValue(typeof(Color), "")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color GraphColor
{
get { return color; }
set { color = value; }
}
[Category("Properties")] // Take this out, and you will soon have problems with serialization;
[DefaultValue(typeof(int), "0")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int Length
{
get { return length; }
set
{
length = value;
if (length != 0)
{
samples = new PointF[length];
}
else
{
// length is 0
if (samples != null)
{
samples = null;
}
}
}
}
[Category("Properties")] // Take this out, and you will soon have problems with serialization;
[DefaultValue(typeof(int), "1")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public int Downsampling
{
get { return downSample; }
set { downSample = value; }
}
}
}
+116
View File
@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ClassLibrary1</RootNamespace>
<AssemblyName>GraphLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="PlotterGraphPaneEx.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="PlotterGraphPaneEx.Designer.cs">
<DependentUpon>PlotterGraphPaneEx.cs</DependentUpon>
</Compile>
<Compile Include="PlotterDisplayEx.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="PlotterDisplayEx.designer.cs">
<DependentUpon>PlotterDisplayEx.cs</DependentUpon>
</Compile>
<Compile Include="BackBuffer.cs" />
<Compile Include="PlotterGraphSelectCurvesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="PlotterGraphSelectCurvesForm.Designer.cs">
<DependentUpon>PlotterGraphSelectCurvesForm.cs</DependentUpon>
</Compile>
<Compile Include="DataSource.cs" />
<Compile Include="PrintPreviewForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="PrintPreviewForm.Designer.cs">
<DependentUpon>PrintPreviewForm.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="PrecisionTimer.cs" />
<Compile Include="Utils.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="PlotterGraphPaneEx.resx">
<DependentUpon>PlotterGraphPaneEx.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="PlotterDisplayEx.resx">
<DependentUpon>PlotterDisplayEx.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="PlotterGraphSelectCurvesForm.resx">
<SubType>Designer</SubType>
<DependentUpon>PlotterGraphSelectCurvesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="PrintPreviewForm.resx">
<SubType>Designer</SubType>
<DependentUpon>PrintPreviewForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
+20
View File
@@ -0,0 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphLib", "GraphLib.csproj", "{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
+404
View File
@@ -0,0 +1,404 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Text;
using System.Windows.Forms;
using System.Threading;
using System.ComponentModel.Design;
using System.Drawing.Drawing2D;
/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
namespace GraphLib
{
public partial class PlotterDisplayEx : UserControl
{
#region MEMBERS
delegate void InvokeVoidFuncDelegate();
PlotterGraphSelectCurvesForm GraphPropertiesForm = null;
PrintPreviewForm printPreviewForm = null;
private PrecisionTimer.Timer mTimer = null;
private float play_speed = 0.5f;
private float play_speed_max = 10f;
private float play_speed_min = 0.5f;
private bool paused = false;
private bool isRunning = false;
#endregion
#region CONSTRUCTOR
public PlotterDisplayEx()
{
InitializeComponent();
mTimer = new PrecisionTimer.Timer();
mTimer.Period = 50; // 20 fps
mTimer.Tick += new EventHandler(OnTimerTick);
play_speed = 0.5f; // 20x10 = 200 values per second == sample frequency
mTimer.Start();
isRunning = false;
}
void contextMenuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
String text = e.ClickedItem.Text;
foreach (DataSource s in gPane.Sources)
{
if (s.Name == text)
{
s.Active ^= true;
gPane.Invalidate();
break;
}
}
}
#endregion
#region PROPERTIES
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[Editor(typeof(System.ComponentModel.Design.CollectionEditor),
typeof(System.Drawing.Design.UITypeEditor))]
public IList<DataSource> DataSources
{
get { return gPane.Sources; }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[Editor(typeof(System.ComponentModel.Design.CollectionEditor),
typeof(System.Drawing.Design.UITypeEditor))]
public PlotterGraphPaneEx.LayoutMode PanelLayout
{
get { return gPane.layout; }
set { gPane.layout = value; }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[Editor(typeof(System.ComponentModel.Design.CollectionEditor),
typeof(System.Drawing.Design.UITypeEditor))]
public SmoothingMode Smoothing
{
get { return gPane.smoothing; }
set { gPane.smoothing = value; }
}
[Category("Playback")]
[DefaultValue(typeof(bool), "true")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool ShowMovingGrid
{
get { return gPane.hasMovingGrid; }
set { gPane.hasMovingGrid = value; }
}
[Category("Properties")]
[DefaultValue(typeof(Color), "")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color BackgroundColorTop
{
get { return gPane.BgndColorTop; }
set { gPane.BgndColorTop = value; }
}
[Category("Properties")]
[DefaultValue(typeof(Color), "")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color BackgroundColorBot
{
get { return gPane.BgndColorBot; }
set { gPane.BgndColorBot = value; }
}
[Category("Properties")]
[DefaultValue(typeof(Color), "")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color DashedGridColor
{
get { return gPane.MinorGridColor; }
set { gPane.MinorGridColor = value; }
}
[Category("Properties")]
[DefaultValue(typeof(Color), "")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public Color SolidGridColor
{
get { return gPane.MajorGridColor; }
set { gPane.MajorGridColor = value; }
}
public bool DoubleBuffering
{
get { return gPane.useDoubleBuffer; }
set { gPane.useDoubleBuffer = value; }
}
#endregion
#region PUBLIC METHODS
public void SetDisplayRangeX(float x_start, float x_end )
{
gPane.XD0 = x_start;
gPane.XD1 = x_end;
gPane.CurXD0 = gPane.XD0;
gPane.CurXD1 = gPane.XD1;
}
public void SetGridDistanceX(float grid_dist_x_samples)
{
gPane.grid_distance_x = grid_dist_x_samples;
}
public void SetGridOriginX(float off_x)
{
gPane.grid_off_x = off_x;
}
#endregion
#region PRIVATE METHODS
protected override void Dispose(bool disposing)
{
paused = true;
if (mTimer.IsRunning)
{
mTimer.Stop();
mTimer.Dispose();
}
base.Dispose(disposing);
}
public void Start()
{
if (isRunning == false && paused == false)
{
gPane.starting_idx = 0;
paused = false;
isRunning = true;
// mTimer.Start();
tb1.Buttons[0].ImageIndex = 2;
}
else
{
if (paused == false)
{
//mTimer.Stop();
paused = true;
}
else
{
// mTimer.Start();
paused = false;
}
if (paused)
{
tb1.Buttons[0].ImageIndex = 0;
}
else
{
tb1.Buttons[0].ImageIndex = 2;
}
}
}
public void Stop()
{
if (isRunning)
{
// mTimer.Stop();
isRunning = false;
paused = false;
hScrollBar1.Value = 0;
tb1.Buttons[0].ImageIndex = 0;
}
}
private void tb1_ButtonClick(object sender, ToolBarButtonClickEventArgs e)
{
bool pushed = e.Button.Pushed;
switch (e.Button.Tag.ToString().ToLower())
{
case "play":
Start();
break;
case "stop":
Stop();
break;
}
}
private void SetPlayPanelVisible()
{
panel1.Visible = true;
tb1.Buttons[0].Visible = true;
tb1.Buttons[1].Visible = true;
}
private void SetPlayPanelInvisible()
{
panel1.Visible = false;
tb1.Buttons[0].Visible = false;
tb1.Buttons[1].Visible = false;
}
private void UpdateControl()
{
try
{
bool AllAutoscaled = true;
foreach (DataSource s in gPane.Sources)
{
AllAutoscaled &= s.AutoScaleX;
}
if (AllAutoscaled == true)
{
if (panel1.Visible == true)
{
this.Invoke(new MethodInvoker(SetPlayPanelInvisible));
}
}
else
{
if (panel1.Visible == false)
{
this.Invoke(new MethodInvoker(SetPlayPanelVisible));
}
}
}
catch
{
}
}
private void UpdatePlayback()
{
if (!paused && isRunning == true)
{
try
{
gPane.starting_idx += play_speed;
UpdateScrollBar();
gPane.Invalidate();
}
catch { }
}
}
private void OnTimerTick(object sender, EventArgs e)
{
UpdateControl();
UpdatePlayback();
}
private void UpdateScrollBar()
{
if (InvokeRequired)
{
Invoke(new MethodInvoker(UpdateScrollBar));
}
else
{
if (gPane.Sources.Count > 0)
{
if (gPane.starting_idx > gPane.Sources[0].Length)
{
hScrollBar1.Value = 10000;
}
else if (gPane.starting_idx >= 0)
{
hScrollBar1.Value = 10000 * (int)gPane.starting_idx / gPane.Sources[0].Length;
}
else
{
hScrollBar1.Value = 0;
}
}
else
{
hScrollBar1.Value = 0;
}
}
}
private void OnScrollbarScroll(object sender, ScrollEventArgs e)
{
if (gPane.Sources.Count > 0)
{
int val = hScrollBar1.Value;
int maxLen = 0;
foreach (var s in DataSources)
{
if (s.Length > maxLen) maxLen = s.Length;
}
gPane.starting_idx = (int)(maxLen * (float)val / 10000.0f);
gPane.Invalidate();
}
}
#endregion
private void selectGraphsToolStripMenuItem_Click(object sender, EventArgs e)
{
if (GraphPropertiesForm == null)
{
GraphPropertiesForm = new PlotterGraphSelectCurvesForm();
}
GraphPropertiesForm.GraphPanel = this.gPane;
GraphPropertiesForm.Show();
// GraphPropertiesForm.BringToFront();
}
}
}
+201
View File
@@ -0,0 +1,201 @@
namespace GraphLib
{
partial class PlotterDisplayEx
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
#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.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlotterDisplayEx));
this.tb1 = new System.Windows.Forms.ToolBar();
this.tbbSave = new System.Windows.Forms.ToolBarButton();
this.tbbOpen = new System.Windows.Forms.ToolBarButton();
this.imgList1 = new System.Windows.Forms.ImageList(this.components);
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.panel1 = new System.Windows.Forms.Panel();
this.lb_Position = new System.Windows.Forms.Label();
this.hScrollBar1 = new System.Windows.Forms.HScrollBar();
this.gPane = new GraphLib.PlotterGraphPaneEx();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.selectGraphsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.panel1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// tb1
//
this.tb1.Appearance = System.Windows.Forms.ToolBarAppearance.Flat;
this.tb1.Buttons.AddRange(new System.Windows.Forms.ToolBarButton[] {
this.tbbSave,
this.tbbOpen});
this.tb1.ButtonSize = new System.Drawing.Size(16, 16);
this.tb1.Divider = false;
this.tb1.Dock = System.Windows.Forms.DockStyle.None;
this.tb1.DropDownArrows = true;
this.tb1.ImageList = this.imgList1;
this.tb1.Location = new System.Drawing.Point(11, 5);
this.tb1.Name = "tb1";
this.tb1.ShowToolTips = true;
this.tb1.Size = new System.Drawing.Size(80, 26);
this.tb1.TabIndex = 1;
this.tb1.Visible = false;
this.tb1.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.tb1_ButtonClick);
//
// tbbSave
//
this.tbbSave.ImageIndex = 0;
this.tbbSave.Name = "tbbSave";
this.tbbSave.Tag = "play";
//
// tbbOpen
//
this.tbbOpen.ImageIndex = 1;
this.tbbOpen.Name = "tbbOpen";
this.tbbOpen.Tag = "stop";
//
// imgList1
//
this.imgList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList1.ImageStream")));
this.imgList1.TransparentColor = System.Drawing.Color.Transparent;
this.imgList1.Images.SetKeyName(0, "media-playback-start.png");
this.imgList1.Images.SetKeyName(1, "media-playback-stop.png");
this.imgList1.Images.SetKeyName(2, "media-playback-pause.png");
this.imgList1.Images.SetKeyName(3, "printer.png");
//
// splitContainer1
//
this.splitContainer1.BackColor = System.Drawing.SystemColors.Control;
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer1.IsSplitterFixed = true;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
this.splitContainer1.Panel1.Controls.Add(this.tb1);
this.splitContainer1.Panel1.Controls.Add(this.panel1);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.Transparent;
this.splitContainer1.Panel2.Controls.Add(this.gPane);
this.splitContainer1.Size = new System.Drawing.Size(598, 339);
this.splitContainer1.SplitterDistance = 34;
this.splitContainer1.TabIndex = 2;
this.splitContainer1.TabStop = false;
//
// panel1
//
this.panel1.Controls.Add(this.lb_Position);
this.panel1.Controls.Add(this.hScrollBar1);
this.panel1.Location = new System.Drawing.Point(99, 3);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(496, 28);
this.panel1.TabIndex = 7;
//
// lb_Position
//
this.lb_Position.AutoSize = true;
this.lb_Position.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.lb_Position.Location = new System.Drawing.Point(6, 8);
this.lb_Position.Name = "lb_Position";
this.lb_Position.Size = new System.Drawing.Size(44, 13);
this.lb_Position.TabIndex = 3;
this.lb_Position.Text = "Position";
//
// hScrollBar1
//
this.hScrollBar1.Location = new System.Drawing.Point(57, 10);
this.hScrollBar1.Maximum = 10000;
this.hScrollBar1.Name = "hScrollBar1";
this.hScrollBar1.Size = new System.Drawing.Size(118, 10);
this.hScrollBar1.TabIndex = 4;
this.hScrollBar1.Scroll += new System.Windows.Forms.ScrollEventHandler(this.OnScrollbarScroll);
//
// gPane
//
this.gPane.Dock = System.Windows.Forms.DockStyle.Fill;
this.gPane.Location = new System.Drawing.Point(0, 0);
this.gPane.Name = "gPane";
this.gPane.Size = new System.Drawing.Size(598, 301);
this.gPane.TabIndex = 1;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.selectGraphsToolStripMenuItem,
this.toolStripSeparator1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(117, 32);
//
// selectGraphsToolStripMenuItem
//
this.selectGraphsToolStripMenuItem.Name = "selectGraphsToolStripMenuItem";
this.selectGraphsToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
this.selectGraphsToolStripMenuItem.Text = "Options";
this.selectGraphsToolStripMenuItem.Click += new System.EventHandler(this.selectGraphsToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(113, 6);
//
// PlotterDisplayEx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Transparent;
this.ContextMenuStrip = this.contextMenuStrip1;
this.Controls.Add(this.splitContainer1);
this.Name = "PlotterDisplayEx";
this.Size = new System.Drawing.Size(598, 339);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel1.PerformLayout();
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.ToolBar tb1;
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.ToolBarButton tbbSave;
private System.Windows.Forms.ToolBarButton tbbOpen;
private System.Windows.Forms.HScrollBar hScrollBar1;
private PlotterGraphPaneEx gPane;
private System.Windows.Forms.Label lb_Position;
public System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem selectGraphsToolStripMenuItem;
private System.Windows.Forms.ImageList imgList1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.Panel panel1;
}
}
+196
View File
@@ -0,0 +1,196 @@
<?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>
<metadata name="imgList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="imgList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACI
DgAAAk1TRnQBSQFMAgEBBAEAARQBAAEUAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AKgADAQECwAABtgGV
AU8B/QHKAZgBWQH/AcoBlwFZAf8BygGXAVkB/wHKAZcBWQH/AcoBlwFYAf8ByQGXAVgB/wHJAZcBWAH/
AcoBmAFZAf8BtgGUAU8B/RQAAxQBHAMRARcDAgEDrAADTgGZA10B0gNMAf8BxwGVAVUB/wH5AfcB9gH/
AfkB8QHsAf8B+QHxAesB/wH4AfAB6QH/AfcB7QHmAf8B9AHqAeEB/wHyAegB3gH/AfoB+AH2Af8BxwGU
AVUB/wMYAf8DWAHRA0QBeggAAxUBHQFiAlgB6QM6AWEDDQESAwABASwAAxsBJgMbASYDGwEmAxsBJgMb
ASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmEAADGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEm
AxsBJgMbASYDGwEmAxsBJgMbASYIAANUAf0DpwH/A7UB/wOBAf8BrwGsAaoB/wHFAcABvQH/AcUBwAG9
Af8BxQHAAb0B/wHFAcABvQH/AcUBwAG9Af8BxQHAAb0B/wGtAaoBqAH/AyAB/wO1Af8DmwH/AxcB/wgA
AxUBHQNNAfoBOgIrAfwDXwHgAysBQgMNARIoAAMbASYDKwH8AYACgQH/AYACgQH/AYACgQH/AYACgQH/
AYACgQH/AYACgQH/AYACgQH/AYACgQH/AYACgQH/AxsBJhAAAxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKB
Af8DIwE0AxsBJgMrAfwBgAKBAf8BgAKBAf8BgAKBAf8DIwE0CAADZAH/A7UB/wO1Af8DlQH/A4EB/wOB
Af8DbQH/A2IB/wNVAf8DRgH/AzcB/wM2Af8DYgH/A7UB/wO1Af8DGQH/CAADFQEdAV8CSgH7AfkB+gH5
Af8DfwH+AV8BUwFSAfsDVQGyAx0BKgMIAQsgAAMbASYDQAH9IP8DQAH9AxsBJgMAAQEMAAMbASYDQAH9
AfwB/QH8Bf8DQAH9AxsBJgMbASYDQAH9AfwB/QH8Bf8DQAH9AxsBJgMAAQEEAANpAf8DuwH/A7sB/wON
Af8D1AH/A7kB/wO5Af8DuQH/A7kB/wO5Af8DuQH/A9MB/wODAf8DuwH/A7sB/wMeAf8IAAMVAR0DKwH8
AfoC+wH/AfUC9gH/AfkC+gH/ATsBLgEtAfwBbQJRAfcDQgF2AxYBHgMFAQcYAAMbASYDQAH9BP8B1QHb
AdgB/wHUAdsB1wH/AdQB2wHYAf8B0wHbAdcB/wHRAdkB1QH/Ac8B1wHTBf8DQAH9AxsBJgMBAQIMAAMb
ASYDQAH9AeIB5QHkAf8B2AHfAdwB/wNAAf0DGwEmAxsBJgNAAf0D8wH/AfcB+AH3Af8DQAH9AxsBJgMB
AQIEAANuAf8D1wH/A9cB/wOXAf8D2AH/A78B/wO/Af8DvwH/A78B/wO/Af8DvwH/A9cB/wOOAf8D1wH/
A9cB/wMzAf8IAAMWAR4DKwH8A/sB/wHTAdoB1wH/AdoB3wHcAf8B9gH3AfYB/wHyAvMB/wE6AisB/AFg
AlkB6wMzAVMDEgEZAwQBBRAAAxsBJgNAAf0E/wHaAeAB3QH/AdsB4QHeAf8B3QHiAeAB/wHdAeIB4AH/
AdsB4QHeAf8B2AHeAdsF/wNAAf0DGwEmAwEBAgwAAxsBJgNAAf0B4gHmAeQB/wHcAeIB3wH/A0AB/QMb
ASYDGwEmA0AB/QHvAfEB8AH/AfAB8wHxAf8DQAH9AxsBJgMBAQIEAANyAf8D+QH/A/kB/wOrAf8D3wH/
A8sB/wPLAf8DywH/A8sB/wPLAf8DywH/A98B/wOjAf8D+QH/A/kB/wNVAf8IAAMWAR4DKwH8A/sB/wHf
AeQB4QH/Ad4B4wHhAf8B3gHjAeAB/wHjAecB5QH/AfQC9QH/A38B/gGRAkAB/QNWAbYDJgE5AxABFQwA
AxsBJgNAAf0E/wHdAeMB4AH/AeEB5gHjAf8B5AHpAecB/wHmAeoB6AH/AeUB6QHnAf8B4gHnAeQF/wNA
Af0DGwEmAwEBAgwAAxsBJgNAAf0B5AHoAeUB/wHeAeMB4QH/A0AB/QMbASYDGwEmA0AB/QHsAe8B7gH/
AecB6wHpAf8DQAH9AxsBJgMBAQIEAANqAfkD/AH/A/wB/wPLAf8D8gH/A/IB/wPyAf8D8gH/A/IB/wPy
Af8D8gH/A/IB/wPGAf8D/AH/A/wB/wNwAf4IAAMWAR4DKwH8A/sB/wHqAe4B7AH/AewB7wHuAf8B7AHv
Ae4B/wHrAe4B7QH/AekB7AHrAf8DfwH+AToCKwH8AVgCVgG7Ax0BKgMGAQgMAAMbASYDQAH9BP8B3wHk
AeEB/wHkAekB5gH/AeoB7QHrAf8B7gHxAe8B/wHvAfEB8AH/AewB7wHuBf8DQAH9AxsBJgMBAQIMAAMb
ASYDQAH9AesB7QHsAf8B3QHjAeAB/wNAAf0DGwEmAxsBJgNAAf0B7QHwAe8B/wHfAeQB4QH/A0AB/QMb
ASYDAQECBAADXQTSAf8D6AH/A3EB/wNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wNxAf8DcQH/A3EB/wPo
Af8DxAH/A1wB3AgAAxYBHgMrAfwD+wH/AfUC9gH/AfoB+wH6Af8D+QH/Ad0C3gH/AWoCRwH5A10B7QE6
AjkBYAMNAREUAAMbASYDQAH9BP8B3AHiAd8B/wHkAegB5gH/AesB7gHtAf8B8gH0AfMB/wH3AvgB/wH2
AfgB9wX/A0AB/QMbASYDAQECDAADGwEmA0AB/QHyAfQB8wH/AdoB3wHdAf8DQAH9AxsBJgMcASgDQAH9
AfMB9QH0Af8B1gHdAdkB/wNAAf0DGwEmAwEBAgQAAy0BRQOaAf8DzAH/AccBiwFCAf8B+QH0Ae0B/wH+
AegB2AH/Af4B6AHXAf8B/QHlAdMB/wH8AeQB0QH/AfoB4AHHAf8B+QHdAcMB/wH6AfQB7QH/AccBhQE+
Af8DwwH/A2gB/wMtAUUIAAMWAR4DKwH8A/sB/wHwAfMB8gH/AeYC6AH/A00B+gFiAlIB9AFRAk8BpQMU
ARwDAAEBGAADGwEmA0AB/QT/AdgB3wHcAf8B4AHlAeMB/wHoAesB6gH/Ae8B8gHwAf8B9wH4AfcB/wP9
Bf8DQAH9AxsBJgMBAQIMAAMbASYDQAH9A/wB/wHVAdsB2AH/A0AB/QMbASYDHAEoA0AB/QP8Af8B0gHa
AdYB/wNAAf0DGwEmAwEBAggAAzsBYwNqAfMBxQGJAUAB/wH5AfQB7wH/Af4B5wHXAf8B/QHnAdUB/wH8
AeYB0gH/AfsB4QHMAf8B+AHcAcIB/wH2AdoBvQH/AfoB9AHvAf8BxAGDATwB/wNdAfMDOwFjDAADFgEe
AysB/AP7Af8BPgIyAfwDTQH6AVoCVwG9AxgBIgMCAQMgAAMbASYDQAH9IP8DQAH9AxsBJgMBAQIMAAMb
ASYDQAH9CP8DQAH9AxsBJgMcASgDQAH9CP8DQAH9AxsBJgMBAQIMAAMHAQkBlgF6AUcC+QH0AfAB/wH8
AeYB0wH/Af0B5wHTAf8B+wHjAc0B/wH6AeAByAH/AfUB1gG7Af8B8wHUAbUB/wH4AfQB8AH/AZUBagFH
AfkDBwEJEAADFgEeA0AB/QFbAjIB+wFgAlwB1AMjATMDBwEKKAADGwEmAysB/AEpAS0BKwH/ASkBLQEr
Af8BKQEtASsB/wEpAS0BKwH/ASkBLQErAf8BKQEtASsB/wEpAS0BKwH/ASkBLQErAf8BKQEtASsB/wMb
ASYDAQECDAADGwEmAWMBVwFVAf4BKQEtASsB/wEpAS0BKwH/ASkBLQErAf8DGwEmAxwBKAFjAVcBVQH+
ASkBLQErAf8BKQEtASsB/wEpAS0BKwH/AxsBJgMBAQIQAAGSAXoBUQH3AfkB9QHxAf8B/AHjAc8B/wH8
AeQBzwH/AfoB4QHKAf8B+QHdAcQB/wH0AekB3wH/AfcB8gHsAf8B9QHvAekB/wGZAV8BRQH7FAADFgEf
AV4CWgHYAygBPQMNAREwAAMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEm
AxsBJgMAAQEMAAMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMbASYDGwEmAxsBJgMA
AQEQAAGJAWoBSQH2AfkB9QHxAf8B/AHjAc0B/wH7AeMBzQH/AfkB4AHIAf8B+AHcAcIB/wH9AfsB+AH/
AfwB5gHNAf8B4gG2AYQB/wJUAVIBphQAAxYBHwMRARcDAgEDuAABngF1AU0B+gH3AfIB7AH/AfgB9AHu
Af8B+AHzAe0B/wH4AfMB7QH/AfgB8gHsAf8B8gHmAdcB/wHiAbIBcQH/AZABcQFiAfYDBQEHFAADAwEE
wAADOgFgAlgBVgG7AbEBfwFPAf4ByAGMAUMB/wGSAX8BUQH3AZIBfwFRAfcBrgF/AUwB/gNOAZQUAAFC
AU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQAB3wX/AeABBwHHBf8CAAHBAf8BwAED
AcABAwIAAcAB/wHAAQMBwAEDAgABwAE/AcABAQHAAQECAAHAAQ8BwAEBAcABAQIAAcABAwHAAQEBwAEB
AgABwAEBAcABAQHAAQECAAHAAQEBwAEBAcABAQIAAcABBwHAAQEBwAEBAgABwAEPAcABAQHAAQEBgAEB
AcABPwHAAQEBwAEBAcABAwHAAf8BwAEBAcABAQHgAQcBwwH/AcABAQHAAQEB4AEHAccF/wHgAQcB3wX/
AeABHws=
</value>
</data>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>84, 17</value>
</metadata>
</root>
+46
View File
@@ -0,0 +1,46 @@
namespace GraphLib
{
partial class PlotterGraphPaneEx
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// PlotterGraphPane
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Name = "PlotterGraphPane";
this.Size = new System.Drawing.Size(409, 150);
this.Load += new System.EventHandler(this.OnLoadControl);
this.ResumeLayout(false);
}
#endregion
}
}
File diff suppressed because it is too large Load Diff
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
+365
View File
@@ -0,0 +1,365 @@
namespace GraphLib
{
partial class PlotterGraphSelectCurvesForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.lb_Graphs = new System.Windows.Forms.CheckedListBox();
this.gB_SelectedGraph = new System.Windows.Forms.GroupBox();
this.cb_X_AutoScale = new System.Windows.Forms.CheckBox();
this.tb_GraphName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.cbDownSampling = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.btn_GraphColor = new System.Windows.Forms.Button();
this.cb_Y_AutoScale = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label7 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.bt_MinorGridColor = new System.Windows.Forms.Button();
this.bt_bg_col_bot = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.bt_MajorGridColor = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.bt_bg_col_top = new System.Windows.Forms.Button();
this.btn_AutoScaleAll = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.cb_Layout = new System.Windows.Forms.ComboBox();
this.button1 = new System.Windows.Forms.Button();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.gB_SelectedGraph.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.lb_Graphs);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.gB_SelectedGraph);
this.splitContainer1.Panel2.Controls.Add(this.groupBox1);
this.splitContainer1.Panel2.Controls.Add(this.button1);
this.splitContainer1.Size = new System.Drawing.Size(395, 431);
this.splitContainer1.SplitterDistance = 171;
this.splitContainer1.TabIndex = 0;
//
// lb_Graphs
//
this.lb_Graphs.Dock = System.Windows.Forms.DockStyle.Fill;
this.lb_Graphs.FormattingEnabled = true;
this.lb_Graphs.Location = new System.Drawing.Point(0, 0);
this.lb_Graphs.Name = "lb_Graphs";
this.lb_Graphs.Size = new System.Drawing.Size(171, 424);
this.lb_Graphs.TabIndex = 0;
this.lb_Graphs.SelectedIndexChanged += new System.EventHandler(this.checkedListBox1_SelectedIndexChanged_1);
//
// gB_SelectedGraph
//
this.gB_SelectedGraph.Controls.Add(this.cb_X_AutoScale);
this.gB_SelectedGraph.Controls.Add(this.tb_GraphName);
this.gB_SelectedGraph.Controls.Add(this.label3);
this.gB_SelectedGraph.Controls.Add(this.cbDownSampling);
this.gB_SelectedGraph.Controls.Add(this.label2);
this.gB_SelectedGraph.Controls.Add(this.btn_GraphColor);
this.gB_SelectedGraph.Controls.Add(this.cb_Y_AutoScale);
this.gB_SelectedGraph.Location = new System.Drawing.Point(6, 232);
this.gB_SelectedGraph.Name = "gB_SelectedGraph";
this.gB_SelectedGraph.Size = new System.Drawing.Size(206, 158);
this.gB_SelectedGraph.TabIndex = 6;
this.gB_SelectedGraph.TabStop = false;
this.gB_SelectedGraph.Text = "Selected Graph Options";
this.gB_SelectedGraph.Visible = false;
//
// cb_X_AutoScale
//
this.cb_X_AutoScale.AutoSize = true;
this.cb_X_AutoScale.Location = new System.Drawing.Point(12, 102);
this.cb_X_AutoScale.Name = "cb_X_AutoScale";
this.cb_X_AutoScale.Size = new System.Drawing.Size(93, 17);
this.cb_X_AutoScale.TabIndex = 8;
this.cb_X_AutoScale.Text = "X AutoScaling";
this.cb_X_AutoScale.UseVisualStyleBackColor = true;
this.cb_X_AutoScale.CheckedChanged += new System.EventHandler(this.cb_X_AutoScale_CheckedChanged);
//
// tb_GraphName
//
this.tb_GraphName.Location = new System.Drawing.Point(12, 24);
this.tb_GraphName.Name = "tb_GraphName";
this.tb_GraphName.Size = new System.Drawing.Size(167, 20);
this.tb_GraphName.TabIndex = 7;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(52, 133);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 13);
this.label3.TabIndex = 6;
this.label3.Text = "Downsampling";
//
// cbDownSampling
//
this.cbDownSampling.FormattingEnabled = true;
this.cbDownSampling.Items.AddRange(new object[] {
"1",
"2",
"3",
"4",
"5",
"6"});
this.cbDownSampling.Location = new System.Drawing.Point(7, 130);
this.cbDownSampling.Name = "cbDownSampling";
this.cbDownSampling.Size = new System.Drawing.Size(39, 21);
this.cbDownSampling.TabIndex = 5;
this.cbDownSampling.Text = "1";
this.cbDownSampling.SelectedIndexChanged += new System.EventHandler(this.OnDownsamplingChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(57, 55);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(63, 13);
this.label2.TabIndex = 4;
this.label2.Text = "Graph Color";
//
// btn_GraphColor
//
this.btn_GraphColor.Location = new System.Drawing.Point(11, 50);
this.btn_GraphColor.Name = "btn_GraphColor";
this.btn_GraphColor.Size = new System.Drawing.Size(26, 23);
this.btn_GraphColor.TabIndex = 3;
this.btn_GraphColor.UseVisualStyleBackColor = true;
this.btn_GraphColor.Click += new System.EventHandler(this.btn_GraphColor_Click);
//
// cb_Y_AutoScale
//
this.cb_Y_AutoScale.AutoSize = true;
this.cb_Y_AutoScale.Location = new System.Drawing.Point(12, 79);
this.cb_Y_AutoScale.Name = "cb_Y_AutoScale";
this.cb_Y_AutoScale.Size = new System.Drawing.Size(93, 17);
this.cb_Y_AutoScale.TabIndex = 2;
this.cb_Y_AutoScale.Text = "Y AutoScaling";
this.cb_Y_AutoScale.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label7);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.bt_MinorGridColor);
this.groupBox1.Controls.Add(this.bt_bg_col_bot);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.bt_MajorGridColor);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.bt_bg_col_top);
this.groupBox1.Controls.Add(this.btn_AutoScaleAll);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.cb_Layout);
this.groupBox1.Location = new System.Drawing.Point(6, 5);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(206, 221);
this.groupBox1.TabIndex = 4;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "General Options";
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(57, 194);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(82, 13);
this.label7.TabIndex = 10;
this.label7.Text = "Minor Grid Color";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(57, 136);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(128, 13);
this.label5.TabIndex = 8;
this.label5.Text = "Background Color Bottom";
//
// bt_MinorGridColor
//
this.bt_MinorGridColor.Location = new System.Drawing.Point(11, 189);
this.bt_MinorGridColor.Name = "bt_MinorGridColor";
this.bt_MinorGridColor.Size = new System.Drawing.Size(26, 23);
this.bt_MinorGridColor.TabIndex = 9;
this.bt_MinorGridColor.UseVisualStyleBackColor = true;
this.bt_MinorGridColor.Click += new System.EventHandler(this.bt_MinorGridColor_Click);
//
// bt_bg_col_bot
//
this.bt_bg_col_bot.Location = new System.Drawing.Point(11, 131);
this.bt_bg_col_bot.Name = "bt_bg_col_bot";
this.bt_bg_col_bot.Size = new System.Drawing.Size(26, 23);
this.bt_bg_col_bot.TabIndex = 7;
this.bt_bg_col_bot.UseVisualStyleBackColor = true;
this.bt_bg_col_bot.Click += new System.EventHandler(this.bt_bg_col_bot_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(57, 165);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(82, 13);
this.label6.TabIndex = 8;
this.label6.Text = "Major Grid Color";
//
// bt_MajorGridColor
//
this.bt_MajorGridColor.Location = new System.Drawing.Point(11, 160);
this.bt_MajorGridColor.Name = "bt_MajorGridColor";
this.bt_MajorGridColor.Size = new System.Drawing.Size(26, 23);
this.bt_MajorGridColor.TabIndex = 7;
this.bt_MajorGridColor.UseVisualStyleBackColor = true;
this.bt_MajorGridColor.Click += new System.EventHandler(this.bt_MajorGridColor_Click);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(57, 107);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(114, 13);
this.label4.TabIndex = 6;
this.label4.Text = "Background Color Top";
//
// bt_bg_col_top
//
this.bt_bg_col_top.Location = new System.Drawing.Point(11, 102);
this.bt_bg_col_top.Name = "bt_bg_col_top";
this.bt_bg_col_top.Size = new System.Drawing.Size(26, 23);
this.bt_bg_col_top.TabIndex = 5;
this.bt_bg_col_top.UseVisualStyleBackColor = true;
this.bt_bg_col_top.Click += new System.EventHandler(this.bt_bg_col_top_Click);
//
// btn_AutoScaleAll
//
this.btn_AutoScaleAll.Location = new System.Drawing.Point(11, 69);
this.btn_AutoScaleAll.Name = "btn_AutoScaleAll";
this.btn_AutoScaleAll.Size = new System.Drawing.Size(167, 25);
this.btn_AutoScaleAll.TabIndex = 4;
this.btn_AutoScaleAll.Text = "Auto Scale All";
this.btn_AutoScaleAll.UseVisualStyleBackColor = true;
this.btn_AutoScaleAll.Click += new System.EventHandler(this.OnButtonAutoScallOnClicked);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(9, 26);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(39, 13);
this.label1.TabIndex = 3;
this.label1.Text = "Layout";
//
// cb_Layout
//
this.cb_Layout.FormattingEnabled = true;
this.cb_Layout.Items.AddRange(new object[] {
"Normal",
"Stacked",
"Tiles - Fill Vertical",
"Tiles - Fill Horizontal",
"Vertically"});
this.cb_Layout.Location = new System.Drawing.Point(11, 42);
this.cb_Layout.Name = "cb_Layout";
this.cb_Layout.Size = new System.Drawing.Size(168, 21);
this.cb_Layout.TabIndex = 2;
this.cb_Layout.Text = "Select";
this.cb_Layout.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// button1
//
this.button1.Location = new System.Drawing.Point(66, 396);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(68, 23);
this.button1.TabIndex = 0;
this.button1.Text = "Exit";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// PlotterGraphSelectCurvesForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(395, 431);
this.Controls.Add(this.splitContainer1);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(16, 246);
this.Name = "PlotterGraphSelectCurvesForm";
this.Text = "Graph Properties";
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
this.splitContainer1.ResumeLayout(false);
this.gB_SelectedGraph.ResumeLayout(false);
this.gB_SelectedGraph.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.CheckedListBox lb_Graphs;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cb_Layout;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btn_GraphColor;
private System.Windows.Forms.CheckBox cb_Y_AutoScale;
private System.Windows.Forms.Button btn_AutoScaleAll;
private System.Windows.Forms.GroupBox gB_SelectedGraph;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox cbDownSampling;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button bt_bg_col_top;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Button bt_bg_col_bot;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Button bt_MinorGridColor;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Button bt_MajorGridColor;
private System.Windows.Forms.TextBox tb_GraphName;
private System.Windows.Forms.CheckBox cb_X_AutoScale;
}
}
+369
View File
@@ -0,0 +1,369 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
/* Copyright (c) 2008-2014 DI Zimmermann Stephan (stefan.zimmermann@tele2.at)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
namespace GraphLib
{
public partial class PlotterGraphSelectCurvesForm : Form
{
private int selectetGraphIndex = -1;
private PlotterGraphPaneEx gpane = null;
public PlotterGraphSelectCurvesForm()
{
InitializeComponent();
FormClosing += new FormClosingEventHandler(OnFormClosing);
lb_Graphs.SelectedIndexChanged += new EventHandler(OnSelectedGraphIndexChanged);
VisibleChanged += new EventHandler(OnVisibleChanged);
tb_GraphName.TextChanged += new EventHandler(tb_GraphName_TextChanged);
}
void tb_GraphName_TextChanged(object sender, EventArgs e)
{
if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
{
DataSource src = gpane.Sources[selectetGraphIndex];
String Text = tb_GraphName.Text;
if (String.IsNullOrEmpty(Text) == false)
{
src.Name = Text;
gpane.Invalidate();
}
}
}
public PlotterGraphPaneEx GraphPanel
{
set
{
gpane = value;
if (gpane != null)
{
this.lb_Graphs.Items.Clear();
foreach (DataSource s in gpane.Sources)
{
if (s.Active)
{
this.lb_Graphs.Items.Add(s.Name, CheckState.Checked);
}
else
{
this.lb_Graphs.Items.Add(s.Name, CheckState.Unchecked);
}
}
UpdateAllCheckedState();
}
}
}
void UpdateAllCheckedState()
{
int AutoScaleOn = 0;
foreach (DataSource src in gpane.Sources)
{
if (src.AutoScaleY)
{
AutoScaleOn++;
}
}
if (AutoScaleOn == 0)
{
btn_AutoScaleAll.Visible = true;
btn_AutoScaleAll.Text = "Auto Y-Scale all Graphs";
}
else
{
btn_AutoScaleAll.Visible = true;
btn_AutoScaleAll.Text = "Normal Y-Scale all Graphs";
}
}
void OnVisibleChanged(object sender, EventArgs e)
{
if (this.Visible == true)
{
selectetGraphIndex = -1;
gB_SelectedGraph.Visible = false;
if (gpane != null)
{
UpdateAllCheckedState();
if (gpane.layout == PlotterGraphPaneEx.LayoutMode.NORMAL)
{
cb_Layout.SelectedIndex = 0;
}
else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.STACKED)
{
cb_Layout.SelectedIndex = 1;
}
else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.TILES_HOR)
{
cb_Layout.SelectedIndex = 2;
}
else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.TILES_VER)
{
cb_Layout.SelectedIndex = 3;
}
else if (gpane.layout == PlotterGraphPaneEx.LayoutMode.VERTICAL_ARRANGED)
{
cb_Layout.SelectedIndex = 4;
}
bt_bg_col_top.BackColor = gpane.BgndColorTop;
bt_bg_col_bot.BackColor = gpane.BgndColorBot;
bt_MajorGridColor.BackColor = gpane.MajorGridColor;
bt_MinorGridColor.BackColor = gpane.MinorGridColor;
}
}
}
void OnSelectedGraphIndexChanged(object sender, EventArgs e)
{
if (gpane != null)
{
for (int i = 0; i < gpane.Sources.Count; i++)
{
if (lb_Graphs.CheckedIndices.Contains(i))
{
gpane.Sources[i].Active = true;
}
else
{
gpane.Sources[i].Active = false;
}
}
gpane.Invalidate();
}
}
void OnFormClosing(object sender, FormClosingEventArgs e)
{
this.Hide();
e.Cancel = true;
}
private void button1_Click(object sender, EventArgs e)
{
this.Hide();
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (cb_Layout.SelectedIndex == 0)
{
gpane.layout = PlotterGraphPaneEx.LayoutMode.NORMAL;
}
if (cb_Layout.SelectedIndex == 1)
{
gpane.layout = PlotterGraphPaneEx.LayoutMode.STACKED;
}
if (cb_Layout.SelectedIndex == 2)
{
gpane.layout = PlotterGraphPaneEx.LayoutMode.TILES_VER;
}
if (cb_Layout.SelectedIndex == 3)
{
gpane.layout = PlotterGraphPaneEx.LayoutMode.TILES_HOR;
}
if (cb_Layout.SelectedIndex == 4)
{
gpane.layout = PlotterGraphPaneEx.LayoutMode.VERTICAL_ARRANGED;
}
gpane.Invalidate();
}
private void checkedListBox1_SelectedIndexChanged_1(object sender, EventArgs e)
{
selectetGraphIndex = lb_Graphs.SelectedIndex;
UpdateSelectedGraphInfo();
gB_SelectedGraph.Visible = true;
}
private void UpdateSelectedGraphInfo()
{
if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
{
DataSource src = gpane.Sources[selectetGraphIndex];
btn_GraphColor.BackColor = src.GraphColor;
cb_Y_AutoScale.Checked = src.AutoScaleY;
cb_X_AutoScale.Checked = src.AutoScaleX;
cbDownSampling.SelectedIndex = (src.Downsampling - 1);
tb_GraphName.Text = src.Name;
}
}
private void btn_GraphColor_Click(object sender, EventArgs e)
{
if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
{
DataSource src = gpane.Sources[selectetGraphIndex];
ColorDialog d = new ColorDialog();
if (d.ShowDialog() == DialogResult.OK)
{
btn_GraphColor.BackColor = d.Color;
src.GraphColor = d.Color;
gpane.Invalidate();
}
}
}
private void OnButtonAutoScallOnClicked(object sender, EventArgs e)
{
int AutoScaleOn = 0;
foreach (DataSource src in gpane.Sources)
{
if (src.AutoScaleY)
{
AutoScaleOn++;
}
}
if (AutoScaleOn == 0)
{
btn_AutoScaleAll.Text = "Normal scale for all graphs";
foreach (DataSource src in gpane.Sources)
{
src.AutoScaleY = true;
}
}
else
{
btn_AutoScaleAll.Text = "Auto scale for all graphs";
foreach (DataSource src in gpane.Sources)
{
src.AutoScaleY = false;
}
}
UpdateSelectedGraphInfo();
gpane.Invalidate();
}
private void OnDownsamplingChanged(object sender, EventArgs e)
{
if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
{
DataSource src = gpane.Sources[selectetGraphIndex];
src.Downsampling = (cbDownSampling.SelectedIndex + 1);
}
gpane.Invalidate();
}
private void bt_bg_col_top_Click(object sender, EventArgs e)
{
ColorDialog d = new ColorDialog();
if (d.ShowDialog() == DialogResult.OK)
{
bt_bg_col_top.BackColor = d.Color;
gpane.BgndColorTop = d.Color;
gpane.Invalidate();
}
}
private void bt_bg_col_bot_Click(object sender, EventArgs e)
{
ColorDialog d = new ColorDialog();
if (d.ShowDialog() == DialogResult.OK)
{
bt_bg_col_bot.BackColor = d.Color;
gpane.BgndColorBot = d.Color;
gpane.Invalidate();
}
}
private void bt_MajorGridColor_Click(object sender, EventArgs e)
{
ColorDialog d = new ColorDialog();
if (d.ShowDialog() == DialogResult.OK)
{
bt_MajorGridColor.BackColor = d.Color;
gpane.MajorGridColor = d.Color;
gpane.Invalidate();
}
}
private void bt_MinorGridColor_Click(object sender, EventArgs e)
{
ColorDialog d = new ColorDialog();
if (d.ShowDialog() == DialogResult.OK)
{
bt_MinorGridColor.BackColor = d.Color;
gpane.MinorGridColor = d.Color;
gpane.Invalidate();
}
}
private void cb_Y_AutoScale_CheckedChanged(object sender, EventArgs e)
{
if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
{
DataSource src = gpane.Sources[selectetGraphIndex];
src.AutoScaleY = cb_Y_AutoScale.Checked;
UpdateAllCheckedState();
gpane.Invalidate();
}
}
private void cb_X_AutoScale_CheckedChanged(object sender, EventArgs e)
{
if (selectetGraphIndex >= 0 && selectetGraphIndex < gpane.Sources.Count)
{
DataSource src = gpane.Sources[selectetGraphIndex];
src.AutoScaleX = cb_X_AutoScale.Checked;
UpdateAllCheckedState();
gpane.Invalidate();
}
}
}
}
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
+490
View File
@@ -0,0 +1,490 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.InteropServices;
#region License
/*
* Based on the work of Leslie Sanford
*/
#endregion
namespace PrecisionTimer
{
public enum Mode
{
OneShot,
Periodic
};
[StructLayout(LayoutKind.Sequential)]
public struct TimerCaps
{
public int periodMin;
public int periodMax;
}
public sealed class Timer : IComponent
{
private delegate void TimeProc(int id, int msg, int user, int param1, int param2);
private delegate void EventRaiser(EventArgs e);
[DllImport("winmm.dll")]
private static extern int timeGetDevCaps(ref TimerCaps caps,
int sizeOfTimerCaps);
[DllImport("winmm.dll")]
private static extern int timeSetEvent(int delay,
int resolution,
TimeProc proc,
int user,
int mode);
[DllImport("winmm.dll")]
private static extern int timeKillEvent(int id);
private const int TIMERR_NOERROR = 0;
private int timerID;
private volatile Mode mode;
private volatile int period;
private volatile int resolution;
private TimeProc timeProcPeriodic;
private TimeProc timeProcOneShot;
private EventRaiser tickRaiser;
private bool running = false;
private volatile bool disposed = false;
private ISynchronizeInvoke synchronizingObject = null;
private ISite site = null;
private static TimerCaps caps;
public event EventHandler Started;
public event EventHandler Stopped;
public event EventHandler Tick;
static Timer()
{
// Get multimedia timer capabilities.
timeGetDevCaps(ref caps, Marshal.SizeOf(caps));
}
public Timer(IContainer container)
{
container.Add(this);
Initialize();
}
public Timer()
{
Initialize();
}
~Timer()
{
if(IsRunning)
{
// Stop and destroy timer.
timeKillEvent(timerID);
}
}
private void Initialize()
{
this.mode = Mode.Periodic;
this.period = Capabilities.periodMin;
this.resolution = 1;
running = false;
timeProcPeriodic = new TimeProc(TimerPeriodicEventCallback);
timeProcOneShot = new TimeProc(TimerOneShotEventCallback);
tickRaiser = new EventRaiser(OnTick);
}
public void Start()
{
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
if(IsRunning)
{
return;
}
if(Mode == Mode.Periodic)
{
timerID = timeSetEvent(Period, Resolution, timeProcPeriodic, 0, (int)Mode);
}
else
{
timerID = timeSetEvent(Period, Resolution, timeProcOneShot, 0, (int)Mode);
}
if(timerID != 0)
{
running = true;
if(SynchronizingObject != null && SynchronizingObject.InvokeRequired)
{
SynchronizingObject.BeginInvoke(
new EventRaiser(OnStarted),
new object[] { EventArgs.Empty });
}
else
{
OnStarted(EventArgs.Empty);
}
}
else
{
throw new TimerException("Unable to start timer.");
}
}
public void Stop()
{
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
if(!running)
{
return;
}
int result = timeKillEvent(timerID);
Debug.Assert(result == TIMERR_NOERROR);
running = false;
if(SynchronizingObject != null && SynchronizingObject.InvokeRequired)
{
SynchronizingObject.BeginInvoke(
new EventRaiser(OnStopped),
new object[] { EventArgs.Empty });
}
else
{
OnStopped(EventArgs.Empty);
}
}
private void TimerPeriodicEventCallback(int id, int msg, int user, int param1, int param2)
{
if(synchronizingObject != null)
{
synchronizingObject.BeginInvoke(tickRaiser, new object[] { EventArgs.Empty });
}
else
{
OnTick(EventArgs.Empty);
}
}
private void TimerOneShotEventCallback(int id, int msg, int user, int param1, int param2)
{
if(synchronizingObject != null)
{
synchronizingObject.BeginInvoke(tickRaiser, new object[] { EventArgs.Empty });
Stop();
}
else
{
OnTick(EventArgs.Empty);
Stop();
}
}
// Raises the Disposed event.
private void OnDisposed(EventArgs e)
{
EventHandler handler = Disposed;
if(handler != null)
{
handler(this, e);
}
}
// Raises the Started event.
private void OnStarted(EventArgs e)
{
EventHandler handler = Started;
if(handler != null)
{
handler(this, e);
}
}
// Raises the Stopped event.
private void OnStopped(EventArgs e)
{
EventHandler handler = Stopped;
if(handler != null)
{
handler(this, e);
}
}
// Raises the Tick event.
private void OnTick(EventArgs e)
{
EventHandler handler = Tick;
if(handler != null)
{
handler(this, e);
}
}
/// <summary>
/// Gets or sets the object used to marshal event-handler calls.
/// </summary>
public ISynchronizeInvoke SynchronizingObject
{
get
{
#region Require
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
#endregion
return synchronizingObject;
}
set
{
#region Require
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
#endregion
synchronizingObject = value;
}
}
public int Period
{
get
{
#region Require
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
#endregion
return period;
}
set
{
#region Require
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
else if(value < Capabilities.periodMin || value > Capabilities.periodMax)
{
throw new ArgumentOutOfRangeException("Period", value,
"Multimedia Timer period out of range.");
}
#endregion
period = value;
if(IsRunning)
{
Stop();
Start();
}
}
}
public int Resolution
{
get
{
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
return resolution;
}
set
{
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
else if(value < 0)
{
throw new ArgumentOutOfRangeException("Resolution", value,
"timer resolution out of range.");
}
resolution = value;
if(IsRunning)
{
Stop();
Start();
}
}
}
public Mode Mode
{
get
{
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
return mode;
}
set
{
if(disposed)
{
throw new ObjectDisposedException("Timer");
}
mode = value;
if(IsRunning)
{
Stop();
Start();
}
}
}
/// <summary>
/// Gets a value indicating whether the Timer is running.
/// </summary>
public bool IsRunning
{
get
{
return running;
}
}
/// <summary>
/// Gets the timer capabilities.
/// </summary>
public static TimerCaps Capabilities
{
get
{
return caps;
}
}
public event System.EventHandler Disposed;
public ISite Site
{
get
{
return site;
}
set
{
site = value;
}
}
public void Dispose()
{
if(disposed)
{
return;
}
if(IsRunning)
{
Stop();
}
disposed = true;
OnDisposed(EventArgs.Empty);
}
}
public class TimerException : ApplicationException
{
public TimerException(string message) : base(message)
{
}
}
}
+264
View File
@@ -0,0 +1,264 @@
namespace GraphLib
{
partial class PrintPreviewForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.printPreviewCtrl = new System.Windows.Forms.PrintPreviewControl();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.rb_Unscaled = new System.Windows.Forms.RadioButton();
this.rb_BestFit = new System.Windows.Forms.RadioButton();
this.rb_Scale = new System.Windows.Forms.RadioButton();
this.cb_PrintBackground = new System.Windows.Forms.CheckBox();
this.label3 = new System.Windows.Forms.Label();
this.cb_Printer = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.cb_Orientation = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.cb_PaperSize = new System.Windows.Forms.ComboBox();
this.bt_Cancel = new System.Windows.Forms.Button();
this.bt_print = new System.Windows.Forms.Button();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// printPreviewCtrl
//
this.printPreviewCtrl.BackColor = System.Drawing.SystemColors.ControlLight;
this.printPreviewCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
this.printPreviewCtrl.Location = new System.Drawing.Point(0, 0);
this.printPreviewCtrl.Name = "printPreviewCtrl";
this.printPreviewCtrl.Size = new System.Drawing.Size(453, 501);
this.printPreviewCtrl.TabIndex = 1;
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer1.IsSplitterFixed = true;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.printPreviewCtrl);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.groupBox1);
this.splitContainer1.Panel2.Controls.Add(this.cb_PrintBackground);
this.splitContainer1.Panel2.Controls.Add(this.label3);
this.splitContainer1.Panel2.Controls.Add(this.cb_Printer);
this.splitContainer1.Panel2.Controls.Add(this.label2);
this.splitContainer1.Panel2.Controls.Add(this.cb_Orientation);
this.splitContainer1.Panel2.Controls.Add(this.label1);
this.splitContainer1.Panel2.Controls.Add(this.cb_PaperSize);
this.splitContainer1.Panel2.Controls.Add(this.bt_Cancel);
this.splitContainer1.Panel2.Controls.Add(this.bt_print);
this.splitContainer1.Size = new System.Drawing.Size(681, 501);
this.splitContainer1.SplitterDistance = 453;
this.splitContainer1.TabIndex = 2;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.rb_Unscaled);
this.groupBox1.Controls.Add(this.rb_BestFit);
this.groupBox1.Controls.Add(this.rb_Scale);
this.groupBox1.Location = new System.Drawing.Point(18, 188);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(93, 93);
this.groupBox1.TabIndex = 12;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Scaling";
//
// rb_Unscaled
//
this.rb_Unscaled.AutoSize = true;
this.rb_Unscaled.Location = new System.Drawing.Point(13, 19);
this.rb_Unscaled.Name = "rb_Unscaled";
this.rb_Unscaled.Size = new System.Drawing.Size(70, 17);
this.rb_Unscaled.TabIndex = 8;
this.rb_Unscaled.TabStop = true;
this.rb_Unscaled.Text = "Unscaled";
this.rb_Unscaled.UseVisualStyleBackColor = true;
this.rb_Unscaled.CheckedChanged += new System.EventHandler(this.rb_Unscaled_CheckedChanged);
//
// rb_BestFit
//
this.rb_BestFit.AutoSize = true;
this.rb_BestFit.Location = new System.Drawing.Point(13, 65);
this.rb_BestFit.Name = "rb_BestFit";
this.rb_BestFit.Size = new System.Drawing.Size(60, 17);
this.rb_BestFit.TabIndex = 6;
this.rb_BestFit.TabStop = true;
this.rb_BestFit.Text = "Best Fit";
this.rb_BestFit.UseVisualStyleBackColor = true;
this.rb_BestFit.CheckedChanged += new System.EventHandler(this.rb_BestFit_CheckedChanged);
//
// rb_Scale
//
this.rb_Scale.AutoSize = true;
this.rb_Scale.Location = new System.Drawing.Point(13, 42);
this.rb_Scale.Name = "rb_Scale";
this.rb_Scale.Size = new System.Drawing.Size(52, 17);
this.rb_Scale.TabIndex = 7;
this.rb_Scale.TabStop = true;
this.rb_Scale.Text = "Scale";
this.rb_Scale.UseVisualStyleBackColor = true;
this.rb_Scale.CheckedChanged += new System.EventHandler(this.rb_Scale_CheckedChanged);
//
// cb_PrintBackground
//
this.cb_PrintBackground.AutoSize = true;
this.cb_PrintBackground.Location = new System.Drawing.Point(22, 321);
this.cb_PrintBackground.Name = "cb_PrintBackground";
this.cb_PrintBackground.Size = new System.Drawing.Size(108, 17);
this.cb_PrintBackground.TabIndex = 11;
this.cb_PrintBackground.Text = "Print Background";
this.cb_PrintBackground.UseVisualStyleBackColor = true;
this.cb_PrintBackground.Visible = false;
this.cb_PrintBackground.CheckedChanged += new System.EventHandler(this.cb_PrintBackground_CheckedChanged);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(19, 29);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(37, 13);
this.label3.TabIndex = 10;
this.label3.Text = "Printer";
//
// cb_Printer
//
this.cb_Printer.FormattingEnabled = true;
this.cb_Printer.Location = new System.Drawing.Point(18, 45);
this.cb_Printer.Name = "cb_Printer";
this.cb_Printer.Size = new System.Drawing.Size(195, 21);
this.cb_Printer.TabIndex = 9;
this.cb_Printer.SelectedIndexChanged += new System.EventHandler(this.cb_Printer_SelectedIndexChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(19, 134);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(58, 13);
this.label2.TabIndex = 5;
this.label2.Text = "Orientation";
//
// cb_Orientation
//
this.cb_Orientation.FormattingEnabled = true;
this.cb_Orientation.Items.AddRange(new object[] {
"Portrait",
"Landscape"});
this.cb_Orientation.Location = new System.Drawing.Point(18, 150);
this.cb_Orientation.Name = "cb_Orientation";
this.cb_Orientation.Size = new System.Drawing.Size(93, 21);
this.cb_Orientation.TabIndex = 4;
this.cb_Orientation.SelectedIndexChanged += new System.EventHandler(this.cb_Orientation_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(19, 81);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(58, 13);
this.label1.TabIndex = 3;
this.label1.Text = "Paper Size";
//
// cb_PaperSize
//
this.cb_PaperSize.FormattingEnabled = true;
this.cb_PaperSize.Location = new System.Drawing.Point(18, 97);
this.cb_PaperSize.Name = "cb_PaperSize";
this.cb_PaperSize.Size = new System.Drawing.Size(93, 21);
this.cb_PaperSize.TabIndex = 2;
this.cb_PaperSize.SelectedIndexChanged += new System.EventHandler(this.cb_PaperSize_SelectedIndexChanged);
//
// bt_Cancel
//
this.bt_Cancel.Location = new System.Drawing.Point(118, 450);
this.bt_Cancel.Name = "bt_Cancel";
this.bt_Cancel.Size = new System.Drawing.Size(69, 26);
this.bt_Cancel.TabIndex = 1;
this.bt_Cancel.Text = "Cancel";
this.bt_Cancel.UseVisualStyleBackColor = true;
this.bt_Cancel.Click += new System.EventHandler(this.bt_Cancel_Click);
//
// bt_print
//
this.bt_print.Location = new System.Drawing.Point(22, 450);
this.bt_print.Name = "bt_print";
this.bt_print.Size = new System.Drawing.Size(69, 26);
this.bt_print.TabIndex = 0;
this.bt_print.Text = "Print";
this.bt_print.UseVisualStyleBackColor = true;
this.bt_print.Click += new System.EventHandler(this.bt_print_Click);
//
// PrintPreviewForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(681, 501);
this.Controls.Add(this.splitContainer1);
this.MaximumSize = new System.Drawing.Size(697, 537);
this.MinimumSize = new System.Drawing.Size(697, 537);
this.Name = "PrintPreviewForm";
this.Text = "PrintPreviewForm";
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
this.splitContainer1.Panel2.PerformLayout();
this.splitContainer1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.PrintPreviewControl printPreviewCtrl;
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Button bt_Cancel;
private System.Windows.Forms.Button bt_print;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cb_PaperSize;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox cb_Orientation;
private System.Windows.Forms.RadioButton rb_Scale;
private System.Windows.Forms.RadioButton rb_BestFit;
private System.Windows.Forms.RadioButton rb_Unscaled;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox cb_Printer;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.CheckBox cb_PrintBackground;
}
}
+336
View File
@@ -0,0 +1,336 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using System.Drawing.Printing;
namespace GraphLib
{
public partial class PrintPreviewForm : Form
{
private PrintDocument printDoc = new PrintDocument();
private PlotterGraphPaneEx gpane = null;
private String strDefaultPrinter = String.Empty;
private bool bBestScale = false;
private bool bPageScale = false;
private bool bUnscaled = false;
private bool bLandscape = false;
private int selPrinterIndex = -1;
public PrintPreviewForm()
{
InitializeComponent();
printPreviewCtrl.Zoom = 1;
rb_BestFit.Checked = true;
rb_Scale.Checked = false;
rb_Unscaled.Checked = false;
cb_Orientation.SelectedIndex = 0;
printDoc.PrintPage += new PrintPageEventHandler(printDoc_PrintPage);
this.VisibleChanged += new EventHandler(OnVisibleChanged);
FormClosing += new FormClosingEventHandler(OnFormClosing);
}
void FillInInstalledPrinters()
{
strDefaultPrinter = printDoc.PrinterSettings.PrinterName;
cb_Printer.Items.Clear();
foreach (String strPrinter in PrinterSettings.InstalledPrinters)
{
cb_Printer.Items.Add(strPrinter);
if (strPrinter == strDefaultPrinter)
{
cb_Printer.SelectedIndex = cb_Printer.Items.IndexOf(strPrinter);
}
}
}
void OnVisibleChanged(object sender, EventArgs e)
{
if (this.Visible)
{
bLandscape = cb_Orientation.SelectedIndex == 1;
FillInInstalledPrinters();
FillInPaperSizes();
UpdateScaleRadioButtons();
InvalidatePrintPreview();
}
else
{
}
}
void OnFormClosing(object sender, FormClosingEventArgs e)
{
this.Hide();
e.Cancel = true;
}
void UpdateScaleRadioButtons()
{
bBestScale = rb_BestFit.Checked;
bPageScale = rb_Scale.Checked;
bUnscaled = rb_Unscaled.Checked;
}
double AutoZoomPreview()
{
float zoom = 1.0f;
float step = 0.05f;
float PaperWidth = printDoc.DefaultPageSettings.PaperSize.Width;
float PaperHeight = printDoc.DefaultPageSettings.PaperSize.Height;
if (bLandscape)
{
PaperHeight = printDoc.DefaultPageSettings.PaperSize.Width * zoom;
PaperWidth = printDoc.DefaultPageSettings.PaperSize.Height * zoom;
}
while (zoom > 0.1f)
{
double CurW = PaperWidth * zoom;
double CurH = PaperHeight * zoom;
if (splitContainer1.Panel1.Width < (CurW+10) || splitContainer1.Panel1.Height < (CurH+10))
{
zoom -= step;
}
else
{
break;
}
}
return zoom;
}
void FillInPaperSizes()
{
cb_PaperSize.Items.Clear();
foreach (PaperSize s in printDoc.PrinterSettings.PaperSizes)
{
cb_PaperSize.Items.Add(s.PaperName.ToString());
}
if (cb_PaperSize.SelectedIndex == -1 || cb_PaperSize.SelectedIndex >= cb_PaperSize.Items.Count)
{
int idx = cb_PaperSize.Items.IndexOf(printDoc.DefaultPageSettings.PaperSize.PaperName);
if (idx >= 0 && idx < cb_PaperSize.Items.Count)
{
cb_PaperSize.SelectedIndex = idx;
}
else
{
cb_PaperSize.SelectedIndex = 0;
}
}
}
void InvalidatePrintPreview()
{
printDoc.DefaultPageSettings.Landscape = bLandscape;
printPreviewCtrl.Document = printDoc;
printPreviewCtrl.Document.DocumentName = "Preview";
printPreviewCtrl.Zoom = AutoZoomPreview();
printPreviewCtrl.InvalidatePreview();
}
public PlotterGraphPaneEx GraphPanel
{
set
{
gpane = value;
}
}
private void AutoScaleDocument(ref float w, ref float h, ref float x, ref float y)
{
float CurGraphWidth = gpane.Width;
float CurGraphHeight = gpane.Height;
float CurPaperWidth = printDoc.DefaultPageSettings.PaperSize.Width;
float CurPaperHeight = printDoc.DefaultPageSettings.PaperSize.Height;
if (bLandscape)
{
CurPaperWidth = printDoc.DefaultPageSettings.PaperSize.Height;
CurPaperHeight = printDoc.DefaultPageSettings.PaperSize.Width;
}
if (bUnscaled)
{
// do nothing
}
if (bPageScale) // scale to page
{
CurGraphWidth = CurPaperWidth;
CurGraphHeight = CurPaperHeight;
}
if (bBestScale) // scale to best fit
{
float zoom = 1.0f;
float step = 0.05f;
if (CurGraphWidth > (CurPaperWidth ) || CurGraphHeight > (CurPaperHeight ))
{
// scale down
while ((zoom * gpane.Width > CurPaperWidth || zoom * gpane.Height > CurPaperHeight) && zoom > step)
{
zoom -= step;
}
zoom -= step;
}
else if (CurGraphWidth < CurPaperWidth && CurGraphHeight < CurPaperHeight)
{
// scale up
while (((zoom+step) * gpane.Width < CurPaperWidth && (zoom+step) * gpane.Height < CurPaperHeight) && zoom > step)
{
zoom += step;
}
}
CurGraphWidth = zoom * gpane.Width;
CurGraphHeight = zoom * gpane.Height;
}
w = CurGraphWidth;
h = CurGraphHeight;
// center print
x = (CurPaperWidth - w) / 2.0f;
y = (CurPaperHeight - h) / 2.0f;
}
private void printDoc_PrintPage(object sender, PrintPageEventArgs e)
{
if (gpane != null)
{
float x=0, y=0, w=gpane.Width, h=gpane.Height;
AutoScaleDocument(ref w, ref h, ref x, ref y);
e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
//gpane.PaintControl(e.Graphics, w, h,x,y,cb_PrintBackground.Checked);
gpane.PaintControl(e.Graphics, w, h, x, y, false);
}
}
private void bt_print_Click(object sender, EventArgs e)
{
if (printDoc != null)
{
printDoc.Print();
this.Hide();
}
}
private void bt_Cancel_Click(object sender, EventArgs e)
{
this.Hide();
}
private void cb_PaperSize_SelectedIndexChanged(object sender, EventArgs e)
{
if (cb_PaperSize.SelectedIndex >= 0 && cb_PaperSize.SelectedIndex < cb_PaperSize.Items.Count)
{
foreach (PaperSize s in printDoc.PrinterSettings.PaperSizes)
{
if (s.PaperName == (string)cb_PaperSize.Items[cb_PaperSize.SelectedIndex])
{
printDoc.DefaultPageSettings.PaperSize = s;
InvalidatePrintPreview();
}
}
}
}
private void rb_BestFit_CheckedChanged(object sender, EventArgs e)
{
if (rb_BestFit.Checked)
{
rb_Scale.Checked = !rb_BestFit.Checked;
rb_Unscaled.Checked = !rb_BestFit.Checked;
}
UpdateScaleRadioButtons();
InvalidatePrintPreview();
}
private void rb_Scale_CheckedChanged(object sender, EventArgs e)
{
if (rb_Scale.Checked)
{
rb_BestFit.Checked = !rb_Scale.Checked;
rb_Unscaled.Checked = !rb_Scale.Checked;
}
UpdateScaleRadioButtons();
InvalidatePrintPreview();
}
private void rb_Unscaled_CheckedChanged(object sender, EventArgs e)
{
if (rb_Unscaled.Checked)
{
rb_Scale.Checked = !rb_Unscaled.Checked;
rb_BestFit.Checked = !rb_Unscaled.Checked;
}
UpdateScaleRadioButtons();
InvalidatePrintPreview();
}
private void cb_Printer_SelectedIndexChanged(object sender, EventArgs e)
{
selPrinterIndex = cb_Printer.SelectedIndex;
if (selPrinterIndex >= 0 && selPrinterIndex < cb_Printer.Items.Count)
{
printDoc.PrinterSettings.PrinterName = (string)cb_Printer.Items[selPrinterIndex];
this.Text = "Print Preview - " + printDoc.PrinterSettings.PrinterName;
}
FillInPaperSizes();
InvalidatePrintPreview();
}
private void cb_Orientation_SelectedIndexChanged(object sender, EventArgs e)
{
if (cb_Orientation.SelectedIndex == 0)
{
bLandscape = false;
}
else
{
bLandscape = true;
}
InvalidatePrintPreview();
}
private void cb_PrintBackground_CheckedChanged(object sender, EventArgs e)
{
InvalidatePrintPreview();
}
}
}
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
+35
View File
@@ -0,0 +1,35 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("GraphLibrary")]
[assembly: AssemblyDescription("Library for easy and simple graph drawing")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("GraphLibrary")]
[assembly: AssemblyCopyright("Copyright © 2008-2014 ZIMMERMANN STEPHAN")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b23e30ac-c4b8-4863-90d0-cf0ad837c050")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.1")]
[assembly: AssemblyFileVersion("1.0.0.1")]
+63
View File
@@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.18408
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
namespace ClassLibrary1.Properties {
using System;
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ClassLibrary1.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
+45
View File
@@ -0,0 +1,45 @@
using System;
namespace GraphLib
{
public class Utilities
{
/// <summary>
/// returns the most significant decimal digit
/// 250 -> 100
/// 350 -> 100
/// 12 -> 10
/// 5 -> 1
/// 0.5 .> 0.1
/// .....
/// </summary>
/// <param name="Value"></param>
/// <returns></returns>
static public float MostSignificantDigit(float Value)
{
float n = 1;
float val_abs = Math.Abs(Value);
float sig = 1.0f * Math.Sign(Value);
if (val_abs > 1)
{
while (n < val_abs)
{
n *= 10.0f;
}
return (float)((int)(sig * n / 10));
}
else // n <= 1
{
while (n > val_abs)
{
n /= 10.0f;
}
return sig * n;
}
}
}
}
+68
View File
@@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
namespace MonitoringDB.Entities
{
public class Part
{
public virtual int Id { get; protected set; }
public virtual string Name { get; set; }
public virtual string OraDBType { get; set; }
public virtual string Description { get; set; }
public virtual CodeType CodeType { get; set; }
public virtual CodeForm CodeForm { get; set; }
public virtual CodeLocation CodeLocation { get; set; }
public virtual LifetimeManagement LifetimeManagement { get; set; }
public virtual int StepNumber { get; set; }
public virtual Process Process { get; set; }
public virtual Workstep Workstep { get; set; }
protected Part()
{
Name = string.Empty;
Description = string.Empty;
}
/// <summary>
/// Constructor used when the part is added to a process
/// </summary>
/// <param name="name"></param>
/// <param name="codeType"></param>
/// <param name="codeForm"></param>
/// <param name="process"></param>
public Part(string name, Process process, CodeType codeType, CodeForm codeForm, CodeLocation codeLocation)
{
Name = name;
OraDBType = string.Empty;
Description = string.Empty;
CodeType = codeType;
CodeForm = codeForm;
CodeLocation = codeLocation;
StepNumber = 0;
Process = process;
Workstep = null;
}
/// <summary>
/// Create a copy of a part (1) belongig to another process, (2) not assigned to any workstep yet.
/// </summary>
/// <param name="process">Process owning the cloned part</param>
/// <returns>Cloned part</returns>
public virtual Part Clone(Process owningProcess)
{
Part rslt = new Part(Name, owningProcess, CodeType, CodeForm, CodeLocation);
rslt.OraDBType = OraDBType;
rslt.Description = Description;
rslt.LifetimeManagement = LifetimeManagement;
return rslt;
}
public override string ToString()
{
return string.Format("{0} step={1} ({2})", Name, StepNumber, Description);
}
}
}
+68
View File
@@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
namespace MonitoringDB.Entities
{
public class Process
{
public virtual int Id { get; protected set; }
public virtual int ItemNr { get; set; }
public virtual string Name { get; set; }
public virtual string Description { get; set; }
public virtual ReleaseStatus ReleaseStatus { get; set; }
public virtual DateTime TimeStamp { get; set; }
public virtual string UserName { get; set; }
public virtual IList<Part> Parts { get; set; }
public virtual IList<Workstep> Worksteps { get; set; }
/// <summary>
/// Default (private) constructor inicializing lists
/// </summary>
protected Process()
{
Parts = new List<Part>();
Worksteps = new List<Workstep>();
}
/// <summary>
/// Constructor used when this process is created
/// </summary>
/// <param name="name"></param>
public Process(string name)
: this()
{
Name = name;
Description = string.Empty;
ReleaseStatus = ReleaseStatus.In_preparation;
TimeStamp = DateTime.Now;
UserName = "admin";
}
/// <summary>
/// Create a copy of a process with a new name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public virtual Process Clone(string name)
{
Process rslt = new Process(name);
rslt.Description = Description;
foreach (var part in Parts) rslt.Parts.Add(part.Clone(rslt));
foreach (var workstep in Worksteps) rslt.Worksteps.Add(workstep.Clone(rslt));
return rslt;
}
public override string ToString()
{
return string.Format("{0} '{1}' ({2}) {3} {4}",
ItemNr,
Name,
TimeStamp.Date.ToShortDateString(),
(Description == null) ? string.Empty : Description,
ReleaseStatus);
}
}
}
+61
View File
@@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
namespace MonitoringDB.Entities
{
public class Record
{
public virtual int Id { get; protected set; }
public virtual string Code { get; set; }
public virtual DateTime TimeStamp { get; set; }
public virtual Part Part { get; set; }
public virtual ReferenceRecord ReferenceRecord { get; set; }
protected Record()
{
}
/// <summary>
/// Constructor used when a part barcode is scanned
/// </summary>
/// <param name="partId">Part</param>
/// <param name="referenceRecordId">Reference record</param>
/// <param name="code">Scanned barcode</param>
public Record(Part part, ReferenceRecord referenceRecord, string code)
{
Part = part;
ReferenceRecord = referenceRecord;
Code = code;
TimeStamp = DateTime.Now;
}
/// <summary>
/// Create a copy of a process with a new name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public virtual Record Clone(Process newProcess, ReferenceRecord newRR)
{
Part newPart = null;
foreach (var pt in newProcess.Parts)
{
if (Part.Name == pt.Name)
{
newPart = pt;
break;
}
}
Record rslt = new Record(newPart, newRR, Code);
rslt.TimeStamp = TimeStamp;
return rslt;
}
public override string ToString()
{
return string.Format("code={0} part={1} description='{2}'", Code, Part.Name, Part.Description);
}
}
}
+88
View File
@@ -0,0 +1,88 @@
using System;
using System.Collections.Generic;
namespace MonitoringDB.Entities
{
public class ReferenceRecord
{
public virtual int Id { get; protected set; }
public virtual string Code { get; set; }
public virtual DateTime TimeStamp { get; set; }
public virtual string UserName { get; set; }
public virtual string Workplace { get; set; }
public virtual int Result { get; set; } /// 0 = No error (OK), >0 = Error code
public virtual Process Process { get; set; }
public virtual Workstep Workstep { get; set; }
public virtual IList<Record> Records { get; set; }
/// <summary>
/// Default (private) constructor inicializing lists
/// </summary>
protected ReferenceRecord()
{
Records = new List<Record>();
}
/// <summary>
/// Constructor used when reference barcode is scanned
/// </summary>
/// <param name="process">Process</param>
/// <param name="workstep">Workstep</param>
/// <param name="code">Scanned barcode</param>
public ReferenceRecord(Process process, Workstep workstep, string code,
string userName, string workplace, int result)
{
Process = process;
Workstep = workstep;
Code = code;
TimeStamp = DateTime.Now;
UserName = userName;
Workplace = workplace;
Result = result;
}
/// <summary>
/// Create a copy of a process with a new name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public virtual ReferenceRecord Clone(Process newProcess)
{
Workstep newWorkstep = null;
foreach (var ws in newProcess.Worksteps)
{
if (Workstep.Name == ws.Name)
{
newWorkstep = ws;
break;
}
}
ReferenceRecord rslt = new ReferenceRecord(newProcess, newWorkstep,
Code, UserName, Workplace, Result);
rslt.TimeStamp = TimeStamp;
rslt.Records = new List<Record>();
foreach (var record in Records)
{
rslt.Records.Add(record.Clone(newProcess, rslt));
}
return rslt;
}
public override string ToString()
{
return string.Format("code={0} part={1} description='{2}' step='{3}' workplace='{4}' user={5} time={6:dd.MM.yyyy HH:mm:ss}",
(Code != null) ? Code : "<none>",
Workstep.ReferencePart.Name,
Workstep.ReferencePart.Description,
Workstep.Name,
Workplace,
UserName,
TimeStamp);
}
}
}

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