trigger

diff --git a/psychlops/extension/devices/psychlops_devices_nidaqmx.cpp b/psychlops/extension/devices/psychlops_devices_nidaqmx.cpp
index 412788b..7c84f10 100644 (file)
--- a/psychlops/extension/devices/psychlops_devices_nidaqmx.cpp
+++ b/psychlops/extension/devices/psychlops_devices_nidaqmx.cpp
@@ -44,6 +44,7 @@ namespace Devices {
        AnalogOutput_NIDAQmx::AnalogOutput_NIDAQmx(const char* devname) : api(0) {}
        AnalogOutput_NIDAQmx::~AnalogOutput_NIDAQmx() {}
        void AnalogOutput_NIDAQmx::put(double val) {}
+       void AnalogOutput_NIDAQmx::trigger() {}
        void AnalogOutput_NIDAQmx::pulse(double val) {}
        void AnalogOutput_NIDAQmx::keep(double val) {}
        void AnalogOutput_NIDAQmx::setVoltage(double val, const char* devname) {}
@@ -322,6 +323,9 @@ namespace Devices {
        void AnalogOutput_NIDAQmx::put(double val) {
                api->putOneShot(denormalize(val));
        }
+       void AnalogOutput_NIDAQmx::trigger() {
+               api->putOneShot(denormalize(5.0));
+       }
        void AnalogOutput_NIDAQmx::pulse(double val) {
                api->putOneShot(denormalize(val));
        }
@@ -372,6 +376,9 @@ namespace Devices {
        void NIDAQmx::put(double val) {
                if(aout!=0) aout->putOneShot(val);
        }
+       void NIDAQmx::trigger() {
+               if(aout!=0) aout->putOneShot(5.0);
+       }
        void NIDAQmx::pulse(double val) {
                if(aout!=0) aout->putOneShot(val);
        }

diff --git a/psychlops/extension/devices/psychlops_devices_nidaqmx.h b/psychlops/extension/devices/psychlops_devices_nidaqmx.h
index a7eba92..2f90c1d 100644 (file)
--- a/psychlops/extension/devices/psychlops_devices_nidaqmx.h
+++ b/psychlops/extension/devices/psychlops_devices_nidaqmx.h
@@ -36,13 +36,14 @@ namespace Devices {
                virtual bool isAnalog();
 
                virtual double get();
-               virtual int NIDAQmx::get(double* buf, int length, double timeout_second);
+               virtual int get(double* buf, int length, double timeout_second);
                virtual void put(double);
+               virtual void trigger();
                virtual void pulse(double);
                virtual void keep(double);
        };
 
-       class AnalogInput_NIDAQmx : public ITrigger, public AnalogInput {
+       class AnalogInput_NIDAQmx : public AnalogInput {
                protected:
                NIDAQmxAPI *api;
 
@@ -75,6 +76,7 @@ namespace Devices {
                virtual ~AnalogOutput_NIDAQmx();
                virtual void put(double);
                static void setVoltage(double val, const char* devname = "Dev1/ao0");
+               virtual void trigger();
                virtual void pulse(double);
                virtual void keep(double);
 

diff --git a/psychlops/extension/devices/psychlops_devices_nidaqmxbase.cpp b/psychlops/extension/devices/psychlops_devices_nidaqmxbase.cpp
index e71061b..4bece7c 100644 (file)
--- a/psychlops/extension/devices/psychlops_devices_nidaqmxbase.cpp
+++ b/psychlops/extension/devices/psychlops_devices_nidaqmxbase.cpp
@@ -48,7 +48,7 @@ namespace Devices {
        void AnalogInput_NIDAQmxBase::pulse(double v) { ; }
        void AnalogInput_NIDAQmxBase::keep(double v) { ; }
 
-    
+
        AnalogOutput_NIDAQmxBase::AnalogOutput_NIDAQmxBase(const char* devname) : api(0) { ; }
        AnalogOutput_NIDAQmxBase::~AnalogOutput_NIDAQmxBase() { ; }
        void AnalogOutput_NIDAQmxBase::put(double val) { ; }
@@ -236,13 +236,16 @@ namespace Devices {
                AnalogOutput_NIDAQmxBase mx(devname);
                mx.put(val);
        }
+       void AnalogOutput_NIDAQmxBase::trigger() {
+               api->putOneShot(denormalize(5.0));
+       }
        void AnalogOutput_NIDAQmxBase::pulse(double val) {
                api->putOneShot(denormalize(val));
        }
        void AnalogOutput_NIDAQmxBase::keep(double val) {
                api->putOneShot(denormalize(val));
        }
-       
+
 
        double AnalogOutput_NIDAQmxBase::getLatency() { return 0; }
        double AnalogOutput_NIDAQmxBase::getJitterSD() { return 0; }

diff --git a/psychlops/extension/devices/psychlops_devices_nidaqmxbase.h b/psychlops/extension/devices/psychlops_devices_nidaqmxbase.h
index 1955859..cdb182d 100644 (file)
--- a/psychlops/extension/devices/psychlops_devices_nidaqmxbase.h
+++ b/psychlops/extension/devices/psychlops_devices_nidaqmxbase.h
@@ -20,7 +20,7 @@ namespace Devices {
 
        struct NIDAQmxBaseAPI;
 
-       class AnalogInput_NIDAQmxBase : public ITrigger, public AnalogInput {
+       class AnalogInput_NIDAQmxBase : public AnalogInput {
                protected:
                NIDAQmxBaseAPI *api;
 
@@ -53,6 +53,7 @@ namespace Devices {
                virtual ~AnalogOutput_NIDAQmxBase();
                virtual void put(double);
                static void setVoltage(double val, const char* devname = "Dev1/ao0");
+               virtual void trigger();
                virtual void pulse(double);
                virtual void keep(double);
 

diff --git a/win32gl/dev/psychlopswin32.cbp b/win32gl/dev/psychlopswin32.cbp
index b89599d..90ac7b7 100644 (file)
--- a/win32gl/dev/psychlopswin32.cbp
+++ b/win32gl/dev/psychlopswin32.cbp
@@ -48,6 +48,7 @@
                                        <Add option="-Os" />
                                        <Add option="-O3" />
                                        <Add option="-DPSYCHLOPS_PLATFORM_WIN32GL" />
+                                       <Add option="-D___EXTENSIONS___" />
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
@@ -74,6 +75,7 @@
                                        <Add option="-Os" />
                                        <Add option="-O3" />
                                        <Add option="-DPSYCHLOPS_PLATFORM_WIN32GL" />
+                                       <Add option="-D___EXTENSIONS___" />
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
@@ -103,6 +105,7 @@
                                        <Add option="/GR" />
                                        <Add option="/Ox" />
                                        <Add option="/DPSYCHLOPS_PLATFORM_WIN32GL" />
+                                       <Add option="/D___EXTENSIONS___" />
                                </Compiler>
                                <Linker>
                                        <Add library="OpenGL32" />
@@ -131,6 +134,7 @@
                                        <Add option="/GR" />
                                        <Add option="/Ox" />
                                        <Add option="/DPSYCHLOPS_PLATFORM_WIN32GL" />
+                                       <Add option="/D___EXTENSIONS___" />
                                </Compiler>
                                <Linker>
                                        <Add library="OpenGL32" />
@@ -211,6 +215,7 @@
                                        <Add option="-Os" />
                                        <Add option="-O3" />
                                        <Add option="-DPSYCHLOPS_PLATFORM_WIN32GL" />
+                                       <Add option="-D___EXTENSIONS___" />
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
@@ -239,6 +244,7 @@
                                        <Add option="/GR" />
                                        <Add option="/Ox" />
                                        <Add option="/DPSYCHLOPS_PLATFORM_WIN32GL" />
+                                       <Add option="/D___EXTENSIONS___" />
                                </Compiler>
                                <Linker>
                                        <Add library="OpenGL32" />
@@ -255,6 +261,7 @@
                        <Add alias="All" targets="BCC5.51;VC9;MinGW;" />
                </VirtualTargets>
                <Compiler>
+                       <Add option="___EXTENSIONS___" />
                        <Add directory="C:/Library/frameworks/opencv/build/include" />
                        <Add directory="C:/Library/frameworks/Psychlops.framework/cv/include" />
                </Compiler>

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2
index 6d4cccd..70636b5 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2
@@ -1,14 +1,14 @@
 [Project]\r
 ProjectName=Psychlops Framework Win32\r
 CreateFileName=PsychlopsFramework_Win32_%VER_MAJOR%.%VER_MINOR%.%VER_RELEASE%\r
-CreateFolder=D:\Users\hskwk\Documents\Develop\Psychlops\cpp\trunk\win32gl\package\trunk\@EasyInstaller\PsychlopsInstaller\r
+CreateFolder=D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\@EasyInstaller\PsychlopsInstaller\r
 UseUniqueKey=0\r
 InstallerModuleName=EI_MODERN\r
 InstallerModuleLanguage=1041\r
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/01/30 17:59:54\r
+UpdateDateTime=2015/03/19 0:12:27\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r