Steema Issues Database

Note: This database is for bugs and wishes only. For technical support help, if you are a customer please visit our online forums;
otherwise you can use StackOverflow.
Before using this bug-tracker we recommend a look at this document, Steema Bug Fixing Policy.



View | Details | Raw Unified | Return to bug 1615
Collapse All | Expand All

(-)a/src/com/steema/teechart/ImageBevel.java (-4 / +12 lines)
Lines 97-106 public class ImageBevel extends TeeBase { Link Here
97
     * @param b ImageBevel
97
     * @param b ImageBevel
98
     */
98
     */
99
    public void assign(ImageBevel b) {
99
    public void assign(ImageBevel b) {
100
        if (b!=null) {
100
        if (b != null) {
101
            this.getPen().assign(b.getPen());
101
            if (b.pen == null) {
102
            this.getBrush().assign(b.getBrush());
102
                pen = null;
103
            this.setVisible(b.getVisible());
103
            } else {
104
                getPen().assign(b.pen);
105
            }
106
            if (b.brush == null) {
107
                brush = null;
108
            } else {
109
                getBrush().assign(b.getBrush());
110
            }
111
            setVisible(b.getVisible());
104
        }
112
        }
105
    }
113
    }
106
114
(-)a/src/com/steema/teechart/Shape.java (-15 / +20 lines)
Lines 565-586 public class Shape extends TeeBase { Link Here
565
	 */
565
	 */
566
	public void assign(final Shape s) {
566
	public void assign(final Shape s) {
567
		if (s != null) {
567
		if (s != null) {
568
			if (s.bBevel != null) {
568
			if (s.bBevel == null) {
569
				bBevel.assign(s.bBevel);
569
			    bBevel = null;
570
			}
570
			} else {
571
			if (s.bBrush != null) {
571
                getBevel().assign(s.bBevel);
572
				bBrush.assign(s.bBrush);
572
            }
573
			}
573
			if (s.bBrush == null) {
574
574
				bBrush = null;
575
			} else {
576
                getBrush().assign(s.bBrush);
577
            }
575
			setShapeBounds(s.shapeBounds);
578
			setShapeBounds(s.shapeBounds);
576
579
			if (s.pPen == null) {
577
			if (s.pPen != null) {
580
				pPen = null;
578
				pPen.assign(s.pPen, s.pPen.getColor());
581
			} else {
579
			}
582
                getPen().assign(s.pPen, s.pPen.getColor());
580
			if (s.shadow != null) {
583
            }
581
				shadow.assign(s.shadow);
584
			if (s.shadow == null) {
582
			}
585
				shadow = null;
583
586
			} else {
587
                getShadow().assign(s.shadow);
588
            }
584
			setVisible(s.getVisible());
589
			setVisible(s.getVisible());
585
			setTransparent(s.getTransparent());
590
			setTransparent(s.getTransparent());
586
		}
591
		}
(-)a/src/com/steema/teechart/TextShape.java (-14 / +12 lines)
Lines 199-219 public class TextShape extends Shape { Link Here
199
        return font;
199
        return font;
200
    }
200
    }
201
201
202
    /**
202
    @Override
203
     * Assign all properties from a TextShape to another.
203
    public void assign(Shape s) {
204
     *
204
        super.assign(s);
205
     * @param s TextShape
205
        if (s instanceof TextShape) {
206
     */
206
            TextShape tmp = (TextShape)s;
207
    public void assign(TextShape s) {
207
            if (tmp.font == null) {
208
        if (s != null) {
208
                font = null;
209
            super.assign(s);
209
            } else {
210
210
                getFont().assign(tmp.font);
211
            if (s.font != null) {
212
                getFont().assign(s.font);
213
            }
211
            }
214
            lines = s.lines;
212
            lines = tmp.lines;
215
            shapeStyle = s.shapeStyle;
213
            shapeStyle = tmp.shapeStyle;
216
             textAlign = s.textAlign;
214
            textAlign = tmp.textAlign;
217
        }
215
        }
218
    }
216
    }
219
217
(-)a/src/com/steema/teechart/drawing/ChartBrush.java (-1 / +1 lines)
Lines 106-112 public class ChartBrush extends TeeBase { Link Here
106
        imageMode = b.imageMode;
106
        imageMode = b.imageMode;
107
107
108
        //CDI chart cannot be null
108
        //CDI chart cannot be null
109
        if(chart == null) {
109
        if (chart == null) {
110
            chart = b.chart;
110
            chart = b.chart;
111
        }
111
        }
112
112
(-)a/src/com/steema/teechart/styles/BarJoin.java (-4 / +8 lines)
Lines 51-61 public class BarJoin extends Bar { Link Here
51
    
51
    
52
    @Override
52
    @Override
53
    public void assign(Series source) {
53
    public void assign(Series source) {
54
            super.assign(source);
54
        super.assign(source);
55
            if(source instanceof BarJoin)
55
        if (source instanceof BarJoin) {
56
            {
56
            BarJoin tmp = (BarJoin)source;
57
                this.joinPen.assign(((BarJoin)source).joinPen);
57
            if (tmp.joinPen == null) {
58
                joinPen = null;
59
            } else {
60
                getJoinPen().assign(tmp.joinPen);
58
            }
61
            }
62
        }
59
    }
63
    }
60
64
61
    /**
65
    /**
(-)a/src/com/steema/teechart/styles/BubbleCloud.java (-5 / +4 lines)
Lines 79-89 public class BubbleCloud extends Custom3DPalette { Link Here
79
    
79
    
80
    @Override
80
    @Override
81
    public void assign(Series source) {
81
    public void assign(Series source) {
82
            super.assign(source);
82
        super.assign(source);
83
            if(source instanceof BubbleCloud)
83
        if (source instanceof BubbleCloud) {
84
            {
84
            separationUnits = ((BubbleCloud)source).separationUnits;
85
                this.separationUnits=((BubbleCloud)source).separationUnits;
85
        }
86
            }
87
    }    
86
    }    
88
87
89
    /**
88
    /**
(-)a/src/com/steema/teechart/styles/Candle.java (-10 / +10 lines)
Lines 62-77 public class Candle extends OHLC { Link Here
62
    
62
    
63
    @Override
63
    @Override
64
    public void assign(Series source) {
64
    public void assign(Series source) {
65
            super.assign(source);
65
        super.assign(source);
66
            if(source instanceof Candle)
66
        if (source instanceof Candle) {
67
            {
67
            Candle tmp = (Candle)source;
68
                this.upCloseColor=((Candle)source).upCloseColor;
68
            upCloseColor = tmp.upCloseColor;
69
                this.downCloseColor=((Candle)source).downCloseColor;
69
            downCloseColor = tmp.downCloseColor;
70
                this.candleWidth=((Candle)source).candleWidth;
70
            candleWidth = tmp.candleWidth;
71
                this.style=((Candle)source).style;
71
            style = tmp.style;
72
                this.showOpenTick=((Candle)source).showOpenTick;
72
            showOpenTick = tmp.showOpenTick;
73
                this.showCloseTick=((Candle)source).showCloseTick;
73
            showCloseTick = tmp.showCloseTick;
74
            }
74
        }
75
    }    
75
    }    
76
76
77
    /**
77
    /**
(-)a/src/com/steema/teechart/styles/Circular.java (-12 / +15 lines)
Lines 69-87 public class Circular extends Series { Link Here
69
69
70
    public void assign(final Series source) {
70
    public void assign(final Series source) {
71
        if (source instanceof Circular) {
71
        if (source instanceof Circular) {
72
            Circular sourceCircular = (Circular)source;
72
            Circular tmp = (Circular)source;
73
            this.circled = sourceCircular.circled;
73
            circled = tmp.circled;
74
            this.rotationAngle = sourceCircular.rotationAngle;
74
            rotationAngle = tmp.rotationAngle;
75
            this.rotDegree = sourceCircular.rotDegree;
75
            rotDegree = tmp.rotDegree;
76
            this.customXRadius = sourceCircular.customXRadius;
76
            customXRadius = tmp.customXRadius;
77
            this.customYRadius = sourceCircular.customYRadius;
77
            customYRadius = tmp.customYRadius;
78
            this.uniqueCustomRadius = sourceCircular.uniqueCustomRadius;
78
            uniqueCustomRadius = tmp.uniqueCustomRadius;
79
            this.autoPenColor = sourceCircular.autoPenColor;
79
            autoPenColor = tmp.autoPenColor;
80
            this.circleBackColor = sourceCircular.circleBackColor;
80
            circleBackColor = tmp.circleBackColor;
81
            this.circleGradient.assign(sourceCircular.circleGradient);
81
            if (tmp.circleGradient == null) {
82
            this.iAdjustCircleForMarks = sourceCircular.iAdjustCircleForMarks;
82
                circleGradient = null;
83
            } else {
84
                getCircleGradient().assign(tmp.circleGradient);
85
            }
86
            iAdjustCircleForMarks = tmp.iAdjustCircleForMarks;
83
        }
87
        }
84
        
85
        super.assign(source);
88
        super.assign(source);
86
    }
89
    }
87
    
90
    
(-)a/src/com/steema/teechart/styles/CircularGauge.java (-15 / +14 lines)
Lines 54-76 public class CircularGauge extends Circular { Link Here
54
		super.dispose();
54
		super.dispose();
55
	}
55
	}
56
        
56
        
57
        public void assign(final Series source) {
57
    public void assign(final Series source) {
58
        if (source instanceof CircularGauge) {
58
        if (source instanceof CircularGauge) {
59
            CircularGauge sourceCircularGauge = (CircularGauge)source;
59
            CircularGauge tmp = (CircularGauge)source;
60
            this.handDistance = sourceCircularGauge.handDistance;
60
            handDistance = tmp.handDistance;
61
            this.totalAngle = sourceCircularGauge.totalAngle;
61
            totalAngle = tmp.totalAngle;
62
            this.maximum = sourceCircularGauge.maximum;
62
            maximum = tmp.maximum;
63
            this.redLineStartValue = sourceCircularGauge.redLineStartValue;
63
            redLineStartValue = tmp.redLineStartValue;
64
            this.redLineEndValue = sourceCircularGauge.redLineEndValue;
64
            redLineEndValue = tmp.redLineEndValue;
65
            this.greenLineStartValue = sourceCircularGauge.greenLineStartValue;
65
            greenLineStartValue = tmp.greenLineStartValue;
66
            this.greenLineEndValue = sourceCircularGauge.greenLineEndValue;
66
            greenLineEndValue = tmp.greenLineEndValue;
67
            this.labelsInside = sourceCircularGauge.labelsInside;
67
            labelsInside = tmp.labelsInside;
68
            this.rotateLabels = sourceCircularGauge.rotateLabels;
68
            rotateLabels = tmp.rotateLabels;
69
            this.labelsVisible = sourceCircularGauge.labelsVisible;
69
            labelsVisible = tmp.labelsVisible;
70
            this.handOffset = sourceCircularGauge.handOffset;
70
            handOffset = tmp.handOffset;
71
            this.fillToSemiCircle = sourceCircularGauge.fillToSemiCircle;
71
            fillToSemiCircle = tmp.fillToSemiCircle;
72
        }
72
        }
73
        
74
        super.assign(source);
73
        super.assign(source);
75
    }
74
    }
76
75
(-)a/src/com/steema/teechart/styles/Clock.java (-6 / +18 lines)
Lines 96-108 public class Clock extends Custom2DPolar { Link Here
96
    
96
    
97
    @Override
97
    @Override
98
    public void assign(Series source) {
98
    public void assign(Series source) {
99
            super.assign(source);
99
        super.assign(source);
100
            if(source instanceof Clock)
100
        if (source instanceof Clock) {
101
            {
101
            Clock tmp = (Clock)source;
102
                this.penHours.assign(((Clock)source).penHours);
102
            if (tmp.penHours == null) {
103
                this.penMinutes.assign(((Clock)source).penMinutes);
103
                penHours = null;
104
                this.penSeconds.assign(((Clock)source).penSeconds);
104
            } else {
105
                getPenHours().assign(tmp.penHours);
105
            }
106
            }
107
            if (tmp.penMinutes == null) {
108
                penMinutes = null;
109
            } else {
110
                getPenMinutes().assign(tmp.penMinutes);
111
            }
112
            if (tmp.penSeconds == null) {
113
                penSeconds = null;
114
            } else {
115
                getPenSeconds().assign(tmp.penSeconds);
116
            }
117
        }
106
    } 
118
    } 
107
119
108
    private void startTimer() {
120
    private void startTimer() {
(-)a/src/com/steema/teechart/styles/ColorGrid.java (-5 / +4 lines)
Lines 66-76 public class ColorGrid extends Custom3DGrid { Link Here
66
    
66
    
67
    @Override
67
    @Override
68
    public void assign(Series source) {
68
    public void assign(Series source) {
69
            super.assign(source);
69
        super.assign(source);
70
            if(source instanceof ColorGrid)
70
        if (source instanceof ColorGrid) {
71
            {
71
            centered = ((ColorGrid)source).centered;
72
                this.centered=((ColorGrid)source).centered;
72
        }
73
            }
74
    } 
73
    } 
75
74
76
    /**
75
    /**
(-)a/src/com/steema/teechart/styles/Contour.java (-12 / +12 lines)
Lines 125-142 public class Contour extends Custom3DGrid { Link Here
125
    
125
    
126
    @Override
126
    @Override
127
    public void assign(Series source) {
127
    public void assign(Series source) {
128
            super.assign(source);
128
        super.assign(source);
129
            if(source instanceof Contour)
129
        if (source instanceof Contour) {
130
            {
130
            Contour tmp = (Contour)source;
131
                this.automaticLevels=((Contour)source).automaticLevels;
131
            automaticLevels = tmp.automaticLevels;
132
                this.levels=((Contour)source).levels;
132
            levels = tmp.levels;
133
                this.numLevels=((Contour)source).numLevels;
133
            numLevels = tmp.numLevels;
134
                this.yPosition=((Contour)source).yPosition;
134
            yPosition = tmp.yPosition;
135
                this.yPositionLevel=((Contour)source).yPositionLevel;
135
            yPositionLevel = tmp.yPositionLevel;
136
                this.drawingalgorithm=((Contour)source).drawingalgorithm;
136
            drawingalgorithm = tmp.drawingalgorithm;
137
                this.fillLevels=((Contour)source).fillLevels;
137
            fillLevels = tmp.fillLevels;
138
                this.contourmarks=((Contour)source).contourmarks;
138
            contourmarks = tmp.contourmarks;
139
            }
139
        }
140
    }     
140
    }     
141
    
141
    
142
    /// <summary>
142
    /// <summary>
(-)a/src/com/steema/teechart/styles/Custom.java (-23 / +32 lines)
Lines 324-354 public class Custom extends CustomPoint Link Here
324
    
324
    
325
    public void assign(Series source) {
325
    public void assign(Series source) {
326
        super.assign(source);
326
        super.assign(source);
327
        if(source instanceof Custom) {
327
        if (source instanceof Custom) {
328
            Custom series = (Custom)source;
328
            Custom tmp = (Custom)source;
329
            this.setStairs(series.getStairs());
329
            setStairs(tmp.getStairs());
330
            this.setClickableLine(series.getClickableLine());
330
            setClickableLine(tmp.getClickableLine());
331
            this.setLineHeight(series.getLineHeight());
331
            setLineHeight(tmp.getLineHeight());
332
            if(series.bAreaBrush != null) {
332
            if (tmp.bAreaBrush == null) {
333
              if(this.bAreaBrush == null)
333
                bAreaBrush = null;
334
                this.bAreaBrush =  new ChartBrush(this.getChart());
334
            } else {
335
                this.bAreaBrush.assign(series.bAreaBrush);
335
                if (bAreaBrush == null) {
336
                    bAreaBrush = new ChartBrush(getChart());
337
                }
338
                bAreaBrush.assign(tmp.bAreaBrush);
339
            }
340
            if (tmp.pAreaLines == null) {
341
                pAreaLines = null;
342
            } else {
343
                if (pAreaLines == null) {
344
                    pAreaLines = new ChartPen(getChart());
345
                }
346
                pAreaLines.assign(tmp.pAreaLines);
336
            }
347
            }
337
            if(series.pAreaLines != null) {
348
            if (tmp.linePen == null) {
338
                if(this.pAreaLines == null)
349
                linePen = null;
339
                  this.pAreaLines =  new ChartPen(this.getChart());
350
            } else {
340
                this.pAreaLines.assign(series.pAreaLines);
351
                getLinePen().assign(tmp.linePen);
341
            }
352
            }
342
            this.getLinePen().assign(series.getLinePen());
353
            bDark3D = tmp.bDark3D;
343
            
354
            drawArea = tmp.drawArea;
344
            this.bDark3D=((Custom)source).bDark3D;
355
            invertedStairs = tmp.invertedStairs;
345
            this.drawArea=((Custom)source).drawArea;
356
            colorEachLine = tmp.colorEachLine;
346
            this.invertedStairs=((Custom)source).invertedStairs;
357
            lineHeight = tmp.lineHeight;
347
            this.colorEachLine=((Custom)source).colorEachLine;
358
            outLine = tmp.outLine;
348
            this.lineHeight=((Custom)source).lineHeight;
359
            stairs = tmp.stairs;
349
            this.outLine=((Custom)source).outLine;
360
            smoothed = tmp.smoothed;
350
            this.stairs=((Custom)source).stairs;
351
            this.smoothed=((Custom)source).smoothed;
352
        }
361
        }
353
    }
362
    }
354
    
363
    
(-)a/src/com/steema/teechart/styles/CustomBar.java (-32 / +35 lines)
Lines 164-201 public class CustomBar extends Series { Link Here
164
	@Override
164
	@Override
165
	public void assign(Series source) {
165
	public void assign(Series source) {
166
		super.assign(source);
166
		super.assign(source);
167
		if(source instanceof CustomBar)
167
        if (source instanceof CustomBar) {
168
		{
168
            CustomBar tmp = (CustomBar)source;
169
			this.setBarSizePercent(((CustomBar) source).getBarSizePercent());
169
            setBarSizePercent(tmp.getBarSizePercent());
170
			this.setDepthPercent(((CustomBar) source).getDepthPercent());
170
            setDepthPercent(tmp.getDepthPercent());
171
			this.setOffsetPercent(((CustomBar) source).getOffsetPercent());
171
            setOffsetPercent(tmp.getOffsetPercent());
172
			this.setConePercent(((CustomBar) source).getConePercent());
172
            setConePercent(tmp.getConePercent());
173
			this.setDark3D(((CustomBar) source).getDark3D());
173
            setDark3D(tmp.getDark3D());
174
			this.setMultiBar(((CustomBar) source).getMultiBar());
174
            setMultiBar(tmp.getMultiBar());
175
			this.setUseOrigin(((CustomBar) source).getUseOrigin());
175
            setUseOrigin(tmp.getUseOrigin());
176
			this.setMarksOnBar(((CustomBar) source).getMarksOnBar());
176
            setMarksOnBar(tmp.getMarksOnBar());
177
			this.setOrigin(((CustomBar) source).getOrigin());
177
            setOrigin(tmp.getOrigin());
178
			this.setMarksLocation(((CustomBar) source).getMarksLocation());
178
            setMarksLocation(tmp.getMarksLocation());
179
			this.setAutoMarkPosition(((CustomBar) source).getAutoMarkPosition());
179
            setAutoMarkPosition(tmp.getAutoMarkPosition());
180
			this.setBarStyle(((CustomBar) source).getBarStyle());
180
            setBarStyle(tmp.getBarStyle());
181
			this.setGradientRelative(((CustomBar) source).getGradientRelative());
181
            setGradientRelative(tmp.getGradientRelative());
182
			this.setRoundSize(((CustomBar) source).getRoundSize());
182
            setRoundSize(tmp.getRoundSize());
183
			this.setBarRound(((CustomBar) source).getBarRound());
183
            setBarRound(tmp.getBarRound());
184
			this.setSideMargins(((CustomBar) source).getSideMargins());
184
            setSideMargins(tmp.getSideMargins());
185
			this.setStackGroup(((CustomBar) source).getStackGroup());
185
            setStackGroup(tmp.getStackGroup());
186
			this.iBarBounds=((CustomBar) source).iBarBounds;
186
            iBarBounds = tmp.iBarBounds;
187
			this.iMaxBarPoints=((CustomBar) source).iMaxBarPoints;
187
            iMaxBarPoints = tmp.iMaxBarPoints;
188
			this.iOrderPos=((CustomBar) source).iOrderPos;
188
            iOrderPos = tmp.iOrderPos;
189
			this.iPreviousCount=((CustomBar) source).iPreviousCount;
189
            iPreviousCount = tmp.iPreviousCount;
190
			this.iBarSize=((CustomBar) source).iBarSize;
190
            iBarSize = tmp.iBarSize;
191
			this.customBarSize=((CustomBar) source).customBarSize;
191
            customBarSize = tmp.customBarSize;
192
                        this.allowSinglePoint = ((CustomBar) source).allowSinglePoint;
192
            allowSinglePoint = tmp.allowSinglePoint;
193
                        this.groups = ((CustomBar) source).groups;
193
            groups = tmp.groups;
194
                        this.normalBarColor = ((CustomBar) source).normalBarColor;
194
            normalBarColor = tmp.normalBarColor;
195
                        this.roundSize = ((CustomBar) source).roundSize;
195
            roundSize = tmp.roundSize;
196
                        this.styleResolver = ((CustomBar) source).styleResolver;
196
            styleResolver = tmp.styleResolver;
197
                        this.tickLines.assign(((CustomBar) source).tickLines);
197
            if (tmp.tickLines == null) {
198
198
                tickLines = null;
199
            } else {
200
                getTickLines().assign(tmp.tickLines);
201
            }
199
		}
202
		}
200
	}
203
	}
201
204
(-)a/src/com/steema/teechart/styles/CustomBox.java (-7 / +23 lines)
Lines 73-85 public class CustomBox extends Points { Link Here
73
    public void assign(Series source) {
73
    public void assign(Series source) {
74
        if (source instanceof CustomBox) {
74
        if (source instanceof CustomBox) {
75
            CustomBox tmp = (CustomBox)source;
75
            CustomBox tmp = (CustomBox)source;
76
            this.extrOut.assign(tmp.extrOut);
76
            if (tmp.extrOut == null) {
77
            this.mildOut.assign(tmp.mildOut);
77
                extrOut = null;
78
            this.medianPen.assign(tmp.medianPen);
78
            } else {
79
            this.whiskerPen.assign(tmp.whiskerPen);
79
                getExtrOut().assign(tmp.extrOut);
80
            this.dPosition = tmp.dPosition;
80
            }
81
            this.whiskerLength = tmp.whiskerLength;
81
            if (tmp.mildOut == null) {
82
            this.useCustomValues = tmp.useCustomValues;
82
                mildOut = null;
83
            } else {
84
                getMildOut().assign(tmp.mildOut);
85
            }
86
            if (tmp.medianPen == null) {
87
                medianPen = null;
88
            } else {
89
                getMedianPen().assign(tmp.medianPen);
90
            }
91
            if (tmp.whiskerPen == null) {
92
                whiskerPen = null;
93
            } else {
94
                getWhiskerPen().assign(tmp.whiskerPen);
95
            }
96
            dPosition = tmp.dPosition;
97
            whiskerLength = tmp.whiskerLength;
98
            useCustomValues = tmp.useCustomValues;
83
        }
99
        }
84
        super.assign(source);
100
        super.assign(source);
85
    }
101
    }
(-)a/src/com/steema/teechart/styles/CustomError.java (-4 / +8 lines)
Lines 50-59 public class CustomError extends Bar { Link Here
50
    public void assign(Series source) {
50
    public void assign(Series source) {
51
        if (source instanceof CustomError) {
51
        if (source instanceof CustomError) {
52
            CustomError tmp = (CustomError)source;
52
            CustomError tmp = (CustomError)source;
53
            this.getErrorPen().assign(tmp.getErrorPen());
53
            if (tmp.errorPen == null) {
54
            this.setErrorWidth(tmp.getErrorWidth());
54
                errorPen = null;
55
            this.setErrorWidthUnits(tmp.getErrorWidthUnits());
55
            } else {
56
            this.setErrorStyle(tmp.getErrorStyle());
56
                getErrorPen().assign(tmp.errorPen);
57
            }
58
            setErrorWidth(tmp.getErrorWidth());
59
            setErrorWidthUnits(tmp.getErrorWidthUnits());
60
            setErrorStyle(tmp.getErrorStyle());
57
        }
61
        }
58
        super.assign(source);
62
        super.assign(source);
59
    }
63
    }
(-)a/src/com/steema/teechart/styles/CustomPoint.java (-3 / +5 lines)
Lines 36-45 public class CustomPoint extends BaseLine { Link Here
36
    public void assign(Series source) {
36
    public void assign(Series source) {
37
        if (source instanceof CustomPoint) {
37
        if (source instanceof CustomPoint) {
38
            CustomPoint tmp = (CustomPoint)source;
38
            CustomPoint tmp = (CustomPoint)source;
39
            if (tmp.point != null) {
39
            if (tmp.point == null) {
40
                this.getPointer().assign(tmp.point);
40
                point = null;
41
            } else {
42
                getPointer().assign(tmp.point);
41
            }
43
            }
42
            this.iStacked = tmp.iStacked;
44
            iStacked = tmp.iStacked;
43
        }
45
        }
44
        super.assign(source);
46
        super.assign(source);
45
    }
47
    }
(-)a/src/com/steema/teechart/styles/CustomPolar.java (-10 / +13 lines)
Lines 75-90 public class CustomPolar extends Circular { Link Here
75
    public void assign(Series source) {
75
    public void assign(Series source) {
76
        if (source instanceof CustomPolar) {
76
        if (source instanceof CustomPolar) {
77
            CustomPolar tmp = (CustomPolar)source;
77
            CustomPolar tmp = (CustomPolar)source;
78
            
78
            if (tmp.pen == null) {
79
            this.getPen().assign(tmp.getPen());
79
                pen = null;
80
            this.getCirclePen().assign(tmp.getCirclePen());
80
            } else {
81
            this.getCircleLabelsFont().assign(tmp.getCircleLabelsFont());
81
                getPen().assign(tmp.pen);
82
            this.circleLabels = tmp.circleLabels;
82
            }
83
            this.circleLabelsInside = tmp.circleLabelsInside;
83
            getCirclePen().assign(tmp.getCirclePen());
84
            this.circleLabelsRot = tmp.circleLabelsRot;
84
            getCircleLabelsFont().assign(tmp.getCircleLabelsFont());
85
            this.clockWiseLabels = tmp.clockWiseLabels;
85
            circleLabels = tmp.circleLabels;
86
            this.closeCircle = tmp.closeCircle;
86
            circleLabelsInside = tmp.circleLabelsInside;
87
            this.treatnulls = tmp.treatnulls;
87
            circleLabelsRot = tmp.circleLabelsRot;
88
            clockWiseLabels = tmp.clockWiseLabels;
89
            closeCircle = tmp.closeCircle;
90
            treatnulls = tmp.treatnulls;
88
        }
91
        }
89
        super.assign(source);
92
        super.assign(source);
90
    }
93
    }
(-)a/src/com/steema/teechart/styles/Donut.java (-3 / +1 lines)
Lines 42-50 public class Donut extends Pie { Link Here
42
    
42
    
43
    public void assign(Series source) {
43
    public void assign(Series source) {
44
        if (source instanceof Donut) {
44
        if (source instanceof Donut) {
45
            Donut tmp = (Donut)source;
45
            setDonutPercent(((Donut)source).getDonutPercent());
46
            
47
            this.setDonutPercent(tmp.DEFAULTDONUTPERCENT);
48
        }
46
        }
49
        super.assign(source);
47
        super.assign(source);
50
    }
48
    }
(-)a/src/com/steema/teechart/styles/FastLine.java (-2 / +4 lines)
Lines 607-614 abstract class BaseLine extends Series { Link Here
607
    public void assign(Series source) {
607
    public void assign(Series source) {
608
        if (source instanceof BaseLine) {
608
        if (source instanceof BaseLine) {
609
            BaseLine tmp = (BaseLine)source;
609
            BaseLine tmp = (BaseLine)source;
610
            if (tmp.linePen != null) {
610
            if (tmp.linePen == null) {
611
                this.getLinePen().assign(tmp.linePen);
611
                tmp.linePen = null;
612
            } else {
613
                getLinePen().assign(tmp.linePen);
612
            }
614
            }
613
            treatnulls = tmp.getTreatNulls();
615
            treatnulls = tmp.getTreatNulls();
614
            setTreatNaNAsNull(tmp.getTreatNaNAsNull());
616
            setTreatNaNAsNull(tmp.getTreatNaNAsNull());
(-)a/src/com/steema/teechart/styles/Funnel.java (-9 / +8 lines)
Lines 68-82 public class Funnel extends Series { Link Here
68
    public void assign(Series source) {
68
    public void assign(Series source) {
69
        if (source instanceof Funnel) {
69
        if (source instanceof Funnel) {
70
            Funnel tmp = (Funnel)source;
70
            Funnel tmp = (Funnel)source;
71
            
71
            setAboveColor(tmp.getAboveColor());
72
            tmp.setAboveColor(((Funnel) source).getAboveColor());
72
            setAutoUpdate(tmp.getAutoUpdate());
73
            tmp.setAutoUpdate(((Funnel) source).getAutoUpdate());
73
            setBelowColor(tmp.getBelowColor());
74
            tmp.setBelowColor(((Funnel) source).getBelowColor());
74
            setChart(tmp.getChart());
75
            tmp.setChart(((Funnel) source).getChart());
75
            setDifferenceLimit(tmp.getDifferenceLimit());
76
            tmp.setDifferenceLimit(((Funnel) source).getDifferenceLimit());
76
            setOpportunityValues(tmp.getOpportunityValues());
77
            tmp.setOpportunityValues(((Funnel) source).getOpportunityValues());
77
            setQuotesSorted(tmp.getQuotesSorted());
78
            tmp.setQuotesSorted(((Funnel) source).getQuotesSorted());
78
            setWithinColor(tmp.getWithinColor());
79
            tmp.setWithinColor(((Funnel) source).getWithinColor());
80
        }
79
        }
81
        super.assign(source);
80
        super.assign(source);
82
    }
81
    }
(-)a/src/com/steema/teechart/styles/HighLow.java (-2 / +1 lines)
Lines 94-101 public class HighLow extends Series { Link Here
94
    
94
    
95
    public void assign(Series source) {
95
    public void assign(Series source) {
96
        if (source instanceof HighLow) {
96
        if (source instanceof HighLow) {
97
            HighLow tmp = (HighLow)source;
97
            setChart(source.getChart());
98
            tmp.setChart(((HighLow) source).getChart());
99
        }
98
        }
100
        super.assign(source);
99
        super.assign(source);
101
    }
100
    }
(-)a/src/com/steema/teechart/styles/Histogram.java (-3 / +3 lines)
Lines 57-65 public class Histogram extends BaseLine { Link Here
57
    public void assign(Series source) {
57
    public void assign(Series source) {
58
        if (source instanceof Histogram) {
58
        if (source instanceof Histogram) {
59
            Histogram tmp = (Histogram)source;
59
            Histogram tmp = (Histogram)source;
60
            tmp.setChart(((Histogram) source).getChart());
60
            setChart(tmp.getChart());
61
            tmp.setTransparency(((Histogram) source).getTransparency());
61
            setTransparency(tmp.getTransparency());
62
            tmp.setUseYOrigin(((Histogram) source).getUseYOrigin());
62
            setUseYOrigin(tmp.getUseYOrigin());
63
        }
63
        }
64
        super.assign(source);
64
        super.assign(source);
65
    }
65
    }
(-)a/src/com/steema/teechart/styles/IsoSurface.java (-5 / +9 lines)
Lines 89-99 public class IsoSurface extends Surface { Link Here
89
    public void assign(Series source) {
89
    public void assign(Series source) {
90
        if (source instanceof IsoSurface) {
90
        if (source instanceof IsoSurface) {
91
            IsoSurface tmp = (IsoSurface)source;
91
            IsoSurface tmp = (IsoSurface)source;
92
            tmp.setChart(((IsoSurface) source).getChart());
92
            setChart(tmp.getChart());
93
            tmp.getBandPen().assign(((IsoSurface)source).getBandPen());
93
            if (tmp.bandPen == null) {
94
            tmp.setSides(((IsoSurface)source).getSides());
94
                bandPen = null;
95
            tmp.setUseYPosition(((IsoSurface)source).getUseYPosition());
95
            } else {
96
            tmp.setYPosition(((IsoSurface)source).getYPosition());
96
                getBandPen().assign(tmp.bandPen);
97
            }
98
            setSides(tmp.getSides());
99
            setUseYPosition(tmp.getUseYPosition());
100
            setYPosition(tmp.getYPosition());
97
        }
101
        }
98
        super.assign(source);
102
        super.assign(source);
99
    }
103
    }
(-)a/src/com/steema/teechart/styles/KnobGauge.java (-2 / +2 lines)
Lines 44-51 public class KnobGauge extends CircularGauge { Link Here
44
    public void assign(Series source) {
44
    public void assign(Series source) {
45
        if (source instanceof KnobGauge) {
45
        if (source instanceof KnobGauge) {
46
            KnobGauge tmp = (KnobGauge)source;
46
            KnobGauge tmp = (KnobGauge)source;
47
            tmp.setChart(((KnobGauge) source).getChart());
47
            setChart(tmp.getChart());
48
            tmp.setAxisInside(((KnobGauge)source).getAxisInside());
48
            setAxisInside(tmp.getAxisInside());
49
        }
49
        }
50
        super.assign(source);
50
        super.assign(source);
51
    }
51
    }
(-)a/src/com/steema/teechart/styles/LinearGauge.java (-7 / +7 lines)
Lines 59-72 public class LinearGauge extends CustomGauge { Link Here
59
		this((IBaseChart) null);
59
		this((IBaseChart) null);
60
	}
60
	}
61
61
62
        public void assign(Series source) {
62
    public void assign(Series source) {
63
            if (source instanceof LinearGauge) {
63
        if (source instanceof LinearGauge) {
64
                LinearGauge tmp = (LinearGauge)source;
64
            LinearGauge tmp = (LinearGauge)source;
65
                tmp.setChart(((LinearGauge) source).getChart());
65
            setChart(tmp.getChart());
66
                tmp.setMaxValueIndicator(((LinearGauge)source).getMaxValueIndicator());
66
            setMaxValueIndicator(tmp.getMaxValueIndicator());
67
            }
68
            super.assign(source);
69
        }
67
        }
68
        super.assign(source);
69
    }
70
    
70
    
71
	protected void drawFace(IGraphics3D g) {
71
	protected void drawFace(IGraphics3D g) {
72
		g.rectangle(iNewRectangle);
72
		g.rectangle(iNewRectangle);
(-)a/src/com/steema/teechart/styles/Map.java (-3 / +3 lines)
Lines 55-63 public class Map extends Custom3DPalette { Link Here
55
    public void assign(Series source) {
55
    public void assign(Series source) {
56
        if (source instanceof Map) {
56
        if (source instanceof Map) {
57
            Map tmp = (Map)source;
57
            Map tmp = (Map)source;
58
            tmp.setChart(((Map) source).getChart());
58
            setChart(tmp.getChart());
59
            tmp.setShapes(((Map)source).getShapes());
59
            setShapes(tmp.getShapes());
60
            tmp.setTransparency(((Map)source).getTransparency());
60
            setTransparency(tmp.getTransparency());
61
        }
61
        }
62
        super.assign(source);
62
        super.assign(source);
63
    }    
63
    }    
(-)a/src/com/steema/teechart/styles/NumericGauge.java (-5 / +5 lines)
Lines 50-60 public class NumericGauge extends CustomGauge { Link Here
50
    public void assign(Series source) {
50
    public void assign(Series source) {
51
        if (source instanceof NumericGauge) {
51
        if (source instanceof NumericGauge) {
52
            NumericGauge tmp = (NumericGauge)source;
52
            NumericGauge tmp = (NumericGauge)source;
53
            tmp.setChart(((NumericGauge) source).getChart());
53
            setChart(tmp.getChart());
54
            tmp.setMarkersCollection(((NumericGauge)source).getMarkersCollection());
54
            setMarkersCollection(tmp.getMarkersCollection());
55
            tmp.setTextMarker(((NumericGauge)source).getTextMarker());
55
            setTextMarker(tmp.getTextMarker());
56
            tmp.setUnitsMarker(((NumericGauge)source).getUnitsMarker());
56
            setUnitsMarker(tmp.getUnitsMarker());
57
            tmp.setValueMarker(((NumericGauge)source).getValueMarker());
57
            setValueMarker(tmp.getValueMarker());
58
        }
58
        }
59
        super.assign(source);
59
        super.assign(source);
60
    }     
60
    }     
(-)a/src/com/steema/teechart/styles/OHLC.java (-5 / +5 lines)
Lines 48-58 public class OHLC extends Custom { Link Here
48
    public void assign(Series source) {
48
    public void assign(Series source) {
49
        if (source instanceof OHLC) {
49
        if (source instanceof OHLC) {
50
            OHLC tmp = (OHLC)source;
50
            OHLC tmp = (OHLC)source;
51
            tmp.setChart(((OHLC) source).getChart());
51
            setChart(tmp.getChart());
52
            tmp.setCloseValues(((OHLC)source).getCloseValues());
52
            setCloseValues(tmp.getCloseValues());
53
            tmp.setDateValues(((OHLC)source).getDateValues());
53
            setDateValues(tmp.getDateValues());
54
            tmp.setHighValues(((OHLC)source).getHighValues());
54
            setHighValues(tmp.getHighValues());
55
            tmp.setLowValues(((OHLC)source).getLowValues());
55
            setLowValues(tmp.getLowValues());
56
        }
56
        }
57
        super.assign(source);
57
        super.assign(source);
58
    }    
58
    }    
(-)a/src/com/steema/teechart/styles/Pie.java (-15 / +13 lines)
Lines 356-377 public class Pie extends Circular { Link Here
356
356
357
    public void assign(final Series source) {
357
    public void assign(final Series source) {
358
        if (source instanceof Pie) {
358
        if (source instanceof Pie) {
359
            Pie sourcePie = (Pie)source;
359
            Pie tmp = (Pie)source;
360
        
360
            angleSize = tmp.angleSize;
361
            this.angleSize = sourcePie.angleSize;
361
            bevelPercent = tmp.bevelPercent;
362
            this.bevelPercent = sourcePie.bevelPercent;
362
            dark3D = tmp.dark3D;
363
            this.dark3D = sourcePie.dark3D;
363
            darkPen = tmp.darkPen;
364
            this.darkPen =sourcePie.darkPen;
364
            iDonutPercent = tmp.iDonutPercent;
365
            this.iDonutPercent = sourcePie.iDonutPercent;
365
            explodeBiggest = tmp.explodeBiggest;
366
            this.explodeBiggest = sourcePie.explodeBiggest;
366
            explodedSlice = (ExplodedSliceList)tmp.explodedSlice.clone();
367
            this.explodedSlice = (ExplodedSliceList)sourcePie.explodedSlice.clone();
367
            multiPie = tmp.multiPie;
368
            this.multiPie = sourcePie.multiPie;
368
            sliceHeight = (SliceValueList)tmp.sliceHeight.clone();
369
            this.sliceHeight = (SliceValueList)sourcePie.sliceHeight.clone();
369
            usePatterns = tmp.usePatterns;
370
            this.usePatterns = sourcePie.usePatterns;
370
            otherSlice = tmp.otherSlice;
371
            this.otherSlice = sourcePie.otherSlice;
371
            piemarks = tmp.piemarks;
372
            this.piemarks = sourcePie.piemarks;
373
        }
372
        }
374
        
375
        super.assign(source);
373
        super.assign(source);
376
    }
374
    }
377
    
375
    
(-)a/src/com/steema/teechart/styles/PointFigure.java (-2 / +2 lines)
Lines 56-63 public class PointFigure extends OHLC { Link Here
56
    public void assign(Series source) {
56
    public void assign(Series source) {
57
        if (source instanceof PointFigure) {
57
        if (source instanceof PointFigure) {
58
            PointFigure tmp = (PointFigure)source;
58
            PointFigure tmp = (PointFigure)source;
59
            tmp.setChart(((PointFigure) source).getChart());
59
            setChart(tmp.getChart());
60
            tmp.setBoxSize(((PointFigure)source).getBoxSize());
60
            setBoxSize(tmp.getBoxSize());
61
        }
61
        }
62
        super.assign(source);
62
        super.assign(source);
63
    }    
63
    }    
(-)a/src/com/steema/teechart/styles/Points.java (-2 / +2 lines)
Lines 44-51 public class Points extends CustomPoint { Link Here
44
    public void assign(Series source) {
44
    public void assign(Series source) {
45
        if (source instanceof Points) {
45
        if (source instanceof Points) {
46
            Points tmp = (Points)source;
46
            Points tmp = (Points)source;
47
            tmp.setColor(((Points)source).getColor());
47
            setColor(tmp.getColor());
48
            tmp.setColorEach(((Points) source).getColorEach());  
48
            setColorEach(tmp.getColorEach());
49
        }
49
        }
50
        super.assign(source);
50
        super.assign(source);
51
    }     
51
    }     
(-)a/src/com/steema/teechart/styles/Points3D.java (-4 / +4 lines)
Lines 78-87 public class Points3D extends Custom3D { Link Here
78
    public void assign(Series source) {
78
    public void assign(Series source) {
79
        if (source instanceof Points3D) {
79
        if (source instanceof Points3D) {
80
            Points3D tmp = (Points3D)source;
80
            Points3D tmp = (Points3D)source;
81
            tmp.setChart(((Points3D)source).getChart());
81
            setChart(tmp.getChart());
82
            tmp.setColor(((Points3D) source).getColor());  
82
            setColor(tmp.getColor());
83
            tmp.setDepthSize(((Points3D) source).getDepthSize());  
83
            setDepthSize(tmp.getDepthSize());
84
            tmp.setTreatNulls(((Points3D) source).getTreatNulls());  
84
            setTreatNulls(tmp.getTreatNulls());
85
        }
85
        }
86
        super.assign(source);
86
        super.assign(source);
87
    }    
87
    }    
(-)a/src/com/steema/teechart/styles/PolygonList.java (-1 / +1 lines)
Lines 53-59 import java.util.ArrayList; Link Here
53
53
54
        public void assign(PolygonList value) {
54
        public void assign(PolygonList value) {
55
            clear();
55
            clear();
56
            add(value);
56
            addAll(value);
57
        }
57
        }
58
58
59
        public Polygon getPolygon(int index) {
59
        public Polygon getPolygon(int index) {
(-)a/src/com/steema/teechart/styles/PolygonSeries.java (-2 / +2 lines)
Lines 47-54 import com.steema.teechart.drawing.IGraphics3D; Link Here
47
        public void assign(Series source) {
47
        public void assign(Series source) {
48
            if (source instanceof PolygonSeries) {
48
            if (source instanceof PolygonSeries) {
49
                PolygonSeries tmp = (PolygonSeries)source;
49
                PolygonSeries tmp = (PolygonSeries)source;
50
                tmp.setPolygon(((PolygonSeries)source).getPolygon());
50
                setPolygon(tmp.getPolygon());
51
                tmp.setColor(((PolygonSeries) source).getColor());   
51
                setColor(tmp.getColor());
52
            }
52
            }
53
            super.assign(source);
53
            super.assign(source);
54
        }        
54
        }        
(-)a/src/com/steema/teechart/styles/Pyramid.java (-2 / +1 lines)
Lines 42-49 public class Pyramid extends Series { Link Here
42
    
42
    
43
    public void assign(Series source) {
43
    public void assign(Series source) {
44
        if (source instanceof Pyramid) {
44
        if (source instanceof Pyramid) {
45
            Pyramid tmp = (Pyramid)source;
45
            setSizePercent(((Pyramid)source).getSizePercent());
46
            tmp.setSizePercent(((Pyramid)source).getSizePercent()); 
47
        }
46
        }
48
        super.assign(source);
47
        super.assign(source);
49
    }      
48
    }      
(-)a/src/com/steema/teechart/styles/SeriesMarks.java (-8 / +11 lines)
Lines 92-105 public class SeriesMarks extends TextShape { Link Here
92
    @Override
92
    @Override
93
    public void assign(Shape s) {
93
    public void assign(Shape s) {
94
        super.assign(s);
94
        super.assign(s);
95
        ((SeriesMarks) s).iSeries = iSeries;
95
        if (s instanceof SeriesMarks) {
96
        ((SeriesMarks) s).setStyle(markerStyle);
96
            SeriesMarks tmp = (SeriesMarks)s;
97
        ((SeriesMarks) s).setAngle(angle);
97
            iSeries = tmp.iSeries;
98
        ((SeriesMarks) s).setMultiLine(multiLine);
98
            setStyle(tmp.getStyle());
99
        ((SeriesMarks) s).setDrawEvery(drawEvery);
99
            setAngle(tmp.getAngle());
100
        ((SeriesMarks) s).setFontSeriesColor(fontSeriesColor);
100
            setMultiLine(tmp.getMultiLine());
101
        ((SeriesMarks) s).setCallout(getCallout());
101
            setDrawEvery(tmp.getDrawEvery());
102
        ((SeriesMarks) s).setMarkerTail(markerTail);
102
            setFontSeriesColor(tmp.getFontSeriesColor());
103
            setCallout(tmp.getCallout());
104
            setMarkerTail(tmp.getMarkerTail());
105
        }
103
    }
106
    }
104
107
105
    public MarksCallout getCallout() {
108
    public MarksCallout getCallout() {
(-)a/src/com/steema/teechart/styles/SeriesMarksPosition.java (-7 / +4 lines)
Lines 37-51 public class SeriesMarksPosition { Link Here
37
    }
37
    }
38
38
39
    public void assign(SeriesMarksPosition source) {
39
    public void assign(SeriesMarksPosition source) {
40
        arrowFrom.x = source.arrowFrom.x;
40
        arrowFrom.set(source.arrowFrom);
41
        arrowFrom.y = source.arrowFrom.y;
41
        arrowTo.set(source.arrowTo);
42
        arrowTo.x = source.arrowTo.x;
42
        leftTop.set(source.leftTop);
43
        arrowTo.y = source.arrowTo.y;
44
        leftTop.x = source.leftTop.x;
45
        leftTop.y = source.leftTop.y;
46
        height = source.height;
43
        height = source.height;
47
        width = source.width;
44
        width = source.width;
48
        midPoint = new Point(source.midPoint.x,source.midPoint.y);
45
        midPoint.set(source.midPoint);
49
        hasMid = source.hasMid;
46
        hasMid = source.hasMid;
50
    }
47
    }
51
    
48
    
(-)a/src/com/steema/teechart/styles/SeriesPointer.java (-13 / +17 lines)
Lines 51-71 public class SeriesPointer extends TeeBase { Link Here
51
    }
51
    }
52
52
53
    public void assign(SeriesPointer source) {
53
    public void assign(SeriesPointer source) {
54
        if (source.bBrush != null) {
54
        if (source.bBrush == null) {
55
            this.getBrush().assign(source.bBrush);
55
            bBrush = null;
56
        } else {
57
            getBrush().assign(source.bBrush);
56
        }
58
        }
57
        if (source.pen != null) {
59
        if (source.pen == null) {
58
            this.getPen().assign(source.pen);
60
            pen = null;
61
        } else {
62
            getPen().assign(source.pen);
59
        }
63
        }
60
        this.style = source.style;
64
        style = source.style;
61
        this.vertSize = source.vertSize;
65
        vertSize = source.vertSize;
62
        this.horizSize = source.horizSize;
66
        horizSize = source.horizSize;
63
        this.dark3D = source.dark3D;
67
        dark3D = source.dark3D;
64
        this.draw3D = source.draw3D;
68
        draw3D = source.draw3D;
65
        this.inflate = source.inflate;
69
        inflate = source.inflate;
66
        this.bVisible = source.bVisible;
70
        bVisible = source.bVisible;
67
        this.allowChangeSize = source.allowChangeSize;
71
        allowChangeSize = source.allowChangeSize;
68
        this.defaultVisible = source.defaultVisible;
72
        defaultVisible = source.defaultVisible;
69
    }
73
    }
70
74
71
    protected Object readResolve() {
75
    protected Object readResolve() {
(-)a/src/com/steema/teechart/styles/Shape.java (-11 / +11 lines)
Lines 54-70 public class Shape extends Series { Link Here
54
    public void assign(Series source) {
54
    public void assign(Series source) {
55
        if (source instanceof Shape) {
55
        if (source instanceof Shape) {
56
            Shape tmp = (Shape)source;
56
            Shape tmp = (Shape)source;
57
            tmp.setChart(((Shape)source).getChart()); 
57
            setChart(tmp.getChart());
58
            tmp.setHorizAlignment(((Shape)source).getHorizAlignment()); 
58
            setHorizAlignment(tmp.getHorizAlignment());
59
            tmp.setStyle(((Shape)source).getStyle()); 
59
            setStyle(tmp.getStyle());
60
            tmp.setText(((Shape)source).getText()); 
60
            setText(tmp.getText());
61
            tmp.setTransparent(((Shape)source).getTransparent()); 
61
            setTransparent(tmp.getTransparent());
62
            tmp.setVertAlignment(((Shape)source).getVertAlignment());
62
            setVertAlignment(tmp.getVertAlignment());
63
            tmp.setX0(((Shape)source).getX0());
63
            setX0(tmp.getX0());
64
            tmp.setY0(((Shape)source).getY0());
64
            setY0(tmp.getY0());
65
            tmp.setX1(((Shape)source).getX1());
65
            setX1(tmp.getX1());
66
            tmp.setY1(((Shape)source).getY1());
66
            setY1(tmp.getY1());
67
            tmp.setXYStyle(((Shape)source).getXYStyle());
67
            setXYStyle(tmp.getXYStyle());
68
        }
68
        }
69
        super.assign(source);
69
        super.assign(source);
70
    }     
70
    }     
(-)a/src/com/steema/teechart/styles/Smith.java (-4 / +4 lines)
Lines 59-68 public class Smith extends Circular { Link Here
59
    public void assign(Series source) {
59
    public void assign(Series source) {
60
        if (source instanceof Smith) {
60
        if (source instanceof Smith) {
61
            Smith tmp = (Smith)source;
61
            Smith tmp = (Smith)source;
62
            tmp.setChart(((Smith)source).getChart());
62
            setChart(tmp.getChart());
63
            tmp.setCLabels(((Smith)source).getCLabels());
63
            setCLabels(tmp.getCLabels());
64
            tmp.setImagSymbol(((Smith)source).getImagSymbol());
64
            setImagSymbol(tmp.getImagSymbol());
65
            tmp.setRLabels(((Smith)source).getRLabels());
65
            setRLabels(tmp.getRLabels());
66
        }
66
        }
67
        super.assign(source);
67
        super.assign(source);
68
    }     
68
    }     
(-)a/src/com/steema/teechart/styles/Surface.java (-7 / +7 lines)
Lines 96-108 public class Surface extends Custom3DGrid { Link Here
96
    public void assign(Series source) {
96
    public void assign(Series source) {
97
        if (source instanceof Surface) {
97
        if (source instanceof Surface) {
98
            Surface tmp = (Surface)source;
98
            Surface tmp = (Surface)source;
99
            tmp.setChart(((Surface)source).getChart());
99
            setChart(tmp.getChart());
100
            tmp.setDotFrame(((Surface)source).getDotFrame());
100
            setDotFrame(tmp.getDotFrame());
101
            tmp.setHideCells(((Surface)source).getHideCells());
101
            setHideCells(tmp.getHideCells());
102
            tmp.setSideLines(((Surface)source).getSideLines());
102
            setSideLines(tmp.getSideLines());
103
            tmp.setSmoothPalette(((Surface)source).getSmoothPalette());
103
            setSmoothPalette(tmp.getSmoothPalette());
104
            tmp.setWaterFall(((Surface)source).getWaterFall());
104
            setWaterFall(tmp.getWaterFall());
105
            tmp.setWireFrame(((Surface)source).getWireFrame());
105
            setWireFrame(tmp.getWireFrame());
106
        }
106
        }
107
        super.assign(source);
107
        super.assign(source);
108
    }     
108
    }     
(-)a/src/com/steema/teechart/styles/Ternary.java (-14 / +22 lines)
Lines 121-140 public class Ternary extends Custom3DPalette { Link Here
121
        public void assign(Series source) {
121
        public void assign(Series source) {
122
            if (source instanceof Ternary) {
122
            if (source instanceof Ternary) {
123
                Ternary tmp = (Ternary)source;
123
                Ternary tmp = (Ternary)source;
124
                tmp.setAxisScale(((Ternary)source).getAxisScale());
124
                setAxisScale(tmp.getAxisScale());
125
                tmp.setChart(((Ternary)source).getChart()); 
125
                setChart(tmp.getChart());
126
                tmp.getGradient().assign(((Ternary)source).getGradient()); 
126
                getGradient().assign(tmp.getGradient());
127
                tmp.getLinesPen().assign(((Ternary)source).getLinesPen()); 
127
                if (tmp.fLinesPen == null) {
128
                tmp.setMarkStyle(((Ternary)source).getMarkStyle());
128
                    fLinesPen = null;
129
                tmp.setPlotFormat(((Ternary)source).getPlotFormat());
129
                } else {
130
                tmp.getPointer().assign(((Ternary)source).getPointer());
130
                    getLinesPen().assign(tmp.fLinesPen);
131
                tmp.setRadiusValues(((Ternary)source).getRadiusValues());
131
                }
132
                tmp.setRotateLabels(((Ternary)source).getRotateLabels());
132
                setMarkStyle(tmp.getMarkStyle());
133
                tmp.setTernaryLegendStyle(((Ternary)source).getTernaryLegendStyle());
133
                setPlotFormat(tmp.getPlotFormat());
134
                tmp.setTernaryMarkStyle(((Ternary)source).getTernaryMarkStyle());
134
                if (tmp.fPointer == null) {
135
                tmp.setTernaryStyle(((Ternary)source).getTernaryStyle());
135
                    fPointer = null;
136
                tmp.fVertexTitles = (((Ternary)source).fVertexTitles);
136
                } else {
137
                tmp.setWeightValues(((Ternary)source).getWeightValues());
137
                    getPointer().assign(tmp.fPointer);
138
                }
139
                setRadiusValues(tmp.getRadiusValues());
140
                setRotateLabels(tmp.getRotateLabels());
141
                setTernaryLegendStyle(tmp.getTernaryLegendStyle());
142
                setTernaryMarkStyle(tmp.getTernaryMarkStyle());
143
                setTernaryStyle(tmp.getTernaryStyle());
144
                fVertexTitles = tmp.fVertexTitles;
145
                setWeightValues(tmp.getWeightValues());
138
            }
146
            }
139
            super.assign(source);
147
            super.assign(source);
140
        }         
148
        }         
(-)a/src/com/steema/teechart/styles/Tower.java (-5 / +5 lines)
Lines 58-68 public class Tower extends Custom3DGrid { Link Here
58
    public void assign(Series source) {
58
    public void assign(Series source) {
59
        if (source instanceof Tower) {
59
        if (source instanceof Tower) {
60
            Tower tmp = (Tower)source;
60
            Tower tmp = (Tower)source;
61
            tmp.setPercentWidth(((Tower)source).getPercentWidth()); 
61
            setPercentWidth(tmp.getPercentWidth());
62
            tmp.setPercentDepth(((Tower)source).getPercentDepth()); 
62
            setPercentDepth(tmp.getPercentDepth());
63
            tmp.setTowerStyle(((Tower)source).getTowerStyle()); 
63
            setTowerStyle(tmp.getTowerStyle());
64
            tmp.setTransparency(((Tower)source).getTransparency());
64
            setTransparency(tmp.getTransparency());
65
            tmp.setUseOrigin(((Tower)source).getUseOrigin());
65
            setUseOrigin(tmp.getUseOrigin());
66
        }
66
        }
67
        super.assign(source);
67
        super.assign(source);
68
    }     
68
    }     
(-)a/src/com/steema/teechart/styles/TriSurface.java (-2 / +2 lines)
Lines 103-110 public class TriSurface extends Custom3DPalette { Link Here
103
    public void assign(Series source) {
103
    public void assign(Series source) {
104
        if (source instanceof TriSurface) {
104
        if (source instanceof TriSurface) {
105
            TriSurface tmp = (TriSurface)source;
105
            TriSurface tmp = (TriSurface)source;
106
            tmp.setCacheTriangles(((TriSurface)source).getCacheTriangles()); 
106
            setCacheTriangles(tmp.getCacheTriangles());
107
            tmp.setHideTriangles(((TriSurface)source).getHideTriangles());
107
            setHideTriangles(tmp.getHideTriangles());
108
        }
108
        }
109
        super.assign(source);
109
        super.assign(source);
110
    }     
110
    }     
(-)a/src/com/steema/teechart/styles/Vector3D.java (-2 / +2 lines)
Lines 54-61 public class Vector3D extends Custom3DPalette { Link Here
54
    public void assign(Series source) {
54
    public void assign(Series source) {
55
        if (source instanceof Vector3D) {
55
        if (source instanceof Vector3D) {
56
            Vector3D tmp = (Vector3D)source;
56
            Vector3D tmp = (Vector3D)source;
57
            tmp.setArrowHeight(((Vector3D)source).getArrowHeight());
57
            setArrowHeight(tmp.getArrowHeight());
58
            tmp.setArrowWidth(((Vector3D)source).getArrowWidth());
58
            setArrowWidth(tmp.getArrowWidth());
59
        }
59
        }
60
        super.assign(source);
60
        super.assign(source);
61
    }     
61
    }     
(-)a/src/com/steema/teechart/styles/Volume.java (-3 / +3 lines)
Lines 58-66 public class Volume extends Custom { Link Here
58
    public void assign(Series source) {
58
    public void assign(Series source) {
59
        if (source instanceof Volume) {
59
        if (source instanceof Volume) {
60
            Volume tmp = (Volume)source;
60
            Volume tmp = (Volume)source;
61
            tmp.setColor(((Volume)source).getColor()); 
61
            setColor(tmp.getColor());
62
            tmp.setOrigin(((Volume)source).getOrigin());
62
            setOrigin(tmp.getOrigin());
63
            tmp.setUseOrigin(((Volume)source).getUseOrigin());
63
            setUseOrigin(tmp.getUseOrigin());
64
        }
64
        }
65
        super.assign(source);
65
        super.assign(source);
66
    }     
66
    }     
(-)a/src/com/steema/teechart/styles/World.java (-8 / +11 lines)
Lines 157-170 import java.util.logging.Logger; Link Here
157
      }
157
      }
158
    }
158
    }
159
159
160
    public void assign(Series source)
160
    public void assign(Series source) {
161
    {
161
        super.assign(source);
162
      super.assign(source);
162
        if (source instanceof World) {
163
      if (source instanceof World)
163
            World tmp = (World)source;
164
      {
164
            if (tmp.shadow == null) {
165
        this.shadow.assign(((World)source).shadow);
165
                shadow = null;
166
        this.map = ((World)source).map;
166
            } else {
167
      }
167
                getShadow().assign(tmp.shadow);
168
            }
169
            map = tmp.map;
170
        }
168
    }
171
    }
169
172
170
    public void galleryChanged3D(boolean Is3D)
173
    public void galleryChanged3D(boolean Is3D)

Return to bug 1615