Révision 1169
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java (revision 1169) | ||
---|---|---|
130 | 130 |
parentContainer.setLayout(new FormLayout());// change layout |
131 | 131 |
final Sash sash = new Sash(parentContainer, SWT.VERTICAL); |
132 | 132 |
|
133 |
Composite cAGraphComposite = new Composite(parentContainer, SWT.NONE);
|
|
133 |
Composite caChartComposite = new Composite(parentContainer, SWT.NONE);
|
|
134 | 134 |
|
135 | 135 |
FormData containerData = new FormData(); |
136 | 136 |
containerData.left = new FormAttachment(sash, 0); |
... | ... | |
163 | 163 |
AFCgraphData.right = new FormAttachment(sash, 0); |
164 | 164 |
AFCgraphData.top = new FormAttachment(0, 0); |
165 | 165 |
AFCgraphData.bottom = new FormAttachment(100, 0); |
166 |
cAGraphComposite.setLayoutData(AFCgraphData);// set new layout data
|
|
167 |
cAGraphComposite.setLayout(new FillLayout());
|
|
166 |
caChartComposite.setLayoutData(AFCgraphData);// set new layout data
|
|
167 |
caChartComposite.setLayout(new FillLayout());
|
|
168 | 168 |
// ///////////////////// |
169 | 169 |
|
170 | 170 |
|
... | ... | |
201 | 201 |
// Set the parent multi pages editor of the CA factorial map editor to activate it from the child editor |
202 | 202 |
caFactorialMapEditorPart.setParentMultiPagesEditor(this); |
203 | 203 |
|
204 |
caFactorialMapEditorPart.createPartControl(cAGraphComposite);
|
|
204 |
caFactorialMapEditorPart.createPartControl(caChartComposite);
|
|
205 | 205 |
caFactorialMapEditorPart.refresh(false); |
206 | 206 |
|
207 | 207 |
caFactorialMapEditorPart.addPropertyListener(new IPropertyListener() { |
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java (revision 1169) | ||
---|---|---|
105 | 105 |
} else { // aborted |
106 | 106 |
return null; |
107 | 107 |
} |
108 |
|
|
109 |
// ca = new CA(new LexicalTable(partition)); |
|
108 | 110 |
} |
109 | 111 |
// Creates from Lexical Table |
110 | 112 |
else if (selection instanceof LexicalTable) { |
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 1169) | ||
---|---|---|
1417 | 1417 |
// TODO Auto-generated catch block |
1418 | 1418 |
e.printStackTrace(); |
1419 | 1419 |
} |
1420 |
if (r !=null && r.inherits("try-error")) throw new RException(expr, r.asString()); //$NON-NLS-1$ |
|
1420 |
finally { |
|
1421 |
if (r !=null && r.inherits("try-error")) { |
|
1422 |
throw new RException(expr, r.asString()); //$NON-NLS-1$ |
|
1423 |
} |
|
1424 |
} |
|
1421 | 1425 |
return r; |
1422 | 1426 |
} |
1423 | 1427 |
|
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1169) | ||
---|---|---|
739 | 739 |
*/ |
740 | 740 |
public void setDirty() { |
741 | 741 |
this.dirty = true; |
742 |
for (TXMResult c : getChildren()) {
|
|
743 |
c.setDirty();
|
|
742 |
for (int i = 0; i < this.children.size(); i++) {
|
|
743 |
this.children.get(i).setDirty();
|
|
744 | 744 |
} |
745 | 745 |
} |
746 | 746 |
|
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 1169) | ||
---|---|---|
36 | 36 |
public static String common_reference; |
37 | 37 |
public static String common_rows; |
38 | 38 |
public static String common_structuralUnit; |
39 |
|
|
40 |
|
|
41 |
public static String common_structuralUnitAndProperty; |
|
39 | 42 |
public static String common_structure; |
40 | 43 |
public static String common_thresholds; |
41 | 44 |
public static String common_units; |
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 1169) | ||
---|---|---|
268 | 268 |
Workspace_6 = ** Echec de la création du fichier d'espace de travail : |
269 | 269 |
Workspace_8 = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré... |
270 | 270 |
|
271 |
common_cols = Colonnes |
|
272 |
common_delete = Supprimer |
|
273 |
common_description = Description |
|
274 |
common_done = Terminé. |
|
275 |
common_fMax = Fmax |
|
276 |
common_fMin = Fmin |
|
277 |
common_frequency = Fréquence |
|
278 |
common_lowestFrequency = Fréquence minimale |
|
279 |
common_mode = Mode |
|
280 |
common_numberOfLines = Nombre de lignes |
|
281 |
common_ok = OK |
|
282 |
common_pleaseWait = Veuillez patienter... |
|
283 |
common_properties = Propriétés : |
|
284 |
common_property = Propriété : |
|
285 |
common_queries = Requêtes |
|
286 |
common_query = Requête |
|
287 |
common_reference = Référence |
|
288 |
common_rows = Lignes |
|
289 |
common_structure = Structure |
|
290 |
common_thresholds = Seuils |
|
291 |
common_units = Unités |
|
271 |
common_cols = Colonnes |
|
272 |
common_delete = Supprimer |
|
273 |
common_description = Description |
|
274 |
common_done = Terminé. |
|
275 |
common_fMax = Fmax |
|
276 |
common_fMin = Fmin |
|
277 |
common_frequency = Fréquence |
|
278 |
common_lowestFrequency = Fréquence minimale |
|
279 |
common_mode = Mode |
|
280 |
common_numberOfLines = Nombre de lignes |
|
281 |
common_ok = OK |
|
282 |
common_pleaseWait = Veuillez patienter... |
|
283 |
common_properties = Propriétés : |
|
284 |
common_property = Propriété : |
|
285 |
common_queries = Requêtes |
|
286 |
common_query = Requête |
|
287 |
common_reference = Référence |
|
288 |
common_rows = Lignes |
|
289 |
common_structuralUnitAndProperty = Unité structurelle et propriété |
|
290 |
common_structure = Structure |
|
291 |
common_thresholds = Seuils |
|
292 |
common_units = Unités |
|
292 | 293 |
|
293 | 294 |
error_error = ** Erreur : {0}. |
294 | 295 |
error_error2 = Erreur |
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 1169) | ||
---|---|---|
300 | 300 |
common_reference = Reference |
301 | 301 |
common_rows = Rows |
302 | 302 |
common_structuralUnit = Structural Unit: |
303 |
common_structuralUnitAndProperty=Structural unit and property |
|
303 | 304 |
common_structure = Structure |
304 | 305 |
common_thresholds = Thresholds |
305 | 306 |
common_units = Units |
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 1169) | ||
---|---|---|
225 | 225 |
// may need to fix this in another way: |
226 | 226 |
// Solution 1: store two stacks, one for computing parameters and another for rendering parameters |
227 | 227 |
// Solution 2: stop to dissociate rendering parameters and computing parameters. Maybe the best way but need to check in this dissociation is very useless |
228 |
// clear the last commputing parameters |
|
229 |
this.clearLastComputingParameters(); |
|
228 |
// clear the last computing parameters |
|
229 |
if(this.parametersHistory.size() > 2) { |
|
230 |
this.clearLastComputingParameters(); |
|
231 |
} |
|
230 | 232 |
|
231 | 233 |
// Creating, if needed. |
232 | 234 |
// The change of the chart type parameter can occur if: |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/StructuralUnitsCombosGroup.java (revision 1169) | ||
---|---|---|
6 | 6 |
import org.eclipse.swt.layout.RowLayout; |
7 | 7 |
import org.eclipse.swt.widgets.Composite; |
8 | 8 |
import org.eclipse.swt.widgets.Group; |
9 |
import org.txm.core.messages.TXMCoreMessages; |
|
9 | 10 |
import org.txm.rcp.editors.TXMEditor; |
10 | 11 |
import org.txm.searchengine.cqp.corpus.StructuralUnit; |
11 | 12 |
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty; |
... | ... | |
44 | 45 |
super(parent, style); |
45 | 46 |
|
46 | 47 |
this.setLayout(new RowLayout()); |
47 |
this.setText("Structural unit and property");
|
|
48 |
this.setText(TXMCoreMessages.common_structuralUnitAndProperty);
|
|
48 | 49 |
|
49 | 50 |
// Structural Unit combo box |
50 | 51 |
this.structuralUnitsComboViewer = new StructuralUnitsComboViewer(this, editor, autoCompute, selectedSU, addEmptyEntries); |
tmp/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java (revision 1169) | ||
---|---|---|
124 | 124 |
*/ |
125 | 125 |
public Lexicon(String parametersNodePath, TXMResult parent) { |
126 | 126 |
super(parametersNodePath, parent); |
127 |
// FIXME: SJ: temporary to fix some bugs. Later we should persist them to avoid recreation |
|
128 |
this.internalPersistable = false; |
|
127 | 129 |
} |
128 | 130 |
|
129 | 131 |
@Override |
Formats disponibles : Unified diff