parallel

[psychlops/cpp.git] / psychlops / extension / devices / psychlops_devices_util.h

diff --git a/psychlops/extension/devices/psychlops_devices_util.h b/psychlops/extension/devices/psychlops_devices_util.h
index 6af96d1..3ffccb5 100644 (file)
--- a/psychlops/extension/devices/psychlops_devices_util.h
+++ b/psychlops/extension/devices/psychlops_devices_util.h
@@ -1,20 +1,20 @@
-/*
- *  psychlops_devices_nidaqmxbase.h
- *  Psychlops Standard Library (Universal)
- *
- *  Last Modified 2009/07/30 by Kenchi HOSOKAWA
- *  (C) 2009 Kenchi HOSOKAWA, Kazushi MARUYA, Takao SATO
- */
-
-#ifndef HEADER_PSYCHLOPS_DEVICES_UTIL
-#define HEADER_PSYCHLOPS_DEVICES_UTIL
-
-#include "../../core/devices/psychlops_io_analog.h"
-#include "../../core/devices/psychlops_io_clock.h"
-
-namespace Psychlops {
-
-namespace Devices {
+/*\r
+ *  psychlops_devices_nidaqmxbase.h\r
+ *  Psychlops Standard Library (Universal)\r
+ *\r
+ *  Last Modified 2009/07/30 by Kenchi HOSOKAWA\r
+ *  (C) 2009 Kenchi HOSOKAWA, Kazushi MARUYA, Takao SATO\r
+ */\r
+\r
+#ifndef HEADER_PSYCHLOPS_DEVICES_UTIL\r
+#define HEADER_PSYCHLOPS_DEVICES_UTIL\r
+\r
+#include "../../core/devices/psychlops_io_analog.h"\r
+#include "../../core/devices/psychlops_io_clock.h"\r
+\r
+namespace Psychlops {\r
+\r
+namespace Devices {\r
 \r
 \r
        class DisplayFlash : public ITrigger, public Rectangle\r
@@ -31,44 +31,44 @@ namespace Devices {
                virtual void put(double);\r
        };\r
 \r
-
-       class OscillationSimulator : public AnalogInput {
-               public:
-               double frequency, amplitude, internal_phase;
-               double (*waveform)(double);
-
-               OscillationSimulator();
-               OscillationSimulator(double freq, double amp = 1, double phase = 0);
-               double get();
-       };
-
-
-       class ClockOscillator : public AnalogInput {
-               Clock clock;
-               public:
-               double frequency, amplitude, internal_phase;
-               double (*waveform)(double);
-
-               ClockOscillator();
-               ClockOscillator(double freq, double amp = 1, double phase = 0);
-               double get();
-       };
-
-
-       class MouseX : public AnalogInput {
-               double factor;
-               public:
-               MouseX();
-               MouseX(const double factor);
-               virtual ~MouseX();
-               virtual double get();
-//             virtual double normalize(double);
-       };
-
-}
-
-}      /*      <- namespace Psycholops         */
-
-
-
-#endif
+\r
+       class OscillationSimulator : public AnalogInput {\r
+               public:\r
+               double frequency, amplitude, internal_phase;\r
+               double (*waveform)(double);\r
+\r
+               OscillationSimulator();\r
+               OscillationSimulator(double freq, double amp = 1, double phase = 0);\r
+               double get();\r
+       };\r
+\r
+\r
+       class ClockOscillator : public AnalogInput {\r
+               Clock clock;\r
+               public:\r
+               double frequency, amplitude, internal_phase;\r
+               double (*waveform)(double);\r
+\r
+               ClockOscillator();\r
+               ClockOscillator(double freq, double amp = 1, double phase = 0);\r
+               double get();\r
+       };\r
+\r
+\r
+       class MouseX : public AnalogInput {\r
+               double factor;\r
+               public:\r
+               MouseX();\r
+               MouseX(const double factor);\r
+               virtual ~MouseX();\r
+               virtual double get();\r
+//             virtual double normalize(double);\r
+       };\r
+\r
+}\r
+\r
+}      /*      <- namespace Psycholops         */\r
+\r
+\r
+\r
+#endif\r