Skip to content

Commit a34bd94

Browse files
pkubanekpkubanek
committed
moved to use rts2.rtsapi
1 parent 15d8366 commit a34bd94

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎rts2-unity-indicator

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sys
44
import gtk
55
import appindicator
66

7-
import rts2.json
7+
import rts2.rtsapi
88

99
PING_FREQUENCY = 10 # seconds
1010

‎rts2-unity-indicator-gi

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import sys
44
from gi.repository import Notify, Gtk, GLib
55
from gi.repository import AppIndicator3 as AppIndicator
6-
import rts2.json
6+
import rts2.rtsapi
77
#from espeak import espeak
88
#espeak.set_parameter(rate, 120, False)
99
#espeak.Gender='f'
1010

1111
alarm='/root/meteostation/aaa.mp3'
1212
server='http://lsstccd:8889'
13-
jsonProxy = rts2.json.JSONProxy(server, 'petr', 'test')
13+
jsonProxy = rts2.rtsapi.JSONProxy(server, 'petr', 'test')
1414

1515
PING_FREQUENCY = 10 # milliseconds
1616

‎widgets/queue.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import xml.dom.minidom
2020
import importcatalog
2121
import threading
22-
import rts2.json
22+
import rts2.rtsapi
2323
import rts2.queue
2424
import uiwindow
2525

@@ -733,7 +733,7 @@ def __init__(self,master,qname,load=True):
733733

734734
# assign read-only flag
735735
try:
736-
self.readonly = not(master.jsonProxy.getVariable('SEL',self.qname + '_queing')[0] & rts2.json.RTS2_VALUE_WRITABLE)
736+
self.readonly = not(master.jsonProxy.getVariable('SEL',self.qname + '_queing')[0] & rts2.rtsapi.RTS2_VALUE_WRITABLE)
737737
self.q = QueueTable(master,qname,self.readonly)
738738
except Exception,ex:
739739
msgbox = gtk.MessageDialog(type=gtk.MESSAGE_ERROR, buttons=gtk.BUTTONS_OK, message_format=_('Cannot create queue: {0}'.format(str(ex))))

‎widgets/queues.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import time
1414
import nights
1515
import rts2
16-
import rts2.json
16+
import rts2.rtsapi
1717
import uiwindow
1818
import xml.dom.minidom
1919

@@ -53,7 +53,7 @@ def __init__(self, master, qname, table, row, index=None, label=None, dont_disab
5353
self.cl = gtk.Label()
5454
self.table.attach(self.cl, 1, 2, row, row+1, gtk.FILL, gtk.FILL, xpadding=10)
5555

56-
readonly = not(self.master.jsonProxy.getVariable('SEL',self.qname + '_queing')[0] & rts2.json.RTS2_VALUE_WRITABLE)
56+
readonly = not(self.master.jsonProxy.getVariable('SEL',self.qname + '_queing')[0] & rts2.rtsapi.RTS2_VALUE_WRITABLE)
5757

5858
qe = None
5959
if readonly:

‎widgets/script.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def device_changed(self,b):
151151
m = gtk.ListStore(str)
152152
d = login.getProxy().getDevice(self.device.get_active_text())
153153
for n in d.keys():
154-
if (d[n][0] & rts2.json.RTS2_VALUE_WRITABLE) and n != 'filter':
154+
if (d[n][0] & rts2.rtsapi.RTS2_VALUE_WRITABLE) and n != 'filter':
155155
m.append([n])
156156
self.name.set_model(m)
157157
self.name.set_active(0)
@@ -160,22 +160,22 @@ def name_changed(self,b):
160160
d = self.device.get_active_text()
161161
n = self.name.get_active_text()
162162
self.vf = login.getProxy().getVariable(d,n)[0]
163-
self.vb = rts2.json.RTS2_VALUE_BASETYPE & self.vf
163+
self.vb = rts2.rtsapi.RTS2_VALUE_BASETYPE & self.vf
164164
if self.operands:
165165
self.opbox.remove(self.operands)
166166

167-
if self.vb == rts2.json.RTS2_VALUE_SELECTION:
167+
if self.vb == rts2.rtsapi.RTS2_VALUE_SELECTION:
168168
self.operands = login.getProxy().getSelectionComboEntry(d,n)
169169
self.operands.set_active(login.getProxy().getValue(d,n))
170-
elif self.vb == rts2.json.RTS2_VALUE_INTEGER or self.vb == rts2.json.RTS2_VALUE_LONGINT:
170+
elif self.vb == rts2.rtsapi.RTS2_VALUE_INTEGER or self.vb == rts2.rtsapi.RTS2_VALUE_LONGINT:
171171
self.operands = gtk.SpinButton(gtk.Adjustment(0,-sys.maxint - 1,sys.maxint,1,10))
172172
self.operands.set_width_chars(6)
173173
self.operands.set_value(int(login.getProxy().getValue(d,n)))
174-
elif self.vb == rts2.json.RTS2_VALUE_DOUBLE or self.vb == rts2.json.RTS2_VALUE_FLOAT:
174+
elif self.vb == rts2.rtsapi.RTS2_VALUE_DOUBLE or self.vb == rts2.rtsapi.RTS2_VALUE_FLOAT:
175175
self.operands = gtk.SpinButton(gtk.Adjustment(0,-sys.maxint - 1,sys.maxint,1,10),digits=3)
176176
self.operands.set_width_chars(6)
177177
self.operands.set_value(float(login.getProxy().getValue(d,n)))
178-
elif self.vb == rts2.json.RTS2_VALUE_BOOL:
178+
elif self.vb == rts2.rtsapi.RTS2_VALUE_BOOL:
179179
self.operands = gtk.HBox()
180180
self.rb_true = gtk.RadioButton(None,'On')
181181
self.rb_false = gtk.RadioButton(self.rb_true,'Off')
@@ -190,7 +190,7 @@ def name_changed(self,b):
190190
self.operands.set_width_chars(6)
191191
self.operands.set_text(str(login.getProxy().getValue(d,n)))
192192

193-
if self.vb == rts2.json.RTS2_VALUE_STRING:
193+
if self.vb == rts2.rtsapi.RTS2_VALUE_STRING:
194194
if self.op:
195195
self.opbox.remove(self.op)
196196
self.opbox.pack_start(gtk.Label('='),False,False)
@@ -208,13 +208,13 @@ def name_changed(self,b):
208208

209209
def get_script(self):
210210
operands = None
211-
if self.vb == rts2.json.RTS2_VALUE_SELECTION:
211+
if self.vb == rts2.rtsapi.RTS2_VALUE_SELECTION:
212212
operands = self.operands.child.get_text()
213-
elif self.vb == rts2.json.RTS2_VALUE_INTEGER or self.vb == rts2.json.RTS2_VALUE_LONGINT:
213+
elif self.vb == rts2.rtsapi.RTS2_VALUE_INTEGER or self.vb == rts2.rtsapi.RTS2_VALUE_LONGINT:
214214
operands = int(self.operands.get_value())
215-
elif self.vb == rts2.json.RTS2_VALUE_DOUBLE or self.vb == rts2.json.RTS2_VALUE_FLOAT:
215+
elif self.vb == rts2.rtsapi.RTS2_VALUE_DOUBLE or self.vb == rts2.rtsapi.RTS2_VALUE_FLOAT:
216216
operands = self.operands.get_value()
217-
elif self.vb == rts2.json.RTS2_VALUE_BOOL:
217+
elif self.vb == rts2.rtsapi.RTS2_VALUE_BOOL:
218218
if self.rb_true.get_active():
219219
operands = '1'
220220
else:
@@ -223,7 +223,7 @@ def get_script(self):
223223
operands = self.operands.get_text()
224224

225225
op = '='
226-
if not(self.vb == rts2.json.RTS2_VALUE_STRING):
226+
if not(self.vb == rts2.rtsapi.RTS2_VALUE_STRING):
227227
op = ['+=','=','-='][self.op.get_active()]
228228

229229
if self.device.get_active_text() == self.camera:
@@ -235,27 +235,27 @@ def load_json(self,je):
235235
self.name.set_active(find_combo_string(self.name,je['name']))
236236
self.name_changed(self.name)
237237

238-
if self.vb == rts2.json.RTS2_VALUE_SELECTION:
238+
if self.vb == rts2.rtsapi.RTS2_VALUE_SELECTION:
239239
try:
240240
self.operands.set_active(int(je['operands']))
241241
except ValueError,er:
242242
try:
243243
self.operands.set_active(find_combo_string(self.operands,je['operands']))
244244
except KeyError,ke:
245245
self.operands.child.set_text(je['operands'])
246-
elif self.vb == rts2.json.RTS2_VALUE_INTEGER or self.vb == rts2.json.RTS2_VALUE_LONGINT:
246+
elif self.vb == rts2.rtsapi.RTS2_VALUE_INTEGER or self.vb == rts2.rtsapi.RTS2_VALUE_LONGINT:
247247
self.operands.set_value(int(je['operands']))
248-
elif self.vb == rts2.json.RTS2_VALUE_DOUBLE or self.vb == rts2.json.RTS2_VALUE_FLOAT:
248+
elif self.vb == rts2.rtsapi.RTS2_VALUE_DOUBLE or self.vb == rts2.rtsapi.RTS2_VALUE_FLOAT:
249249
self.operands.set_value(float(je['operands']))
250-
elif self.vb == rts2.json.RTS2_VALUE_BOOL:
250+
elif self.vb == rts2.rtsapi.RTS2_VALUE_BOOL:
251251
if je['operands'] in ['1','true','on','ON']:
252252
self.rb_true.set_active(True)
253253
else:
254254
self.rb_false.set_active(True)
255255
else:
256256
self.operands.set_text(je['operands'])
257257

258-
if not (self.vb == rts2.json.RTS2_VALUE_STRING):
258+
if not (self.vb == rts2.rtsapi.RTS2_VALUE_STRING):
259259
if je['cmd'] == '-':
260260
self.op.set_active(0)
261261
elif je['cmd'] == '=':

‎widgets/testplot.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import signal
1414
import threading
1515
import math
16-
import rts2.json
16+
import rts2.rtsapi
1717

1818
from optparse import OptionParser
1919

@@ -31,7 +31,7 @@
3131
print >>sys.stderr, 'You must specify at least one variable to monitor'
3232
sys.exit(1)
3333

34-
j = rts2.json.JSONProxy(options.server, options.user, options.password, verbose = options.verbose)
34+
j = rts2.rtsapi.JSONProxy(options.server, options.user, options.password, verbose = options.verbose)
3535

3636
gobject.threads_init()
3737

0 commit comments

Comments
 (0)