/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

Révision 3568

     Manifest-Version: 1.0
     Bundle-ManifestVersion: 2
     Bundle-Name: Cooccurrence Graphs
     Bundle-SymbolicName: org.txm.cooccurrence.chartsengine;singleton:=true
     Bundle-SymbolicName: org.txm.dev.cooccurrence.chartsengine;singleton:=true
     Bundle-Version: 1.0.0.qualifier
     Bundle-Vendor: Textometrie.org
     Bundle-RequiredExecutionEnvironment: JavaSE-1.8

TXM/trunk/org.txm.cooccurrence.chartsengine/.project (revision 3568)
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<projectDescription>
3		<name>org.txm.cooccurrence.chartsengine</name>
	3	<name>org.txm.dev.cooccurrence.chartsengine</name>
4	4	<comment></comment>
5	5	<projects>
6	6	</projects>

     		Index index = null;
     		// From link: creating from parameters node
     		// From link/"send to command": creating from a prebuilt parameter node path
     		//FIXME: SJ: all "Send to" commands have a different node path schema than normal result creation since we do not know the target class in the source handler (the class string is replaced with "_link")
     		String parametersNodePath = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
     		if (parametersNodePath != null && !parametersNodePath.isEmpty()) {
     			index = new Index(parametersNodePath);

     		Progression progression = null;
     		// From link: creating from parameter node
     		//FIXME: SJ: all "Send to" commands have a different node path schema since we do not know the target class in the source handler (the class string is replaced with "_link")
     		// From link/"send to command": creating from a prebuilt parameter node path
     		//FIXME: SJ: all "Send to" commands have a different node path schema than normal result creation since we do not know the target class in the source handler (the class string is replaced with "_link")
     		String parametersNodePath = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
     		if (parametersNodePath != null && !parametersNodePath.isEmpty()) {
     			progression = new Progression(parametersNodePath);

     		Concordance concordance = null;
     		// From link: creating from parameter node
     		// From link/"send to command": creating from a prebuilt parameter node path
     		//FIXME: SJ: all "Send to" commands have a different node path schema than normal result creation since we do not know the target class in the source handler (the class string is replaced with "_link")
     		String parametersNodePath = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
     		if (parametersNodePath != null && !parametersNodePath.isEmpty()) {
     			if ("none".equals(parametersNodePath)) {

TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java (revision 3568)
154	154	*
155	155	* @param combo
156	156	*/
157		public void addControl(final Combo combo) {
	157	public void addCombo(final Combo combo) {
158	158	final ToolItem itemSeparator = new ToolItem(this, SWT.SEPARATOR);
159	159	combo.pack();
160	160	itemSeparator.setWidth(combo.getBounds().width);
...	...
168	168	}
169	169	};
170	170
171
172	171	combo.addListener(SWT.RESIZE, listener);
173	172	combo.addListener(SWT.Modify, listener);
174	173	}

+     *
      */
     // FIXME: SJ: improvements:
     // - create an interface as SeletionSendableAsQueries with method createQueries() or buildQueries() or getQueries()
     // - instead of subclassing this class, Editors can implement SeletionSendableAsQueries interface and the method
     // solution 1 - create an interface as SelectionSendableAsQueries with method createQueries() or buildQueries() or getQueries()
     // - instead of subclassing this class, Editors can implement SeletionSendableAsQueries interface and the method?
     // solution 2 - create a unique interface as SelectionSendable with 1 method as createTargetParameters() that directly returns a map of parameters
     // eg. {TXMPreferences.QUERY, "[word=faire]"}
     public abstract class SendSelectionToQueryable extends BaseAbstractHandler {
     	/**
-...
     		ISelection selection = HandlerUtil.getCurrentSelection(event);
     		if (selection != null && !selection.isEmpty()) {
     			String query = this.createQuery(event, selection);
     			String queries = this.createQueries(event, selection);
     			Integer index = this.getIndexResult(event, selection);
-...
     			// create a local result node in the project node, store in some parameters and call the linked command
     			String id = event.getCommand().getId();
     			TXMResult result = this.getResultParent(event, id);
     			// FIXME: we can't put the class name here since we does not know the target class
     			// FIXME: SJ: we can't put the class name in the result node path here since we does not know the target class
     			String resultParametersNodePath = result.getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link";  //$NON-NLS-1$
     			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_PARAMETERS_NODE_PATH, result.getParametersNodePath());

     import java.util.ArrayList;
     import org.apache.commons.lang.StringUtils;
     import org.eclipse.jface.resource.StringConverter;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.events.SelectionEvent;
     import org.eclipse.swt.events.SelectionListener;
     import org.eclipse.swt.graphics.FontData;
     import org.eclipse.swt.widgets.Combo;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.ToolItem;
-...
     public class AdvancedChartEditorToolBar extends ChartEditorToolBar {
     	public final static String ID = "AdvancedChartEditorToolBar";
     	private ToolItem showTitleButton;
     	private ToolItem showLegendButton;
     	private ToolItem showGridButton;
     	private Combo renderingModeCombo;
     	private Combo fontCombo;
     	private Combo fontSizeCombo;
     	private Combo chartTypeCombo;
     	private Font currentFont;
     	private Combo fontStyleCombo;
     	/**
     	 * Creates a new chart editor tool bar dedicated to advanced parameters.
     	 * @param parent
-...
     	 */
     	public AdvancedChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style) {
     		super(chartEditor, parent, subWidgetsComposite, style, AdvancedChartEditorToolBar.ID);
     		// Show/hide chart title button
     		final ToolItem showTitleButton = new ToolItem(this, SWT.CHECK);
     		// showTitleButton.setText(SWTComponentsProviderMessages.showhideTitle);
     		showTitleButton.setImage(IImageKeys.getImage(getClass(), "icons/show_title.png")); //$NON-NLS-1$
     		showTitleButton.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_title_disabled.png")); //$NON-NLS-1$
     		showTitleButton.setToolTipText(ChartsUIMessages.showhideTitle);
     		if (!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_TITLE)) {
     			showTitleButton = new ToolItem(this, SWT.CHECK);
     			// showTitleButton.setText(SWTComponentsProviderMessages.showhideTitle);
     			showTitleButton.setImage(IImageKeys.getImage(getClass(), "icons/show_title.png")); //$NON-NLS-1$
     			showTitleButton.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_title_disabled.png")); //$NON-NLS-1$
     			showTitleButton.setToolTipText(ChartsUIMessages.showhideTitle);
     			showTitleButton.setSelection(chartEditor.getResult().isTitleVisible());
+    		}
     		//		// disable if not managed by the command
     		//		else {
     		//			showTitleButton.setEnabled(false);
     		//		}
     		// disable if not managed by the command
     		else {
     			showTitleButton.setEnabled(false);
+    		}
     		// Show/hide chart legend button
     		final ToolItem showLegendButton = new ToolItem(this, SWT.CHECK);
     		// showLegendButton.setText(SWTComponentsProviderMessages.showhideLegend);
     		showLegendButton.setImage(IImageKeys.getImage(getClass(), "icons/show_legend.png")); //$NON-NLS-1$
     		showLegendButton.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_legend_disabled.png")); //$NON-NLS-1$
     		showLegendButton.setToolTipText(ChartsUIMessages.showhideLegend);
     		if (!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_LEGEND)) {
     			showLegendButton = new ToolItem(this, SWT.CHECK);
     			// showLegendButton.setText(SWTComponentsProviderMessages.showhideLegend);
     			showLegendButton.setImage(IImageKeys.getImage(getClass(), "icons/show_legend.png")); //$NON-NLS-1$
     			showLegendButton.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_legend_disabled.png")); //$NON-NLS-1$
     			showLegendButton.setToolTipText(ChartsUIMessages.showhideLegend);
     			showLegendButton.setSelection(chartEditor.getResult().isLegendVisible());
+    		}
     		//		// disable if not managed by the command
     		//		else {
     		//			showLegendButton.setEnabled(false);
     		//		}
     		// disable if not managed by the command
     		else {
     			showLegendButton.setEnabled(false);
+    		}
     		// Show/hide chart background grid button
     		final ToolItem showGridButton = new ToolItem(this, SWT.CHECK);
     		// showGridButton.setText(SWTComponentsProviderMessages.showhideGrid);
     		showGridButton.setImage(IImageKeys.getImage(getClass(), "icons/show_grid.png")); //$NON-NLS-1$
     		showGridButton.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_grid_disabled.png")); //$NON-NLS-1$
     		showGridButton.setToolTipText(ChartsUIMessages.showhideGrid);
     		if (!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_GRID)) {
     			showGridButton = new ToolItem(this, SWT.CHECK);
     			// showGridButton.setText(SWTComponentsProviderMessages.showhideGrid);
     			showGridButton.setImage(IImageKeys.getImage(getClass(), "icons/show_grid.png")); //$NON-NLS-1$
     			showGridButton.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_grid_disabled.png")); //$NON-NLS-1$
     			showGridButton.setToolTipText(ChartsUIMessages.showhideGrid);
     			showGridButton.setSelection(chartEditor.getResult().isGridVisible());
+    		}
     		//		// disable if not managed by the command
     		//		else {
     		//			showGridButton.setEnabled(false);
     		//		}
     		// disable if not managed by the command
     		else {
     			showGridButton.setEnabled(false);
+    		}
     		// Rendering colors mode selection
     		new ToolItem(this, SWT.SEPARATOR);
     		final Combo renderingModeCombo = new Combo(this, SWT.READ_ONLY);
     		String colorsModes[] = new String[] { ChartsUIMessages.colors,
     				ChartsUIMessages.grayscale,
     				ChartsUIMessages.blackAndWhite,
     				ChartsUIMessages.monochrome
     		};
     		renderingModeCombo.setItems(colorsModes);
     		this.addCombo(renderingModeCombo);
     		if (!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.RENDERING_COLORS_MODE)) {
     			// Rendering colors mode selection
     			new ToolItem(this, SWT.SEPARATOR);
     			renderingModeCombo = new Combo(this, SWT.READ_ONLY);
     			String colorsModes[] = new String[] { ChartsUIMessages.colors,
     					ChartsUIMessages.grayscale,
     					ChartsUIMessages.blackAndWhite,
     					ChartsUIMessages.monochrome
     			};
     			renderingModeCombo.setItems(colorsModes);
     //			ToolItem renderingComboItem = new ToolItem(this, SWT.SEPARATOR);
     //			renderingComboItem.setControl(renderingModeCombo);
     //			renderingModeCombo.pack();
     //			renderingComboItem.setWidth(renderingModeCombo.getBounds().width);
     			this.addControl(renderingModeCombo);
     			renderingModeCombo.select(chartEditor.getResult().getRenderingColorsMode());
+    		}
     		//		// disable if not managed
     		//		else {
     		//			renderingModeCombo.setEnabled(false);
     		//		}
     		// disable if not managed
     		else {
     			renderingModeCombo.setEnabled(false);
+    		}
     		// Font selection
     		currentFont = ChartsEngine.createFont(chartEditor.getResult().getFont());
     		final Font currentFont = ChartsEngine.createFont(chartEditor.getResult().getFont());
     		 // FIXME: SJ: may be better here to get the fonts from SWT rather than from Java, see  java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
     		fontCombo = new Combo(this, SWT.READ_ONLY);
     		final Combo fontCombo = new Combo(this, SWT.READ_ONLY);
     		String fonts[] = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
     		fontCombo.setItems(fonts);
     //		ToolItem fontsComboItem = new ToolItem(this, SWT.SEPARATOR);
     //		fontsComboItem.setControl(fontCombo);
     //		fontCombo.pack();
     //		fontsComboItem.setWidth(fontCombo.getBounds().width);
     		this.addCombo(fontCombo);
     		this.addControl(fontCombo);
     		int currentFontIndex = 0;
     		for (int i = 0; i < fonts.length; i++) {
     			if (fonts[i].equals(currentFont.getName())) {
-...
+    			}
+    		}
     		fontCombo.select(currentFontIndex);
     		// Font size
     		fontSizeCombo = new Combo(this, SWT.READ_ONLY);
     		final Combo fontSizeCombo = new Combo(this, SWT.READ_ONLY);
     		String fontSizes[] = new String[30];
     		int currentFontSizeIndex = 0;
     		for (int i = 0; i < fontSizes.length; i++) {
-...
+    		}
     		fontSizeCombo.setItems(fontSizes);
     //		ToolItem fontSizeComboItem = new ToolItem(this, SWT.SEPARATOR);
     //		fontSizeComboItem.setControl(fontSizeCombo);
     //		fontSizeCombo.pack();
     //		fontSizeComboItem.setWidth(fontSizeCombo.getBounds().width);
     		this.addCombo(fontSizeCombo);
     		this.addControl(fontSizeCombo);
     		fontSizeCombo.select(currentFontSizeIndex);
     		// Font style
     		fontStyleCombo = new Combo(this, SWT.READ_ONLY);
     		final Combo fontStyleCombo = new Combo(this, SWT.READ_ONLY);
     		//FIXME: SJ: the styles list should be builded from the available styles of the current selected font.
     		// Here are some tests to try to get the available styles
-...
     		int currentFontStyleIndex = currentFont.getStyle();
     		fontStyleCombo.setItems(fontStyles);
     //		ToolItem fontStyleComboItem = new ToolItem(this, SWT.SEPARATOR);
     //		fontStyleComboItem.setControl(fontStyleCombo);
     //		fontStyleCombo.pack();
     //		fontStyleComboItem.setWidth(fontStyleCombo.getBounds().width);
     		this.addCombo(fontStyleCombo);
     		this.addControl(fontStyleCombo);
     		fontStyleCombo.select(currentFontStyleIndex);
     		// FIXME: SJ: this Combo may not be created if is not in expert mode. At this moment, it's created and hidden
     		// Chart types from installed chart creators in all installed charts engines
     		chartTypeCombo = new Combo(this, SWT.READ_ONLY);
     		final Combo chartTypeCombo = new Combo(this, SWT.READ_ONLY);
     		if (TBXPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER)) {
     			ArrayList<String> chartsEngineNames = new ArrayList<>();
-...
+    			}
     			chartTypeCombo.setItems(chartTypes);
     //			ToolItem chartTypeComboItem = new ToolItem(this, SWT.SEPARATOR);
     //			chartTypeComboItem.setControl(chartTypeCombo);
     //			chartTypeCombo.pack();
     //			chartTypeComboItem.setWidth(chartTypeCombo.getBounds().width);
     			this.addCombo(chartTypeCombo);
     			this.addControl(chartTypeCombo);
     			chartTypeCombo.select(currentChartCreatorIndex);
-...
     				chartTypeCombo.setVisible(false);
+    			}
+    		}
     		else  {
     			chartTypeCombo.setVisible(false);
+    		}
     		// Listeners
-...
+    			}
     		};
     		if (showTitleButton != null) showTitleButton.addSelectionListener(listener);
     		if (showLegendButton != null) showLegendButton.addSelectionListener(listener);
     		if (showGridButton != null) showGridButton.addSelectionListener(listener);
     		if (renderingModeCombo != null) renderingModeCombo.addSelectionListener(listener);
     		if (fontCombo != null) fontCombo.addSelectionListener(listener);
     		if (fontSizeCombo != null) fontSizeCombo.addSelectionListener(listener);
     		if (fontStyleCombo != null) fontStyleCombo.addSelectionListener(listener);
     		if (chartTypeCombo != null) chartTypeCombo.addSelectionListener(listener);
     		// Add listener
     		if (showTitleButton.isEnabled()) {
     			showTitleButton.addSelectionListener(listener);
+    		}
     		if (showLegendButton != null) {
     			showLegendButton.addSelectionListener(listener);
+    		}
     		if (showGridButton != null) {
     			showGridButton.addSelectionListener(listener);
+    		}
     		if (renderingModeCombo != null) {
     			renderingModeCombo.addSelectionListener(listener);
+    		}
     		fontCombo.addSelectionListener(listener);
     		fontSizeCombo.addSelectionListener(listener);
     		fontStyleCombo.addSelectionListener(listener);
     		if (chartTypeCombo.isVisible()) {
     			chartTypeCombo.addSelectionListener(listener);
+    		}
+    	}

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 3568