Revision 2653

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 2653)
2352 2352
		SubMonitor mainSubMonitor = SubMonitor.convert(monitor, this.getComputingStartMessage(), 3);
2353 2353
		
2354 2354
		// FIXME: SJ: see if this skipComputing tests is still useful? is it possible to directly returns instead?
2355
		// en fait voir ChartResult.compute() if(super.compute(monitor, true, false)), je pense que le prob vient du fait que si on retourne false dans TXMResult.compute() alors renderChart() ne
2356
		// sera pas appelé
2357
		// il faudrait retourner un état: skipped, computed, error, etc.
2358 2355
		boolean skipComputing = false;
2359 2356
		
2360 2357
		
......
2413 2410
				}
2414 2411
				
2415 2412
				// Computing
2416
				// SubMonitor m = subMonitor.split(1);
2417
				// m = SubMonitor.convert(m, this.getComputingStartMessage(), 100);
2418
				
2419
				// store a new sub-monitor dedicated to subclasses computation method
2420
				// this.monitor = mainSubMonitor.split(1).setWorkRemaining(100);
2421
				
2422 2413
				if (!this._compute(new TXMProgressMonitor(mainSubMonitor.split(1)))) {
2423 2414
					Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing failed.");
2424 2415
					this.computing = false;
2425 2416
					return false;
2426 2417
				}
2427
				//
2428
				// // delete the monitor used by subclasses computation method
2429
				// // if (this.monitor != null) {
2430
				// // this.monitor.done();
2431
				// this.monitor = null;
2432
				// // }
2433
				//
2434
				// // subMonitor.worked(1);
2435
				
2436 2418
			}
2437 2419
			else {
2438 2420
				mainSubMonitor.setWorkRemaining(1);
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 2653)
355 355
		this.dirty = super.hasParameterChanged();
356 356
		if (!this.dirty) {
357 357
			this.dirty = this.hasRenderingParameterChanged(); // FIXME: SJ: temporary but breaks the dirty computing state and rendering computing state management
358
			// problem here is that if the object is not dirty, TXMResult.compute() doesn't call ChartResult._compute() so the rendering is not done
358 359
		}
359 360
	}
360 361
	

Also available in: Unified diff