Commit 2b7d1c30 authored by Marian Dovgialo's avatar Marian Dovgialo

#46055 fixes after CR

parent c7a616ee
......@@ -9,6 +9,7 @@
import java.awt.Color;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.border.EmptyBorder;
......@@ -26,7 +27,6 @@
public SignalPlotCorner(SignalPlot plot) {
super();
setBorder(new EmptyBorder(3,3,3,3));
setBackground(new Color(237,237,237));
this.plot = plot;
}
......
......@@ -22,7 +22,9 @@
import javax.swing.AbstractAction;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import org.signalml.app.model.components.ChannelPlotOptionsModel;
import org.signalml.app.util.IconUtils;
......@@ -237,7 +239,10 @@ protected void paintComponent(Graphics gOrig) {
Dimension size = getSize();
Rectangle clip = g.getClipBounds();
g.setColor(new Color(237,237,237));
JPanel color_source = new JPanel();
Color color = color_source.getBackground();
g.setColor(color);
g.fillRect(clip.x,clip.y,clip.width,clip.height);
size.width -= SignalPlot.SCALE_TO_SIGNAL_GAP;
......
......@@ -34,7 +34,6 @@
public static final int TRYOUT_COUNT = 20;
public static final int EXPERIMENT_START_TIMEOUT_MILIS = 10000;
private Container parentContainer;
private static Logger logger = Logger.getLogger(ConnectToExperimentWorker.class);
private ExperimentDescriptor experimentDescriptor;
......@@ -46,7 +45,6 @@
public ConnectToExperimentWorker(Container parentContainer, ExperimentDescriptor experimentDescriptor) {
super(parentContainer);
this.parentContainer = parentContainer;
this.experimentDescriptor = experimentDescriptor;
getBusyDialog().setText(_("Connecting to the experiment"));
getBusyDialog().setCancellable(false);
......@@ -178,7 +176,7 @@ protected void done() {
}
if (shouldDisconnect) {
DisconnectFromExperimentWorker worker = new DisconnectFromExperimentWorker(this.parentContainer, experimentDescriptor);
DisconnectFromExperimentWorker worker = new DisconnectFromExperimentWorker(null, experimentDescriptor);
worker.execute();
}
}
......
package org.signalml.app.worker.monitor.recording;
import static org.signalml.app.util.i18n.SvarogI18n._;
import java.text.SimpleDateFormat;
import java.util.Date;
......@@ -51,7 +52,7 @@ public void run() {
lastState = RecordingState.valueOf(status.status.toUpperCase());
} else if (response instanceof SavingSignalError) {
SavingSignalError error = (SavingSignalError) response;
logger.error("recording finished with error: " + error.details);
logger.error(_("recording finished with error: ") + error.details);
String error_text = "";
for (Object err_text: error.details.values())
{
......@@ -64,11 +65,11 @@ public void run() {
}
error_text += "\n";
}
error_text += "Signal preceeding this error message is not lost.\n";
error_text += _("Signal preceeding this error message is not lost.\n");
String timeStamp = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date());
error_text += "Error received at " + timeStamp;
error_text += _("Error received at ") + timeStamp;
Dialogs.showError("Signal saving error", error_text);
Dialogs.showError(_("Signal saving error"), error_text);
lastState = RecordingState.FINISHED;
} else {
logger.warn("received unexpected response while checking recording status");
......
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