Révision 638
tmp/org.txm.textsbalance.core/src/org/txm/textsbalance/core/functions/TextsBalance.java (revision 638) | ||
---|---|---|
42 | 42 |
protected int fMin; |
43 | 43 |
protected int fMax; |
44 | 44 |
|
45 |
//protected String name; |
|
46 | 45 |
|
47 |
|
|
48 | 46 |
protected int method; |
49 | 47 |
|
50 | 48 |
|
... | ... | |
68 | 66 |
|
69 | 67 |
|
70 | 68 |
/** |
71 |
* |
|
69 |
* Creates a TextsBalance.
|
|
72 | 70 |
* @param corpus |
73 | 71 |
*/ |
74 | 72 |
public TextsBalance(Corpus corpus) { |
... | ... | |
80 | 78 |
|
81 | 79 |
@Override |
82 | 80 |
public boolean loadParameters() { |
83 |
// TODO Auto-generated method stub |
|
84 | 81 |
try { |
85 | 82 |
StructuralUnit su = this.getCorpus().getStructuralUnit(this.getStringParameterValue(TextsBalancePreferences.STRUCTURAL_UNIT)); |
86 | 83 |
this.setParameters(su, su.getProperty(this.getStringParameterValue(TextsBalancePreferences.STRUCTURAL_UNIT_PROPERTY))); |
87 | 84 |
} |
88 | 85 |
catch(CqiClientException e) { |
89 |
// TODO Auto-generated catch block |
|
90 |
e.printStackTrace(); |
|
86 |
Log.printStackTrace(e); |
|
91 | 87 |
return false; |
92 | 88 |
} |
93 | 89 |
return true; |
... | ... | |
343 | 339 |
@Override |
344 | 340 |
public boolean canCompute() { |
345 | 341 |
return |
346 |
getCorpus() != null |
|
347 |
// FIXME |
|
342 |
this.getCorpus() != null |
|
348 | 343 |
&& this.structuralUnit != null |
349 | 344 |
&& this.structuralUnitProperty != null |
350 | 345 |
; |
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages.properties (revision 638) | ||
---|---|---|
3 | 3 |
ChartsEngine_PROGRESSION_TITLE_IN = in |
4 | 4 |
ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF = Progression of |
5 | 5 |
ChartsEngine_PROGRESSION_TITLE_PROPERTY = , property: |
6 |
ChartsEngine_PROGRESSION_TITLE_REGEX = , REGEX: |
|
6 |
ChartsEngine_PROGRESSION_TITLE_REGEX = , filtering REGEX:
|
|
7 | 7 |
ChartsEngine_PROGRESSION_TITLE_STRUCT = structure: |
8 | 8 |
ChartsEngine_PROGRESSION_X_AXIS_LABEL = T = {0} |
9 | 9 |
ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL = Occurrences |
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_fr.properties (revision 638) | ||
---|---|---|
3 | 3 |
ChartsEngine_PROGRESSION_TITLE_IN = dans |
4 | 4 |
ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF = Progression de |
5 | 5 |
ChartsEngine_PROGRESSION_TITLE_PROPERTY = , propriété : |
6 |
ChartsEngine_PROGRESSION_TITLE_REGEX = , filtrage REGEX: |
|
6 | 7 |
ChartsEngine_PROGRESSION_TITLE_STRUCT = structure : |
7 | 8 |
ChartsEngine_PROGRESSION_X_AXIS_LABEL = T = {0} |
8 | 9 |
ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL = Occurrences |
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 638) | ||
---|---|---|
320 | 320 |
if (m.getStart() == previousMatch.getEnd()+1) { |
321 | 321 |
previousMatch = m; |
322 | 322 |
continue; |
323 |
} else { |
|
323 |
} |
|
324 |
else { |
|
324 | 325 |
return false; |
325 | 326 |
} |
326 | 327 |
} |
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionChartCreator.java (revision 638) | ||
---|---|---|
121 | 121 |
|
122 | 122 |
|
123 | 123 |
// Fill the data set from the result |
124 |
if(result.hasParameterChanged(ProgressionPreferences.QUERIES)) {
|
|
124 |
if(progression.hasParameterChanged(ProgressionPreferences.QUERIES)) {
|
|
125 | 125 |
XYSeriesCollection dataset = (XYSeriesCollection) chart.getXYPlot().getDataset(); |
126 | 126 |
dataset.removeAllSeries(); |
127 | 127 |
|
... | ... | |
179 | 179 |
|
180 | 180 |
// Add the part markers |
181 | 181 |
String previousPartName = ""; //$NON-NLS-1$ |
182 |
if(progression.getStructuralUnit() != null && progression.getStructurePositions().length > 0) { |
|
182 |
if(progression.getStructuralUnit() != null && progression.getStructurePositions().length > 0 && |
|
183 |
(progression.hasParameterChanged(ProgressionPreferences.STRUCTURAL_UNIT) || |
|
184 |
progression.hasParameterChanged(ProgressionPreferences.STRUCTURAL_UNIT_PROPERTY) || |
|
185 |
progression.hasParameterChanged(ProgressionPreferences.REPEAT_SAME_VALUES) || |
|
186 |
progression.hasParameterChanged(ProgressionPreferences.PROPERTY_REGEX) |
|
187 |
)) { |
|
183 | 188 |
for(int i = 0; i < progression.getStructurePositions().length; i++) { |
184 | 189 |
if(progression.getStructurePositions()[i] != 0) { |
185 | 190 |
|
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java (revision 638) | ||
---|---|---|
438 | 438 |
@Override |
439 | 439 |
public void updateResultFromEditor() { |
440 | 440 |
|
441 |
// Display.getDefault().syncExec(new Runnable() { |
|
442 |
// @Override |
|
443 |
// public void run() { |
|
441 |
queries = new ArrayList<Query>(); |
|
442 |
for (QueryField wid : queryWidgets) { |
|
443 |
if (!wid.getQuery().isEmpty()) { //$NON-NLS-1$ |
|
444 |
queries.add(wid.getQuery()); |
|
445 |
wid.memorize(); |
|
446 |
} |
|
447 |
} |
|
444 | 448 |
|
445 |
queries = new ArrayList<Query>(); |
|
446 |
for (QueryField wid : queryWidgets) { |
|
447 |
if (!wid.getQuery().isEmpty()) { //$NON-NLS-1$ |
|
448 |
queries.add(wid.getQuery()); |
|
449 |
wid.memorize(); |
|
450 |
} |
|
451 |
} |
|
449 |
cumulative = cumuButton.getSelection(); |
|
452 | 450 |
|
453 |
cumulative = cumuButton.getSelection(); |
|
454 |
|
|
455 |
String smultibande = bandeField.getText(); |
|
456 |
float bandeMultiplier = 1.0f; |
|
457 |
if (smultibande != null && smultibande.length() > 0) { |
|
458 |
try { |
|
459 |
bandeMultiplier = Float.parseFloat(smultibande); |
|
460 |
} catch(Exception e) { |
|
461 |
bandeMultiplier = 1.0f; |
|
462 |
System.out.println(ProgressionUIMessages.ProgressionDialog_17 + e); |
|
463 |
StatusLine.error(ProgressionUIMessages.ProgressionDialog_17 + e); |
|
464 |
} |
|
465 |
} |
|
466 |
else { |
|
467 |
bandeMultiplier = 1.0f; |
|
468 |
} |
|
469 |
//getResultData().setParameters(queries, selectedStructuralUnit, selectedStructuralUnitProperty, regexPropertyValue, cumulative, lineWidth, repeatButton.getSelection(), bandeMultiplier); |
|
470 |
// } |
|
471 |
// }); |
|
472 |
|
|
451 |
String smultibande = bandeField.getText(); |
|
452 |
float bandeMultiplier = 1.0f; |
|
453 |
if (smultibande != null && smultibande.length() > 0) { |
|
454 |
try { |
|
455 |
bandeMultiplier = Float.parseFloat(smultibande); |
|
456 |
} catch(Exception e) { |
|
457 |
bandeMultiplier = 1.0f; |
|
458 |
System.out.println(ProgressionUIMessages.ProgressionDialog_17 + e); |
|
459 |
StatusLine.error(ProgressionUIMessages.ProgressionDialog_17 + e); |
|
460 |
} |
|
461 |
} |
|
462 |
else { |
|
463 |
bandeMultiplier = 1.0f; |
|
464 |
} |
|
473 | 465 |
} |
474 | 466 |
|
475 | 467 |
} |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 638) | ||
---|---|---|
679 | 679 |
else { |
680 | 680 |
f.set(this, value); |
681 | 681 |
} |
682 |
|
|
682 | 683 |
// FIXME: debug |
683 |
System.err.println("TXMEditor.autoUpdateEditorFieldsFromResult(): setting editor parameter " + parameter.key() + " = " + value + " (" + value.getClass() + " to object " + object.getClass() + ")"); |
|
684 |
if(object != null) { |
|
685 |
System.err.println("TXMEditor.autoUpdateEditorFieldsFromResult(): setting editor parameter " + parameter.key() + " = " + value + " (" + value.getClass() + " to object " + object + ")"); |
|
686 |
} |
|
684 | 687 |
|
685 | 688 |
// FIXME: need to extend this list of managed Widgets |
686 | 689 |
} |
Formats disponibles : Unified diff