Skip to content
Snippets Groups Projects
Commit ac50b18b authored by Kentin Rodrigues's avatar Kentin Rodrigues
Browse files

[DevicePanel] JIRA : CONTROLGUI-248

Change SCALAR view
parent c3d10974
No related branches found
No related tags found
No related merge requests found
...@@ -12,13 +12,13 @@ import org.cdma.gui.databrowser.interfaces.Item; ...@@ -12,13 +12,13 @@ import org.cdma.gui.databrowser.interfaces.Item;
import org.cdma.gui.databrowser.view.item.ScalarViewer; import org.cdma.gui.databrowser.view.item.ScalarViewer;
import fr.soleil.comete.box.scalarbox.StringScalarBox; import fr.soleil.comete.box.scalarbox.StringScalarBox;
import fr.soleil.comete.swing.TextArea; import fr.soleil.comete.swing.AdaptableTextArea;
import fr.soleil.comete.swing.TextField; import fr.soleil.comete.swing.TextField;
import fr.soleil.data.target.scalar.IScalarTarget; import fr.soleil.data.target.scalar.IScalarTarget;
public class TextScalarItem extends ScalarItem { public class TextScalarItem extends ScalarItem {
private static final int DEFAULT_TEXTAREA_NB_ROWS = 3; private static final int DEFAULT_TEXTAREA_NB_ROWS = 1;
public TextScalarItem(final ScalarViewer scalarViewer, final Item item, DataBrowserController controller) { public TextScalarItem(final ScalarViewer scalarViewer, final Item item, DataBrowserController controller) {
super(scalarViewer, item, controller); super(scalarViewer, item, controller);
...@@ -26,11 +26,11 @@ public class TextScalarItem extends ScalarItem { ...@@ -26,11 +26,11 @@ public class TextScalarItem extends ScalarItem {
@Override @Override
public IScalarTarget createViewer() { public IScalarTarget createViewer() {
TextArea theViewer = new TextArea(); AdaptableTextArea adaptableTextArea = new AdaptableTextArea();
theViewer.setOpaque(false); adaptableTextArea.setOpaque(false);
theViewer.setRows(DEFAULT_TEXTAREA_NB_ROWS); adaptableTextArea.setRows(DEFAULT_TEXTAREA_NB_ROWS);
return theViewer; return adaptableTextArea;
} }
@Override @Override
...@@ -47,7 +47,7 @@ public class TextScalarItem extends ScalarItem { ...@@ -47,7 +47,7 @@ public class TextScalarItem extends ScalarItem {
StringScalarBox stringBox = getScalarViewer().getStringBox(); StringScalarBox stringBox = getScalarViewer().getStringBox();
stringBox.connectWidget((TextArea) viewer, readKey); stringBox.connectWidget((AdaptableTextArea) viewer, readKey);
if (writeKey != null) { if (writeKey != null) {
stringBox.connectWidget((TextField) setter, writeKey); stringBox.connectWidget((TextField) setter, writeKey);
} }
...@@ -57,7 +57,7 @@ public class TextScalarItem extends ScalarItem { ...@@ -57,7 +57,7 @@ public class TextScalarItem extends ScalarItem {
public void disconnect() { public void disconnect() {
StringScalarBox stringBox = getScalarViewer().getStringBox(); StringScalarBox stringBox = getScalarViewer().getStringBox();
stringBox.disconnectWidget((TextArea) viewer, readKey); stringBox.disconnectWidget((AdaptableTextArea) viewer, readKey);
if (writeKey != null) { if (writeKey != null) {
stringBox.disconnectWidget((TextField) setter, writeKey); stringBox.disconnectWidget((TextField) setter, writeKey);
} }
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
package org.cdma.gui.databrowser.view.item; package org.cdma.gui.databrowser.view.item;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
...@@ -21,6 +20,7 @@ import javax.swing.JPanel; ...@@ -21,6 +20,7 @@ import javax.swing.JPanel;
import org.cdma.gui.databrowser.util.ReverseLabelUI; import org.cdma.gui.databrowser.util.ReverseLabelUI;
import fr.soleil.comete.swing.AdaptableTextArea;
import fr.soleil.comete.swing.CheckBox; import fr.soleil.comete.swing.CheckBox;
import fr.soleil.comete.swing.TextArea; import fr.soleil.comete.swing.TextArea;
import fr.soleil.comete.swing.TextField; import fr.soleil.comete.swing.TextField;
...@@ -30,10 +30,9 @@ public class ScalarRowPanel extends JPanel { ...@@ -30,10 +30,9 @@ public class ScalarRowPanel extends JPanel {
private static final long serialVersionUID = 2717045564359584102L; private static final long serialVersionUID = 2717045564359584102L;
//private static final Color BACKGROUND_SELECTION_COLOR = Color.CYAN;
private static final Color BACKGROUND_SELECTION_COLOR = Color.CYAN; private static final int LABEL_WIDTH = 150;
private static final int LABEL_WIDTH = 400; //private static final int AREA_WIDTH = 500;
private static final int AREA_WIDTH = 500;
private static final int FIELD_WIDTH = 200; private static final int FIELD_WIDTH = 200;
private static final int LABEL_HEIGHT = 25; private static final int LABEL_HEIGHT = 25;
// TODO avisto: we could use a matte border to highlight the selected row // TODO avisto: we could use a matte border to highlight the selected row
...@@ -60,8 +59,7 @@ public class ScalarRowPanel extends JPanel { ...@@ -60,8 +59,7 @@ public class ScalarRowPanel extends JPanel {
private void initComponents() { private void initComponents() {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
setBackground(BACKGROUND_SELECTION_COLOR); //setBackground(BACKGROUND_SELECTION_COLOR);
setSelected(false); setSelected(false);
} }
...@@ -90,11 +88,6 @@ public class ScalarRowPanel extends JPanel { ...@@ -90,11 +88,6 @@ public class ScalarRowPanel extends JPanel {
private void layoutViewerPanel() { private void layoutViewerPanel() {
add((Component) viewer, BorderLayout.CENTER); add((Component) viewer, BorderLayout.CENTER);
if (viewer instanceof TextArea) {
((Component) viewer).setSize(AREA_WIDTH, 100);
((Component) viewer).setPreferredSize(((Component) viewer).getSize());
((Component) viewer).setMinimumSize(((Component) viewer).getSize());
}
if (viewer instanceof TextField) { if (viewer instanceof TextField) {
((Component) viewer).setSize(FIELD_WIDTH, LABEL_HEIGHT); ((Component) viewer).setSize(FIELD_WIDTH, LABEL_HEIGHT);
...@@ -172,9 +165,12 @@ public class ScalarRowPanel extends JPanel { ...@@ -172,9 +165,12 @@ public class ScalarRowPanel extends JPanel {
JLabel label = new JLabel( JLabel label = new JLabel(
"*************mon super attribute qui a un très long nom de malade**************************"); "*************mon super attribute qui a un très long nom de malade**************************");
TextArea textArea = new TextArea(); // TextArea textArea = new TextArea();
textArea.setText("la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************"); AdaptableTextArea adaptableTextArea = new AdaptableTextArea();
ScalarRowPanel panel = new ScalarRowPanel(label, textArea, null); adaptableTextArea
.setText("la valeur de mon attribute text \n qui possede une tres grande valeur aussi\n************************");
CheckBox c2b = new CheckBox();
ScalarRowPanel panel = new ScalarRowPanel(label, adaptableTextArea, c2b);
JLabel label2 = new JLabel("*************mon super attribute 2 **************************"); JLabel label2 = new JLabel("*************mon super attribute 2 **************************");
TextArea textArea2 = new TextArea(); TextArea textArea2 = new TextArea();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment