Revision 196

tmp/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF (revision 196)
12 12
Bundle-ActivationPolicy: lazy
13 13
Export-Package: org.txm.chartsengine.r.core,
14 14
 org.txm.chartsengine.r.core.preferences,
15
 org.txm.chartsengine.r.core.themes,
15 16
 org.txm.stat.engine.r
16 17
Bundle-Vendor: TXM
tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartsEngine.java (revision 196)
18 18
 */
19 19
public class RChartsEngine extends ChartsEngine {
20 20

  
21
	@Deprecated
22
	// FIXME : to remove when charts engine will be validated, related to rendering system
23
	public static String black = "black"; //$NON-NLS-1$
24 21

  
25
	/** The colors. */
26
	@Deprecated
27
	// FIXME : to remove when charts engine will be validated, related to rendering system
28
	public static String[] colors = {"red","blue","green3","gold", "deeppink1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
29
		"firebrick","navyblue","green4", "darkgoldenrod1","magenta1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
30
		"deepskyblue","green","yellow","cyan","greenyellow", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
31
		"seagreen1", black, "grey" }; //$NON-NLS-1$ //$NON-NLS-2$ 
32
	//int[] colors16 = {552, 26, 257, 142, 117,133 ,491, 258, 76, 451, 121, 254, 652, 68 ,259, 575};
33 22

  
34
	/** The monocolors. */
35
	@Deprecated
36
	// FIXME : to remove when charts engine will be validated, related to rendering system
37
	public static String[] monocolors = {black, black, black, black, black,
38
		black, black, black, black, black,
39
		black, black, black, black, black, black }; 
40
	//int[] monocolors = {24, 24, 24, 24, 24, 24 ,24, 24, 24, 24, 24, 24, 24, 24 ,24, 24};
41

  
42
	// jeu de 16 couleurs :
43

  
44
	// jeu de 10 couleurs :
45
	@Deprecated
46
	// FIXME : to remove when charts engine will be validated, related to rendering system
47
	public static String[] colors10 = {"red","blue","green4","gold","deeppink1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
48
			"firebrick", "deepskyblue","greenyellow", "darkgoldenrod1","magenta1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
49

  
50
	// jeu de 5 couleurs :
51
	@Deprecated
52
	// FIXME : to remove when charts engine will be validated, related to rendering system
53
	public static String[] colors5 = {"red", "blue", "green4", "gold", "deeppink1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
54

  
55
	/** The styles. */
56
	@Deprecated
57
	// FIXME : to remove when charts engine will be validated, related to rendering system
58
	public static int[] styles = {
59
		1, 2, 3, 4, 5, 6, 1, 2, 3, 4 ,5, 6 ,1 ,2 ,3, 4 }; 
60

  
61
	/** The monostyles. */
62
	@Deprecated
63
	// FIXME : to remove when charts engine will be validated, related to rendering system
64
	public static int[] monostyles = {
65
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ,1 ,1 ,1, 1, 1, 1 }; 
66

  
67

  
68
	/** The widths. */
69
	@Deprecated
70
	// FIXME : to remove when charts engine will be validated, related to rendering system
71
	public static int[] widths = {
72
		1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3 }; 
73

  
74
	/** The monowidths. */
75
	@Deprecated
76
	// FIXME : to remove when charts engine will be validated, related to rendering system
77
	public static int[] monowidths = {
78
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; 
79

  
80

  
81 23
	/**
82 24
	 * The charts engine internal name.
83 25
	 */
tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/themes/DefaultTheme.java (revision 196)
1
package org.txm.chartsengine.r.core.themes;
2

  
3
public class DefaultTheme {
4

  
5
	
6
	@Deprecated
7
	// FIXME : to remove when charts engine will be validated, related to rendering system
8
	public static String black = "black"; //$NON-NLS-1$
9

  
10
	/** The colors. */
11
	@Deprecated
12
	// FIXME : to remove when charts engine will be validated, related to rendering system
13
	public static String[] colors = {"red","blue","green3","gold", "deeppink1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
14
		"firebrick","navyblue","green4", "darkgoldenrod1","magenta1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
15
		"deepskyblue","green","yellow","cyan","greenyellow", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
16
		"seagreen1", black, "grey" }; //$NON-NLS-1$ //$NON-NLS-2$ 
17
	//int[] colors16 = {552, 26, 257, 142, 117,133 ,491, 258, 76, 451, 121, 254, 652, 68 ,259, 575};
18

  
19
	/** The monocolors. */
20
	@Deprecated
21
	// FIXME : to remove when charts engine will be validated, related to rendering system
22
	public static String[] monocolors = {black, black, black, black, black,
23
		black, black, black, black, black,
24
		black, black, black, black, black, black }; 
25
	//int[] monocolors = {24, 24, 24, 24, 24, 24 ,24, 24, 24, 24, 24, 24, 24, 24 ,24, 24};
26

  
27
	// jeu de 16 couleurs :
28

  
29
	// jeu de 10 couleurs :
30
	@Deprecated
31
	// FIXME : to remove when charts engine will be validated, related to rendering system
32
	public static String[] colors10 = {"red","blue","green4","gold","deeppink1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
33
			"firebrick", "deepskyblue","greenyellow", "darkgoldenrod1","magenta1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
34

  
35
	// jeu de 5 couleurs :
36
	@Deprecated
37
	// FIXME : to remove when charts engine will be validated, related to rendering system
38
	public static String[] colors5 = {"red", "blue", "green4", "gold", "deeppink1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
39

  
40
	/** The styles. */
41
	@Deprecated
42
	// FIXME : to remove when charts engine will be validated, related to rendering system
43
	public static int[] styles = {
44
		1, 2, 3, 4, 5, 6, 1, 2, 3, 4 ,5, 6 ,1 ,2 ,3, 4 }; 
45

  
46
	/** The monostyles. */
47
	@Deprecated
48
	// FIXME : to remove when charts engine will be validated, related to rendering system
49
	public static int[] monostyles = {
50
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ,1 ,1 ,1, 1, 1, 1 }; 
51

  
52

  
53
	/** The widths. */
54
	@Deprecated
55
	// FIXME : to remove when charts engine will be validated, related to rendering system
56
	public static int[] widths = {
57
		1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3 }; 
58

  
59
	/** The monowidths. */
60
	@Deprecated
61
	// FIXME : to remove when charts engine will be validated, related to rendering system
62
	public static int[] monowidths = {
63
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; 
64

  
65
	public DefaultTheme() {
66
		// TODO Auto-generated constructor stub
67
	}
68

  
69
}
0 70

  
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 196)
39 39

  
40 40
import org.txm.HasResults;
41 41
import org.txm.Messages;
42
import org.txm.chartsengine.r.core.themes.DefaultTheme;
42 43
import org.txm.functions.Function;
43 44
import org.txm.functions.TXMResult;
44 45
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
85 86
	/** The writer. */
86 87
	private BufferedWriter writer;
87 88

  
88
	@Deprecated
89
	// FIXME : to remove when charts engine will be validated, related to rendering system
90
	public static String black = "black"; //$NON-NLS-1$
91

  
92
	/** The colors. */
93
	@Deprecated
94
	// FIXME : to remove when charts engine will be validated, related to rendering system
95
	public static String[] colors = {"red","blue","green3","gold", "deeppink1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
96
		"firebrick","navyblue","green4", "darkgoldenrod1","magenta1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
97
		"deepskyblue","green","yellow","cyan","greenyellow", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
98
		"seagreen1", black, "grey" }; //$NON-NLS-1$ //$NON-NLS-2$ 
99
	//int[] colors16 = {552, 26, 257, 142, 117,133 ,491, 258, 76, 451, 121, 254, 652, 68 ,259, 575};
100

  
101
	/** The monocolors. */
102
	@Deprecated
103
	// FIXME : to remove when charts engine will be validated, related to rendering system
104
	public static String[] monocolors = {black, black, black, black, black,
105
		black, black, black, black, black,
106
		black, black, black, black, black, black }; 
107
	//int[] monocolors = {24, 24, 24, 24, 24, 24 ,24, 24, 24, 24, 24, 24, 24, 24 ,24, 24};
108

  
109
	// jeu de 16 couleurs :
110

  
111
	// jeu de 10 couleurs :
112
	@Deprecated
113
	// FIXME : to remove when charts engine will be validated, related to rendering system
114
	public static String[] colors10 = {"red","blue","green4","gold","deeppink1", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
115
			"firebrick", "deepskyblue","greenyellow", "darkgoldenrod1","magenta1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
116

  
117
	// jeu de 5 couleurs :
118
	@Deprecated
119
	// FIXME : to remove when charts engine will be validated, related to rendering system
120
	public static String[] colors5 = {"red", "blue", "green4", "gold", "deeppink1"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
121

  
122
	/** The styles. */
123
	@Deprecated
124
	// FIXME : to remove when charts engine will be validated, related to rendering system
125
	public static int[] styles = {
126
		1, 2, 3, 4, 5, 6, 1, 2, 3, 4 ,5, 6 ,1 ,2 ,3, 4 }; 
127

  
128
	/** The monostyles. */
129
	@Deprecated
130
	// FIXME : to remove when charts engine will be validated, related to rendering system
131
	public static int[] monostyles = {
132
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ,1 ,1 ,1, 1, 1, 1 }; 
133

  
134

  
135
	/** The widths. */
136
	@Deprecated
137
	// FIXME : to remove when charts engine will be validated, related to rendering system
138
	public static int[] widths = {
139
		1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3 }; 
140

  
141
	/** The monowidths. */
142
	@Deprecated
143
	// FIXME : to remove when charts engine will be validated, related to rendering system
144
	public static int[] monowidths = {
145
		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; 
146

  
147

  
148 89
	/** List of token position in the text. */
149 90
	List<int[]> allPositions = new ArrayList<int[]>();
150 91

  
......
202 143
		this.repeatvalues = repeat;
203 144
		this.bandemultiplier = bandemultiplier;
204 145

  
205
		for (int i = 0 ; i < monowidths.length ; i++) {
206
			monowidths[i] = linewidth;
146
		for (int i = 0 ; i < DefaultTheme.monowidths.length ; i++) {
147
			DefaultTheme.monowidths[i] = linewidth;
207 148
		}
208 149
	}
209 150

  
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java (revision 196)
1 1
package org.txm.progression.core.chartsengine.r;
2 2

  
3
import java.awt.Color;
4 3
import java.io.File;
5 4
import java.util.ArrayList;
6 5

  
7 6
import org.apache.commons.lang.StringEscapeUtils;
8
import org.rosuda.REngine.REXPMismatchException;
9 7
import org.txm.chartsengine.core.ChartsEngine;
10 8
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
11 9
import org.txm.chartsengine.r.core.RChartCreator;
12
import org.txm.chartsengine.r.core.RChartsEngine;
10
import org.txm.chartsengine.r.core.themes.DefaultTheme;
13 11
import org.txm.core.preferences.TXMPreferences;
14 12
import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
15 13
import org.txm.progression.core.chartsengine.base.Utils;
......
84 82
			// System.out.println("create colors vector");
85 83
			rw.eval("rm(colors)"); //$NON-NLS-1$
86 84
			if(monochrome) {
87
				rw.addVectorToWorkspace("colors", Progression.monocolors); //$NON-NLS-1$
85
				rw.addVectorToWorkspace("colors", DefaultTheme.monocolors); //$NON-NLS-1$
88 86
			}
89 87
			else {
90 88
				if(progression.getQueries().size() <= 5) {
91 89
					// System.out.println("uses colors5");
92
					rw.addVectorToWorkspace("colors", Progression.colors5); //$NON-NLS-1$
90
					rw.addVectorToWorkspace("colors", DefaultTheme.colors5); //$NON-NLS-1$
93 91
				}
94 92
				else if(progression.getQueries().size() <= 10) {
95 93
					// System.out.println("uses colors10");
96
					rw.addVectorToWorkspace("colors", Progression.colors10); //$NON-NLS-1$
94
					rw.addVectorToWorkspace("colors", DefaultTheme.colors10); //$NON-NLS-1$
97 95
				}
98 96
				else {
99 97
					// System.out.println("uses colors16");
100
					rw.addVectorToWorkspace("colors", Progression.colors); //$NON-NLS-1$
98
					rw.addVectorToWorkspace("colors", DefaultTheme.colors); //$NON-NLS-1$
101 99
				}
102 100
			}
103 101

  
104 102
			// System.out.println("create styles vector");
105 103
			rw.eval("rm(styles)"); //$NON-NLS-1$
106 104
			if(monostyle) {
107
				rw.addVectorToWorkspace("styles", Progression.monostyles); //$NON-NLS-1$
105
				rw.addVectorToWorkspace("styles", DefaultTheme.monostyles); //$NON-NLS-1$
108 106
			}
109 107
			else {
110
				rw.addVectorToWorkspace("styles", Progression.styles); //$NON-NLS-1$
108
				rw.addVectorToWorkspace("styles", DefaultTheme.styles); //$NON-NLS-1$
111 109
			}
112 110

  
113 111
			// System.out.println("create styles vector");
114 112
			rw.eval("rm(widths)"); //$NON-NLS-1$
115
			rw.addVectorToWorkspace("widths", Progression.monowidths); //$NON-NLS-1$
113
			rw.addVectorToWorkspace("widths", DefaultTheme.monowidths); //$NON-NLS-1$
116 114

  
117 115
			// System.out.println("create names vector");
118 116
			String[] queriesstring = new String[progression.getQueries().size()];
tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF (revision 196)
4 4
Bundle-SymbolicName: org.txm.progression.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.progression.core;bundle-version="1.0.0",
7
Require-Bundle: org.txm.chartsengine.r.core;bundle-version="1.0.0",
8
 org.txm.progression.core;bundle-version="1.0.0",
8 9
 org.txm.chartsengine.rcp;bundle-version="1.0.0",
9 10
 org.txm.chartsengine.core,
10 11
 org.eclipse.ui.workbench,
......
12 13
 org.txm.core;bundle-version="0.7.0",
13 14
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
14 15
 org.txm.rcp,
15
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
16 16
 org.eclipse.core.runtime;bundle-version="3.10.0",
17 17
 org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0",
18 18
 org.txm.synopticeditor.rcp
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java (revision 196)
53 53
import org.eclipse.swt.widgets.Shell;
54 54
import org.eclipse.swt.widgets.Text;
55 55
import org.txm.chartsengine.core.ChartsEngine;
56
import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
57 56
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
57
import org.txm.chartsengine.r.core.themes.DefaultTheme;
58 58
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
59 59
import org.txm.core.preferences.TXMPreferences;
60
import org.txm.progression.core.functions.Progression;
61 60
import org.txm.progression.core.preferences.ProgressionPreferences;
62
import org.txm.progression.rcp.preferences.ProgressionPreferencePage;
63 61
import org.txm.rcp.preferences.TXMPreferenceStore;
64 62
import org.txm.rcpapplication.Messages;
65 63
import org.txm.rcpapplication.StatusLine;
......
151 149
	Button styleButton;
152 150
	
153 151
	/** The colors. */
154
	String[] colors = Progression.colors;
152
	String[] colors = DefaultTheme.colors;
155 153
	
156 154
	/** The self. */
157 155
	ProgressionDialog self;
tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/r/RSpecificitiesBarChartCreator.java (revision 196)
5 5
import org.txm.chartsengine.core.ChartsEngine;
6 6
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
7 7
import org.txm.chartsengine.r.core.RChartCreator;
8
import org.txm.chartsengine.r.core.themes.DefaultTheme;
8 9
import org.txm.core.preferences.TXMPreferences;
9
import org.txm.progression.core.functions.Progression;
10 10
import org.txm.specificities.core.functions.SpecificitesResult;
11 11
import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
12 12
import org.txm.specificities.core.preferences.SpecificitiesPreferences;
......
80 80
			String cmd = ""; //$NON-NLS-1$
81 81

  
82 82
			String[] colors;
83
			String[] allcolors = Progression.colors;
83
			String[] allcolors = DefaultTheme.colors;
84 84
			if (transpose) { // one color per part
85 85
				colors = new String[specificitiesResult.getSelectedPartNames().length];
86 86
				for (int j = 0 ; j < specificitiesResult.getSelectedPartNames().length ; j++) {
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java (revision 196)
9 9

  
10 10
import org.txm.Messages;
11 11
import org.txm.chartsengine.r.core.RChartsEngine;
12
import org.txm.chartsengine.r.core.themes.DefaultTheme;
12 13
import org.txm.functions.TXMResult;
13 14
import org.txm.lexicaltable.functions.LexicalTableBuilder;
14 15
//import org.txm.progression.core.functions.Progression;
......
194 195
			String cmd = ""; //$NON-NLS-1$
195 196

  
196 197
			String[] colors;
197
			String[] allcolors = RChartsEngine.colors;
198
			String[] allcolors = DefaultTheme.colors;
198 199
			if (transpose) { // one color per part
199 200
				colors = new String[partNames.length];
200 201
				for (int j = 0 ; j < partNames.length ; j++) {
201 202
					if (j > allcolors.length)
202
						colors[j] = RChartsEngine.black;
203
						colors[j] = DefaultTheme.black;
203 204
					else
204 205
						colors[j] = allcolors[j];
205 206
				}

Also available in: Unified diff