Révision 1679
| tmp/org.txm.chartsengine.svgbatik.rcp/src/org/txm/chartsengine/svgbatik/rcp/swing/SVGPanel.java (revision 1679) | ||
|---|---|---|
| 371 | 371 |
*/ |
| 372 | 372 |
public void zoom(double x, double y, int zoom) {
|
| 373 | 373 |
|
| 374 |
// FIXME: the zoom does nothing when zoom is equal to 0 and 1. |
|
| 374 |
// FIXME: SJ: the zoom does nothing when zoom is equal to 0 and 1.
|
|
| 375 | 375 |
|
| 376 | 376 |
AffineTransform trans = AffineTransform.getTranslateInstance(x, y); |
| 377 | 377 |
|
| ... | ... | |
| 420 | 420 |
} |
| 421 | 421 |
|
| 422 | 422 |
|
| 423 |
@Override |
|
| 424 |
public void setSquareOffEnabled(boolean enabled) {
|
|
| 425 |
this.squareOffEnabled = enabled; |
|
| 426 |
} |
|
| 423 |
// @Override
|
|
| 424 |
// public void setSquareOffEnabled(boolean enabled) {
|
|
| 425 |
// this.squareOffEnabled = enabled;
|
|
| 426 |
// }
|
|
| 427 | 427 |
|
| 428 | 428 |
|
| 429 | 429 |
@Override |
| tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/base/swing/ItemSelectionJFCChartPanel.java (revision 1679) | ||
|---|---|---|
| 37 | 37 |
public class ItemSelectionJFCChartPanel extends ChartPanel implements IChartComponent {
|
| 38 | 38 |
|
| 39 | 39 |
|
| 40 |
protected boolean squareOffEnabled; |
|
| 40 |
// protected boolean squareOffEnabled;
|
|
| 41 | 41 |
|
| 42 | 42 |
/** |
| 43 | 43 |
* Default modifier key mask used for pan by JFC chart panel. |
| ... | ... | |
| 76 | 76 |
public ItemSelectionJFCChartPanel(SWTChartsComponentsProvider swtChartsComponentProvider, JFreeChart chart) {
|
| 77 | 77 |
super(chart); |
| 78 | 78 |
this.swtChartsComponentProvider = swtChartsComponentProvider; |
| 79 |
this.squareOffEnabled = false; |
|
| 79 |
// this.squareOffEnabled = false;
|
|
| 80 | 80 |
} |
| 81 | 81 |
|
| 82 | 82 |
|
| ... | ... | |
| 89 | 89 |
|
| 90 | 90 |
this.restoreAutoBounds(); |
| 91 | 91 |
|
| 92 |
// Square unit axis ratio constraint |
|
| 93 |
if(this.squareOffEnabled) {
|
|
| 94 |
this.squareOff(); |
|
| 95 |
} |
|
| 92 |
// // Square unit axis ratio constraint
|
|
| 93 |
// if(this.squareOffEnabled) {
|
|
| 94 |
// this.squareOff();
|
|
| 95 |
// }
|
|
| 96 | 96 |
} |
| 97 | 97 |
|
| 98 | 98 |
|
| ... | ... | |
| 319 | 319 |
} |
| 320 | 320 |
} |
| 321 | 321 |
|
| 322 |
@Override |
|
| 323 |
public void setSquareOffEnabled(boolean enabled) {
|
|
| 324 |
this.squareOffEnabled = enabled; |
|
| 325 |
} |
|
| 322 |
// @Override
|
|
| 323 |
// public void setSquareOffEnabled(boolean enabled) {
|
|
| 324 |
// this.squareOffEnabled = enabled;
|
|
| 325 |
// }
|
|
| 326 | 326 |
|
| 327 | 327 |
} |
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 1679) | ||
|---|---|---|
| 557 | 557 |
public void run() {
|
| 558 | 558 |
chartComposite.loadChart( |
| 559 | 559 |
getResult().needsToResetView(), |
| 560 |
getResult().needsToClearItemsSelection()); |
|
| 560 |
getResult().needsToClearItemsSelection(), |
|
| 561 |
getResult().needsToSquareOff()); |
|
| 561 | 562 |
} |
| 562 | 563 |
}); |
| 563 | 564 |
} |
| 564 | 565 |
|
| 565 |
/** |
|
| 566 |
* Creates the chart container component from the chart object stored into the composite. |
|
| 567 |
*/ |
|
| 568 |
// FIXME: became useless? |
|
| 569 |
// public void createChartContainer() {
|
|
| 570 |
// this.getSWTChartsComponentsProvider().createChartContainer(this.getEditorInput()); |
|
| 571 |
// } |
|
| 572 | 566 |
|
| 573 | 567 |
/** |
| 574 | 568 |
* Disposes the editor. |
| 575 |
* Implementations using a Composite to embed AWT/Swing components should manually call this.composite.dispose() in the redefined method. |
|
| 569 |
* Implementations using a Composite to embed AWT/Swing components should manually call this.chartComposite.dispose() in the redefined method.
|
|
| 576 | 570 |
*/ |
| 571 |
@Override |
|
| 577 | 572 |
public void dispose() {
|
| 578 |
if (chartComposite != null && !chartComposite.isDisposed()) {
|
|
| 573 |
if (this.chartComposite != null && !this.chartComposite.isDisposed()) {
|
|
| 579 | 574 |
this.chartComposite.dispose(); |
| 580 | 575 |
} |
| 581 | 576 |
super.dispose(); |
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/IChartComponent.java (revision 1679) | ||
|---|---|---|
| 67 | 67 |
*/ |
| 68 | 68 |
public void squareOff(); |
| 69 | 69 |
|
| 70 |
/** |
|
| 71 |
* Sets the square off unit axis constraints state. |
|
| 72 |
* @param enabled |
|
| 73 |
*/ |
|
| 74 |
public void setSquareOffEnabled(boolean enabled); |
|
| 70 |
// /**
|
|
| 71 |
// * Sets the square off unit axis constraints state.
|
|
| 72 |
// * @param enabled
|
|
| 73 |
// */
|
|
| 74 |
// public void setSquareOffEnabled(boolean enabled);
|
|
| 75 | 75 |
|
| 76 | 76 |
} |
| tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartComposite.java (revision 1679) | ||
|---|---|---|
| 140 | 140 |
|
| 141 | 141 |
/** |
| 142 | 142 |
* Loads or reloads the chart from the chart object stored in the linked editor input. |
| 143 |
* |
|
| 144 | 143 |
* @param resetView |
| 145 | 144 |
* @param clearChartItemsSelection |
| 145 |
* @param squareOff |
|
| 146 | 146 |
*/ |
| 147 |
public void loadChart(boolean resetView, boolean clearChartItemsSelection) {
|
|
| 147 |
public void loadChart(boolean resetView, boolean clearChartItemsSelection, boolean squareOff) {
|
|
| 148 | 148 |
this.loadChart(); |
| 149 |
|
|
| 150 |
if(squareOff) {
|
|
| 151 |
this.squareOff(); |
|
| 152 |
} |
|
| 149 | 153 |
|
| 150 | 154 |
if(clearChartItemsSelection) {
|
| 151 | 155 |
this.clearChartItemsSelection(); |
| ... | ... | |
| 156 | 160 |
} |
| 157 | 161 |
} |
| 158 | 162 |
|
| 163 |
/** |
|
| 164 |
* Loads or reloads the chart from the chart object stored in the linked editor input. |
|
| 165 |
* @param resetView |
|
| 166 |
* @param clearChartItemsSelection |
|
| 167 |
*/ |
|
| 168 |
public void loadChart(boolean resetView, boolean clearChartItemsSelection) {
|
|
| 169 |
this.loadChart(resetView, clearChartItemsSelection, false); |
|
| 170 |
} |
|
| 159 | 171 |
|
| 160 | 172 |
/** |
| 161 |
* Copy the chart view as image in the clipboard from the specified chart component.
|
|
| 173 |
* Resets the chart view (zoom, pan, rotation).
|
|
| 162 | 174 |
*/ |
| 175 |
public void resetView() {
|
|
| 176 |
if(this.chartComponent != null) {
|
|
| 177 |
this.chartComponent.resetView(); |
|
| 178 |
|
|
| 179 |
if(this.chartComponent.getChartEditor().getResult().needsToSquareOff()) {
|
|
| 180 |
this.chartComponent.squareOff(); |
|
| 181 |
} |
|
| 182 |
} |
|
| 183 |
} |
|
| 184 |
|
|
| 185 |
|
|
| 186 |
/** |
|
| 187 |
* Copies the chart view as image in the clipboard from the specified chart component. |
|
| 188 |
*/ |
|
| 163 | 189 |
public abstract void copyChartViewToClipboard(); |
| 164 | 190 |
|
| 165 | 191 |
/** |
| ... | ... | |
| 179 | 205 |
public abstract Object getChart(); |
| 180 | 206 |
|
| 181 | 207 |
/** |
| 182 |
* Resets the chart view (zoom, pan, rotation). |
|
| 183 |
*/ |
|
| 184 |
public void resetView() {
|
|
| 185 |
if(this.chartComponent != null) {
|
|
| 186 |
this.chartComponent.resetView(); |
|
| 187 |
} |
|
| 188 |
} |
|
| 189 |
|
|
| 190 |
/** |
|
| 191 | 208 |
* Zooms the chart view at x and y coordinates. |
| 192 | 209 |
* @param x |
| 193 | 210 |
* @param y |
| ... | ... | |
| 209 | 226 |
public void pan(double srcX, double srcY, double dstX, double dstY, double panFactor) {
|
| 210 | 227 |
this.chartComponent.pan(srcX, srcY, dstX, dstY, panFactor); |
| 211 | 228 |
} |
| 229 |
|
|
| 230 |
/** |
|
| 231 |
* Constrains axes ticks to square aspect ratio. |
|
| 232 |
*/ |
|
| 233 |
public void squareOff() {
|
|
| 234 |
if(this.chartComponent != null) {
|
|
| 235 |
this.chartComponent.squareOff(); |
|
| 236 |
} |
|
| 237 |
} |
|
| 238 |
|
|
| 212 | 239 |
|
| 213 | 240 |
|
| 214 | 241 |
/** |
| tmp/org.txm.chartsengine.graphstream.rcp/src/org/txm/chartsengine/graphstream/rcp/swing/GSChartComponent.java (revision 1679) | ||
|---|---|---|
| 111 | 111 |
|
| 112 | 112 |
} |
| 113 | 113 |
|
| 114 |
/* (non-Javadoc) |
|
| 115 |
* @see org.txm.chartsengine.rcp.IChartComponent#setSquareOffEnabled(boolean) |
|
| 116 |
*/ |
|
| 117 |
@Override |
|
| 118 |
public void setSquareOffEnabled(boolean enabled) {
|
|
| 119 |
// TODO Auto-generated method stub |
|
| 114 |
// /* (non-Javadoc) |
|
| 115 |
// * @see org.txm.chartsengine.rcp.IChartComponent#setSquareOffEnabled(boolean) |
|
| 116 |
// */ |
|
| 117 |
// @Override |
|
| 118 |
// public void setSquareOffEnabled(boolean enabled) {
|
|
| 119 |
// // TODO Auto-generated method stub |
|
| 120 |
// |
|
| 121 |
// } |
|
| 120 | 122 |
|
| 121 |
} |
|
| 122 |
|
|
| 123 | 123 |
|
| 124 | 124 |
public Viewer getViewer() {
|
| 125 | 125 |
return this.viewer; |
| tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/preferences/RPreferences.java (revision 1679) | ||
|---|---|---|
| 2 | 2 |
|
| 3 | 3 |
|
| 4 | 4 |
import java.io.File; |
| 5 |
import java.io.IOException; |
|
| 6 | 5 |
|
| 7 |
import org.eclipse.core.runtime.preferences.DefaultScope; |
|
| 8 |
import org.osgi.framework.FrameworkUtil; |
|
| 9 | 6 |
import org.osgi.framework.Version; |
| 10 | 7 |
import org.osgi.service.prefs.Preferences; |
| 8 |
import org.txm.core.messages.TXMCoreMessages; |
|
| 11 | 9 |
import org.txm.core.preferences.TXMPreferences; |
| 12 | 10 |
import org.txm.utils.BundleUtils; |
| 13 | 11 |
import org.txm.utils.StreamHog; |
| ... | ... | |
| 47 | 45 |
/** The Constant R_PASSWORD. */ |
| 48 | 46 |
public static final String PASSWORD = PREFERENCES_PREFIX + "password"; //$NON-NLS-1$ |
| 49 | 47 |
|
| 48 |
// FIXME: SJ: not used anymore? |
|
| 50 | 49 |
/** The Constant R_PACKAGES_PATH. */ |
| 51 | 50 |
public static final String PACKAGES_PATH = PREFERENCES_PREFIX + "packages_path"; //$NON-NLS-1$ |
| 52 | 51 |
|
| ... | ... | |
| 61 | 60 |
public static final String SVG_DEVICE = PREFERENCES_PREFIX + "svg_device"; //$NON-NLS-1$ |
| 62 | 61 |
|
| 63 | 62 |
/** Last version since R Preferences have been set -> the setting is done only ONE time.*/ |
| 64 |
public static final String VERSION = "version"; |
|
| 63 |
public static final String VERSION = "version"; //$NON-NLS-1$
|
|
| 65 | 64 |
|
| 66 | 65 |
/** |
| 67 | 66 |
* To show or not not the R eval command lines. |
| 68 | 67 |
*/ |
| 69 |
public static final String SHOW_EVAL_LOGS = "show_eval_logs"; |
|
| 68 |
public static final String SHOW_EVAL_LOGS = "show_eval_logs"; //$NON-NLS-1$
|
|
| 70 | 69 |
|
| 71 | 70 |
/** |
| 72 | 71 |
* |
| ... | ... | |
| 100 | 99 |
preferences.putBoolean(SHOW_EVAL_LOGS, true); |
| 101 | 100 |
|
| 102 | 101 |
|
| 103 |
String RFRAGMENT = "org.txm.statsengine.r.core."+System.getProperty("osgi.os");
|
|
| 102 |
String RFRAGMENT = "org.txm.statsengine.r.core."+System.getProperty("osgi.os"); //$NON-NLS-1$
|
|
| 103 |
|
|
| 104 | 104 |
Log.fine("RPreferences.initializeDefaultPreferences()");
|
| 105 |
|
|
| 105 | 106 |
String saved = getString(RPreferences.VERSION); |
| 106 | 107 |
Version currentVersion = BundleUtils.getBundleVersion(RFRAGMENT); // the RFRAGMENT plugin contains the right version |
| 107 | 108 |
|
| 108 | 109 |
//ensure plugin binary files rights are ok |
| 109 |
String os = ""; |
|
| 110 |
String ext = ""; |
|
| 111 |
String osname = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
|
|
| 110 |
String os = ""; //$NON-NLS-1$
|
|
| 111 |
String ext = ""; //$NON-NLS-1$
|
|
| 112 |
String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
|
|
| 112 | 113 |
String extraSubPath = ""; |
| 113 |
if (osname.contains("windows")) { //$NON-NLS-1$
|
|
| 114 |
if (osName.contains("windows")) { //$NON-NLS-1$
|
|
| 114 | 115 |
os = "win32"; //$NON-NLS-1$ |
| 115 | 116 |
extraSubPath = "x64/"; |
| 116 | 117 |
ext = ".exe"; //$NON-NLS-1$ |
| 117 |
} else if (osname.contains("mac")) { //$NON-NLS-1$
|
|
| 118 |
} else if (osName.contains("mac")) { //$NON-NLS-1$
|
|
| 118 | 119 |
os = "macosx"; //$NON-NLS-1$ |
| 119 | 120 |
} else {
|
| 120 | 121 |
os = "linux32"; //$NON-NLS-1$ |
| ... | ... | |
| 124 | 125 |
|
| 125 | 126 |
File bundleDir = BundleUtils.getBundleFile(RFRAGMENT); |
| 126 | 127 |
if (bundleDir == null) {
|
| 127 |
System.out.println("Error while retrieving " + RFRAGMENT + " bundle directory.");
|
|
| 128 |
Log.severe(TXMCoreMessages.bind("Error while retrieving {0} bundle directory.", RFRAGMENT));
|
|
| 128 | 129 |
return; |
| 129 | 130 |
} |
| 130 |
File rpluginDir = new File(bundleDir, "res"); |
|
| 131 |
File rpluginDir = new File(bundleDir, "res"); //$NON-NLS-1$
|
|
| 131 | 132 |
File OSDir = new File(rpluginDir, os); |
| 132 |
File execFile = new File(OSDir, "bin/" + extraSubPath + "R" + ext); |
|
| 133 |
File execFile = new File(OSDir, "bin/" + extraSubPath + "R" + ext); //$NON-NLS-1$ //$NON-NLS-2$
|
|
| 133 | 134 |
execFile.setExecutable(true); |
| 134 | 135 |
|
| 135 | 136 |
|
| 136 |
if (!osname.contains("windows")) {
|
|
| 137 |
if (!osName.contains("windows")) { //$NON-NLS-1$
|
|
| 137 | 138 |
try {
|
| 138 |
Log.fine("Setting execution file rights to: "+OSDir.getAbsolutePath());
|
|
| 139 |
Process p = Runtime.getRuntime().exec("chmod -R +x "+OSDir.getAbsolutePath());
|
|
| 139 |
Log.fine(TXMCoreMessages.bind("Setting execution file rights to: {0}.", OSDir.getAbsolutePath()));
|
|
| 140 |
Process p = Runtime.getRuntime().exec("chmod -R +x "+OSDir.getAbsolutePath()); //$NON-NLS-1$
|
|
| 140 | 141 |
new StreamHog(p.getInputStream(), false); |
| 141 | 142 |
new StreamHog(p.getErrorStream(), false); |
| 142 | 143 |
p.waitFor(); |
| 143 | 144 |
} catch (Exception e) {
|
| 144 |
Log.severe("Error while setting execution file rights to: "+OSDir.getAbsolutePath());
|
|
| 145 |
Log.severe(TXMCoreMessages.bind("Error while setting execution file rights to: {0}.", OSDir.getAbsolutePath()));
|
|
| 145 | 146 |
e.printStackTrace(); |
| 146 | 147 |
return; |
| 147 | 148 |
} |
| 148 | 149 |
} |
| 149 | 150 |
|
| 150 | 151 |
if (!execFile.exists()) {
|
| 151 |
Log.severe("Cannot find R executable file: "+execFile);
|
|
| 152 |
Log.severe(TXMCoreMessages.bind("Can not find R executable file: {0}.", execFile));
|
|
| 152 | 153 |
return; |
| 153 | 154 |
} |
| 154 | 155 |
|
| 155 | 156 |
if (!execFile.canExecute()) {
|
| 156 |
Log.severe("File right setting error, cannot execute: "+execFile);
|
|
| 157 |
Log.severe(TXMCoreMessages.bind("File right setting error, can not execute: {0}.", execFile));
|
|
| 157 | 158 |
return; |
| 158 | 159 |
} |
| 159 | 160 |
|
| ... | ... | |
| 163 | 164 |
if (saved != null && saved.length() > 0) {
|
| 164 | 165 |
Version savedVersion = new Version(saved); |
| 165 | 166 |
if (currentVersion.compareTo(savedVersion) <= 0) {
|
| 166 |
Log.fine("No post-installation of R plugin to do.");
|
|
| 167 |
Log.fine("No post-installation of R plugin to do."); //$NON-NLS-1$
|
|
| 167 | 168 |
return; // nothing to do |
| 168 | 169 |
} |
| 169 | 170 |
} |
| 170 |
Log.fine("Updating R preferences for R plugin version = "+ currentVersion);
|
|
| 171 |
Log.fine(TXMCoreMessages.bind("Updating R stats engine preferences for plugin version: {0}...", currentVersion)); //$NON-NLS-1$
|
|
| 171 | 172 |
|
| 172 | 173 |
put(RPreferences.VERSION, currentVersion.toString()); |
| 173 | 174 |
|
| 174 | 175 |
put(PATH_TO_EXECUTABLE, execFile.getAbsolutePath()); |
| 176 |
|
|
| 177 |
// FIXME: SJ: useless since the values are the same than the default ones? |
|
| 175 | 178 |
put(IS_MANDATORY, false); |
| 176 |
put(SERVER_ADDRESS, "127.0.0.1"); |
|
| 179 |
put(SERVER_ADDRESS, "127.0.0.1"); //$NON-NLS-1$
|
|
| 177 | 180 |
put(REMOTE, false); |
| 178 | 181 |
put(DISABLE, false); |
| 179 | 182 |
put(DEBUG, false); |
| 180 |
put(PORT, "6311"); |
|
| 181 |
put(USER, ""); |
|
| 182 |
put(PASSWORD, ""); |
|
| 183 |
put(RARGS, ""); |
|
| 184 |
put(RSERVEARGS, ""); |
|
| 183 |
put(PORT, "6311"); //$NON-NLS-1$
|
|
| 184 |
put(USER, ""); //$NON-NLS-1$
|
|
| 185 |
put(PASSWORD, ""); //$NON-NLS-1$
|
|
| 186 |
put(RARGS, ""); //$NON-NLS-1$
|
|
| 187 |
put(RSERVEARGS, ""); //$NON-NLS-1$
|
|
| 185 | 188 |
put(FILE_TRANSFERT, false); |
| 186 |
put(SVG_DEVICE, "svg"); |
|
| 189 |
put(SVG_DEVICE, "svg"); //$NON-NLS-1$
|
|
| 187 | 190 |
put(SHOW_EVAL_LOGS, true); |
| 188 | 191 |
|
| 189 |
Log.fine("StatsEngine preferences set with: " + OSDir.getAbsolutePath() + " and " + execFile.getAbsolutePath() + ".");
|
|
| 192 |
Log.fine(TXMCoreMessages.bind("R stats engine preferences set with: {0} and {1}.", OSDir.getAbsolutePath(), execFile.getAbsolutePath())); //$NON-NLS-1$
|
|
| 190 | 193 |
} |
| 191 | 194 |
|
| 192 | 195 |
/** |
| tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 1679) | ||
|---|---|---|
| 50 | 50 |
*/ |
| 51 | 51 |
protected boolean needsToClearItemsSelection; |
| 52 | 52 |
|
| 53 |
/** |
|
| 54 |
* If true, the items selection will cleared when the chart will be updated. |
|
| 55 |
*/ |
|
| 56 |
protected boolean needsToSquareOff; |
|
| 53 | 57 |
|
| 54 | 58 |
|
| 55 | 59 |
|
| ... | ... | |
| 129 | 133 |
this.chartDirty = true; |
| 130 | 134 |
this.needsToResetView = false; |
| 131 | 135 |
this.needsToClearItemsSelection = false; |
| 136 |
this.needsToSquareOff = false; |
|
| 132 | 137 |
} |
| 133 | 138 |
|
| 134 | 139 |
|
| ... | ... | |
| 313 | 318 |
|
| 314 | 319 |
this.needsToClearItemsSelection = false; |
| 315 | 320 |
this.needsToResetView = false; |
| 321 |
// this.needsToSquareOff = false; |
|
| 316 | 322 |
|
| 317 | 323 |
this.chartDirty = false; |
| 318 | 324 |
|
| ... | ... | |
| 501 | 507 |
} |
| 502 | 508 |
|
| 503 | 509 |
/** |
| 510 |
* @return the needsToSquareOff |
|
| 511 |
*/ |
|
| 512 |
public boolean needsToSquareOff() {
|
|
| 513 |
return needsToSquareOff; |
|
| 514 |
} |
|
| 515 |
|
|
| 516 |
|
|
| 517 |
/** |
|
| 518 |
* @param needsToSquareOff the needsToSquareOff to set |
|
| 519 |
*/ |
|
| 520 |
public void setNeedsToSquareOff(boolean needsToSquareOff) {
|
|
| 521 |
this.needsToSquareOff = needsToSquareOff; |
|
| 522 |
} |
|
| 523 |
|
|
| 524 |
|
|
| 525 |
/** |
|
| 504 | 526 |
* @return the titleVisible |
| 505 | 527 |
*/ |
| 506 | 528 |
public boolean isTitleVisible() {
|
| ... | ... | |
| 619 | 641 |
} |
| 620 | 642 |
|
| 621 | 643 |
|
| 644 |
|
|
| 622 | 645 |
|
| 646 |
|
|
| 623 | 647 |
// FIXME |
| 624 | 648 |
// public Object createChart(IProgressMonitor monitor, String chartType) {
|
| 625 | 649 |
// Object chart = null; |
| tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 1679) | ||
|---|---|---|
| 242 | 242 |
getResult().setChartDirty(); |
| 243 | 243 |
getResult().setNeedsToResetView(resetView); |
| 244 | 244 |
compute(true); |
| 245 |
// synchronize the part names |
|
| 246 |
// FIXME: became useless? |
|
| 247 |
//((CAEditor)getParentMultiPagesEditor()).setPartName(getResult().getName()); |
|
| 248 | 245 |
forceFocus(); |
| 249 | 246 |
} |
| 250 | 247 |
|
| ... | ... | |
| 296 | 293 |
IChartComponent chartComponent = this.getComposite().getChartComponent(); |
| 297 | 294 |
|
| 298 | 295 |
// Axis unit square ratio constraint |
| 299 |
chartComponent.setSquareOffEnabled(true); |
|
| 296 |
//chartComponent.setSquareOffEnabled(true);
|
|
| 300 | 297 |
chartComponent.squareOff(); |
| 301 | 298 |
|
| 302 | 299 |
// FIXME: this code is too much AWT related |
| tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1679) | ||
|---|---|---|
| 274 | 274 |
this.parametersNodePath != null && |
| 275 | 275 |
!parentNodePath.isEmpty()) {
|
| 276 | 276 |
|
| 277 |
Log.finest("Searching parent with UUID: " + parentNodePath + "..."); //$NON-NLS-1$ //$NON-NLS-2$
|
|
| 277 |
Log.finest("Searching parent with UUID " + parentNodePath + "..."); //$NON-NLS-1$ //$NON-NLS-2$
|
|
| 278 | 278 |
|
| 279 | 279 |
TXMResult retrievedParent = TXMResult.getResult(parentNodePath); |
| 280 | 280 |
if (retrievedParent != null) {
|
| ... | ... | |
| 282 | 282 |
retrievedParent.addChild(this); |
| 283 | 283 |
} |
| 284 | 284 |
else {
|
| 285 |
Log.warning("Warning: no parent was found in project for path=" + parametersNodePath + " and puuid=" + parentNodePath + " preferences=" + this.dumpParameters()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
|
| 286 |
try {TBXPreferences.delete(this);} catch(Exception e) {}
|
|
| 285 |
Log.severe("Warning: no parent was found in project for path=" + parametersNodePath + " and puuid=" + parentNodePath + " preferences=" + this.dumpParameters()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
|
| 286 |
try {
|
|
| 287 |
TBXPreferences.delete(this); |
|
| 288 |
} |
|
| 289 |
catch(Exception e) {
|
|
| 290 |
|
|
| 291 |
} |
|
| 287 | 292 |
return; |
| 288 | 293 |
} |
| 289 | 294 |
} |
| ... | ... | |
| 293 | 298 |
this.autoLoadParametersFromAnnotations(); // auto fill from Parameter annotations |
| 294 | 299 |
this.loadParameters(); // subclasses manual settings |
| 295 | 300 |
} catch (Exception e) {
|
| 296 |
Log.warning("Fail to load " + parametersNodePath + "result: " + e); //$NON-NLS-1$ //$NON-NLS-2$
|
|
| 301 |
Log.severe("Fail to load " + parametersNodePath + "result: " + e); //$NON-NLS-1$ //$NON-NLS-2$
|
|
| 297 | 302 |
Log.printStackTrace(e); |
| 298 | 303 |
} |
| 299 | 304 |
|
| ... | ... | |
| 302 | 307 |
Log.finest("Warning: the TXMResult of " + this.getClass() + " is attached to no parent. (uuid = " + this.parametersNodePath + ")"); //$NON-NLS-1$ //$NON-NLS-2$
|
| 303 | 308 |
} |
| 304 | 309 |
|
| 305 |
// try {
|
|
| 306 |
// this.parametersHistory.add(new HashMap<String, Object>()); |
|
| 307 |
// //this.updateLastParameters(); |
|
| 308 |
// } |
|
| 309 |
// catch (Exception e) {
|
|
| 310 |
// // TODO Auto-generated catch block |
|
| 311 |
// e.printStackTrace(); |
|
| 312 |
// } |
|
| 313 | 310 |
} |
| 314 | 311 |
|
| 315 | 312 |
/** |
| tmp/org.txm.core/src/java/org/txm/objects/Text.java (revision 1679) | ||
|---|---|---|
| 302 | 302 |
return "Text"; |
| 303 | 303 |
} |
| 304 | 304 |
|
| 305 |
@Override |
|
| 305 | 306 |
public String toString() {
|
| 306 |
return userName+" "+pTXMFile;
|
|
| 307 |
return userName + " (file: " + pTXMFile + ")";
|
|
| 307 | 308 |
} |
| 308 | 309 |
} |
Formats disponibles : Unified diff