Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tango-controls/VACCA
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: VACCA_4.5.6
Choose a base ref
...
head repository: tango-controls/VACCA
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Sep 26, 2017

  1. Copy the full SHA
    f1f0b37 View commit details

Commits on Oct 5, 2017

  1. Copy the full SHA
    225eee8 View commit details

Commits on Nov 17, 2017

  1. Copy the full SHA
    71b7580 View commit details
  2. Copy the full SHA
    387e692 View commit details

Commits on Nov 20, 2017

  1. Solve formatting issues

    sergirubio committed Nov 20, 2017
    Copy the full SHA
    556253d View commit details
  2. Copy the full SHA
    bae260f View commit details

Commits on Nov 27, 2017

  1. Copy the full SHA
    bb65ceb View commit details
  2. Copy the full SHA
    766c450 View commit details

Commits on Apr 2, 2019

  1. Copy the full SHA
    eb42163 View commit details
  2. catch chdir errors

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    6b6a012 View commit details
  3. adapt to taurus 4.5

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    3d5bf18 View commit details
  4. Copy the full SHA
    bc1cee3 View commit details
  5. Copy the full SHA
    eeafd85 View commit details
  6. add ctvc script'

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    d8e2623 View commit details
  7. add ctvc

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    cc2b4cc View commit details
  8. Copy the full SHA
    2edd04d View commit details
  9. update version

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    575e645 View commit details
  10. add .ui file

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    4333398 View commit details
  11. add .ui file

    sergirubio committed Apr 2, 2019
    Copy the full SHA
    b3cab7f View commit details

Commits on Nov 6, 2019

  1. init bug

    sergirubio committed Nov 6, 2019
    Copy the full SHA
    228d7d3 View commit details

Commits on May 20, 2020

  1. 4.7: debian packaging

    sergirubio committed May 20, 2020
    Copy the full SHA
    99c11b7 View commit details
  2. add gitlab-ci, vaccabar

    sergirubio committed May 20, 2020
    Copy the full SHA
    5d52292 View commit details

Commits on May 21, 2020

  1. fix setup

    sergirubio committed May 21, 2020
    Copy the full SHA
    cd3fdfb View commit details

Commits on Jun 7, 2021

  1. launchers updated

    sergirubio committed Jun 7, 2021
    Copy the full SHA
    53a7d2e View commit details

Commits on Jul 26, 2021

  1. 4.7.1

    sergirubio committed Jul 26, 2021
    Copy the full SHA
    9381b76 View commit details
  2. 4.7.2

    sergirubio committed Jul 26, 2021
    Copy the full SHA
    991cbf7 View commit details
  3. removed debian folder

    sergirubio committed Jul 26, 2021
    Copy the full SHA
    780a483 View commit details
  4. 4.7.3

    sergirubio committed Jul 26, 2021
    Copy the full SHA
    af9b588 View commit details

Commits on Jul 27, 2021

  1. 4.7.4 ci

    sergirubio committed Jul 27, 2021
    Copy the full SHA
    f971dd6 View commit details

Commits on Jul 29, 2021

  1. clean setup.py

    sergirubio committed Jul 29, 2021
    Copy the full SHA
    3be0282 View commit details
  2. 4.7.5

    sergirubio committed Jul 29, 2021
    Copy the full SHA
    fc6c217 View commit details
  3. removed

    sergirubio committed Jul 29, 2021
    Copy the full SHA
    c939066 View commit details
  4. 4.7.6

    sergirubio committed Jul 29, 2021
    Copy the full SHA
    c368686 View commit details

Commits on Jul 30, 2021

  1. buster ci

    sergirubio committed Jul 30, 2021
    Copy the full SHA
    67513b5 View commit details
  2. ci

    sergirubio committed Jul 30, 2021
    Copy the full SHA
    bc86b4c View commit details

Commits on Aug 10, 2021

  1. add ctvc/vacca launchers

    sergirubio committed Aug 10, 2021
    Copy the full SHA
    d470c40 View commit details
  2. 4.7.9, add ctvc launcher

    sergirubio committed Aug 10, 2021
    Copy the full SHA
    2c9d8a6 View commit details
  3. 4.7.10, add ctvc launcher

    sergirubio committed Aug 10, 2021
    Copy the full SHA
    bab4bbb View commit details
8 changes: 8 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# ---------------------------------------------------------
# Use this as the ".gitlab-ci.yml" in your project root dir
# to activate the ctpipeline
# ---------------------------------------------------------

include:
- https://git.cells.es/ctpkg/ci/ctpipeline/raw/master/ctjobdefs-ci.yml
- https://git.cells.es/ctpkg/ci/ctpipeline/raw/master/ctpipeline.yml
8 changes: 5 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -2,9 +2,11 @@

include AUTHORS
include LICENSE
include README
include README.rst
include bin/ctvc
include bin/vaccagui
include vacca/VERSION
include vacca/CHANGES
include vacca/legacy/ui/TaurusDevPanel.ui


recursive-include vacca *.ini *.jpg *.png *.PNG *.JPG *.qrc *.gif
recursive-include vacca *.ini *.jpg *.png *.PNG *.JPG *.qrc *.gif *.py *.ico
19 changes: 19 additions & 0 deletions PKG-INFO
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Metadata-Version: 1.1
Name: vacca
Version: 4.6.4
Summary: Viewer and Commander Control Application for Tango Control System.
Home-page: UNKNOWN
Author: Sergi Rubio
Author-email: srubio@cells.es
License: GPL-3.0
Description: UNKNOWN
Platform: Linux
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Other Environment
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)
Classifier: Operating System :: POSIX :: Linux
Classifier: Operating System :: Unix
Classifier: Programming Language :: Python
Classifier: Topic :: Scientific/Engineering
Classifier: Topic :: Software Development :: Libraries
46 changes: 46 additions & 0 deletions bin/ctvc
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash

# # VACuum Control Application for ALBA
# #
# # Usage:
# # vaccagui [CONFIG] ; tries to open config file with absolute path or relative to the vacca module.
# #
# # With no argument the file default.py or TANGO_HOST.py will be launched as config
# #
# # The VACCA_PATH environment variable should be used to set the path to vacca modules
# # To use vacca widgets in other GUI's, both vacca and vaccagui modules must be in PYTHONPATH
# #
# # NOTE: It's better to not modify this file to allow setup.py to work properly,
# # to write your custom launcher better copy it to vaccagui.sh and continue editing there.
# #
# # ----
# #
# # The configuration variables:
# #
# # * VACCA_PATH: folder of vacca module, to find data files relative to it.
# #
# # * VACCA_CONFIG: the configuration file to be loaded. If not defined then the default.py file will be used. When VACCA.VaccaConfigs is defined with multiple configs; then the first one will be used as default.
# #
# # * VACCA_DIR: local folder with custom images and synoptics to be loaded by the configuration files. If not defined, the folder of the VACCA_CONFIG will be used.
# #
# #
# #
# # S.Rubio-Manrique, srubio@cells.es, 2006-2015

#Source your own environment variables from here:
#source alba_blissrc

export QT_API=pyqt

if [ ! "$VACCA_PATH" ] ; then
#Getting current script folder
export VACCA_PATH=$(python -c "import imp;print(imp.find_module('vacca')[1])")
fi

echo "Launching $VACCA_PATH/main.py [$*]"

LAUNCHER=$VACCA_PATH/main.py
export QT_API=pyqt
python $LAUNCHER $*
#3>&1 2>&1 1>/dev/null

46 changes: 46 additions & 0 deletions bin/vacca
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash

# # VACuum Control Application for ALBA
# #
# # Usage:
# # vaccagui [CONFIG] ; tries to open config file with absolute path or relative to the vacca module.
# #
# # With no argument the file default.py or TANGO_HOST.py will be launched as config
# #
# # The VACCA_PATH environment variable should be used to set the path to vacca modules
# # To use vacca widgets in other GUI's, both vacca and vaccagui modules must be in PYTHONPATH
# #
# # NOTE: It's better to not modify this file to allow setup.py to work properly,
# # to write your custom launcher better copy it to vaccagui.sh and continue editing there.
# #
# # ----
# #
# # The configuration variables:
# #
# # * VACCA_PATH: folder of vacca module, to find data files relative to it.
# #
# # * VACCA_CONFIG: the configuration file to be loaded. If not defined then the default.py file will be used. When VACCA.VaccaConfigs is defined with multiple configs; then the first one will be used as default.
# #
# # * VACCA_DIR: local folder with custom images and synoptics to be loaded by the configuration files. If not defined, the folder of the VACCA_CONFIG will be used.
# #
# #
# #
# # S.Rubio-Manrique, srubio@cells.es, 2006-2015

#Source your own environment variables from here:
#source alba_blissrc

export QT_API=pyqt

if [ ! "$VACCA_PATH" ] ; then
#Getting current script folder
export VACCA_PATH=$(python -c "import imp;print(imp.find_module('vacca')[1])")
fi

echo "Launching $VACCA_PATH/main.py [$*]"

LAUNCHER=$VACCA_PATH/main.py
export QT_API=pyqt
python $LAUNCHER $*
#3>&1 2>&1 1>/dev/null

6 changes: 6 additions & 0 deletions bin/vaccabar
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

export QT_API=pyqt
DIR=$(fandango findModule vacca)
python $DIR/launcher.py &
echo "done"
4 changes: 3 additions & 1 deletion bin/vaccagui
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash


# # VACuum Control Application for ALBA
# #
# # Usage:
@@ -31,6 +30,8 @@
#Source your own environment variables from here:
#source alba_blissrc

export QT_API=pyqt

if [ ! "$VACCA_PATH" ] ; then
#Getting current script folder
export VACCA_PATH=$(python -c "import imp;print(imp.find_module('vacca')[1])")
@@ -39,6 +40,7 @@ fi
echo "Launching $VACCA_PATH/main.py [$*]"

LAUNCHER=$VACCA_PATH/main.py
export QT_API=pyqt
python $LAUNCHER $*
#3>&1 2>&1 1>/dev/null

5 changes: 4 additions & 1 deletion bin/vaccapanel
Original file line number Diff line number Diff line change
@@ -13,12 +13,15 @@
#Source your own environment variables from here:
#source alba_blissrc

export QT_API=pyqt

if [ ! "$VACCA_PATH" ] ; then
#Getting current script folder
export VACCA_PATH=$(python -c "import imp;print(imp.find_module('vacca')[1])")
fi

LAUNCHER=$VACCA_PATH/panel.py
python $LAUNCHER $*
#python $LAUNCHER --panel $* #vacca main fails with args
python $LAUNCHER $*
#3>&1 2>&1 1>/dev/null

186 changes: 186 additions & 0 deletions examples/elinac/elinac-full.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
#!/usr/bin/env python

#############################################################################
##
## This file is part of Taurus, a Tango User Interface Library
##
## http://www.tango-controls.org/static/taurus/latest/doc/html/index.html
##
## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
##
## Taurus is free software: you can redistribute it and/or modify
## it under the terms of the GNU Lesser General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## Taurus is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU Lesser General Public License for more details.
##
## You should have received a copy of the GNU Lesser General Public License
## along with Taurus. If not, see <http://www.gnu.org/licenses/>.
##
###########################################################################

"""
default.py.ini is a configuration file example of how to specify system-wide defaults for VaccaGUI
After copying it to default.py this configuration file determines the default, permanent, pre-defined
options for the GUI; modify them to match your default gui options.
Every CONFIG file loaded by vaccagui will override those options redefined on it;
use default.py for your common options and whatever.py for your in-place customization.
"""

import os,fandango,imp,vacca.utils
from fandango import matchCl,searchCl,replaceCl,CaselessDict,CaselessList,get_matching_devices,get_matching_attributes

print '>'*20+' Loading Default.py'

#ALL these variables can be re-defined in CONFIG FILE
GUI_NAME = 'VACCA'
WDIR = vacca.utils.WORKING_DIR #imp.find_module('vacca')[1]+'/'
URL_HELP = 'http://www.tango-controls.org/Members/srubio/vacca'
URL_LOGBOOK = 'http://logbook.cells.es/'
VACCA_LOGO = WDIR+'image/icons/nggshow.php.png'
ORGANIZATION_LOGO = WDIR+'image/icons/AlbaLogo.png'

###############################################################################
# Synoptic file

JDRAW_FILE = 'linac.jdw' #WDIR+'%s/%s.jdw'%(TARGET,TARGET)
#Enables/disables loading jdraw objects into tree
JDRAW_TREE = True
#A method that does transformation on signals sent to other widgets.
JDRAW_HOOK = None #lambda s: apply_transform(get_coordinates(s))
# Enable multiple selection of objects in Synoptic
#from taurus.qt.qtgui.graphic import TaurusGraphicsScene
#TaurusGraphicsScene.ANY_ATTRIBUTE_SELECTS_DEVICE = True

###############################################################################
# Setup of the tree

#Domain/Target used to generate grids/trees ; domain may be regexp, target should not
DOMAIN = 'elinac*'
TARGET = DOMAIN
USE_DEVICE_TREE = True

#Devices not in JDraw or regular expression to be added to the tree
EXTRA_DEVICES = fandango.get_matching_devices('elin*') #map(bool,set(['%s/VC/ALL'%TARGET,'%s/CT/ALARMS'%TARGET,DEVICE,COMPOSER]))

#Custom tree branches are built using nested dictionaries and regular expressions (if empty a jive-like tree is built).
CUSTOM_TREE = {}
# {'CT':'BL*(CT|ALARMS|PLC)$',
# 'FE':'FE*/VC/*',
# 'Valves': {'.OH':'*OH/PNV*',
# 'EH01':'*EH01/PNV*',},
# 'BAKEOUTS':'BL*(BAKE|BK)*',}

###############################################################################
# Device Panel setup

#PyStateComposer to get Vacuum Profile curves
COMPOSER = '' #'%s/vc/all'%DOMAIN

#Default device to appear in the DevicePanel
DEVICE = 'elin/beam/run' #sys/tg_test/1'
USE_DEVICE_PANEL = True
PANEL_COMMAND = 'taurusdevicepanel --config-file='+WDIR+'default.py'

#Examples of Attribute filters to be applied to DevicePanel
AttributeFilters = {'V-PEN': ['pressure','channelstatus','controller'],}
AttributeFilters['EPS']=[ #You can distribute attributes in different tabs using tuples
('Status',['_READY','OPEN_','CLOSE_']),
('Signals',['.*_PT.*','was_','paas_','*RGA*']),
]
CommandFilters = {'V-PEN': (('on',()),('off',()),('setMode',('START','PROTECT'))),} #Second argument of tuple is the list of default arguments
IconMap = {'v-pen':WDIR+'image/equips/icon-pen.gif'} #Will be used in both panel and tree

## Optional:
## If you put filters in a separate file you can load a taurusdevicepanel.py with --config-file=filters.py option
## Then replace previous lines by:
# from vacca.filters import *

###############################################################################
# Plot setup

#Pressure values to be added to the trend
GAUGES = [] #['bl13/vc/vgct-01/p1','bl13/vc/vgct-01/p2']
#sorted(fandango.get_matching_attributes('%s/*/vgct*/p[12]'%DOMAIN.replace('BL','(BL|FE|ID)')))

###############################################################################
# Grid setup

#Grid showing all pressures in rows/columns
GRID = {
'column_labels': '',
'delayed': False,
'frames': False,
'model': [],
#['%s/VC/(IPCT|VGCT|CCGX)*/(P[12]|Pressure|State)$'%DOMAIN,'%s/V-[^/]*/[0-9]*/(Pressure|State)'%DOMAIN],
'row_labels':'VcGauges(mbar):(VGCT|PEN), IonPumps(mbar):(IPCT|VARIP)',
}

#Extra widgets to appear in the NewPanel dialog
EXTRA_WIDGETS = [
('panic.gui.AlarmGUI',WDIR+'/vacca/image/icons/panic.gif'),
('PyTangoArchiving.widget.ArchivingBrowser.ArchivingBrowser',WDIR+'/vacca/image/icons/search.png'),
] #('vacca.VacuumProfile',WDIR+'image/ProfilePlot.jpg'),

from taurus.qt.qtgui.taurusgui.utils import PanelDescription
EXTRA_PANELS = {}
EXTRA_PANELS['PANIC'] = PanelDescription('PANIC','panic.gui.AlarmGUI',model='',
sharedDataWrite={'HighlightInstruments':'devicesSelected'})
try:
import MySQLdb
EXTRA_PANELS['Finder'] = PanelDescription('Finder','vacca.panel.VaccaFinder',model='')
except:
pass
TOOLBARS = [] #[(name,modulename.classname)]

#===============================================================================
# Define which External Applications are to be inserted.
# To define an external application, instantiate an ExternalApp object
# See TaurusMainWindow.addExternalAppLauncher for valid values of ExternalApp
#===============================================================================

from taurus.qt.qtgui.taurusgui.utils import PanelDescription, ExternalApp, ToolBarDescription, AppletDescription

xvacca = ExternalApp(cmdargs=['konqueror',URL_HELP], text="Alba VACuum Controls Application", icon=WDIR+'image/icons/cow-tux.png')
xtrend = ExternalApp(cmdargs=['taurustrend','-a'], text="TaurusTrend")
xjive = ExternalApp(cmdargs=['jive'], text="Jive")#, icon=WDIR+'image/icons/cow-tux.png')
xastor = ExternalApp(cmdargs=['astor'], text="Astor")#, icon=WDIR+'image/icons/cow-tux.png')
#logbook = ExternalApp(cmdargs=['konqueror %s'%URL_LOGBOOK], text="Logbook", icon=WDIR+"image/icons/elog.png")

#===============================================================================
# Define custom applets to be shown in the applets bar (the wide bar that
# contains the logos). To define an applet, instantiate an AppletDescription
# object (see documentation for the gblgui_utils module)
#===============================================================================

#Each Applet can be described with a dictionary like this:
# (name, classname=None, modulename=None, widgetname=None,
# sharedDataWrite=None, sharedDataRead=None, model=None, floating=True, **kwargs)
#For ExternalApp/VaccaActions use:
# {'$VarName':{'name':'$AppName','classname':'VaccaAction','model':['$Test','$/path/to/icon.png','$launcher']}}

EXTRA_APPS = {
#'xrga':{'name':'RGA','classname':'VaccaAction','model':['RGA',WDIR+'image/equips/icon-rga.gif']+['rdesktop -g 1440x880 ctrga01']}
}

try:
import panic
EXTRA_APPS['PANIC'] = {'name': 'PANIC',
'class': vacca.VaccaPanic}
except: pass

EXTRA_APPS['Finder'] = {'name': 'Finder',
'class': lambda:os.system('taurusfinder&'),
'icon': vacca.utils.wdir('image/icons/search.png')}

#from vacca.panel import VaccaAction

#xmambo = AppletDescription('Mambo',classname = 'vacca.panel.VaccaAction',model=["Archiving",WDIR+'image/icons/Mambo-icon.png','mambo'],)
#xalarms = AppletDescription('Alarms',classname='vacca.panel.VaccaAction',model=['Alarms',WDIR+'image/icons/panic.gif','panic'])
#xsnap = AppletDescription('xSnap',classname='vacca.panel.VaccaAction',model=['Snap',WDIR+'image/icons/Crystal_Clear_app_kedit.png','ctsnaps'])
Loading