kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

make solution spaces accessible from GUI and fix some solver implementation errors

Browse Source
This commit is contained in:
Stefan Tröger
2013-10-20 12:15:44 +02:00
parent 757a934cf3
commit fe5727011a
9 changed files with 207 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp
View File

@@ -85,6 +85,7 @@ TaskAssemblyConstraints::TaskAssemblyConstraints(ViewProviderConstraint* vp)
//get the individual constraint settings
ui->value->setValue(obj->Value.getValue());
setOrientation(dcm::Direction(obj->Orientation.getValue()));
setSolutionSpace(dcm::SolutionSpace(obj->SolutionSpace.getValue()));
int v = obj->Type.getValue();
if(v==0)
@@ -139,6 +140,18 @@ TaskAssemblyConstraints::TaskAssemblyConstraints(ViewProviderConstraint* vp)
QObject::connect(
ui->perpendicular, SIGNAL(toggled(bool)),
this, SLOT(on_orientation_selection(bool)));
QObject::connect(
ui->bidirectional, SIGNAL(toggled(bool)),
this, SLOT(on_solutionspace_selection(bool)));
QObject::connect(
ui->pos_direction, SIGNAL(toggled(bool)),
this, SLOT(on_solutionspace_selection(bool)));
QObject::connect(
ui->neg_direction, SIGNAL(toggled(bool)),
this, SLOT(on_solutionspace_selection(bool)));
QObject::connect(
ui->perpendicular, SIGNAL(toggled(bool)),
this, SLOT(on_orientation_selection(bool)));
QObject::connect(
ui->value, SIGNAL(valueChanged(double)),
this, SLOT(on_value_change(double)));
@@ -180,6 +193,30 @@ void TaskAssemblyConstraints::setOrientation(dcm::Direction d)
}
}
dcm::SolutionSpace TaskAssemblyConstraints::getSolutionSpace()
{
if(ui->bidirectional->isChecked())
return dcm::bidirectional;
if(ui->pos_direction->isChecked())
return dcm::positiv_directional;
return dcm::negative_directional;
}
void TaskAssemblyConstraints::setSolutionSpace(dcm::SolutionSpace d)
{
switch(d) {
case dcm::bidirectional:
ui->bidirectional->setChecked(true);
break;
case dcm::positiv_directional:
ui->pos_direction->setChecked(true);
break;
default:
ui->neg_direction->setChecked(true);
}
}
TaskAssemblyConstraints::~TaskAssemblyConstraints()
{
@@ -216,8 +253,8 @@ void TaskAssemblyConstraints::onSelectionChanged(const Gui::SelectionChanges& ms
if(ui->second_geom->text().isEmpty()) {
std::vector<Gui::SelectionObject> objs = Gui::Selection().getSelectionEx();
Assembly::Constraint* con = dynamic_cast<Assembly::Constraint*>(view->getObject());
if(!ActiveAsmObject || !ActiveAsmObject->getTypeId().isDerivedFrom(Assembly::ItemAssembly::getClassTypeId())) {
if(!ActiveAsmObject || !ActiveAsmObject->getTypeId().isDerivedFrom(Assembly::ItemAssembly::getClassTypeId())) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No active Assembly"),
QObject::tr("You need a active (blue) Assembly to insert a Constraint. Please create a new one or make one active (double click)."));
return;
@@ -277,6 +314,17 @@ void TaskAssemblyConstraints::on_orientation_selection(bool clicked)
}
}
void TaskAssemblyConstraints::on_solutionspace_selection(bool clicked)
{
if(clicked) {
Assembly::Constraint* obj = dynamic_cast<Assembly::Constraint*>(view->getObject());
obj->SolutionSpace.setValue(getSolutionSpace());
App::GetApplication().getActiveDocument()->recompute();
view->draw();
}
}
void TaskAssemblyConstraints::on_value_change(double val)
{