Commit 07f3a55b authored by Marian Dovgialo's avatar Marian Dovgialo

#45812 removed all mentions of signal backuping - svarog doesn't handle file saving anymore

parent 232d2a93
......@@ -83,5 +83,4 @@
<rs:calibrationParam>0.1</rs:calibrationParam>
<rs:calibrationParam>0.1</rs:calibrationParam>
</rs:calibrationOffset>
<rs:isBackup>0</rs:isBackup>
</rs:rawSignal>
......@@ -95,8 +95,6 @@
private int reconstructionHeight;
private float backupFrequency;
private String openbciIPAddress;
private int openbciPort;
private String sentryDsn;
......@@ -146,14 +144,6 @@ public void setFavouriteDirs(String[] dirs) {
this.favouriteDirs = dirs;
}
public float getBackupFrequency() {
return backupFrequency;
}
public void setBackupFrequency(float backupFrequency) {
this.backupFrequency = backupFrequency;
}
public String[] getLastDirs() {
return lastDirs;
}
......
......@@ -133,8 +133,6 @@ public static void setApplicationConfigurationDefaults(ApplicationConfiguration
config.setMapAspectRatioDown(getInt("application.mapAspectRatioDown"));
config.setReconstructionHeight(getInt("application.reconstructionHeight"));
config.setBackupFrequency(getFloat("application.signalRecording.frequency"));
config.setMonitorPageSize(getFloat("monitor.pageSize"));
config.setOpenbciIPAddress(getString("monitor.openbciIPAddress"));
config.setOpenbciPort(getInt("monitor.openbciPort"));
......
......@@ -821,8 +821,6 @@ private SignalDocument openMonitorDocument(final OpenDocumentDescriptor descript
ExperimentDescriptor monitorOptions = (ExperimentDescriptor) descriptor.getOpenSignalDescriptor();
monitorOptions.setBackupFrequency(getApplicationConfig().getBackupFrequency());
MonitorSignalDocument monitorSignalDocument = new MonitorSignalDocument(monitorOptions);
monitorSignalDocument.setMontage(descriptor.getOpenSignalDescriptor().getMontage());
monitorSignalDocument.openDocument();
......
......@@ -29,7 +29,6 @@
private int multiplexerPort;
private Peer peer;
private Float backupFrequency;
private MonitorRecordingDescriptor monitorRecordingDescriptor = new MonitorRecordingDescriptor();
@XStreamOmitField
......@@ -56,8 +55,6 @@ public ExperimentDescriptor(ExperimentDescriptor other) {
this.experimentRepUrls = other.experimentRepUrls;
this.signalParameters = new SignalParameters(other.signalParameters);
this.backupFrequency = other.backupFrequency;
this.eegSystemName = other.eegSystemName;
this.tagStylesName = other.tagStylesName;
......@@ -65,7 +62,6 @@ public ExperimentDescriptor(ExperimentDescriptor other) {
}
public ExperimentDescriptor() {
setBackupFrequency(10.0F);
signalParameters = new SignalParameters();
}
......@@ -141,14 +137,6 @@ public void setMultiplexerPort(int multiplexerPort) {
this.multiplexerPort = multiplexerPort;
}
public Float getBackupFrequency() {
return backupFrequency;
}
public void setBackupFrequency(Float backupFrequency) {
this.backupFrequency = backupFrequency;
}
public Peer getPeer() {
return peer;
}
......
......@@ -33,8 +33,6 @@
/**
* The frequency text field.
*/
private FloatSpinner backupFrequencySpinner;
private JTextField openbciIpAddressTextField;
private IntegerSpinner openbciPortSpinner;
......@@ -51,39 +49,9 @@ public MonitorConfigPanel() {
*/
private void initialize() {
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
add(createSignalRecordingPanel());
add(createOpenbciAddressPanel());
}
protected JPanel createSignalRecordingPanel() {
JPanel signalRecordingPanel = new JPanel();
JLabel backupFrequencyLabel = new JLabel(_("Backup frequency [s]"));
signalRecordingPanel.setLayout(new GridBagLayout());
setTitledBorder(signalRecordingPanel, _("Signal recording"));
GridBagConstraints constraints = new GridBagConstraints();
constraints.anchor = GridBagConstraints.CENTER;
constraints.fill = GridBagConstraints.HORIZONTAL;
constraints.insets = new Insets(3, 3, 3, 3);
constraints.weighty = 0;
constraints.gridx = 0;
constraints.gridy = 0;
constraints.gridwidth = 1;
constraints.weightx = 0;
signalRecordingPanel.add(backupFrequencyLabel, constraints);
constraints.gridx = 1;
constraints.gridy = 0;
constraints.gridwidth = 2;
constraints.weightx = 1;
signalRecordingPanel.add(getBackupFrequencySpinner(), constraints);
return signalRecordingPanel;
}
protected JPanel createOpenbciAddressPanel() {
JPanel openbciAddressPanel = new JPanel();
setTitledBorder(openbciAddressPanel, _("OpenBCI Address"));
......@@ -115,17 +83,6 @@ protected JPanel createOpenbciAddressPanel() {
return openbciAddressPanel;
}
/**
* Returns the frequency text field.
*
* @return the frequency text field
*/
protected FloatSpinner getBackupFrequencySpinner() {
if (backupFrequencySpinner == null) {
backupFrequencySpinner = new FloatSpinner(new SpinnerNumberModel(10.0, 0.1, 100000.0, 0.1));
}
return backupFrequencySpinner;
}
protected JTextField getOpenbciIpAddressTextField() {
if (openbciIpAddressTextField == null)
......@@ -150,7 +107,6 @@ protected IntegerSpinner getOpenbciPortSpinner() {
* the configuration of Svarog
*/
public void fillPanelFromModel(ApplicationConfiguration applicationConfig) {
getBackupFrequencySpinner().setValue(applicationConfig.getBackupFrequency());
getOpenbciIpAddressTextField().setText(applicationConfig.getOpenbciIPAddress());
getOpenbciPortSpinner().setValue(applicationConfig.getOpenbciPort());
}
......@@ -163,7 +119,6 @@ public void fillPanelFromModel(ApplicationConfiguration applicationConfig) {
* the configuration of Svarog
*/
public void fillModelFromPanel(ApplicationConfiguration applicationConfig) {
applicationConfig.setBackupFrequency(getBackupFrequencySpinner().getValue());
applicationConfig.setOpenbciIPAddress(getOpenbciIpAddressTextField().getText());
applicationConfig.setOpenbciPort(openbciPortSpinner.getValue());
}
......
......@@ -108,11 +108,6 @@
*/
private float videoFileOffset;
/**
* Whether the signal is a backup and was not saved as a result
* of a proper recording stop.
*/
private boolean isBackup;
/**
* Constructor. Creates an empty descriptor of a raw signal.
......@@ -154,21 +149,6 @@ public void setSourceFileName(String sourceFileName) {
this.sourceFileName = sourceFileName;
}
/**
* Whether the signal is a backup.
* @return true if signal is a backup
*/
public boolean isBackup() {
return isBackup;
}
/**
* Set backup info.
* @param isBackup backup info
*/
public void setIsBackup(boolean isBackup) {
this.isBackup = isBackup;
}
/**
* Returns the {@link SourceSignalType type} of a source signal
......
......@@ -236,12 +236,6 @@ public RawSignalDescriptor getDescriptor(Element rawSignalEl) throws SignalMLExc
descriptor.setFirstSampleTimestamp(Double.parseDouble(firstSampleTimestamp));
}
String backup = path.evaluate(RawSignalDocumentBuilder.IS_BACKUP, rawSignalEl);
if (backup != null && !backup.isEmpty() && backup.equals("1")) {
descriptor.setIsBackup(true);
} else {
descriptor.setIsBackup(false);
}
} catch (XPathExpressionException ex) {
throw new SignalMLException("error.invalidRawSignalXML", ex);
......
......@@ -250,10 +250,6 @@ public Document getDocument(RawSignalDescriptor descriptor) {
root.appendChild(element);
}
element = document.createElement(RawSignalDocumentBuilder.IS_BACKUP);
element.setTextContent(descriptor.isBackup() ? "1" : "0");
root.appendChild(element);
return document;
}
......
......@@ -62,7 +62,6 @@
public static final String FIRST_SAMPLE_TIMESTAMP = "rs:firstSampleTimestamp";
public static final String VIDEO_FILE_NAME = "rs:videoFileName";
public static final String VIDEO_FILE_OFFSET = "rs:videoFileOffset";
public static final String IS_BACKUP = "rs:isBackup";
static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
......
......@@ -748,7 +748,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -748,7 +748,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -418,7 +418,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -458,7 +458,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -418,7 +418,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -458,7 +458,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -418,7 +418,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -458,7 +458,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -198,7 +198,6 @@
</amplifier>
<status>NEW</status>
<multiplexerPort>0</multiplexerPort>
<backupFrequency>10.0</backupFrequency>
<monitorRecordingDescriptor>
<recordingEnabled>false</recordingEnabled>
<tagsRecordingEnabled>true</tagsRecordingEnabled>
......
......@@ -596,10 +596,6 @@ msgstr "B"
msgid "Back"
msgstr "Z powrotem"
#: org/signalml/app/view/preferences/MonitorConfigPanel.java:61
msgid "Backup frequency [s]"
msgstr "Częstość zapasowa [s]"
#: org/signalml/app/view/preferences/MonitorConfigPanel.java:189
msgid "Bad IP address value!"
msgstr "Zły adres IP!"
......
......@@ -235,15 +235,6 @@
</restriction>
</simpleType>
<simpleType name="isBackup">
<annotation>
<documentation>
Whether the signal is a backup
</documentation>
</annotation>
<restriction base="boolean" />
</simpleType>
<complexType name="rawSignalInfo">
<sequence minOccurs="1" maxOccurs="1">
<element name="exportFileName" type="rs:fileName"
......@@ -413,11 +404,6 @@
<documentation>The timestamp of the first sample in the signal.</documentation>
</annotation>
</element>
<element name="isBackup" type="rs:isBackup" maxOccurs="1" minOccurs="0">
<annotation>
<documentation>Whether this signal is a backup or a properly recorded file.</documentation>
</annotation>
</element>
</sequence>
</complexType>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment