Révision 1080
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1080) | ||
---|---|---|
1650 | 1650 |
|
1651 | 1651 |
// Computing requirements test |
1652 | 1652 |
if (!this.canCompute()) { |
1653 |
Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": missing or wrong parameters, computing aborted.");
|
|
1653 |
Log.severe("TXMResult.compute(): " + this.getClass().getSimpleName() + ": missing or wrong parameters, computing aborted.");
|
|
1654 | 1654 |
return false; |
1655 | 1655 |
} |
1656 | 1656 |
|
1657 | 1657 |
// Computing |
1658 | 1658 |
if (!this._compute()) { |
1659 |
Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing failed.");
|
|
1659 |
Log.severe("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing failed.");
|
|
1660 | 1660 |
return false; |
1661 | 1661 |
} |
1662 | 1662 |
|
... | ... | |
1719 | 1719 |
* @return |
1720 | 1720 |
*/ |
1721 | 1721 |
public boolean mustBePersisted() { |
1722 |
if (this.persistable || TBXPreferences.getInstance().getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED) || this.userPersistable) { |
|
1722 |
if (this.persistable |
|
1723 |
//|| TBXPreferences.getInstance().getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED) // FIXME |
|
1724 |
|| this.userPersistable) { |
|
1723 | 1725 |
return true; |
1724 | 1726 |
} |
1725 | 1727 |
return false; |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMResultDebugView.java (revision 1080) | ||
---|---|---|
113 | 113 |
buffer.append("toString(): " + this.currentResult.toString() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ |
114 | 114 |
buffer.append("Details: " + this.currentResult.getDetails() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ |
115 | 115 |
buffer.append("Dirty: " + this.currentResult.isDirty() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ |
116 |
buffer.append("Has been computed once: " + this.currentResult.hasBeenComputedOnce() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ |
|
116 | 117 |
// if (this.currentResult instanceof ChartResult) { |
117 | 118 |
// buffer.append("Chart dirty: " + ((ChartResult)this.currentResult).isChartDirty() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ |
118 | 119 |
// } |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1080) | ||
---|---|---|
643 | 643 |
|
644 | 644 |
notifyExtensions("notifyStartOfCompute"); //$NON-NLS-1$ |
645 | 645 |
if (!TXMEditor.this.getResult().compute(monitor)) { |
646 |
Log.severe("TXMEditor.compute(): computing failed."); |
|
646 |
Log.severe("TXMEditor.compute(): " + this.getClass().getSimpleName() + ": computing failed.");
|
|
647 | 647 |
} |
648 | 648 |
notifyExtensions("notifyEndOfCompute"); //$NON-NLS-1$ |
649 | 649 |
|
... | ... | |
656 | 656 |
try { |
657 | 657 |
refresh(update); |
658 | 658 |
} catch (Exception e) { |
659 |
Log.severe("Error while refreshing the editor: " + e); //$NON-NLS-1$ |
|
659 |
Log.severe("TXMEditor.compute(): " + this.getClass().getSimpleName() + ": Error while refreshing the editor: " + e); //$NON-NLS-1$
|
|
660 | 660 |
Log.printStackTrace(e); |
661 | 661 |
} |
662 | 662 |
} |
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java (revision 1080) | ||
---|---|---|
39 | 39 |
|
40 | 40 |
import org.rosuda.REngine.REXP; |
41 | 41 |
import org.txm.core.preferences.TBXPreferences; |
42 |
import org.txm.core.preferences.TXMPreferences; |
|
42 | 43 |
import org.txm.core.results.Parameter; |
43 | 44 |
import org.txm.core.results.TXMParameters; |
44 | 45 |
import org.txm.core.results.TXMResult; |
... | ... | |
122 | 123 |
/** |
123 | 124 |
* Unit property. |
124 | 125 |
*/ |
125 |
@Parameter(key=SpecificitiesPreferences.UNIT_PROPERTY)
|
|
126 |
@Parameter(key=TXMPreferences.UNIT_PROPERTY)
|
|
126 | 127 |
protected Property unitProperty; |
127 | 128 |
|
128 | 129 |
/** |
... | ... | |
259 | 260 |
for (int j = 0 ; j < indices[i].length ; j++) { |
260 | 261 |
if (indices[i][j] > MAX) { |
261 | 262 |
indices[i][j] = MAX; |
262 |
} else if (indices[i][j] < MIN) { |
|
263 |
} |
|
264 |
else if (indices[i][j] < MIN) { |
|
263 | 265 |
indices[i][j] = MIN; |
264 | 266 |
} |
265 | 267 |
} |
Formats disponibles : Unified diff