Révision 1742

tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartsEngine.java (revision 1742)
93 93
	 */
94 94
	public void plot(File file, String cmd, ChartResult result, String title, String subtitle)	{
95 95
		try {
96
			
97
			// FIXME: margin tests
98
			//cmd += "par(mar = c(10,4,4,2) + 0.1);\n"; //$NON-NLS-1$
99
			
100
			// FIXME: outer margin to not cut of title
101
			//cmd += "par(oma = c(10,2,2,2));\n"; //$NON-NLS-1$
102

  
103
			
96 104
			if(result != null)	{
97 105
				// draw grid
98 106
				if(result.isGridVisible())	{
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java (revision 1742)
59 59
			// colors
60 60
			//this.getChartsEngine().setColors(result.getRenderingColorsMode(),  1);
61 61
			// FIXME: one color by part
62
			this.getChartsEngine().setColors(result.getRenderingColorsMode(),  parts.size());
62
			this.getChartsEngine().setColors(result.getRenderingColorsMode(), parts.size());
63 63

  
64 64
			
65 65
			String ylab = PartitionCoreMessages.numberOfWords;
66 66

  
67
			String cmd = "pie(" + ssizes + ", col=colors, labels=" + snames + //$NON-NLS-1$ //$NON-NLS-2$
68
					", horiz=F, las=2, ylab=\"" + ylab + "\");\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
67
			//String cmd = "pie(" + ssizes + ", col=colors, labels=" + snames + ", horiz=F, las=2, ylab=\"" + ylab + "\");\n"; //$NON-NLS-1$
69 68

  
69
			String cmd = String.format("pie(%s, col=colors, labels=%s, horiz=F, las=2, ylab=\"%s\");\n", ssizes, snames, ylab); //$NON-NLS-1$
70
			
70 71
			// plot the chart
71 72
			this.getChartsEngine().plot(file, cmd, result, Utils.createPartitionDimensionsChartTitle(partitionDimensions), Utils.createPartitionDimensionsChartSubtitle(partitionDimensions, sortPartsBySize, displayPartsCountInTitle));
72 73

  
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java (revision 1742)
69 69
			
70 70
			String ylab = PartitionCoreMessages.numberOfWords;
71 71

  
72
			// FIXME: margin
73
			//cmd += "par(mar=c(5.5,5,5,5));\n"; //$NON-NLS-1$
74
			
75
			// FIXME: outer margin to not cut of title
76
			//cmd += "par(oma=c(2,2,2,2));\n"; //$NON-NLS-1$
77
			
78
			
79
			
80 72
//			String cmd += "barplot(" + ssizes + ", col=colors, names.arg=" + snames + //$NON-NLS-1$ //$NON-NLS-2$
81 73
//					", main=\"" + title + "\", horiz=F, las=2, ylab=\"" + ylab + "\");\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
82 74

  

Formats disponibles : Unified diff