Révision 427

tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java (revision 427)
135 135
		ChartEditorPart editor = null;
136 136
		
137 137
		// FIXME: temporary force R/SVG version because the Progression density chart is not yet implemented in JFC mode
138
		if(!TXMPreferences.getBoolean(progression, ProgressionPreferences.CHART_CUMULATIVE))	{
138
		if(!progression.getBooleanParameterValue(ProgressionPreferences.CHART_CUMULATIVE))	{
139 139
			SVGSWTChartsComponentsProvider tmpSWTComponentsProvider = (SVGSWTChartsComponentsProvider) SWTChartsComponentsProvider.getComponentsProvider(SVGSWTChartsComponentsProvider.class);
140 140
			RChartsEngine tmpChartsEngine = (RChartsEngine) ChartsEngine.getChartsEngine(RChartsEngine.class);									
141 141
			tmpSWTComponentsProvider.setChartsEngine(tmpChartsEngine);
142 142
			
143 143
			// Create and open the chart editor
144
			editor = tmpSWTComponentsProvider.openEditor(progression, ProgressionPreferences.PREFERENCES_NODE);
144
			editor = tmpSWTComponentsProvider.openEditor(progression);
145 145
		}
146 146
		else	{
147 147
			// Create and open the chart editor
148
			editor = SWTChartsComponentsProvider.getCurrent().openEditor(progression, ProgressionPreferences.PREFERENCES_NODE);
148
			editor = SWTChartsComponentsProvider.getCurrent().openEditor(progression);
149 149

  
150 150
			
151 151

  
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java (revision 427)
212 212
			// get preferences values
213 213
			TXMPreferenceStore store = new TXMPreferenceStore(ProgressionPreferences.PREFERENCES_NODE);
214 214
			
215
			this.blackAndWhite = (TXMPreferences.getInt(ProgressionPreferences.PREFERENCES_NODE, ChartsEnginePreferences.RENDERING_COLORS_MODE) == ChartsEngine.RENDERING_BLACK_AND_WHITE_MODE);
215
			this.blackAndWhite = (TXMPreferences.getInt(ChartsEnginePreferences.RENDERING_COLORS_MODE, ProgressionPreferences.PREFERENCES_NODE) == ChartsEngine.RENDERING_BLACK_AND_WHITE_MODE);
216 216
			
217 217
			this.monostyle = store.getBoolean(ProgressionPreferences.CHART_MONO_STYLE);
218 218
			this.cumulative = store.getBoolean(ProgressionPreferences.CHART_CUMULATIVE);

Formats disponibles : Unified diff