Changeset 324


Ignore:
Timestamp:
12/05/11 22:17:00 (6 months ago)
Author:
sc
Message:
  • Release 0.7.1
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed
  • tags/release-0.7.1/Puzzlebox/Brainstorms/Client.py

    r322 r324  
    44# Puzzlebox - Brainstorms - Network - Client 
    55# 
    6 # Copyright Puzzlebox Productions, LLC (2010) 
     6# Copyright Puzzlebox Productions, LLC (2010-2011) 
    77# 
    88# This code is released under the GNU Pulic License (GPL) version 2 
  • tags/release-0.7.1/Puzzlebox/Brainstorms/Interface.py

    r322 r324  
    3636        import serial 
    3737else: 
    38         DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images' 
    3938        import bluetooth 
    40         os.chdir('/usr/share/puzzlebox_brainstorms') 
     39        if os.path.exists('/usr/share/puzzlebox_brainstorms'): 
     40                os.chdir('/usr/share/puzzlebox_brainstorms') 
     41        if os.path.exists('/usr/share/puzzlebox_brainstorms'): 
     42                DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images' 
     43        else: 
     44                DEFAULT_IMAGE_PATH = os.path.join( os.getcwd(), 'images') 
    4145 
    4246##try: 
  • tags/release-0.7.1/Puzzlebox/Brainstorms/Server.py

    r322 r324  
    4747#from PyQt4 import QtCore, QtNetwork 
    4848 
    49 import NXT_Control as nxt_control 
    50 import iRobot_Control as irobot_control 
    51 import RC_Car_Control as rc_car_control 
     49 
     50try: 
     51        import NXT_Control as nxt_control 
     52except: 
     53        pass 
     54 
     55try: 
     56        import iRobot_Control as irobot_control 
     57except: 
     58        pass 
     59 
     60try: 
     61        import RC_Car_Control as rc_car_control 
     62except: 
     63        pass 
     64 
    5265#import puzzlebox_logger 
    5366 
  • tags/release-0.7.1/setup.cfg

    r276 r324  
    55use_bzip2 = 1 
    66# icon = puzzlebox.ico 
     7#           PyQt4 
    78requires = python 
    8            PyQt4 
     9           python-pyside 
    910           python-simplejson 
    1011           pybluez 
  • tags/release-0.7.1/setup.py

    r309 r324  
    33# Puzzlebox - Brainstorms - Distutils 
    44# 
    5 # Copyright Puzzlebox Productions, LLC (2010) 
     5# Copyright Puzzlebox Productions, LLC (2010-2011) 
    66# 
    77# This code is released under the GNU Pulic License (GPL) version 2 
    88# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    99# 
    10 # Last Update: 2011.06.20 
     10# Last Update: 2011.12.05 
    1111# 
    1212##################################################################### 
     
    175175setup( 
    176176        name='puzzlebox_brainstorms', 
    177         version='0.7.0', 
     177        version='0.7.1', 
    178178        description='Puzzlebox Brainstorms provides Brain-Computer Interface (BCI) controls for robots and devices', 
    179179        author='Steve Castellotti', 
  • trunk/Puzzlebox/Brainstorms/Client.py

    r322 r324  
    44# Puzzlebox - Brainstorms - Network - Client 
    55# 
    6 # Copyright Puzzlebox Productions, LLC (2010) 
     6# Copyright Puzzlebox Productions, LLC (2010-2011) 
    77# 
    88# This code is released under the GNU Pulic License (GPL) version 2 
  • trunk/Puzzlebox/Brainstorms/Interface.py

    r322 r324  
    3636        import serial 
    3737else: 
    38         DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images' 
    3938        import bluetooth 
    40         os.chdir('/usr/share/puzzlebox_brainstorms') 
     39        if os.path.exists('/usr/share/puzzlebox_brainstorms'): 
     40                os.chdir('/usr/share/puzzlebox_brainstorms') 
     41        if os.path.exists('/usr/share/puzzlebox_brainstorms'): 
     42                DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_brainstorms/images' 
     43        else: 
     44                DEFAULT_IMAGE_PATH = os.path.join( os.getcwd(), 'images') 
    4145 
    4246##try: 
  • trunk/Puzzlebox/Brainstorms/Server.py

    r322 r324  
    4747#from PyQt4 import QtCore, QtNetwork 
    4848 
    49 import NXT_Control as nxt_control 
    50 import iRobot_Control as irobot_control 
    51 import RC_Car_Control as rc_car_control 
     49 
     50try: 
     51        import NXT_Control as nxt_control 
     52except: 
     53        pass 
     54 
     55try: 
     56        import iRobot_Control as irobot_control 
     57except: 
     58        pass 
     59 
     60try: 
     61        import RC_Car_Control as rc_car_control 
     62except: 
     63        pass 
     64 
    5265#import puzzlebox_logger 
    5366 
  • trunk/setup.cfg

    r276 r324  
    55use_bzip2 = 1 
    66# icon = puzzlebox.ico 
     7#           PyQt4 
    78requires = python 
    8            PyQt4 
     9           python-pyside 
    910           python-simplejson 
    1011           pybluez 
  • trunk/setup.py

    r309 r324  
    33# Puzzlebox - Brainstorms - Distutils 
    44# 
    5 # Copyright Puzzlebox Productions, LLC (2010) 
     5# Copyright Puzzlebox Productions, LLC (2010-2011) 
    66# 
    77# This code is released under the GNU Pulic License (GPL) version 2 
    88# For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    99# 
    10 # Last Update: 2011.06.20 
     10# Last Update: 2011.12.05 
    1111# 
    1212##################################################################### 
     
    175175setup( 
    176176        name='puzzlebox_brainstorms', 
    177         version='0.7.0', 
     177        version='0.7.1', 
    178178        description='Puzzlebox Brainstorms provides Brain-Computer Interface (BCI) controls for robots and devices', 
    179179        author='Steve Castellotti', 
Note: See TracChangeset for help on using the changeset viewer.