Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
svarog2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Redmine
Redmine
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Brain
svarog2
Commits
7c6bd94a
Commit
7c6bd94a
authored
Sep 09, 2019
by
Marian Dovgialo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#44939 Fixing svarog to work with signal and video saving in obci
parent
caf635ed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
12 deletions
+3
-12
ExperimentDescriptor.java
...l/app/model/document/opensignal/ExperimentDescriptor.java
+0
-8
ChooseFilesForMonitorRecordingPanel.java
...document/monitor/ChooseFilesForMonitorRecordingPanel.java
+1
-1
ChooseVideoForMonitorRecordingPanel.java
...document/monitor/ChooseVideoForMonitorRecordingPanel.java
+2
-1
ConnectToExperimentWorker.java
...ignalml/app/worker/monitor/ConnectToExperimentWorker.java
+0
-2
No files found.
svarog/src/main/java/org/signalml/app/model/document/opensignal/ExperimentDescriptor.java
View file @
7c6bd94a
...
...
@@ -39,7 +39,6 @@
private
String
peerId
;
private
String
recommendedScenario
;
private
boolean
hasVideoSaver
;
/**
* This value holds information whether Svarog has connected to this experiment or not.
...
...
@@ -207,13 +206,6 @@ public void setRecommendedScenario(String recommendedScenario) {
this
.
recommendedScenario
=
recommendedScenario
;
}
public
boolean
getHasVideoSaver
()
{
return
hasVideoSaver
;
}
public
void
setHasVideoSaver
(
boolean
hasVideoSaver
)
{
this
.
hasVideoSaver
=
hasVideoSaver
;
}
@Override
public
String
toString
()
{
return
getName
();
...
...
svarog/src/main/java/org/signalml/app/view/document/monitor/ChooseFilesForMonitorRecordingPanel.java
View file @
7c6bd94a
...
...
@@ -186,7 +186,7 @@ public void fillPanelFromModel(Object model) {
MonitorRecordingDescriptor
monitorRecordingDescriptor
=
experimentDescriptor
.
getMonitorRecordingDescriptor
();
getEnableTagRecordingPanel
().
setRecordingEnabled
(
monitorRecordingDescriptor
.
isTagsRecordingEnabled
());
getEnableVideoRecordingPanel
().
setRecordingEnabled
(
monitorRecordingDescriptor
.
isVideoRecordingEnabled
());
getEnableVideoRecordingPanel
().
setEnabled
(
experimentDescriptor
.
getHasVideoSaver
());
getEnableVideoRecordingPanel
().
setEnabled
(
ObciServerCapabilities
.
getSharedInstance
().
hasVideoSaving
());
getSelectSignalRecordingFilePanel
().
setFileName
(
monitorRecordingDescriptor
.
getSignalRecordingFilePath
());
getSelectVideoRecordingFilePanel
().
setFileName
(
monitorRecordingDescriptor
.
getVideoRecordingFilePath
());
}
...
...
svarog/src/main/java/org/signalml/app/view/document/monitor/ChooseVideoForMonitorRecordingPanel.java
View file @
7c6bd94a
...
...
@@ -27,6 +27,7 @@
import
org.signalml.app.video.components.VideoStreamSelectionCompactPanel
;
import
org.signalml.app.video.components.VideoStreamSelectionListener
;
import
org.signalml.app.worker.monitor.GetAvailableVideoWorker
;
import
org.signalml.app.worker.monitor.ObciServerCapabilities
;
import
org.signalml.app.worker.monitor.exceptions.OpenbciCommunicationException
;
/**
...
...
@@ -149,7 +150,7 @@ public void fillModelFromPanel(Object model) {
public
void
fillPanelFromModel
(
Object
model
)
{
ExperimentDescriptor
experimentDescriptor
=
(
ExperimentDescriptor
)
model
;
MonitorRecordingDescriptor
monitorRecordingDescriptor
=
experimentDescriptor
.
getMonitorRecordingDescriptor
();
setEnabled
(
experimentDescriptor
.
getHasVideoSaver
()
&&
monitorRecordingDescriptor
.
isVideoRecordingEnabled
());
setEnabled
(
ObciServerCapabilities
.
getSharedInstance
().
hasVideoSaving
()
&&
monitorRecordingDescriptor
.
isVideoRecordingEnabled
());
previewCheckBox
.
setSelected
(
monitorRecordingDescriptor
.
getDisplayVideoPreviewWhileSaving
());
}
...
...
svarog/src/main/java/org/signalml/app/worker/monitor/ConnectToExperimentWorker.java
View file @
7c6bd94a
...
...
@@ -137,8 +137,6 @@ protected void sendJoinExperimentRequest() throws OpenbciCommunicationException
StringTokenizer
tokenizer
=
new
StringTokenizer
(
mxAddr
,
":"
);
multiplexerAddress
=
tokenizer
.
nextToken
();
multiplexerPort
=
Integer
.
parseInt
(
tokenizer
.
nextToken
());
boolean
hasVideoSaver
=
response
.
getParams
().
containsKey
(
"has_video_saver"
)
&&
(
Boolean
)
response
.
getParams
().
get
(
"has_video_saver"
);
experimentDescriptor
.
setHasVideoSaver
(
hasVideoSaver
);
}
protected
void
connectToMultiplexer
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment