@@ -38,6 +38,7 @@ public partial class FormReactExposition : Form
3838 private long expositionAccumulative ;
3939 private Stopwatch hitStopWatch = new Stopwatch ( ) ;
4040 private Stopwatch accumulativeStopWatch = new Stopwatch ( ) ;
41+ private Stopwatch betweenAttemptsStopWatch = new Stopwatch ( ) ;
4142 private bool intervalCancelled ;
4243 private bool cancelExposition = false ;
4344
@@ -55,14 +56,15 @@ public partial class FormReactExposition : Form
5556 private System . Windows . Forms . Label wordLabel = new System . Windows . Forms . Label ( ) ;
5657
5758 private bool exposing = false ;
59+ private bool between = false ;
5860 private string [ ] currentStimuli = { "-" , "-" } ;
5961 private string [ ] currentLists = { "-" , "-" } ;
6062 private int currentPosition ;
6163 private string currentPositionOutput ;
6264 private bool currentBeep = false ;
6365 private string currentColor = "false" ;
6466 private int currentExposition = 0 ;
65-
67+ private long fixPointTime = 100 ;
6668 private ResourceManager LocRM = new ResourceManager ( "TestPlatform.Resources.Localizations.LocalizedResources" , typeof ( FormMain ) . Assembly ) ;
6769 private CultureInfo currentCulture = CultureInfo . CurrentUICulture ;
6870
@@ -368,7 +370,12 @@ private int waitIntervalTime(bool isWaitTimeRandom, int waitTime)
368370
369371 Stopwatch intervalStopWatch = new Stopwatch ( ) ;
370372 intervalStopWatch . Start ( ) ;
371- while ( intervalStopWatch . ElapsedMilliseconds < intervalTimeRandom )
373+ long interval = intervalTimeRandom ;
374+ if ( Program . hasFixPoint ( executingTest . ProgramInUse . FixPoint ) )
375+ {
376+ interval = intervalTimeRandom - fixPointTime ;
377+ }
378+ while ( intervalStopWatch . ElapsedMilliseconds < interval )
372379 {
373380 if ( expositionBW . CancellationPending )
374381 {
@@ -377,6 +384,20 @@ private int waitIntervalTime(bool isWaitTimeRandom, int waitTime)
377384 }
378385 /* just wait for interval time to be finished */
379386 }
387+ ExpositionController . makingFixPoint ( executingTest . ProgramInUse . FixPoint , executingTest . ProgramInUse . FixPointColor ,
388+ this ) ;
389+ if ( Program . hasFixPoint ( executingTest . ProgramInUse . FixPoint ) )
390+ {
391+ while ( intervalStopWatch . ElapsedMilliseconds < intervalTimeRandom )
392+ {
393+ if ( expositionBW . CancellationPending )
394+ {
395+ intervalCancelled = true ;
396+ break ;
397+ }
398+ /* just wait for interval time to be finished */
399+ }
400+ }
380401 intervalShouldBe = intervalTimeRandom ;
381402 intervalStopWatch . Stop ( ) ;
382403 int elapsedTime = ( int ) intervalStopWatch . ElapsedMilliseconds ;
@@ -615,13 +636,20 @@ private void expositionBW_DoWork(object sender, DoWorkEventArgs e)
615636 expositionAccumulative = accumulativeStopWatch . ElapsedMilliseconds ;
616637 hitStopWatch = new Stopwatch ( ) ;
617638 hitStopWatch . Start ( ) ;
618-
639+ between = false ;
619640 // Sending mark to neuronspectrum to sinalize that exposition of stimulus started
620641 SendKeys . SendWait ( executingTest . Mark . ToString ( ) ) ;
621642 executingTest . ExpositionTime = DateTime . Now ;
643+ try
644+ {
645+ showStimulus ( ) ;
646+ }
647+ catch ( Exception )
648+ {
649+
650+ }
651+
622652
623- showStimulus ( ) ;
624-
625653 if ( intervalCancelled )
626654 {
627655 e . Cancel = true ;
@@ -646,6 +674,34 @@ private void expositionBW_DoWork(object sender, DoWorkEventArgs e)
646674 /* just wait for exposition time to be finished */
647675 }
648676 }
677+ between = true ;
678+ if ( Player . SoundLocation != null )
679+ {
680+ Player . Stop ( ) ;
681+ Player = new SoundPlayer ( ) ;
682+ }
683+ // cleaning screen
684+ if ( ActiveForm != null )
685+ {
686+ this . CreateGraphics ( ) . Clear ( ActiveForm . BackColor ) ;
687+
688+ }
689+ betweenAttemptsStopWatch = new Stopwatch ( ) ;
690+ betweenAttemptsStopWatch . Start ( ) ;
691+
692+ while ( betweenAttemptsStopWatch . ElapsedMilliseconds < executingTest . ProgramInUse . IntervalBetweenAttempts )
693+ {
694+ if ( expositionBW . CancellationPending )
695+ {
696+ betweenAttemptsStopWatch . Stop ( ) ;
697+ e . Cancel = true ;
698+ break ;
699+ }
700+ else
701+ {
702+ /* just wait for between expositions time to be finished */
703+ }
704+ }
649705 }
650706
651707 if ( Player . SoundLocation != null )
@@ -683,32 +739,41 @@ private void expositionBW_RunWorkerCompleted(object sender, RunWorkerCompletedEv
683739 intervalBW . ReportProgress ( 50 , currentControl ) ;
684740 }
685741 }
686- ExpositionController . makingFixPoint ( executingTest . ProgramInUse . FixPoint , executingTest . ProgramInUse . FixPointColor , this ) ;
687742 }
688743 else
689744 {
690745 /*do nothing*/
691746 }
692747
748+ if ( ( e . Cancelled ) == true && between )
749+ {
750+ /* user clicked after stimulus disappeared */
751+ between = false ;
752+ executingTest . writeLineOutput ( intervalElapsedTime , intervalShouldBe , betweenAttemptsStopWatch . ElapsedMilliseconds ,
753+ currentExposition + 1 , expositionAccumulative , currentLists , currentStimuli , currentPositionOutput , currentBeep , currentColor ,
754+ ReactionProgram . responseTimeType [ ReactionProgram . AFTER_EXPOSITION ] ) ;
755+ }
693756 if ( ( e . Cancelled == true ) && ! intervalCancelled )
694757 {
695758 /* user clicked after stimulus is shown*/
696759 executingTest . writeLineOutput ( intervalElapsedTime , intervalShouldBe , hitStopWatch . ElapsedMilliseconds ,
697- currentExposition + 1 , expositionAccumulative , currentLists , currentStimuli , currentPositionOutput , currentBeep , currentColor ) ;
760+ currentExposition + 1 , expositionAccumulative , currentLists , currentStimuli , currentPositionOutput , currentBeep , currentColor ,
761+ ReactionProgram . responseTimeType [ ReactionProgram . DURING_EXPOSITION ] ) ;
698762 }
699-
700763 else if ( ( e . Cancelled == true ) && intervalCancelled )
701764 {
702765 /* user clicked before stimulus is shown*/
703766 executingTest . writeLineOutput ( intervalElapsedTime , intervalShouldBe , intervalElapsedTime - intervalShouldBe ,
704- currentExposition + 1 , expositionAccumulative , currentLists , currentStimuli , currentPositionOutput , currentBeep , currentColor ) ;
767+ currentExposition + 1 , expositionAccumulative , currentLists , currentStimuli , currentPositionOutput , currentBeep , currentColor ,
768+ ReactionProgram . responseTimeType [ ReactionProgram . ANTECIPATION ] ) ;
705769 }
706770 else
707771 {
708772 /* user missed stimulus */
709773 executingTest . CurrentResponse = "NA" ;
710774 executingTest . writeLineOutput ( intervalElapsedTime , intervalShouldBe , 0 , currentExposition + 1 , expositionAccumulative , currentLists , currentStimuli ,
711- currentPositionOutput , currentBeep , currentColor ) ;
775+ currentPositionOutput , currentBeep , currentColor ,
776+ ReactionProgram . responseTimeType [ ReactionProgram . NO_RESPONSE ] ) ;
712777 hitStopWatch . Stop ( ) ;
713778 }
714779 expositionBW . Dispose ( ) ;
@@ -721,8 +786,6 @@ private void intervalBW_DoWork(object sender, DoWorkEventArgs e)
721786
722787 for ( int counter = 0 ; counter < executingTest . ProgramInUse . NumExpositions && ! cancelExposition ; counter ++ )
723788 {
724- ExpositionController . makingFixPoint ( executingTest . ProgramInUse . FixPoint , executingTest . ProgramInUse . FixPointColor ,
725- this ) ;
726789 currentExposition = counter ;
727790 //preparing execution
728791 expositionBackground ( ) ;
0 commit comments