Révision 1731
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java (revision 1731) | ||
|---|---|---|
| 17 | 17 |
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences; |
| 18 | 18 |
import org.txm.chartsengine.core.results.ChartResult; |
| 19 | 19 |
import org.txm.chartsengine.rcp.editors.ChartEditor; |
| 20 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 20 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 21 | 21 |
import org.txm.core.engines.EngineType; |
| 22 | 22 |
import org.txm.core.preferences.TBXPreferences; |
| 23 | 23 |
import org.txm.core.preferences.TXMPreferences; |
| ... | ... | |
| 48 | 48 |
//showTitle.setText(SWTComponentsProviderMessages.showhideTitle); |
| 49 | 49 |
showTitle.setImage(IImageKeys.getImage(getClass(), "icons/show_title.png")); |
| 50 | 50 |
showTitle.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_title_disabled.png")); |
| 51 |
showTitle.setToolTipText(SWTComponentsProviderMessages.showhideTitle);
|
|
| 51 |
showTitle.setToolTipText(ChartsUIMessages.showhideTitle);
|
|
| 52 | 52 |
|
| 53 | 53 |
if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_TITLE)) {
|
| 54 | 54 |
showTitle.setSelection(chartEditor.getResult().isTitleVisible()); |
| ... | ... | |
| 63 | 63 |
//showLegend.setText(SWTComponentsProviderMessages.showhideLegend); |
| 64 | 64 |
showLegend.setImage(IImageKeys.getImage(getClass(), "icons/show_legend.png")); |
| 65 | 65 |
showLegend.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_legend_disabled.png")); |
| 66 |
showLegend.setToolTipText(SWTComponentsProviderMessages.showhideLegend);
|
|
| 66 |
showLegend.setToolTipText(ChartsUIMessages.showhideLegend);
|
|
| 67 | 67 |
|
| 68 | 68 |
if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_LEGEND)) {
|
| 69 | 69 |
showLegend.setSelection(chartEditor.getResult().isLegendVisible()); |
| ... | ... | |
| 78 | 78 |
//showGrid.setText(SWTComponentsProviderMessages.showhideGrid); |
| 79 | 79 |
showGrid.setImage(IImageKeys.getImage(getClass(), "icons/show_grid.png")); |
| 80 | 80 |
showGrid.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_grid_disabled.png")); |
| 81 |
showGrid.setToolTipText(SWTComponentsProviderMessages.showhideGrid);
|
|
| 81 |
showGrid.setToolTipText(ChartsUIMessages.showhideGrid);
|
|
| 82 | 82 |
|
| 83 | 83 |
if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_GRID)) {
|
| 84 | 84 |
showGrid.setSelection(chartEditor.getResult().isGridVisible()); |
| ... | ... | |
| 93 | 93 |
// Rendering colors mode selection |
| 94 | 94 |
new ToolItem(this, SWT.SEPARATOR); |
| 95 | 95 |
final Combo renderingModeCombo = new Combo(this, SWT.READ_ONLY); |
| 96 |
String colorsModes[] = new String[]{SWTComponentsProviderMessages.colors,
|
|
| 97 |
SWTComponentsProviderMessages.grayscale,
|
|
| 98 |
SWTComponentsProviderMessages.blackAndWhite,
|
|
| 99 |
SWTComponentsProviderMessages.monochrome
|
|
| 96 |
String colorsModes[] = new String[]{ChartsUIMessages.colors,
|
|
| 97 |
ChartsUIMessages.grayscale,
|
|
| 98 |
ChartsUIMessages.blackAndWhite,
|
|
| 99 |
ChartsUIMessages.monochrome
|
|
| 100 | 100 |
}; |
| 101 | 101 |
renderingModeCombo.setItems(colorsModes); |
| 102 | 102 |
|
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java (revision 1731) | ||
|---|---|---|
| 18 | 18 |
import org.txm.chartsengine.core.ChartsEnginesManager; |
| 19 | 19 |
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences; |
| 20 | 20 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
| 21 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 21 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 22 | 22 |
import org.txm.core.engines.EngineType; |
| 23 | 23 |
import org.txm.core.preferences.TBXPreferences; |
| 24 | 24 |
import org.txm.core.preferences.TXMPreferences; |
| ... | ... | |
| 70 | 70 |
chartsEngines[i][1] = contributions[i].getAttribute("name"); //$NON-NLS-1$
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 |
this.chartsEngineComboField = new ComboFieldEditor(ChartsEnginePreferences.CURRENT_NAME, SWTComponentsProviderMessages.currentEngine, chartsEngines, this.getFieldEditorParent());
|
|
| 73 |
this.chartsEngineComboField = new ComboFieldEditor(ChartsEnginePreferences.CURRENT_NAME, ChartsUIMessages.currentEngine, chartsEngines, this.getFieldEditorParent());
|
|
| 74 | 74 |
this.addField(this.chartsEngineComboField); |
| 75 | 75 |
|
| 76 | 76 |
|
| ... | ... | |
| 88 | 88 |
exportFormats[i][1] = formats[i]; |
| 89 | 89 |
} |
| 90 | 90 |
|
| 91 |
this.addField(new ComboFieldEditor(ChartsEnginePreferences.DEFAULT_EXPORT_FORMAT, SWTComponentsProviderMessages.defaultExportFormat, exportFormats, this.getFieldEditorParent()));
|
|
| 91 |
this.addField(new ComboFieldEditor(ChartsEnginePreferences.DEFAULT_EXPORT_FORMAT, ChartsUIMessages.defaultExportFormat, exportFormats, this.getFieldEditorParent()));
|
|
| 92 | 92 |
|
| 93 | 93 |
|
| 94 | 94 |
// other shared preferences |
| 95 | 95 |
SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, this.getFieldEditorParent()); |
| 96 | 96 |
|
| 97 | 97 |
// Monochrome color |
| 98 |
this.addField(new ColorFieldEditor(ChartsEnginePreferences.MONOCHROME_COLOR, SWTComponentsProviderMessages.monochromeRenderingColor, this.getFieldEditorParent()));
|
|
| 98 |
this.addField(new ColorFieldEditor(ChartsEnginePreferences.MONOCHROME_COLOR, ChartsUIMessages.monochromeRenderingColor, this.getFieldEditorParent()));
|
|
| 99 | 99 |
|
| 100 | 100 |
FontFieldEditor font = new FontFieldEditor(ChartsEnginePreferences.FONT, "Font", "Specificities / Spécificités / Специфичность", this.getFieldEditorParent()); //$NON-NLS-1$ //$NON-NLS-2$ |
| 101 | 101 |
this.addField(font); |
| ... | ... | |
| 124 | 124 |
@Override |
| 125 | 125 |
public void init(IWorkbench workbench) {
|
| 126 | 126 |
this.setPreferenceStore(new TXMPreferenceStore(ChartsEnginePreferences.getInstance().getPreferencesNodeQualifier())); |
| 127 |
this.setDescription(SWTComponentsProviderMessages.thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected);
|
|
| 127 |
this.setDescription(ChartsUIMessages.thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected);
|
|
| 128 | 128 |
} |
| 129 | 129 |
|
| 130 | 130 |
@Override |
| ... | ... | |
| 142 | 142 |
// Only if the current engine has changed |
| 143 | 143 |
if(this.hasChanged) {
|
| 144 | 144 |
|
| 145 |
Log.info(SWTComponentsProviderMessages.recreatingChartsEngineAndSWTChartComponentsProvider);
|
|
| 145 |
Log.info(ChartsUIMessages.recreatingChartsEngineAndSWTChartComponentsProvider);
|
|
| 146 | 146 |
|
| 147 | 147 |
Toolbox.getEngineManager(EngineType.CHARTS).setCurrentEngine(this.getPreferenceStore().getString(ChartsEnginePreferences.CURRENT_NAME)); |
| 148 | 148 |
|
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 1731) | ||
|---|---|---|
| 47 | 47 |
import org.txm.chartsengine.rcp.editors.ChartEditor; |
| 48 | 48 |
import org.txm.chartsengine.rcp.editors.ChartEditorInput; |
| 49 | 49 |
import org.txm.chartsengine.rcp.events.EventCallBack; |
| 50 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 50 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 51 | 51 |
import org.txm.chartsengine.rcp.preferences.___KeyboardBindingProperties; |
| 52 | 52 |
import org.txm.chartsengine.rcp.preferences.___MouseBindingProperties; |
| 53 | 53 |
import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar; |
| ... | ... | |
| 380 | 380 |
|
| 381 | 381 |
Group chartsGroup = new Group(parent, SWT.NONE); |
| 382 | 382 |
|
| 383 |
chartsGroup.setText(SWTComponentsProviderMessages.chartsRendering);
|
|
| 383 |
chartsGroup.setText(ChartsUIMessages.chartsRendering);
|
|
| 384 | 384 |
|
| 385 | 385 |
GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false); |
| 386 | 386 |
gridData.horizontalSpan = 2; |
| ... | ... | |
| 397 | 397 |
* @return |
| 398 | 398 |
*/ |
| 399 | 399 |
public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent) {
|
| 400 |
return createChartsRenderingPreferencesTabFolderComposite(parent, SWTComponentsProviderMessages.chartsRendering);
|
|
| 400 |
return createChartsRenderingPreferencesTabFolderComposite(parent, ChartsUIMessages.chartsRendering);
|
|
| 401 | 401 |
} |
| 402 | 402 |
|
| 403 | 403 |
/** |
| ... | ... | |
| 438 | 438 |
|
| 439 | 439 |
// Show title |
| 440 | 440 |
if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_TITLE)) {
|
| 441 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_TITLE, SWTComponentsProviderMessages.showTitle, composite));
|
|
| 441 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_TITLE, ChartsUIMessages.showTitle, composite));
|
|
| 442 | 442 |
} |
| 443 | 443 |
// Show legend |
| 444 | 444 |
if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_LEGEND)) {
|
| 445 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_LEGEND, SWTComponentsProviderMessages.showLegend, composite));
|
|
| 445 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_LEGEND, ChartsUIMessages.showLegend, composite));
|
|
| 446 | 446 |
} |
| 447 | 447 |
// Show grid |
| 448 | 448 |
if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_GRID)) {
|
| 449 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_GRID, SWTComponentsProviderMessages.showGrid, composite));
|
|
| 449 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_GRID, ChartsUIMessages.showGrid, composite));
|
|
| 450 | 450 |
} |
| 451 | 451 |
|
| 452 | 452 |
// Rendering colors mode selection |
| 453 | 453 |
if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.RENDERING_COLORS_MODE)) {
|
| 454 | 454 |
String colorsModes[][] = new String[4][2]; |
| 455 |
colorsModes[0][0] = SWTComponentsProviderMessages.colors;
|
|
| 455 |
colorsModes[0][0] = ChartsUIMessages.colors;
|
|
| 456 | 456 |
colorsModes[0][1] = "0"; //$NON-NLS-1$ |
| 457 |
colorsModes[1][0] = SWTComponentsProviderMessages.grayscale;
|
|
| 457 |
colorsModes[1][0] = ChartsUIMessages.grayscale;
|
|
| 458 | 458 |
colorsModes[1][1] = "1"; //$NON-NLS-1$ |
| 459 |
colorsModes[2][0] = SWTComponentsProviderMessages.blackAndWhite;
|
|
| 459 |
colorsModes[2][0] = ChartsUIMessages.blackAndWhite;
|
|
| 460 | 460 |
colorsModes[2][1] = "2"; //$NON-NLS-1$ |
| 461 |
colorsModes[3][0] = SWTComponentsProviderMessages.monochrome;
|
|
| 461 |
colorsModes[3][0] = ChartsUIMessages.monochrome;
|
|
| 462 | 462 |
colorsModes[3][1] = "3"; //$NON-NLS-1$ |
| 463 |
ComboFieldEditor renderingModeComboField = new ComboFieldEditor(ChartsEnginePreferences.RENDERING_COLORS_MODE, SWTComponentsProviderMessages.renderingColorsMode, colorsModes, composite);
|
|
| 463 |
ComboFieldEditor renderingModeComboField = new ComboFieldEditor(ChartsEnginePreferences.RENDERING_COLORS_MODE, ChartsUIMessages.renderingColorsMode, colorsModes, composite);
|
|
| 464 | 464 |
page.addField(renderingModeComboField); |
| 465 | 465 |
} |
| 466 | 466 |
|
| 467 | 467 |
// Same lines stroke |
| 468 | 468 |
if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.MULTIPLE_LINE_STROKES)) {
|
| 469 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.MULTIPLE_LINE_STROKES, SWTComponentsProviderMessages.multipleLineStrokeStyles, composite));
|
|
| 469 |
page.addField(new BooleanFieldEditor(ChartsEnginePreferences.MULTIPLE_LINE_STROKES, ChartsUIMessages.multipleLineStrokeStyles, composite));
|
|
| 470 | 470 |
} |
| 471 | 471 |
|
| 472 | 472 |
|
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java (revision 1731) | ||
|---|---|---|
| 1 |
package org.txm.chartsengine.rcp.messages; |
|
| 2 |
|
|
| 3 |
import org.eclipse.osgi.util.NLS; |
|
| 4 |
import org.txm.utils.messages.Utf8NLS; |
|
| 5 |
|
|
| 6 |
public class SWTComponentsProviderMessages extends NLS {
|
|
| 7 |
|
|
| 8 |
private static final String BUNDLE_NAME = "org.txm.chartsengine.rcp.messages.messages"; //$NON-NLS-1$ |
|
| 9 |
|
|
| 10 |
public static String displayFormat; |
|
| 11 |
public static String defaultExportFormat; |
|
| 12 |
|
|
| 13 |
public static String currentEngine; |
|
| 14 |
public static String recreatingChartsEngineAndSWTChartComponentsProvider; |
|
| 15 |
|
|
| 16 |
public static String thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected; |
|
| 17 |
public static String renderingColorsMode; |
|
| 18 |
public static String blackAndWhite; |
|
| 19 |
public static String colors; |
|
| 20 |
public static String grayscale; |
|
| 21 |
public static String monochrome; |
|
| 22 |
public static String monochromeRenderingColor; |
|
| 23 |
|
|
| 24 |
public static String chartsRendering; |
|
| 25 |
|
|
| 26 |
public static String showTitle; |
|
| 27 |
public static String showLegend; |
|
| 28 |
public static String showGrid; |
|
| 29 |
|
|
| 30 |
public static String showhideTitle; |
|
| 31 |
public static String showhideLegend; |
|
| 32 |
public static String showhideGrid; |
|
| 33 |
|
|
| 34 |
public static String rendering; |
|
| 35 |
|
|
| 36 |
public static String showHideRenderingParameters; |
|
| 37 |
|
|
| 38 |
public static String multipleLineStrokeStyles; |
|
| 39 |
|
|
| 40 |
|
|
| 41 |
|
|
| 42 |
static {
|
|
| 43 |
// initialize resource bundle |
|
| 44 |
Utf8NLS.initializeMessages(BUNDLE_NAME, SWTComponentsProviderMessages.class); |
|
| 45 |
} |
|
| 46 |
|
|
| 47 |
private SWTComponentsProviderMessages() {
|
|
| 48 |
} |
|
| 49 |
} |
|
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_fr.properties (revision 1731) | ||
|---|---|---|
| 43 | 43 |
showhideTitle = Show/Hide title |
| 44 | 44 |
|
| 45 | 45 |
thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected = Ces préférences seront appliquées aux nouveaux graphiques. Les graphiques précédemment créés ne seront pas affectés. |
| 46 |
|
|
| 47 |
canNotOpenChartPropertiesInterfaceForThecurrentChartEngine=Les propriétés de graphique ne sont pas disponibles pour le moteur de rendu courant. |
|
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/ChartsUIMessages.java (revision 1731) | ||
|---|---|---|
| 1 |
package org.txm.chartsengine.rcp.messages; |
|
| 2 |
|
|
| 3 |
import org.eclipse.osgi.util.NLS; |
|
| 4 |
import org.txm.utils.messages.Utf8NLS; |
|
| 5 |
|
|
| 6 |
public class ChartsUIMessages extends NLS {
|
|
| 7 |
|
|
| 8 |
private static final String BUNDLE_NAME = "org.txm.chartsengine.rcp.messages.messages"; //$NON-NLS-1$ |
|
| 9 |
|
|
| 10 |
public static String displayFormat; |
|
| 11 |
public static String defaultExportFormat; |
|
| 12 |
|
|
| 13 |
public static String currentEngine; |
|
| 14 |
public static String recreatingChartsEngineAndSWTChartComponentsProvider; |
|
| 15 |
|
|
| 16 |
public static String thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected; |
|
| 17 |
public static String renderingColorsMode; |
|
| 18 |
public static String blackAndWhite; |
|
| 19 |
public static String colors; |
|
| 20 |
public static String grayscale; |
|
| 21 |
public static String monochrome; |
|
| 22 |
public static String monochromeRenderingColor; |
|
| 23 |
|
|
| 24 |
public static String chartsRendering; |
|
| 25 |
|
|
| 26 |
public static String showTitle; |
|
| 27 |
public static String showLegend; |
|
| 28 |
public static String showGrid; |
|
| 29 |
|
|
| 30 |
public static String showhideTitle; |
|
| 31 |
public static String showhideLegend; |
|
| 32 |
public static String showhideGrid; |
|
| 33 |
|
|
| 34 |
public static String rendering; |
|
| 35 |
|
|
| 36 |
public static String showHideRenderingParameters; |
|
| 37 |
|
|
| 38 |
public static String multipleLineStrokeStyles; |
|
| 39 |
|
|
| 40 |
public static String canNotOpenChartPropertiesInterfaceForThecurrentChartEngine; |
|
| 41 |
|
|
| 42 |
|
|
| 43 |
|
|
| 44 |
static {
|
|
| 45 |
// initialize resource bundle |
|
| 46 |
Utf8NLS.initializeMessages(BUNDLE_NAME, ChartsUIMessages.class); |
|
| 47 |
} |
|
| 48 |
|
|
| 49 |
private ChartsUIMessages() {
|
|
| 50 |
} |
|
| 51 |
} |
|
| 0 | 52 | |
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages.properties (revision 1731) | ||
|---|---|---|
| 43 | 43 |
showhideTitle = Show/Hide title |
| 44 | 44 |
|
| 45 | 45 |
thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected = These preferences will be applied to new charts, previously created charts will not be affected. |
| 46 |
|
|
| 47 |
canNotOpenChartPropertiesInterfaceForThecurrentChartEngine=Can not open chart properties interface for the current chart engine. |
|
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 1731) | ||
|---|---|---|
| 23 | 23 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
| 24 | 24 |
import org.txm.chartsengine.rcp.events.EventCallBack; |
| 25 | 25 |
import org.txm.chartsengine.rcp.events.EventCallBackHandler; |
| 26 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 26 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 27 | 27 |
import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar; |
| 28 | 28 |
import org.txm.chartsengine.rcp.swt.ChartComposite; |
| 29 | 29 |
import org.txm.chartsengine.rcp.swt.ChartEditorToolBar; |
| ... | ... | |
| 135 | 135 |
|
| 136 | 136 |
// Advanced tool bar |
| 137 | 137 |
//this.advancedToolBarComposite = new Composite(parent, SWT.NONE); |
| 138 |
Group group = this.topToolBar.installGroup(SWTComponentsProviderMessages.rendering, SWTComponentsProviderMessages.showHideRenderingParameters,
|
|
| 138 |
Group group = this.topToolBar.installGroup(ChartsUIMessages.rendering, ChartsUIMessages.showHideRenderingParameters,
|
|
| 139 | 139 |
"platform:/plugin/org.txm.chartsengine.rcp/icons/show_rendering_parameters.png", //$NON-NLS-1$ |
| 140 | 140 |
"platform:/plugin/org.txm.chartsengine.rcp/icons/hide_rendering_parameters.png", //$NON-NLS-1$ |
| 141 | 141 |
false); |
| tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/handlers/OpenJFCChartPropertiesEditor.java (revision 1731) | ||
|---|---|---|
| 11 | 11 |
import org.txm.chartsengine.jfreechart.core.JFCChartsEngine; |
| 12 | 12 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
| 13 | 13 |
import org.txm.chartsengine.rcp.editors.ChartEditor; |
| 14 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages; |
|
| 14 | 15 |
import org.txm.utils.OSDetector; |
| 15 | 16 |
import org.txm.utils.logger.Log; |
| 16 | 17 |
|
| ... | ... | |
| 69 | 70 |
}); |
| 70 | 71 |
} |
| 71 | 72 |
else {
|
| 72 |
Log.warning("Can not open chart properties interface for the current chart engine."); //$NON-NLS-1$
|
|
| 73 |
Log.warning(ChartsUIMessages.canNotOpenChartPropertiesInterfaceForThecurrentChartEngine);
|
|
| 73 | 74 |
} |
| 74 | 75 |
|
| 75 | 76 |
return null; |
| tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java (revision 1731) | ||
|---|---|---|
| 40 | 40 |
import org.txm.chartsengine.jfreechart.core.JFCChartsEngine; |
| 41 | 41 |
import org.txm.chartsengine.jfreechart.core.preferences.JFCChartsEnginePreferences; |
| 42 | 42 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
| 43 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 43 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 44 | 44 |
import org.txm.core.engines.EngineType; |
| 45 | 45 |
import org.txm.rcp.messages.TXMUIMessages; |
| 46 | 46 |
import org.txm.rcp.preferences.TXMPreferencePage; |
| ... | ... | |
| 76 | 76 |
displayFormats[i][1] = formats[i]; |
| 77 | 77 |
} |
| 78 | 78 |
|
| 79 |
this.addField(new ComboFieldEditor(JFCChartsEnginePreferences.OUTPUT_FORMAT, SWTComponentsProviderMessages.displayFormat, displayFormats, this.getFieldEditorParent()));
|
|
| 79 |
this.addField(new ComboFieldEditor(JFCChartsEnginePreferences.OUTPUT_FORMAT, ChartsUIMessages.displayFormat, displayFormats, this.getFieldEditorParent()));
|
|
| 80 | 80 |
|
| 81 | 81 |
} |
| 82 | 82 |
|
| tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java (revision 1731) | ||
|---|---|---|
| 40 | 40 |
import org.txm.chartsengine.r.core.RChartsEngine; |
| 41 | 41 |
import org.txm.chartsengine.r.core.preferences.RChartsEnginePreferences; |
| 42 | 42 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
| 43 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 43 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 44 | 44 |
import org.txm.core.engines.EngineType; |
| 45 | 45 |
import org.txm.rcp.messages.TXMUIMessages; |
| 46 | 46 |
import org.txm.rcp.preferences.TXMPreferencePage; |
| ... | ... | |
| 76 | 76 |
displayFormats[i][1] = formats[i]; |
| 77 | 77 |
} |
| 78 | 78 |
|
| 79 |
addField(new ComboFieldEditor(RChartsEnginePreferences.OUTPUT_FORMAT, SWTComponentsProviderMessages.displayFormat, displayFormats, getFieldEditorParent()));
|
|
| 79 |
addField(new ComboFieldEditor(RChartsEnginePreferences.OUTPUT_FORMAT, ChartsUIMessages.displayFormat, displayFormats, getFieldEditorParent()));
|
|
| 80 | 80 |
|
| 81 | 81 |
} |
| 82 | 82 |
|
| tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java (revision 1731) | ||
|---|---|---|
| 459 | 459 |
// |
| 460 | 460 |
// drawSecondaryPass(g2, plot, dataset, pass, series, item, domainAxis, dataArea, rangeAxis, crosshairState, entities); |
| 461 | 461 |
} |
| 462 |
|
|
| 463 | 462 |
} |
| 464 | 463 |
|
| 465 |
|
|
| 466 |
|
|
| 467 | 464 |
/** |
| 468 | 465 |
* Draws the item using selected item rendering. |
| 469 | 466 |
* @param g2 |
| ... | ... | |
| 480 | 477 |
* @param pass |
| 481 | 478 |
*/ |
| 482 | 479 |
public void drawSelectedItem(Graphics2D g2, XYItemRendererState state, Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot, ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset, int series, int item, CrosshairState crosshairState, int pass) {
|
| 483 |
// get the selected item screen coords
|
|
| 480 |
// get the selected item screen coords |
|
| 484 | 481 |
double x1 = dataset.getXValue(series, item); |
| 485 | 482 |
double y1 = dataset.getYValue(series, item); |
| 486 | 483 |
if (Double.isNaN(y1) || Double.isNaN(x1)) {
|
Formats disponibles : Unified diff