Commit 8aa1435b authored by Markus Krug's avatar Markus Krug

Merge branch 'redeWiedergabe_dev' into 'master'

Rede wiedergabe dev

See merge request !83
parents b348cbde f7351944
Pipeline #12422 passed with stages
in 18 minutes and 34 seconds
...@@ -1025,7 +1025,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart { ...@@ -1025,7 +1025,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
} }
for (AnnotationFS stwr : stwrList){ for (AnnotationFS stwr : stwrList){
if (anno.getBegin() >= stwr.getBegin() && anno.getEnd() <= stwr.getEnd()) if (anno.getBegin() >= stwr.getBegin() && anno.getEnd() <= stwr.getEnd() && stwr.getFeatureValueAsString(rTypeFeat).equals("reported"))
{ {
anno.getFeatureValueAsString(speakerFeat); anno.getFeatureValueAsString(speakerFeat);
addAnnotation(anno); addAnnotation(anno);
...@@ -1080,10 +1080,10 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart { ...@@ -1080,10 +1080,10 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
//JOptionPane.showMessageDialog(jFrame, "The speaker already has the ID " + selected.getFeatureValueAsString(frameIDFeat) + ".", "Attention", JOptionPane.WARNING_MESSAGE); //JOptionPane.showMessageDialog(jFrame, "The speaker already has the ID " + selected.getFeatureValueAsString(frameIDFeat) + ".", "Attention", JOptionPane.WARNING_MESSAGE);
}else if (anno.getFeatureValueAsString(speakerIDFeat).equals("0")) { }else if (anno.getFeatureValueAsString(speakerIDFeat).equals("0")) {
concatenatedId = selected.getFeatureValueAsString(frameIDFeat); concatenatedId = selected.getFeatureValueAsString(frameIDFeat);
updateAnnotation(anno, speakerIDFeat, concatenatedId, true); updateAnnotation(anno, speakerIDFeat, concatenatedId, true);
}else { }else {
concatenatedId = anno.getFeatureValueAsString(speakerIDFeat) + " " + selected.getFeatureValueAsString(frameIDFeat); concatenatedId = anno.getFeatureValueAsString(speakerIDFeat) + " " + selected.getFeatureValueAsString(frameIDFeat);
updateAnnotation(anno, speakerIDFeat, concatenatedId, true); updateAnnotation(anno, speakerIDFeat, concatenatedId, true);
} }
} }
...@@ -2194,7 +2194,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart { ...@@ -2194,7 +2194,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true); updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true);
String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat); String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat);
versionValue = "0.0.11a 0.0.1s"; versionValue = "0.0.12a 0.0.1s";
//versionValue = "0.0.8a 0.0.1s"; //versionValue = "0.0.8a 0.0.1s";
updateAnnotation(metaDataList.get(0), versionFeat, versionValue, true); updateAnnotation(metaDataList.get(0), versionFeat, versionValue, true);
} }
......
...@@ -202,7 +202,8 @@ public class RwFrameTableComposite extends Composite{ ...@@ -202,7 +202,8 @@ public class RwFrameTableComposite extends Composite{
{ {
IStructuredSelection sel = (IStructuredSelection) frameViewer.getSelection(); IStructuredSelection sel = (IStructuredSelection) frameViewer.getSelection();
AnnotationFS selected = (AnnotationFS) sel.getFirstElement(); AnnotationFS selected = (AnnotationFS) sel.getFirstElement();
part.createSpeakerOutsideFrame(selected); part.createSpeakerOutsideFrame(selected);
refreshTable();
} }
// small utility method // small utility method
......
...@@ -273,7 +273,8 @@ public class RwStwrTableComposite extends Composite{ ...@@ -273,7 +273,8 @@ public class RwStwrTableComposite extends Composite{
{ {
IStructuredSelection sel = (IStructuredSelection) stwrViewer.getSelection(); IStructuredSelection sel = (IStructuredSelection) stwrViewer.getSelection();
AnnotationFS selected = (AnnotationFS) sel.getFirstElement(); AnnotationFS selected = (AnnotationFS) sel.getFirstElement();
part.createSpeakerOutsideStwr(selected); part.createSpeakerOutsideStwr(selected);
refreshTable();
} }
// small utility method // small utility method
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment