Mercurial > hg > svcore
comparison transform/FeatureExtractionModelTransformer.cpp @ 933:d03b3d956358 warnfix_no_size_t
Merge from branch tony_integration
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 08:34:46 +0100 |
parents | 06579b8ffb7b defbe5bc47b7 |
children | 65494d0d9ded |
comparison
equal
deleted
inserted
replaced
932:e06f03013f46 | 933:d03b3d956358 |
---|---|
1011 if (isOutput<SparseOneDimensionalModel>(n)) { | 1011 if (isOutput<SparseOneDimensionalModel>(n)) { |
1012 | 1012 |
1013 SparseOneDimensionalModel *model = | 1013 SparseOneDimensionalModel *model = |
1014 getConformingOutput<SparseOneDimensionalModel>(n); | 1014 getConformingOutput<SparseOneDimensionalModel>(n); |
1015 if (!model) return; | 1015 if (!model) return; |
1016 if (model->isAbandoning()) abandon(); | |
1016 model->setCompletion(completion, true); | 1017 model->setCompletion(completion, true); |
1017 | 1018 |
1018 } else if (isOutput<SparseTimeValueModel>(n)) { | 1019 } else if (isOutput<SparseTimeValueModel>(n)) { |
1019 | 1020 |
1020 SparseTimeValueModel *model = | 1021 SparseTimeValueModel *model = |
1021 getConformingOutput<SparseTimeValueModel>(n); | 1022 getConformingOutput<SparseTimeValueModel>(n); |
1022 if (!model) return; | 1023 if (!model) return; |
1024 if (model->isAbandoning()) abandon(); | |
1023 model->setCompletion(completion, true); | 1025 model->setCompletion(completion, true); |
1024 | 1026 |
1025 } else if (isOutput<NoteModel>(n)) { | 1027 } else if (isOutput<NoteModel>(n)) { |
1026 | 1028 |
1027 NoteModel *model = getConformingOutput<NoteModel>(n); | 1029 NoteModel *model = getConformingOutput<NoteModel>(n); |
1028 if (!model) return; | 1030 if (!model) return; |
1031 if (model->isAbandoning()) abandon(); | |
1029 model->setCompletion(completion, true); | 1032 model->setCompletion(completion, true); |
1030 | 1033 |
1031 } else if (isOutput<FlexiNoteModel>(n)) { | 1034 } else if (isOutput<FlexiNoteModel>(n)) { |
1032 | 1035 |
1033 FlexiNoteModel *model = getConformingOutput<FlexiNoteModel>(n); | 1036 FlexiNoteModel *model = getConformingOutput<FlexiNoteModel>(n); |
1034 if (!model) return; | 1037 if (!model) return; |
1038 if (model->isAbandoning()) abandon(); | |
1035 model->setCompletion(completion, true); | 1039 model->setCompletion(completion, true); |
1036 | 1040 |
1037 } else if (isOutput<RegionModel>(n)) { | 1041 } else if (isOutput<RegionModel>(n)) { |
1038 | 1042 |
1039 RegionModel *model = getConformingOutput<RegionModel>(n); | 1043 RegionModel *model = getConformingOutput<RegionModel>(n); |
1040 if (!model) return; | 1044 if (!model) return; |
1045 if (model->isAbandoning()) abandon(); | |
1041 model->setCompletion(completion, true); | 1046 model->setCompletion(completion, true); |
1042 | 1047 |
1043 } else if (isOutput<EditableDenseThreeDimensionalModel>(n)) { | 1048 } else if (isOutput<EditableDenseThreeDimensionalModel>(n)) { |
1044 | 1049 |
1045 EditableDenseThreeDimensionalModel *model = | 1050 EditableDenseThreeDimensionalModel *model = |
1046 getConformingOutput<EditableDenseThreeDimensionalModel>(n); | 1051 getConformingOutput<EditableDenseThreeDimensionalModel>(n); |
1047 if (!model) return; | 1052 if (!model) return; |
1053 if (model->isAbandoning()) abandon(); | |
1048 model->setCompletion(completion, true); //!!!m_context.updates); | 1054 model->setCompletion(completion, true); //!!!m_context.updates); |
1049 } | 1055 } |
1050 } | 1056 } |
1051 | 1057 |