aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't waite dialog stage, block bad data on early stage.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-11-08 17:49:59 +02:00
parent d6a55c9a40
commit aa0b73d930
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -218,21 +218,34 @@ void DialogLineIntersectAxis::ChosenObject(quint32 id, const SceneObject &type)
} }
break; break;
case (1): case (1):
if (SetObject(id, ui->comboBoxSecondLinePoint, tr("Select axis point"))) if (getCurrentObjectId(ui->comboBoxFirstLinePoint) != id)
{ {
number++; if (SetObject(id, ui->comboBoxSecondLinePoint, tr("Select axis point")))
line->setPoint2Id(id); {
line->RefreshGeometry(); number++;
line->setPoint2Id(id);
line->RefreshGeometry();
}
} }
break; break;
case (2): case (2):
if (SetObject(id, ui->comboBoxAxisPoint, "")) {
QSet<quint32> set;
set.insert(getCurrentObjectId(ui->comboBoxFirstLinePoint));
set.insert(getCurrentObjectId(ui->comboBoxSecondLinePoint));
set.insert(id);
if (set.size() == 3)
{ {
basePointId = id; if (SetObject(id, ui->comboBoxAxisPoint, ""))
line->setAxisPointId(id); {
line->RefreshGeometry(); basePointId = id;
prepare = true; line->setAxisPointId(id);
line->RefreshGeometry();
prepare = true;
}
} }
}
break; break;
default: default:
break; break;