Changeset 1451


Ignore:
Timestamp:
Jan 16, 2014 6:35:51 PM (9 years ago)
Author:
jemian
Message:

handle color of alarm severity for INVALID

Location:
bcdaqwidgets/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • bcdaqwidgets/trunk/CHANGES

    r1395 r1451  
    77
    88
    9 Version 0.1 (not released)
     9Version 0.1.1 (not officially released)
    1010---------------------------------
    1111
    12 * -tba-
     12* handle color of alarm severity for CALC_INVALID
     13
     14
     15Version 0.1 (not officially released)
     16---------------------------------
     17
     18* initial trial

  • bcdaqwidgets/trunk/src/bcdaqwidgets/__init__.py

    r1443 r1451  
    2525
    2626__yyyymmdd__      = str(datetime.datetime.now()).split()[0]
    27 __version__       = u"0.1"
     27__version__       = u"0.1.1"
    2828__minor_version__ = u""
    2929__svnid__         = u"$Id$"

  • bcdaqwidgets/trunk/src/bcdaqwidgets/bcdaqwidgets.py

    r1425 r1451  
    7070}
    7171
    72 SeverityColor = typesafe_enum('NO_ALARM', 'MINOR', 'MAJOR',)
     72SeverityColor = typesafe_enum('NO_ALARM', 'MINOR', 'MAJOR', 'CALC_INVALID')
    7373SeverityColor.NO_ALARM =     "green"        # green
    7474SeverityColor.MINOR =        "#ff0000"      # dark orange since yellow looks bad against gray
    7575SeverityColor.MAJOR =        "red"          # red
     76SeverityColor.CALC_INVALID = "pink"         # pink
    7677
    7778
    … …  
    153154
    154155        self.useAlarmState = useAlarmState
    155         self.severity_color_list = [SeverityColor.NO_ALARM, SeverityColor.MINOR, SeverityColor.MAJOR]
     156        self.severity_color_list = [SeverityColor.NO_ALARM, SeverityColor.MINOR, SeverityColor.MAJOR, SeverityColor.CALC_INVALID]
    156157
    157158        # for internal use persisting the various styleSheet settings
    … …  
    226227            self.pv.get_ctrlvars()
    227228            if self.pv.severity is not None:
     229                if self.pv.severity < 0 or self.pv.severity >= len(self.severity_color_list):
     230                    print self.pv.severity
     231                    print self.severity_color_list
     232                    pass
    228233                color = self.severity_color_list[self.pv.severity]
    229234                self.updateStyleSheet({'color': color})

  • bcdaqwidgets/trunk/src/bcdaqwidgets/pvview.py

    r1447 r1451  
    77from PySide.QtGui import QWidget, QLabel, QGridLayout, QApplication
    88
    9 #sys.path.insert(0, os.path.abspath('..'))
     9sys.path.insert(0, os.path.abspath('..'))
    1010import bcdaqwidgets
    1111
    … …  
    6060
    6161if __name__ == '__main__':
     62    txt = '${P}cr:{pwm11,ai{0,1,2}:mean,{rate,period},cmd}{.DESC,}'
     63    pvs = []
     64    _p = ['ino:cr:' + _ for _ in ('ai0', 'ai1', 'ai2')]
     65    for _ in _p:
     66        pvs.append(_)
     67        pvs.append(_ + ':mean')
     68    pvs.insert(0, 'ino:cr:pwm11')
     69    for _ in ('rate', 'period', 'cmd'):
     70        pvs.append('ino:cr:' + _)
     71    for _ in pvs:
     72        sys.argv.append(_)
     73        sys.argv.append(_ + '.DESC')
    6274    main()
    6375
Note: See TracChangeset for help on using the changeset viewer.