Skip to content

Commit 8833c2a

Browse files
author
Greg Denton
authored
switching service dialog update to use service wrapper and allowing cuesubmit to use the set service. (#189)
1 parent d0bc79c commit 8833c2a

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

cuegui/cuegui/ServiceDialog.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,16 @@ def save(self):
136136
QtWidgets.QMessageBox.critical(self, "Error", "The service name must alphanumeric.")
137137
return
138138

139-
data = opencue.api.service_pb2.Service()
140-
data.name = str(self.name.text())
141-
data.threadable = self.threadable.isChecked()
142-
data.min_cores = self.min_cores.value()
143-
data.max_cores = self.max_cores.value()
144-
data.min_memory = self.min_memory.value() * 1024
145-
data.min_gpu = self.min_gpu.value() * 1024
146-
147-
data.tags.extend(self._tags_w.get_tags())
139+
data = opencue.wrappers.service.Service()
140+
data.data.id = self.__service.id
141+
data.setName(str(self.name.text()))
142+
data.setThreadable(self.threadable.isChecked())
143+
data.setMinCores(self.min_cores.value())
144+
data.setMaxCores(self.max_cores.value())
145+
data.setMinMemory(self.min_memory.value() * 1024)
146+
data.setMinGpu(self.min_gpu.value() * 1024)
147+
data.setTags(self._tags_w.get_tags())
148+
148149
self.saved.emit(data)
149150

150151

@@ -221,7 +222,7 @@ def saved(self, data):
221222
else:
222223
opencue.api.createService(data)
223224
else:
224-
self.__selected.update(data)
225+
data.update()
225226

226227
self.refresh()
227228
self.__new_service = False

cuesubmit/cuesubmit/Submission.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ def buildLayer(layerData, command):
5757
"""
5858
layer = Shell(layerData.name, command=command.split(), chunk=layerData.chunk,
5959
threads=float(layerData.cores), range=str(layerData.layerRange))
60+
if layerData.services:
61+
layer.set_service(layerData.services[0])
6062
if layerData.dependType and layerData.dependsOn:
6163
if layerData.dependType == 'Layer':
6264
layer.depend_all(layerData.dependsOn)

0 commit comments

Comments
 (0)