DAQ/GUI: mount uses refernce tools if reference=True otherwise uses sample spreadsheet
This commit is contained in:
1 parent
e8c1040bec
commit
ae7b538072
3 files changed
+12
-4
No files matched your search
@@ -1258,6 +1258,10 @@ class AareDAQ:
|
||||
def sample_spreadsheet(self) -> SampleShortInfoList:
|
||||
return self.__cfg.spreadsheet
|
||||
|
||||
@property
|
||||
def reference_tools(self) -> SampleShortInfoList:
|
||||
return self.__cfg.reference_tools
|
||||
|
||||
def sample_spreadsheet_user(self, pgroup: str) -> SampleShortInfoList:
|
||||
sample = self.sample_spreadsheet
|
||||
sample.s = list(filter(lambda x: x.user == pgroup, sample.s))
|
||||
|
||||
@@ -197,10 +197,14 @@ async def sample(token: str = Depends(oauth2_scheme)) -> SampleShortInfo:
|
||||
|
||||
|
||||
@app.post("/sample/mount")
|
||||
async def mount(dbid: int, token: str = Depends(oauth2_scheme)):
|
||||
async def mount(dbid: int, token: str = Depends(oauth2_scheme), reference: bool = False):
|
||||
token_data = auth.parse_token(token)
|
||||
auth.check_jwt_rw(cfg, auth.parse_token(token))
|
||||
st = daq.sample_spreadsheet
|
||||
|
||||
if reference:
|
||||
st = daq.reference_tools
|
||||
else:
|
||||
st = daq.sample_spreadsheet
|
||||
|
||||
index = -1
|
||||
for i in range(len(st.s)):
|
||||
|
||||
@@ -384,8 +384,8 @@ class DAQWorker(QObject):
|
||||
self.generic_post("sample/unmount")
|
||||
|
||||
@Slot(SampleShortInfo)
|
||||
def mount(self, s: SampleShortInfo):
|
||||
self.generic_post(f"sample/mount?dbid={s.db_id}")
|
||||
def mount(self, s: SampleShortInfo, reference: bool = False):
|
||||
self.generic_post(f"sample/mount?dbid={s.db_id}&reference={reference}")
|
||||
|
||||
@Slot(SampleShortInfo)
|
||||
def sample_manual(self, s: SampleShortInfo):
|
||||
|
||||
Reference in new issue
Block a user