Skip to content
Snippets Groups Projects
Commit 6f3ca33d authored by Katy Saintin's avatar Katy Saintin
Browse files

DataBrowser : SpectrumViewer cleanup the unused internal Panel for display... 

DataBrowser : SpectrumViewer cleanup the unused internal Panel for display writableTangoKey used by TangoDeviceExplorer
parent 39311383
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/java/org/cdma/gui/databrowser/model/DataItemViewer.java
+ 5
− 16
View file @ 6f3ca33d
......@@ -142,13 +142,6 @@ public class DataItemViewer implements IDataBrowserItemListener {
}
public void setWritableItem(Item writableItem){
if(spectrumViewer != null){
spectrumViewer.setWritableItem(writableItem);
}
}
private IItemViewer getItemViewer(final DataType type, final DataFormat format, final AxisType axis) {
IItemViewer result = null;
switch (type) {
......@@ -222,9 +215,9 @@ public class DataItemViewer implements IDataBrowserItemListener {
DataType type = item.getUserType();
if (displayedItems.contains(item)) {
IItemViewer viewer = getItemViewer(type, item.getFormat(), item.getAxis());
if (item.getAxis() != null) {
//if (item.getAxis() != null) {
viewer.selectItem(item);
}
//}
selectViewer((Component) viewer);
// item.getBrowser();
// item.getKey();
......@@ -252,10 +245,6 @@ public class DataItemViewer implements IDataBrowserItemListener {
}
}
public void removeItemForTabChart(Item item){
spectrumViewer.removeItemForTabChart(item);
}
private void changeItemAxis(final Item item) {
AxisType newAxis = item.getAxis();
// If it was displayed
......
src/main/java/org/cdma/gui/databrowser/view/item/SpectrumViewer.java
+ 61
− 80
View file @ 6f3ca33d
package org.cdma.gui.databrowser.view.item;
import java.awt.BorderLayout;
import java.awt.Component;
import java.util.HashMap;
import java.util.Map;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import org.cdma.gui.databrowser.DataBrowser;
......@@ -18,27 +19,20 @@ import org.cdma.gui.databrowser.util.DockingUtil;
import fr.soleil.comete.definition.widget.properties.ChartProperties;
import fr.soleil.comete.definition.widget.properties.PlotProperties;
import fr.soleil.data.service.IKey;
import fr.soleil.docking.view.IView;
public class SpectrumViewer extends JTabbedPane implements IItemViewer {
private static final long serialVersionUID = -3419144929681320818L;
private static ChartSpectrumViewer chartSpectrumViewer;
private static ChartSpectrumViewer tabChartSpectrumViewer;
private static TextSpectrumViewer stringSpectrumViewer;
private static ChartSpectrumViewer tabMultiChartSpectrumViewer;
private static Map<String, IView> spectrumViewerMap = new HashMap<String, IView>();
private boolean activTabForWritableItem = false;
private Item writableItem = null;
private JComponent dockingArea = null;
private JPanel tabChartPane = null;
private JPanel tabMutltiChartPane = null;
public SpectrumViewer(final DataBrowserController controller) {
this(controller, false);
}
......@@ -52,29 +46,21 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
public void initComponents(DataBrowserController controller) {
chartSpectrumViewer = new ChartSpectrumViewer(controller);
stringSpectrumViewer = new TextSpectrumViewer(controller);
tabMultiChartSpectrumViewer = new ChartSpectrumViewer(null);
tabMutltiChartPane = new JPanel();
}
private void layoutComponent() {
if(activTabForWritableItem){
dockingArea = getDockingArea();
addTab(DataBrowser.MESSAGES.getString("DataItem.Spectrum.Tab.Chart"),
DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), dockingArea);
addTab(DataBrowser.MESSAGES.getString("DataItem.Spectrum.Tab.String"),
DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.String"), stringSpectrumViewer);
tabMutltiChartPane.setLayout(new BorderLayout());
tabMutltiChartPane.add(chartSpectrumViewer, BorderLayout.CENTER);
DockingUtil.createView("MultiChart", DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), "MULTI CHART",
tabMutltiChartPane, dockingArea);
if (activTabForWritableItem) {
addTab(DataBrowser.MESSAGES.getString("DataItem.Spectrum.Tab.Chart"),
DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), getDockingArea());
DockingUtil.createView("MultiChart", DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"),
"MULTI CHART", chartSpectrumViewer, getDockingArea());
} else {
addTab(DataBrowser.MESSAGES.getString("DataItem.Spectrum.Tab.Chart"),
DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), chartSpectrumViewer);
addTab(DataBrowser.MESSAGES.getString("DataItem.Spectrum.Tab.String"),
DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.String"), stringSpectrumViewer);
}
}
......@@ -93,53 +79,45 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
// nop
break;
}
// if (itemViewer != null) {
// setSelectedComponent((Component) itemViewer);
// }
return itemViewer;
}
@Override
public void addItem(Item item) {
IKey settableKey = null;
if (item != null) {
IItemViewer viewer = getItemViewer(item.getFormat());
settableKey = item.getBrowser().generateSettableKey(item.getKey());
boolean settable = item.getBrowser().isSettable(settableKey);
DataFormat format = item.getFormat();
if (format != DataFormat.TEXT && activTabForWritableItem) {
addSettableSource(item, settable);
}
if (viewer != null) {
viewer.addItem(item);
tabMultiChartSpectrumViewer.addItem(item);
tabMutltiChartPane.add(tabMultiChartSpectrumViewer, BorderLayout.CENTER);
}
if (activTabForWritableItem && !settable) {
viewer.addItem(item);
DataFormat format = item.getFormat();
if (activTabForWritableItem && format != DataFormat.TEXT) {
addSettableItem(item);
}
}
}
private void addSettableSource(Item item, boolean settable) {
private void addSettableItem(Item item) {
String name = getDataItemName(item);
tabChartSpectrumViewer = new ChartSpectrumViewer(null);
if (writableItem != null && settable) {
tabChartSpectrumViewer.addItem(writableItem);
}
ChartSpectrumViewer tabChartSpectrumViewer = new ChartSpectrumViewer(null);
tabChartSpectrumViewer.addItem(item);
tabChartPane = new JPanel();
tabChartPane.setLayout(new BorderLayout());
tabChartPane.add(tabChartSpectrumViewer, BorderLayout.CENTER);
// Manage settable key
IKey settableKey = item.getBrowser().generateSettableKey(item.getKey());
if (settableKey != null) {
Item itemWritable = new Item(settableKey, item.getBrowser(), item.getType(), item.getFormat());
tabChartSpectrumViewer.addItem(itemWritable);
}
dockingArea = getDockingArea();
if (dockingArea != null && tabChartPane != null) {
DockingUtil.createView(name, DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"), name,
tabChartPane, dockingArea);
if (dockingArea != null && tabChartSpectrumViewer != null) {
IView createView = DockingUtil.createView(name, DataBrowser.ICONS.getIcon("DataItem.Spectrum.Tab.Chart"),
name, tabChartSpectrumViewer, dockingArea);
spectrumViewerMap.put(name, createView);
}
}
......@@ -152,19 +130,6 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
return name;
}
public void removeItemForTabChart(Item item) {
if (tabChartSpectrumViewer != null && tabMultiChartSpectrumViewer != null) {
tabChartSpectrumViewer.removeItem(item);
tabMultiChartSpectrumViewer.removeItem(item);
if (writableItem != null) {
tabChartSpectrumViewer.removeItem(writableItem);
}
String name = getDataItemName(item);
DockingUtil.removeView(name);
}
}
public JComponent getDockingArea() {
if (dockingArea == null) {
dockingArea = DockingUtil.createDockingArea(true, true);
......@@ -180,6 +145,12 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
viewer.removeItem(item);
}
}
if (activTabForWritableItem) {
String dataItemName = getDataItemName(item);
spectrumViewerMap.remove(dataItemName);
DockingUtil.removeView(dataItemName);
}
}
public void setValueConvertor(IKey key) {
......@@ -233,12 +204,27 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
@Override
public void selectItem(Item item) {
if (item != null) {
IItemViewer viewer = getItemViewer(item.getFormat());
if (viewer != null) {
viewer.selectItem(item);
}
if(activTabForWritableItem && viewer == chartSpectrumViewer){
this.setSelectedComponent(getDockingArea());
}
else {
this.setSelectedComponent((Component) viewer);
}
if (item != null && activTabForWritableItem) {
String dataItemName = getDataItemName(item);
IView iView = spectrumViewerMap.get(dataItemName);
if (iView != null) {
iView.select();
}
}
}
@Override
......@@ -257,9 +243,4 @@ public class SpectrumViewer extends JTabbedPane implements IItemViewer {
stringSpectrumViewer.clearSelection();
}
public void setWritableItem(Item writableItem) {
if (writableItem != null) {
this.writableItem = writableItem;
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code