Revision 172

tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java (revision 172)
24 24
import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
25 25
import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
26 26
import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
27
import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
28 27
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IItemSelectionRenderer;
29 28
import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
30 29

  
......
41 40
	 */
42 41
	protected MultipleItemsSelector multipleItemsSelector;
43 42

  
43

  
44 44
	/**
45 45
	 * Values number format.
46 46
	 */
tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/HighchartsDefaultTheme.java (revision 172)
42 42
import org.jfree.ui.RectangleInsets;
43 43
import org.jfree.ui.TextAnchor;
44 44
import org.jfree.util.ShapeUtilities;
45
//import org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers.CASingularValuesItemSelectionRenderer;
46
//import org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers.FCAItemSelectionRenderer;
45
import org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers.CASingularValuesItemSelectionRenderer;
46
import org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers.FCAItemSelectionRenderer;
47 47
import org.txm.chartsengine.core.ChartsEngine;
48 48
import org.txm.chartsengine.jfreechart.core.renderers.XYCardinalSplineRenderer;
49 49
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IItemSelectionRenderer;
......
58 58
import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionXYLineAndShapeRenderer;
59 59
import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionXYSplineRenderer;
60 60
import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionXYStepRenderer;
61
//import org.txm.core.chartsengine.base.___ChartsEngine;
61
import org.txm.core.chartsengine.base.___ChartsEngine;
62 62

  
63 63
/**
64 64
 * Highcharts GWT library default rendering theme.
......
242 242
	    	}
243 243

  
244 244

  
245
//	        // CA Factorial Map chart
246
//	        if(renderer instanceof FCAItemSelectionRenderer)	{
245
	        // CA Factorial Map chart
246
	    	// FIXME: done now in the chart creator
247
	        if(renderer instanceof FCAItemSelectionRenderer)	{
247 248
//
248 249
//	        	((FCAItemSelectionRenderer)renderer).setBaseLinesVisible(false);
249 250
//	        	renderer.setBaseOutlinePaint(Color.decode("#666666"));
......
268 269
//		    	if(legendTitle != null)	{
269 270
//		    		legendTitle.setFrame(new BlockRoundBorder(Color.GRAY));
270 271
//		    	}
271
//	        }
272
//	        // Not a CA Factorial Map chart
273
//	        else	{
272
	        }
273
	        // Not a CA Factorial Map chart
274
	        else	{
274 275

  
275 276
	        	// Items colors
276 277
	        	this.applySeriesPaint(plot, itemsColorsRenderingMode);
......
324 325
		    	}
325 326

  
326 327

  
327
	    //    }
328
	        }
328 329

  
329 330

  
330 331
	        // Series shapes
......
394 395

  
395 396

  
396 397
	    	// For drawing tick marks between categories and not in theirs middle
397
	    	if(((IItemSelectionRenderer)renderer).getChartType() != ChartsEngine.CHART_TYPE_CAH_2D)	{
398
	    	if(((IItemSelectionRenderer)renderer).getChartType() != ___ChartsEngine.CHART_TYPE_CAH_2D)	{
398 399
	    		plot.setDomainAxis(new CategoryAxisBetweenTicks(plot.getDomainAxis()));
399 400
	    	}
400 401

  
......
415 416
	    		ItemSelectionCategoryBarRenderer barRenderer = (ItemSelectionCategoryBarRenderer) renderer;
416 417
	    		barRenderer.setDrawBarOutline(true);
417 418

  
418
		    	if(((IItemSelectionRenderer)renderer).getChartType() == ChartsEngine.CHART_TYPE_CAH_2D)	{
419
		    	if(((IItemSelectionRenderer)renderer).getChartType() == ___ChartsEngine.CHART_TYPE_CAH_2D)	{
419 420
		    		barRenderer.setMaximumBarWidth(0.001);
420 421
		    	}
421 422
		    	else	{
......
666 667

  
667 668

  
668 669
 
669
//	@Override
670
//	public XYLineAndShapeRenderer createFCARenderer() {
671
//		return new FCAItemSelectionRenderer();
672
//	}
670
	@Override
671
	public XYLineAndShapeRenderer createFCARenderer() {
672
		return new FCAItemSelectionRenderer();
673
	}
673 674

  
674
//
675
//	@Override
676
//	public BarRenderer createCASingularValuesRenderer()	{
677
//		return new CASingularValuesItemSelectionRenderer();
678
//	}
679 675

  
676
	@Override
677
	public BarRenderer createCASingularValuesRenderer()	{
678
		return new CASingularValuesItemSelectionRenderer();
679
	}
680 680

  
681

  
681 682
	@Override
682 683
	public XYLineAndShapeRenderer createXYLineAndShapeRenderer(boolean linesVisible, boolean shapesVisible) {
683 684
		return new ItemSelectionXYLineAndShapeRenderer(linesVisible, shapesVisible);

Also available in: Unified diff