Commit c317a0b1 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

more cleanup

parent dfade60d

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ test: 
	@$(PYTHON) --version

	@PYTHONPATH=.  $(PYTHON) -m nose --verbosity=1 --exe ./test



check:

	@PYTHONPATH=. pylint --rcfile=.pylint.rc pysen

pylint:

	@PYTHONPATH=. pylint --rcfile=.pylint.rc pysen scripts





clean: clean-ui clean-docs

misc/image.py

+8 −5
Original line number Diff line number Diff line 
#!/usr/bin/env python



import Image, ImageFont, ImageDraw

from PIL import Image, ImageFont, ImageDraw

import ftplib



class StatusImage(object):
@@ -8,8 +8,11 @@ class StatusImage(object): 
    WIDTH, HEIGHT = 320, 240

    HEAD_POSITION = (30, 10)



    FONT_HEAD = ImageFont.truetype("LiberationSans-Bold.ttf", 20)

    FONT_TEXT = ImageFont.truetype("LiberationSans-Bold.ttf", 80)

    font = ImageFont.load("arial.pil")

    #FONT_HEAD = ImageFont.truetype("LiberationSans-Bold.ttf", 20)

    #FONT_TEXT = ImageFont.truetype("LiberationSans-Bold.ttf", 80)

    FONT_HEAD = ImageFont.truetype('/Library/Fonts/Arial.ttf', 20)

    FONT_TEXT = ImageFont.truetype('/Library/Fonts/Arial.ttf', 80)

    COLORS    = { 0: dict(txt_col='white' , bgr_col='green'),

                  1: dict(txt_col='yellow', bgr_col='red')   }
@@ -62,6 +65,6 @@ if __name__ == "__main__": 


    status = StatusImage()

    getattr(status, command)()

    passwd = getpass('PASS: ')

    status.upload('bl15sign.ornl.gov', 'status_upload', passwd)

    #passwd = getpass('PASS: ')

    #status.upload('bl15sign.ornl.gov', 'status_upload', passwd)

    status.save('out.gif')

pysen/hardware/device.py

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ NAK = b'\x15' # negative acknowledgement 
ESC = b'\x1B'  # escape





#class TimeoutError(RuntimeError):

#    "timeout error"

#    pass

class TimeoutError(RuntimeError):

    "timeout error"

    pass

class CommError(RuntimeError):

    "communication error"

    pass

scripts/convert2hdf.py

+1 −3
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ 


""" a script to convert .echo files to .hfd5 format

"""

import os.path

import argparse

import logging

from collections import OrderedDict



from pysen    import version

from pysen.io import echo_to_hdf, magnetic_to_hdf

scripts/filemon.py

+8 −6
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ Application main entry point/runner. 
"""

__version__ = "0.2"



import sys

import argparse
@@ -18,16 +17,19 @@ from pysen.ui.FileMonMainWindow import MainWindow 




def main():

    usage   = "%prog [options] filename1 filename2 ..." #% argv0

    version = "%%prog %s" % __version__



    parser = argparse.ArgumentParser(description='sns-nse status file monitor')

    """main filemon app"""

    usage   = "%(prog)s [options] filename1 filename2 ..." #% argv0



    parser = argparse.ArgumentParser(description='sns-nse status file monitor',

                                     usage=usage)

    parser.set_defaults(interval = 1500)

    parser.add_argument('filename', metavar='file', nargs='+',

                        help='file(s) to process')

    parser.add_argument("-i", "--interval", dest="interval",

                        type=int, help="check interval in ms , default (%(default)s)")

    parser.add_argument('--version', action='version',

                        version='%(prog)s {version}'.format(version=__version__))





    args = parser.parse_args()

    app = QApplication([])