Skip to content

Commit

Permalink
Merge pull request slaclab#1 from lisazacarias/master
Browse files Browse the repository at this point in the history
First stab at formatting
  • Loading branch information
lisazacarias authored Jun 20, 2020
2 parents b60d44b + acc37f6 commit 414c0b2
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 1 deletion.
15 changes: 15 additions & 0 deletions lisa/devPanelLisa.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from pydm import Display
from PyQt5 import QtGui

class DevPanel(Display):

def __init__(self, parent=None, args=None):
super(DevPanel, self).__init__(parent=parent, args=args)

def ui_filename(self):
return 'devPanel.ui'

def updatePower(self):
button = self.ui.devPanelLisa

intelclass = DevPanel
57 changes: 57 additions & 0 deletions lisa/devPanelLisa.ui
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>480</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="PyDMShellCommand" name="PyDMShellCommand_2">
<property name="toolTip">
<string/>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="PyDMShellCommand" name="rtbsa">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>RTBSA</string>
</property>
<property name="commands" stdset="0">
<stringlist>
<string>python ~/zacarias/rtbsa/rtbsa.py</string>
</stringlist>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="PyDMShellCommand" name="PyDMShellCommand_3">
<property name="toolTip">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>PyDMShellCommand</class>
<extends>QPushButton</extends>
<header>pydm.widgets.shell_command</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
2 changes: 1 addition & 1 deletion devPanel.ui → opsDevPanel.ui
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</property>
<property name="filenames" stdset="0">
<stringlist>
<string>devPanelLisa.ui</string>
<string>lisa/devPanelLisa.ui</string>
</stringlist>
</property>
</widget>
Expand Down

0 comments on commit 414c0b2

Please sign in to comment.