Révision 1767

tmp/org.txm.chartsengine.svgbatik.rcp/src/org/txm/chartsengine/svgbatik/rcp/swt/SVGComposite.java (revision 1767)
60 60
				this.getPanel().resetView();
61 61
			}
62 62
		}
63
		catch(MalformedURLException e) {
63
		catch(Exception e) {
64 64
			Log.severe("Can't load SVG document from file: " + file + e);
65 65
			Log.printStackTrace(e);
66 66
		}
tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartsEngine.java (revision 1767)
80 80
	 * @param file
81 81
	 * @param cmd
82 82
	 */
83
	public void plot(File file, String cmd)	{
84
		this.plot(file, cmd, null, null, null);
83
	public File plot(File file, String cmd)	{
84
		return this.plot(file, cmd, null, null, null);
85 85
	}
86 86
	
87 87
	/**
......
91 91
	 * @param cmd
92 92
	 * @param result
93 93
	 */
94
	public void plot(File file, String cmd, ChartResult result, String title, String subtitle)	{
94
	public File plot(File file, String cmd, ChartResult result, String title, String subtitle)	{
95 95
		try {
96 96

  
97 97
			if (!cmd.endsWith(";") && !cmd.endsWith("\n")) { //$NON-NLS-1$
......
126 126
			}
127 127
			RWorkspaceRenderer.getInstance().plot(file, cmd, this.rDevice);
128 128
		}
129
		catch(RWorkspaceException e) {
130
			// TODO Auto-generated catch block
129
		catch(Exception e) {
131 130
			e.printStackTrace();
131
			return null;
132 132
		}
133
		catch(REXPMismatchException e) {
134
			// TODO Auto-generated catch block
135
			e.printStackTrace();
136
		}
137
		catch(StatException e) {
138
			// TODO Auto-generated catch block
139
			e.printStackTrace();
140
		}
133
		
134
		return file;
141 135
	}
142 136
	
143 137
	
tmp/org.txm.chartsengine.r.core/src/org/txm/stat/engine/r/RWorkspaceRenderer.java (revision 1767)
85 85
	 * @throws REXPMismatchException the rEXP mismatch exception
86 86
	 * @throws StatException the stat exception
87 87
	 */
88
	public void plot(File file, String expr) throws REXPMismatchException,	StatException {
89
		plot(file, expr, defaultDevice );
88
	public File plot(File file, String expr) throws REXPMismatchException,	StatException {
89
		return plot(file, expr, defaultDevice );
90 90
	}
91 91

  
92 92
	/**
......
98 98
	 * @throws REXPMismatchException the rEXP mismatch exception
99 99
	 * @throws StatException the stat exception
100 100
	 */
101
	public void plot(File file, String expr, RDevice device)throws REXPMismatchException,
102
	StatException
101
	public File plot(File file, String expr, RDevice device) throws REXPMismatchException, StatException
103 102
	{
104 103
		try {
105 104
			file.createNewFile();
106 105
		}
107 106
		catch (IOException e1) {
108 107
			org.txm.utils.logger.Log.printStackTrace(e1);
109
			return;
108
			return null;
110 109
		}
111 110
		if (!file.canWrite()) {
112 111
			Log.severe(TXMCoreMessages.bind("** Error: can not write in file {0}.", file));
......
164 163
		// ok, so the device should be fine - let's plot
165 164
		workspace.voidEval(expr);
166 165
		workspace.voidEval("dev.off()"); //$NON-NLS-1$
166
		
167
		return file;
167 168
	}
168 169

  
169 170
	/**
tmp/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/r/RAHCChartCreator.java (revision 1767)
38 38
			cmd = "plot.HCPC("+ ahc.getSymbol() +", new.plot=FALSE)";
39 39
		}
40 40
		
41
		this.getChartsEngine().plot(file, cmd);
42
		
43
		return file;
41
		return this.getChartsEngine().plot(file, cmd);
44 42
	}
45 43

  
46 44
	

Formats disponibles : Unified diff