reduce solver calls and fix cylinder-cylinder coincident options

This commit is contained in:
Stefan Tröger
2013-10-24 21:06:11 +02:00
parent e9540eadcc
commit bc8d2d2294
4 changed files with 22 additions and 8 deletions

View File

@@ -420,7 +420,8 @@ void TaskAssemblyConstraints::setPossibleOptions() {
if(isCombination(g1,g2, dcm::geometry::line, dcm::geometry::cylinder) ||
isCombination(g1,g2, dcm::geometry::plane, dcm::geometry::plane) ||
isCombination(g1,g2, dcm::geometry::line, dcm::geometry::cylinder)) {
isCombination(g1,g2, dcm::geometry::line, dcm::geometry::cylinder) ||
isCombination(g1,g2, dcm::geometry::cylinder, dcm::geometry::cylinder)) {
ui->parallel->setEnabled(true);
ui->equal->setEnabled(true);
ui->opposite->setEnabled(true);