Author: kono
Date: 2010-10-07 15:11:49 -0700 (Thu, 07 Oct 2010)
New Revision: 22184
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
Log:
Bug ID 0001437: "Deleting a continuous mapper point doesn't
work"?\227?\128?\128is fixed.
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
2010-10-07 20:39:21 UTC (rev 22183)
+++
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
2010-10-07 22:11:49 UTC (rev 22184)
@@ -70,9 +70,13 @@
// Default value for below and above.
private static final Float DEF_BELOW_AND_ABOVE = 1f;
+
+ private static final Float DEFAULT_MIN = 0f;
+ private static final Float DEFAULT_MAX = 100f;
/**
* Creates a new C2CMappingEditor object.
+ * This is for mappings from numbers to numbers.
*
* @param type DOCUMENT ME!
*/
@@ -85,8 +89,8 @@
// Add two sliders by default.
if ((mapping != null) && (mapping.getPointCount() == 0)) {
- addSlider(0f, 10f);
- addSlider(100f, 30f);
+ addSlider(DEFAULT_MIN, 10f);
+ addSlider(DEFAULT_MAX, 30f);
}
}
@@ -153,9 +157,10 @@
return rend.getLegend(width, height);
}
+
// Add slider to the editor.
private void addSlider(float position, float value) {
- CyLogger.getLogger().info("=====Adding slider\n");
+ CyLogger.getLogger().info("Adding slider\n");
final double maxValue =
EditorValueRangeTracer.getTracer().getMax(type);
@@ -204,22 +209,29 @@
addSlider(100f, 5f);
}
- @Override
- protected void deleteButtonActionPerformed(ActionEvent evt) {
+
+ /**
+ * Remove selected slider.
+ */
+ @Override protected void deleteButtonActionPerformed(ActionEvent evt) {
+ if(slider.getModel().getThumbCount() <=0)
+ return;
+
final int selectedIndex = slider.getSelectedIndex();
+
+ if(selectedIndex<0)
+ return;
+
+ slider.getModel().removeThumb(selectedIndex);
+ mapping.removePoint(selectedIndex);
- if ((0 <= selectedIndex) && (slider.getModel().getThumbCount()
> 1)) {
- slider.getModel().removeThumb(selectedIndex);
- mapping.removePoint(selectedIndex);
+ updateMap();
+ ((ContinuousTrackRenderer)
slider.getTrackRenderer()).removeSquare(selectedIndex);
- updateMap();
- ((ContinuousTrackRenderer)
slider.getTrackRenderer()).removeSquare(selectedIndex);
+ mapping.fireStateChanged();
- mapping.fireStateChanged();
-
-
Cytoscape.getVisualMappingManager().getNetworkView().redrawGraph(false, true);
- repaint();
- }
+
Cytoscape.getVisualMappingManager().getNetworkView().redrawGraph(false, true);
+ repaint();
}
private void setSlider() {
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
2010-10-07 20:39:21 UTC (rev 22183)
+++
cytoscape/trunk/application/src/main/java/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
2010-10-07 22:11:49 UTC (rev 22184)
@@ -89,7 +89,7 @@
private static final long serialVersionUID = -2558647616344119220L;
- // Tell vizMapper main whic editor is disabled/enabled.
+ // Tell vizMapper main which editor is disabled/enabled.
/**
* DOCUMENT ME!
*/
--
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.
