Changeset 1b1f11f in orbit


Ignore:
Timestamp:
02/24/14 03:13:27 (8 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master
Children:
e85c5b0
Parents:
5420592 (diff), 362bcc6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ssh://puzzlebox.info/repo/orbit

Location:
python
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • python/Puzzlebox/Orbit/Configuration.py

    rcb467b5 r362bcc6  
    168168EEG_PRESERVE_RAW_DATA = False 
    169169 
    170 EMULATE_THINKGEAR_FOR_EMOTIV = True 
     170#EMULATE_THINKGEAR_FOR_EMOTIV = True 
     171EMULATE_THINKGEAR_FOR_EMOTIV = False 
    171172 
    172173 
  • python/Puzzlebox/Orbit/Plugin_Orbit.py

    rcb467b5 r362bcc6  
    371371                                print "ERROR [Plugin:Orbit] Exception:", 
    372372                                print e 
     373 
     374                # EEG 
     375                self.parent.plugin_eeg.checkBoxControlEmulateThinkGear.setVisible(False) 
    373376                 
    374377                # Help 
  • python/PuzzleboxOrbit-install.nsi

    r5420592 r1b1f11f  
    4747 File dist\orbit-gui.exe 
    4848 File dist\phonon4.dll 
    49 # File dist\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
     49 File dist\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
    5050 File dist\pyside-python2.7.dll 
    5151 File dist\PySide.QtCore.pyd 
     
    13841384 Delete $INSTDIR\orbit-gui.exe 
    13851385 Delete $INSTDIR\phonon4.dll 
    1386 # Delete $INSTDIR\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
     1386 Delete $INSTDIR\Puzzlebox.Synapse.Emotiv.Protocol.pyd 
    13871387 Delete $INSTDIR\pyside-python2.7.dll 
    13881388 Delete $INSTDIR\PySide.QtCore.pyd 
  • python/orbit-gui.py

    rd8ce4a3 r362bcc6  
    44# Puzzlebox - Orbit - Interface - GUI 
    55# 
    6 # Copyright Puzzlebox Productions, LLC (2011-2013) 
     6# Copyright Puzzlebox Productions, LLC (2013-2014) 
    77 
    88__changelog__ = """\ 
    9 Last Update: 2013.05.05 
     9Last Update: 2014.02.23 
    1010""" 
    1111 
     
    2929        pass 
    3030 
    31 import Puzzlebox.Jigsaw.Configuration as configuration 
     31import Puzzlebox.Orbit.Configuration as configuration 
    3232 
    3333if configuration.ENABLE_PYSIDE: 
  • python/scripts/build-orbit-exe.bat

    rcb467b5 r362bcc6  
    55 
    66rem ***Output to Console for Debugging 
    7 rem \Python27\Scripts\cxfreeze jigsaw-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico 
    8 rem \Python27\Scripts\cxfreeze orbit-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico 
    97rem \Python27\Scripts\cxfreeze orbit-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork,serial.win32,matplotlib.backends.backend_tkagg --icon=images\puzzlebox.ico 
    108 
    119rem ***GUI Mode only for Distribution 
    12 rem \Python27\Scripts\cxfreeze jigsaw-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico 
    13 rem \Python27\Scripts\cxfreeze orbit-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork,serial.win32,matplotlib --icon=images\puzzlebox.ico 
    1410\Python27\Scripts\cxfreeze orbit-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork,serial.win32,matplotlib.backends.backend_tkagg --icon=images\puzzlebox.ico 
    15  
    16  
    17 rem PyInstaller 
    18 rem \Python27\python.exe \Development\pyinstaller-1.5.1\Makespec.py --onefile --windowed --icon=images\puzzlebox.ico --name=PuzzleboxJigsaw jigsaw-gui.py 
    19  
    20 rem \Python27\python.exe \Development\pyinstaller-1.5.1\Build.py PuzzleboxJigsaw.spec 
  • python/setup-orbit.py2app.py

    rd8ce4a3 r5420592  
    7575        'excludes': ['PyQt4'], \ 
    7676         
    77 # Disabled for PySide    
    7877        'frameworks': [ \ 
    7978                "/opt/local/share/qt4/plugins/imageformats/libqjpeg.dylib", \ 
     
    8685         
    8786        "resources": [ \ 
    88                 "puzzlebox_jigsaw_configuration.ini", \ 
     87                "puzzlebox_orbit_configuration.ini", \ 
    8988                #"images/puzzlebox.ico", \ 
    9089                #"/opt/local/lib/Resources/qt_menu.nib/classes.nib", \ 
     
    9796         
    9897        name='Puzzlebox Orbit', 
    99         version='1.4.2', 
     98        version='1.4.4', 
    10099        description='An integrated bio and neurofeedback marketing solution for web design, content, and software evaluation', 
    101100        author='Steve Castellotti', 
    102101        author_email='sc@puzzlebox.info', 
    103         url='http://orbit.puzzlebox.info', 
     102        url='http://puzzlebox.info', 
    104103         
    105104        classifiers=[ \ 
Note: See TracChangeset for help on using the changeset viewer.