Skip to content

Commit

Permalink
File repair
Browse files Browse the repository at this point in the history
  • Loading branch information
@dev-jam
dev-jam committed Mar 16, 2015
1 parent c6f9765 commit 389b290
Showing 1 changed file with 0 additions and 210 deletions.
210 changes: 0 additions & 210 deletions parallel_port_trigger/parallel_port_trigger.py
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
<<<<<<< HEAD
#-*- coding:utf-8 -*-

"""
=======
"""
>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3
25-06-2013
This based on io_port of Per Sederberg
Author: Bob Rosbag
Author: Edwin Dalmaijer
<<<<<<< HEAD
=======

>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3
This file is part of OpenSesame.
OpenSesame is free software: you can redistribute it and/or modify
Expand All @@ -24,7 +16,6 @@
OpenSesame is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
<<<<<<< HEAD
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Expand All @@ -38,20 +29,6 @@
#from PyQt4 import QtGui, QtCore

from openexp.keyboard import keyboard
=======
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OpenSesame. If not, see <http://www.gnu.org/licenses/>.
"""

from libopensesame import item
from libqtopensesame import qtplugin
from openexp.keyboard import keyboard
from PyQt4 import QtGui, QtCore

>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3
import warnings
import os
import imp
Expand Down Expand Up @@ -84,7 +61,6 @@
_winpp = None
else:
_pp = None
<<<<<<< HEAD



Expand Down Expand Up @@ -119,42 +95,6 @@ def reset(self):
#self.experiment.cleanup_functions.append(self.clean_up_the_mess)

def clean_up_the_mess(self):
=======


class parallel_port_trigger(item.item):

"""
This class (the class with the same name as the module)
handles the basic functionality of the item. It does
not deal with GUI stuff.
"""

def __init__(self, name, experiment, string = None):

"""
Constructor
"""

# The item_typeshould match the name of the module
self.item_type = "parallel_port_trigger"

# Provide a short accurate description of the item's functionality
self.description = "Allows setting pins on the parallel port"

# Set some item-specific variables
self.value = 0
self.duration = 500
self.port = "0x378"

# The parent handles the rest of the contruction
item.item.__init__(self, name, experiment, string)

# add cleanup code
self.experiment.cleanup_functions.append(self.clean_up_the_mess)

def clean_up_the_mess(self):
>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3

if os.name == 'nt':
if "_winpp" in globals():
Expand All @@ -172,7 +112,6 @@ def clean_up_the_mess(self):
del _pp

def prepare(self):
<<<<<<< HEAD

"""The preparation phase of the plug-in goes here."""

Expand All @@ -183,33 +122,15 @@ def prepare(self):
# get the global pp instance and initialize it if
# necessary#-*- coding:utf-8 -*-

=======

"""
Prepare the item. In this case this means doing little.
"""

# Pass the word on to the parent
item.item.prepare(self)

# get the global pp instance and initialize it if
# necessary
>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3

if os.name == 'nt':
global _winpp
if _winpp is None:
try:
_winpp = windll.dlportio
<<<<<<< HEAD
print('Successfully accessed the parallel port on address: %s' % self.get("_port"))
except OSError:
print('Could not access the parallel port on address: %s' % self.get("_port"))
=======
print('Successfully accessed the parallel port on address: %s' % self.get("port"))
except OSError:
print('Could not access the parallel port on address: %s' % self.get("port"))
>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3
self.winpp = _winpp
else:
global _pp
Expand All @@ -227,7 +148,6 @@ def prepare(self):

# Report success
return True
<<<<<<< HEAD

def run(self):

Expand Down Expand Up @@ -255,44 +175,10 @@ def run(self):

else:
if not self.pp is None and self.get("_duration") !=0:
=======

def run(self):

"""
Run the item. In this case this means putting the offline canvas
to the display and waiting for the specified duration.
"""

# Set the pp value

if os.name == 'nt':
if not self.winpp is None:
self.set_item_onset(self.winpp.DlPortWritePortUchar(int(self.get("port"),0), self.get("value")))
print('Sending value %s for %s ms to the parallel port on address: %s' % (self.get("value"),self.get("duration"),self.get("port")))

else:
if not self.pp is None:
self.set_item_onset(self.pp.setData(self.get("value")))
print('Sending value %s for %s ms to the parallel port on address: %s' % (self.get("value"),self.get("duration"),self.get("port")))


# use keyboard as timeout, allowing for Escape presses to abort experiment
self.kb.get_key(timeout=self.get("duration"))

# unless duration was zero, turn it off
if os.name == 'nt':
if not self.winpp is None and self.get("duration") !=0:
self.winpp.DlPortWritePortUchar(int(self.get("port"),0), 0)

else:
if not self.pp is None and self.get("duration") !=0:
>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3
self.pp.setData(0)

# Report success
return True
<<<<<<< HEAD

class qtparallel_port_trigger(parallel_port_trigger, qtautoplugin):

Expand Down Expand Up @@ -339,99 +225,3 @@ def init_edit_widget(self):
# disabling the QLineEdit when the QCheckBox is uncheckhed.
# self.checkbox_widget.stateChanged.connect( \
# self.line_edit_widget.setEnabled)
=======

class qtparallel_port_trigger(parallel_port_trigger, qtplugin.qtplugin):

"""
This class (the class named qt[name of module] handles
the GUI part of the plugin. For more information about
GUI programming using PyQt4, see:
<http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/classes.html>
"""

def __init__(self, name, experiment, string = None):

"""
Constructor
"""

# Pass the word on to the parents
parallel_port_trigger.__init__(self, name, experiment, string)
qtplugin.qtplugin.__init__(self, __file__)

def init_edit_widget(self):

"""
This function creates the controls for the edit
widget.
"""

# Lock the widget until we're doing creating it
self.lock = True

# Pass the word on to the parent
qtplugin.qtplugin.init_edit_widget(self, False)

# Create the controls
#
# A number of convenience functions are available which
# automatically create controls, which are also automatically
# updated and applied. If you set the varname to None, the
# controls will be created, but not automatically updated
# and applied.
#
# qtplugin.add_combobox_control(varname, label, list_of_options)
# - creates a QComboBox
# qtplugin.add_line_edit_control(varname, label)
# - creates a QLineEdit
# qtplugin.add_spinbox_control(varname, label, min, max, suffix = suffix, prefix = prefix)

self.add_line_edit_control("value", "Value", tooltip = "Value to set port")
self.add_line_edit_control("duration", "Duration", tooltip = "Expecting a value in milliseconds")
self.add_line_edit_control("port", "Port Adress (Windows only)", tooltip = "Adress of the parallel port in Windows")


# Add a stretch to the edit_vbox, so that the controls do not
# stretch to the bottom of the window.
self.edit_vbox.addStretch()

# Unlock
self.lock = True

def apply_edit_changes(self):

"""
Set the variables based on the controls
"""

# Abort if the parent reports failure of if the controls are locked
if not qtplugin.qtplugin.apply_edit_changes(self, False) or self.lock:
return False

# Refresh the main window, so that changes become visible everywhere
self.experiment.main_window.refresh(self.name)

# Report success
return True

def edit_widget(self):

"""
Set the controls based on the variables
"""

# Lock the controls, otherwise a recursive loop might aris
# in which updating the controls causes the variables to be
# updated, which causes the controls to be updated, etc...
self.lock = True

# Let the parent handle everything
qtplugin.qtplugin.edit_widget(self)

# Unlock
self.lock = False

# Return the _edit_widget
return self._edit_widget
>>>>>>> d442713727922c1208e4de5fe3c74c462b73f0e3

0 comments on commit 389b290

Please sign in to comment.