Merge branch 'master' into master-unstable
# Conflicts: # gui/src/aaregui/panels/reference_tools_panel.py
This commit is contained in:
@@ -212,8 +212,6 @@ class ReferenceToolsPanel(QFrame):
|
||||
return self.table_model.get_item(idx.row())
|
||||
|
||||
def _on_unmount_clicked(self):
|
||||
# item = self._selected_item()
|
||||
# if item is not None:
|
||||
self.unmount.emit()
|
||||
|
||||
def _context_menu(self, position):
|
||||
|
||||
@@ -69,7 +69,7 @@ class JFJochDBusClient(QObject):
|
||||
path = name
|
||||
else:
|
||||
path = "/sls/mx/data/" + name + "_master.h5"
|
||||
print(f"Load dataset: {name} image: {number}")
|
||||
print(f"Load dataset: {path} image: {number}")
|
||||
if self._ensure_interface():
|
||||
reply = self.__interface.call("LoadFile", "http://sls-gpu-001:8080", number, 1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user