Author: kono
Date: 2011-03-24 17:40:20 -0700 (Thu, 24 Mar 2011)
New Revision: 24594
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
Log:
Fixed continuous-to-discrete mapping editor. Need to fix icons later.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2011-03-24 23:28:44 UTC (rev 24593)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2011-03-25 00:40:20 UTC (rev 24594)
@@ -2,10 +2,10 @@
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import javax.swing.GroupLayout;
import javax.swing.JDialog;
import javax.swing.JPanel;
@@ -18,8 +18,10 @@
import com.l2fprod.common.beans.editor.AbstractPropertyEditor;
-public abstract class AbstractContinuousMappingEditor<K, V> extends
AbstractPropertyEditor {
+public abstract class AbstractContinuousMappingEditor<K extends Number, V>
extends AbstractPropertyEditor {
+ private static final Dimension MIN_SIZE = new Dimension(650, 400);
+
protected ContinuousMapping<K, V> mapping;
protected ContinuousMappingEditorPanel<K, V> editorPanel;
@@ -43,11 +45,11 @@
this.editor.addMouseListener(new MouseAdapter() {
@Override
- public void mouseClicked(MouseEvent arg0) {
+ public void mouseClicked(MouseEvent ev) {
final JDialog editorDialog = new JDialog();
initComponents(editorDialog);
- editorDialog.setTitle("Discrete Mapping Editor:
Mapping for " + mapping.getVisualProperty().getDisplayName());
+ editorDialog.setTitle("Continuous Mapping
Editor: Mapping for " + mapping.getVisualProperty().getDisplayName());
editorDialog.setLocationRelativeTo(editor);
editorDialog.setVisible(true);
}
@@ -59,6 +61,8 @@
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.getContentPane().add(editorPanel,
BorderLayout.CENTER);
+ dialog.setPreferredSize(MIN_SIZE);
+
dialog.pack();
}
});
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DEditor.java
2011-03-24 23:28:44 UTC (rev 24593)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DEditor.java
2011-03-25 00:40:20 UTC (rev 24594)
@@ -23,6 +23,7 @@
if (value instanceof ContinuousMapping == false)
throw new IllegalArgumentException(
"Value should be ContinuousMapping:
this is " + value);
+
ContinuousMapping<?, ?> mTest = (ContinuousMapping<?, ?>) value;
// TODO: error chekcing
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2011-03-24 23:28:44 UTC (rev 24593)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2011-03-25 00:40:20 UTC (rev 24594)
@@ -65,9 +65,8 @@
ContinuousMappingEditorPanel<Number, V> {
private final static long serialVersionUID = 1213748837197780L;
- private static final Logger logger = LoggerFactory
- .getLogger(C2DMappingEditor.class);
-
+ private static final Logger logger =
LoggerFactory.getLogger(C2DMappingEditor.class);
+
private final EditorManager editorManager;
public C2DMappingEditor(final VisualStyle style,
@@ -75,7 +74,7 @@
final CyApplicationManager appManager,
final VisualMappingManager vmm, final EditorManager
editorManager) {
super(style, mapping, attr, appManager, vmm);
-
+
if(editorManager == null)
throw new NullPointerException("Editor manager is
null.");
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-03-24 23:28:44 UTC (rev 24593)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-03-25 00:40:20 UTC (rev 24594)
@@ -50,6 +50,7 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
@@ -70,7 +71,7 @@
* type of the value associated with the thumb.
*
*/
-public abstract class ContinuousMappingEditorPanel<K, V> extends JPanel
implements
+public abstract class ContinuousMappingEditorPanel<K extends Number, V>
extends JPanel implements
PropertyChangeListener {
private static final long serialVersionUID = 2077889066171872186L;
@@ -82,7 +83,8 @@
// Only accepts Continuous Mapping
protected final ContinuousMapping<K, V> mapping;
protected final VisualProperty<V> type;
- private final CyTable attr;
+ private final CyTable dataTable;
+ private final Class<K> dataType;
protected List<ContinuousMappingPoint<K, V>> allPoints;
private SpinnerNumberModel spinnerModel;
@@ -128,11 +130,12 @@
final String controllingAttrName =
mapping.getMappingAttributeName();
final Class<?> attrType =
attr.getColumn(controllingAttrName).getType();
- logger.debug("Selected Attr Type is " + attrType);
- if (Number.class.isAssignableFrom(attrType))
+ logger.debug("Selected attr type is " + attrType);
+ if (!Number.class.isAssignableFrom(attrType))
throw new IllegalArgumentException("Cannot support
attribute data type. Numerical values only: " + attrType);
- this.attr = attr;
+ this.dataTable = attr;
+ this.dataType = (Class<K>) attrType;
initComponents();
setVisualPropLabel();
@@ -176,8 +179,9 @@
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">
private void initComponents() {
- mainPanel.setSize(650, 300);
- mainPanel.setPreferredSize(new Dimension(650, 300));
+ mainPanel.setSize(650, 800);
+ mainPanel.setMinimumSize(new Dimension(650, 800));
+ mainPanel.setPreferredSize(new Dimension(650, 800));
abovePanel = new BelowAndAbovePanel(Color.yellow, false,
mapping);
abovePanel.setName("abovePanel");
@@ -398,13 +402,13 @@
if (tracer.getRange(type) == 0) {
Double maxValue = Double.NEGATIVE_INFINITY;
Double minValue = Double.POSITIVE_INFINITY;
- final List<Double> valueList =
attr.getColumn(mapping.getMappingAttributeName()).getValues(Double.class);
- for (Double val : valueList) {
- if (val > maxValue)
- maxValue = val;
+ final List<K> valueList =
dataTable.getColumn(mapping.getMappingAttributeName()).getValues(this.dataType);
+ for (K val : valueList) {
+ if (val.doubleValue() > maxValue)
+ maxValue = val.doubleValue();
- if (val < minValue)
- minValue = val;
+ if (val.doubleValue() < minValue)
+ minValue = val.doubleValue();
}
tracer.setMax(type, maxValue);
@@ -513,7 +517,7 @@
public void mouseReleased(MouseEvent e) {
- logger.debug("$$$$$$$$ Mouse released: ");
+ logger.debug("Mouse released from thumb: ");
int selectedIndex = slider.getSelectedIndex();
@@ -530,7 +534,9 @@
slider.repaint();
repaint();
- appManager.getCurrentNetworkView().updateView();
+ final CyNetworkView curView =
appManager.getCurrentNetworkView();
+ style.apply(curView);
+ curView.updateView();
} else {
valueSpinner.setEnabled(false);
valueSpinner.setValue(0);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
