Commit fc9994d7 authored by Claes Sjofors's avatar Claes Sjofors

Java pwg fix for color tone/fill color dynamics

parent 190b5e93
...@@ -296,7 +296,6 @@ public class JopSessionRep implements JopSessionIfc { ...@@ -296,7 +296,6 @@ public class JopSessionRep implements JopSessionIfc {
} }
} }
} }
System.out.println("openGraphFrame end");
} }
public void openCrrFrame( String name) { public void openCrrFrame( String name) {
......
...@@ -125,7 +125,6 @@ public class Graph implements GraphIfc, GrowApplIfc { ...@@ -125,7 +125,6 @@ public class Graph implements GraphIfc, GrowApplIfc {
} }
} }
} }
System.out.println("before connect total_dyn_type1 : " + dyn.total_dyn_type1);
dyn.connect(object); dyn.connect(object);
......
...@@ -230,7 +230,6 @@ public class GrowFrame extends JFrame implements GraphApplIfc, ActionListener { ...@@ -230,7 +230,6 @@ public class GrowFrame extends JFrame implements GraphApplIfc, ActionListener {
graph.setOwner( instance); graph.setOwner( instance);
graph.open(reader); graph.open(reader);
System.out.println("After open " + defaultWidth + " " + defaultHeight);
if ( defaultWidth == 0 || defaultHeight == 0) if ( defaultWidth == 0 || defaultHeight == 0)
setSize(); setSize();
......
...@@ -587,13 +587,26 @@ public class GrowNode extends GlowArrayElem implements GlowColorNode { ...@@ -587,13 +587,26 @@ public class GrowNode extends GlowArrayElem implements GlowColorNode {
color_tone = original_color_tone; color_tone = original_color_tone;
} }
public void setFillColor(int fill_drawtype) { public void setFillColor(int fill_drawtype) {
this.fill_drawtype = fill_drawtype; this.fill_drawtype = fill_drawtype;
color_tone = Glow.eDrawTone_No;
color_shift = 0;
color_lightness = 0;
color_intensity = 0;
} }
public void resetFillColor() { public void resetFillColor() {
fill_drawtype = original_fill_drawtype; fill_drawtype = original_fill_drawtype;
color_tone = original_color_tone;
color_shift = original_color_shift;
color_lightness = original_color_lightness;
color_intensity = original_color_intensity;
} }
public void setBorderColor(int draw_type) { public void setBorderColor(int draw_type) {
this.draw_type = draw_type; this.draw_type = draw_type;
color_tone = Glow.eDrawTone_No;
color_shift = 0;
color_lightness = 0;
color_intensity = 0;
} }
public void resetBorderColor() { public void resetBorderColor() {
draw_type = original_border_drawtype; draw_type = original_border_drawtype;
......
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