diff --git a/Doc/FlyingStartMassCollectionTest.uxf b/Doc/FlyingStartMassCollectionTest.uxf deleted file mode 100644 index ab365fdad..000000000 --- a/Doc/FlyingStartMassCollectionTest.uxf +++ /dev/null @@ -1,525 +0,0 @@ - - - 8 - - com.umlet.element.Relation - - 400 - 0 - 40 - 64 - - lt=<- - 24;48;24;24 - - - com.umlet.element.custom.InitialState - - 416 - 8 - 16 - 16 - - i - - - - com.umlet.element.custom.State - - 328 - 48 - 192 - 32 - - 'Test Start' transition sequence - - - - com.umlet.element.Relation - - 400 - 56 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.RegionEndState - - 416 - 96 - 16 - 16 - - - - - - com.umlet.element.Relation - - 400 - 88 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.State - - 344 - 128 - 160 - 32 - - Initialize (single) test results - - - - com.umlet.element.Relation - - 400 - 136 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.Decision - - 408 - 176 - 32 - 32 - - - - - - com.umlet.element.Relation - - 400 - 184 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.Decision - - 408 - 224 - 32 - 32 - - - - - - com.umlet.element.custom.RegionEndState - - 416 - 272 - 16 - 16 - - - - - - com.umlet.element.Relation - - 400 - 232 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.Relation - - 400 - 264 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.State - - 344 - 304 - 160 - 32 - - Make the water tank empty - - - - com.umlet.element.Relation - - 400 - 312 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.RegionEndState - - 416 - 352 - 16 - 16 - - - - - - com.umlet.element.Relation - - 400 - 344 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.Relation - - 272 - 168 - 160 - 128 - - lt=<- -m2=[Emptying always] - 144;112;24;112;24;24;136;24 - - - com.umlet.element.Relation - - 408 - 216 - 176 - 160 - - lt=<- -m2=[Enough room in tank] - 24;144;160;144;160;24;32;24 - - - com.umlet.element.custom.State - - 344 - 384 - 160 - 32 - - Set the required water flow - - - - com.umlet.element.Relation - - 400 - 392 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.State - - 328 - 432 - 192 - 32 - - Measure the 'start' mass of water - - - - com.umlet.element.Relation - - 400 - 440 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.State - - 344 - 480 - 160 - 32 - - Start the test (diverter, etc.) - - - - com.umlet.element.Relation - - 400 - 488 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.RegionEndState - - 416 - 528 - 16 - 16 - - - - - - com.umlet.element.custom.State - - 344 - 560 - 160 - 32 - - Read intermediate results - - - - com.umlet.element.Relation - - 400 - 520 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.Relation - - 400 - 568 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.Decision - - 408 - 608 - 32 - 32 - - - - - - com.umlet.element.Relation - - 272 - 512 - 160 - 128 - - lt=<- -m2=[Test in progress] - 144;24;24;24;24;112;136;112 - - - com.umlet.element.Relation - - 400 - 616 - 40 - 64 - - lt=<- - 24;48;24;24 - - - com.umlet.element.custom.Text - - 424 - 640 - 104 - 24 - - [Test completed] - - - - com.umlet.element.custom.State - - 328 - 664 - 192 - 32 - - Measure the 'end' mass of water - - - - com.umlet.element.custom.State - - 328 - 712 - 192 - 32 - - Calculate and save this test results - - - - com.umlet.element.Relation - - 400 - 672 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.Relation - - 400 - 720 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.custom.Decision - - 408 - 760 - 32 - 32 - - - - - - com.umlet.element.Relation - - 400 - 768 - 40 - 64 - - lt=<- - 24;48;24;24 - - - com.umlet.element.Relation - - 408 - 80 - 216 - 712 - - lt=<- -m2=[More repetitions to be done] - 24;24;200;24;200;696;32;696 - - - com.umlet.element.custom.Text - - 264 - 792 - 160 - 24 - - [All test repetitions completed] - - - - com.umlet.element.custom.State - - 328 - 816 - 192 - 32 - - Stop any running tests, etc. (?) - - - - com.umlet.element.custom.State - - 328 - 864 - 192 - 32 - - 'Test End' transition sequence - - - - com.umlet.element.Relation - - 400 - 824 - 40 - 56 - - lt=<- - 24;40;24;24 - - - com.umlet.element.Relation - - 400 - 872 - 40 - 64 - - lt=<- - 24;48;24;24 - - - com.umlet.element.custom.FinalState - - 416 - 920 - 16 - 16 - - - - - diff --git a/Doc/MainSeq.uxf b/Doc/MainSeq.uxf deleted file mode 100644 index 5738f7ba4..000000000 --- a/Doc/MainSeq.uxf +++ /dev/null @@ -1,261 +0,0 @@ - - - 10 - - com.umlet.element.custom.State - - 400 - 120 - 120 - 40 - - Load the default -procedure - - - - - com.umlet.element.Relation - - 430 - 40 - 50 - 100 - - lt=<- - 30;80;30;30 - - - com.umlet.element.custom.InitialState - - 450 - 60 - 20 - 20 - - i - - - - com.umlet.element.custom.State - - 400 - 190 - 120 - 40 - - Reset valves, -pumps, etc. - - - - - com.umlet.element.Relation - - 430 - 130 - 50 - 80 - - lt=<- - 30;60;30;30 - - - com.umlet.element.custom.State - - 400 - 260 - 120 - 40 - - Detect cameras - - - - com.umlet.element.Relation - - 430 - 200 - 50 - 80 - - lt=<- - 30;60;30;30 - - - com.umlet.element.custom.State - - 370 - 550 - 180 - 110 - - complex -state --- -some more... - - --. - - - - com.umlet.element.custom.State - - 370 - 390 - 180 - 60 - - Display prompt, enable -'Cycle' and 'Test' buttons -and wait for a selection - - - - com.umlet.element.Relation - - 430 - 320 - 50 - 90 - - lt=<- - 30;70;30;30 - - - com.umlet.element.custom.RegionEndState - - 450 - 330 - 20 - 20 - - - - - - com.umlet.element.Relation - - 430 - 270 - 50 - 80 - - lt=<- - 30;60;30;30 - - - com.umlet.element.custom.Decision - - 440 - 480 - 40 - 40 - - - - - - com.umlet.element.Relation - - 430 - 420 - 50 - 80 - - lt=<- - 30;60;30;30 - - - com.umlet.element.Relation - - 430 - 490 - 50 - 80 - - lt=<- - 30;60;30;30 - - - com.umlet.element.custom.State - - 620 - 430 - 160 - 40 - - Disable 'Cycle' -and 'Test' buttons - - - - com.umlet.element.custom.State - - 620 - 360 - 160 - 40 - - Empty the tank - - - - com.umlet.element.Relation - - 450 - 440 - 270 - 80 - - lt=<- - 250;30;250;60;30;60 - - - com.umlet.element.Relation - - 670 - 370 - 50 - 80 - - lt=<- - 30;30;30;60 - - - com.umlet.element.Relation - - 440 - 310 - 280 - 70 - - lt=<- - 30;30;260;30;260;50 - - - com.umlet.element.custom.Text - - 490 - 480 - 180 - 20 - - 'Empty a tank' selected - - - - - com.umlet.element.custom.Text - - 290 - 520 - 160 - 20 - - 'Cycle' or 'Test' selected - - - - diff --git a/Doc/TODO.txt b/Doc/TODO.txt deleted file mode 100644 index 9f840af6c..000000000 --- a/Doc/TODO.txt +++ /dev/null @@ -1,73 +0,0 @@ -Otazky: -------- -- ako pouzit T6 -- co je 'T to Open' pri RV -- na co sluzia VI2P, VI3P a VI4P - - -TODO: ------ -- nefunguje pumpa P3 -- nahlad na cestu v procedure -- purgeStart a purgeEnd --> transitionSteps/Sequences -- horeuvedene pre RegulValve -- volba procedury nie je zablokovana pocas testov -- vsetky Target... v Process tabe -- Hmotnosti: - 1 netarovat, merat okamzitu, - 2 nulovacia procedura na tlacitko manualne, - 3 pri starte sa spytat ci vynulovat vahy -- Preco sa nenacitaju zmeny v Test-e ??? - - -- pouzit oneskorenie na ventily -- skontrolovat doc (freq v Hz) - -Demo version: - -- pouzit progress bary na vyber testu -- vycistit Measurement -- simulacia skonci pri druhom 'start_measurement' -- pri simulacii sa meni mass pri merani end-mass (klapka by mala byt vypnuta!) - -- otvorit Proceduru (v dalsom okne v zamknutom stave) aj ked je okno Procedures zamknute -- pridat seriove cisla do parametrov komponentov -- zapamatavat si sirky stlpcov v PathsDlg, ... (aj inde) -- skontroluj vsetky ListViewEx-y + skorsie spracovanie vysledkov (dolezite aj pre spravnu tvorbu noveho mena) -- preco posledne okno skace -- chyba spracovanie procedure / metrology2 Tol.Abzug, Fehl.Korr -+ -- vsetky mena stlpcov a tabov do Strings.xxx - -Testovanie na stanici: - -- pouzivat skutocne 'rvalves' -- ked vyberiem priamo Q1, Q2, Q3 (poskonceni predchadzajuceho testu), neprepise sa obsah combo boxu -- prislusne EtPulses by mali ist cez RegisterReader komponent + common RegisterReader pre Master -- ako je to s WM0 ... -- na zaciatku zmerat vahu a dovolit vypustit tanky -- updatovat vahu - obrazok = je nespravna kapacita vahy -- spracovanie vysledkov podla excelu: corr. na hustotu vzduchu (zavazie), corr. na hustotu vody v zav. od teploty -- podpora pre zbieranie vysledkov -- logovanie vysledkov do excelu -- zastavit vodu na konci skusky -- Pri nastavovani prietoku nie je nic vidno -- pouzivat skutocne 'rvalves' -- pri vytvarani testov vyberat cesty podla prietoku -- ked sa zada cesta napisanim mena = skontrolovat -- zapamatat si stav ventilu pri prietoku -- nulovanie = nulovanie vahy -- zmenit text: tarovanie -> vypustanie - -- pripravit IDC100: !ReadRegisterOp, Idc100.GetValue-SetValue (na konci), GetState a ukoncenie operacie -- sub-sekvencie pre Q-set a metody -- zobrazit typizovanu schemu - -Neskor: - -- nevidno ci su neulozene zmeny -- upozornenie pri cancel ak su neulozene zmeny -- spravne updatovat tlacitka ked su FixedItems (FixedRows) -- ked odomknem Komponenty tak sa zrusi vyber -- vaha ToString - prve zobrazit capacity -- moznost menenia poradia aj v components -- rozdelit ventily podla ciest? diff --git a/Doc/Translation MTS 1_3.doc b/Doc/Translation MTS 1_3.doc deleted file mode 100644 index 475d7a3fd..000000000 Binary files a/Doc/Translation MTS 1_3.doc and /dev/null differ diff --git a/Doc/Virtual-bench-components.ods b/Doc/Virtual-bench-components.ods deleted file mode 100644 index 070bf79fa..000000000 Binary files a/Doc/Virtual-bench-components.ods and /dev/null differ diff --git a/Doc/Virtualbench.png b/Doc/Virtualbench.png deleted file mode 100644 index fa98f5faa..000000000 Binary files a/Doc/Virtualbench.png and /dev/null differ diff --git a/Doc/design.txt b/Doc/design.txt deleted file mode 100644 index c05a6b2a0..000000000 --- a/Doc/design.txt +++ /dev/null @@ -1,91 +0,0 @@ -Assumption ----------- - The installation consists of one or more similar test benches. Each test bench is controlled by one PC-based computer. In addition, one or more PC-s can run the same application and manipulated data shared by the test benches (e.g. PC located in offices). All PC-s run the same version of software (this is a must now - Munich - in the future we can try to deal with backward/forward compatibility issues). - -Development environment ------------------------ - - Visual Studio 2012 Professional - - Database: MySQL (???) - -User iterface -------------- - - WindowsFormsApplication - - Main part of the window occupies a tab control with hidden tabs - (see http://weblogs.asp.net/kdente/archive/2005/11/14/430591.aspx) - Tabs swithing is done programatically - - Tabs: - - Procedure - - Procedure Info (summary, header) - - Procedure History (changes) - - Procedure Metrology - - Procedure Technical - - Procedure Purge - - Procedure End - - Procedure Adjustment - - Procedure View - - Procedure Inputs - Home - Insert - Results - - Results - - Results D - - Meters Ch - - Temp Ch - - Pressure - Bench parameters - - Technical - - Balance - - Temperature - - Pressure - - Flowmeter - - Density - Logs - - - -Sensus Testbench Framework application settings consist of ----------------------------------------------------------- - S1. Local settings stored on each PC - S1.1 language settings, appearance, etc. (no other impact on the system function) - S1.2 specification of databases used to store other settings (see 2.) - There might be several sets of DB settings (1.2) when one should be able to access more test benches. When starting the system, this is indicated on the login screen as 'Test bench'/'Pruefstation'. - - S2. Settings stored in databases: - S2.1 'users' (typically shared between all benches - centralized access control) - S2.2 'watermeter_types' info (typically shared between more benches) - S2.3 'test_procedures' (typically shared between more identical benches) - S2.4 'metrological_parameters' of the system (always unique for each system, not shared) - S2.5 'watermeters' info (typically centralized / shared) - S2.6 'test_results' (typically centralized / shared) - etc. - The databases might be running either on the local PC or remote, - each database might be used by a single bench, or shared by more test benches. This configured in 1.2. - -Application can be used to: ---------------------------- - A1. Change local settings (S1.1, S1.2) - A2. Change settings stored in the databases - A3. Control system and run test procedures - this is only possible on PC-s controlling the benches. When procedure is started, local copy of necessary information from the DB-s is made to avoid problems. - - User access control: - -------------------- - U1. Access to - U1.1 information read - U1.2 information write/modify - U1.3 action start - is controlled by an access control mechanism. - U2. Users - U3. Groups - Each user is a member of one or more groups. In case needed, a group with a single user is created. Access to information/actions is granted to groups. - Muenich: Grooups are 'Tester', - 'Testing specialist', - 'Head of lab' - 'Maintenance specialist' - 'Metrologist' - 'Calibration specialist' - U4. When necessary, system prompts user to authenticate himself/herself (login dialog). Authentication is invalidated as follows (optional): - U4.1 When user closes the dialog, which was protected. - U4.2 After certain time period - U4.3 Never diff --git a/Doc/mylog4net.xml b/Doc/mylog4net.xml deleted file mode 100644 index bf5766ace..000000000 --- a/Doc/mylog4net.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Doc/sample-sequence-of-calls.txt b/Doc/sample-sequence-of-calls.txt deleted file mode 100644 index 80636547b..000000000 --- a/Doc/sample-sequence-of-calls.txt +++ /dev/null @@ -1,27 +0,0 @@ -foreach (var device in devices) device.RunDeviceBefore(); . . . . . . in StateMachine.Worker() -State.Create(...).AddOperation(...).AddOperation(...).EnterState() . . in the sequence in Execute(...) - -foreach (var device in devices) device.RunDeviceAfter(); . . . . . . . in WaitRunDevsRunOps() -WaitNextTick() (may throw QuitStateMachineException) . . . . . . . . in WaitRunDevsRunOps() -foreach (var device in devices) device.RunDeviceBefore(); . . . . . . in WaitRunDevsRunOps() -IList events = State.RunOperations(); . . . . . . . . . . . . . in WaitRunDevsRunOps() - -foreach (var device in devices) device.RunDeviceAfter(); . . . . . . . in WaitRunDevsRunOps() -WaitNextTick() (may throw QuitStateMachineException) . . . . . . . . in WaitRunDevsRunOps() -foreach (var device in devices) device.RunDeviceBefore(); . . . . . . in WaitRunDevsRunOps() -IList events = State.RunOperations(); . . . . . . . . . . . . . in WaitRunDevsRunOps() - -State.Create(...).AddOperation(...).AddOperation(...).EnterState() . . in the sequence in Execute(...) - -foreach (var device in devices) device.RunDeviceAfter(); . . . . . . . in WaitRunDevsRunOps() -WaitNextTick() (may throw QuitStateMachineException) . . . . . . . . in WaitRunDevsRunOps() -foreach (var device in devices) device.RunDeviceBefore(); . . . . . . in WaitRunDevsRunOps() -IList events = State.RunOperations(); . . . . . . . . . . . . . in WaitRunDevsRunOps() - -foreach (var device in devices) device.RunDeviceAfter(); . . . . . . . in WaitRunDevsRunOps() -WaitNextTick() (assume QuitStateMachineException thrown) . . . . . . in WaitRunDevsRunOps() -foreach (var device in devices) device.RunDeviceBefore(); . . . . . . in StateMachine.Worker() catch() -State.RunOperations(); . . . . . . . . . . . . . . . . . . . . . . . . in StateMachine.Worker() catch() -State.Empty.EnterState(); . . . . . . . . . . . . . . . . . . . . . . in StateMachine.Worker() catch() -foreach (var device in devices) device.RunDeviceAfter(); . . . . . . . in StateMachine.Worker() catch() -foreach (var device in devices) device.StopDevice(); . . . . . . . . . in StateMachine.Worker() catch() diff --git a/Doc/show-hide-tabs.txt b/Doc/show-hide-tabs.txt deleted file mode 100644 index 8a5db1898..000000000 --- a/Doc/show-hide-tabs.txt +++ /dev/null @@ -1,11 +0,0 @@ -Showing tabs in the designer: - - select mainTabControl - - in Properies change SizeMode to normal - - in Properies change ItemSize to 0; 20 - -Hiding tabs in the designer: - - select mainTabControl - - in Properies change SizeMode to Fixed - - in Poperties change ItemSize to 0; 1 - - \ No newline at end of file diff --git a/Doc/user-admin-password-hash.txt b/Doc/user-admin-password-hash.txt deleted file mode 100644 index be6e9e618..000000000 --- a/Doc/user-admin-password-hash.txt +++ /dev/null @@ -1,4 +0,0 @@ -af242843887f3bdcc52e485483356eaccd37ba67a35941530bd195a8310fc7d5aca8560576dfb62ad5a4bd2df789a5e8be068e62e7c976d6eeed8d63abbd9909 - - -= staratura \ No newline at end of file diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index ba7d9d341..78cffbffb 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -853,8 +853,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication else if (currentActivity.ToLower() == NormalizeCalibrationV4FactorsStr.ToLower()) error = NormalizeCalibrationV4Factors(threadID, ihead, wm, ref resultStr); else if (currentActivity.ToLower() == ReadQ2CorrectionStr.ToLower()) error = ReadQ2Correction(threadID, ihead, wm, ref resultStr); else if (currentActivity.ToLower() == ResetQ2CorrectionStr.ToLower()) error = ResetQ2Correction(threadID, ihead, wm, ref resultStr); - else if (currentActivity.ToLower() == WriteDefaultQ2CorrectionsStr.ToLower()) error = WriteDefaultQ2Corrections(threadID, ihead, wm, ref resultStr); - else if (currentActivity.ToLower() == InitOrReadQ2CorrectionsStr.ToLower()) error = InitOrReadQ2Corrections(threadID, ihead, wm, ref resultStr); + else if (currentActivity.ToLower() == WriteDefaultQ2CorrectionsStr.ToLower()) error = WriteDefaultQ2Corrections(threadID, ihead, wm, ref resultStr); + else if (currentActivity.ToLower() == InitOrReadQ2CorrectionsStr.ToLower()) error = InitOrReadQ2Corrections(threadID, ihead, wm, ref resultStr); else if (currentActivity.ToLower() == WriteQ2CorrectionStr.ToLower()) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Standard, null); else if (currentActivity.ToLower() == WriteQ2CorrectionAltStr.ToLower()) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Dewa, null); else if (currentActivity.ToLower().Contains(WriteQ2CorrectionGreeceStr.ToLower())) error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.Greece, currentActivity.Substring(WriteQ2CorrectionGreeceStr.Length).Trim());