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

PartDesign: restrict patterns to only one original and improve selection of references

Browse Source
This commit is contained in:
logari81
2012-09-11 16:54:45 +02:00
parent afc794894f
commit 8b35efdb83
18 changed files with 512 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@@ -62,6 +62,8 @@ TaskPolarPatternParameters::TaskPolarPatternParameters(ViewProviderTransformed *
ui->buttonOK->hide();
ui->checkBoxUpdateView->setEnabled(true);
referenceSelectionMode = false;
updateUIinProgress = false; // Hack, sometimes it is NOT false although set to false in Transformed::Transformed()!!
setupUI();
}
@@ -79,9 +81,12 @@ TaskPolarPatternParameters::TaskPolarPatternParameters(TaskMultiTransformParamet
layout->addWidget(proxy);
ui->buttonOK->setEnabled(true);
ui->listFeatures->hide();
ui->labelOriginal->hide();
ui->lineOriginal->hide();
ui->checkBoxUpdateView->hide();
referenceSelectionMode = false;
updateUIinProgress = false; // Hack, sometimes it is NOT false although set to false in Transformed::Transformed()!!
setupUI();
}
@@ -100,35 +105,24 @@ void TaskPolarPatternParameters::setupUI()
this, SLOT(onAngle(double)));
connect(ui->spinOccurrences, SIGNAL(valueChanged(int)),
this, SLOT(onOccurrences(int)));
connect(ui->buttonReference, SIGNAL(pressed()),
this, SLOT(onButtonReference()));
connect(ui->buttonReference, SIGNAL(toggled(bool)),
this, SLOT(onButtonReference(bool)));
connect(ui->checkBoxUpdateView, SIGNAL(toggled(bool)),
this, SLOT(onUpdateView(bool)));
// TODO: The following code could be generic in TaskTransformedParameters
// if it were possible to make ui_TaskPolarPatternParameters a subclass of
// ui_TaskTransformedParameters
// ---------------------
// Add a context menu to the listview of the originals to delete items
QAction* action = new QAction(tr("Delete"), ui->listFeatures);
action->connect(action, SIGNAL(triggered()),
this, SLOT(onOriginalDeleted()));
ui->listFeatures->addAction(action);
ui->listFeatures->setContextMenuPolicy(Qt::ActionsContextMenu);
// Get the feature data
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
std::vector<App::DocumentObject*> originals = pcPolarPattern->Originals.getValues();
// Fill data into dialog elements
ui->listFeatures->setEnabled(true);
ui->listFeatures->clear();
ui->lineOriginal->setEnabled(false);
for (std::vector<App::DocumentObject*>::const_iterator i = originals.begin(); i != originals.end(); i++)
{
if ((*i) != NULL)
ui->listFeatures->addItem(QString::fromAscii((*i)->getNameInDocument()));
if ((*i) != NULL) { // find the first valid original
ui->lineOriginal->setText(QString::fromAscii((*i)->getNameInDocument()));
break;
}
}
QMetaObject::invokeMethod(ui->listFeatures, "setFocus", Qt::QueuedConnection);
// ---------------------
ui->buttonX->setEnabled(true);
@@ -144,7 +138,8 @@ void TaskPolarPatternParameters::setupUI()
void TaskPolarPatternParameters::updateUI()
{
if (updateUIinProgress) return;
if (updateUIinProgress)
return;
updateUIinProgress = true;
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
@@ -156,9 +151,9 @@ void TaskPolarPatternParameters::updateUI()
double angle = pcPolarPattern->Angle.getValue();
unsigned occurrences = pcPolarPattern->Occurrences.getValue();
if ((featureSelectionMode || insideMultiTransform) && !stdAxis.empty())
ui->buttonReference->setChecked(referenceSelectionMode);
if (!stdAxis.empty())
{
ui->buttonReference->setDown(false);
ui->buttonX->setAutoExclusive(true);
ui->buttonY->setAutoExclusive(true);
ui->buttonZ->setAutoExclusive(true);
@@ -166,19 +161,20 @@ void TaskPolarPatternParameters::updateUI()
ui->buttonY->setChecked(stdAxis == "Y");
ui->buttonZ->setChecked(stdAxis == "Z");
ui->lineReference->setText(tr(""));
} else if ((axisFeature != NULL) && !axes.empty()) {
} else if (axisFeature != NULL && !axes.empty()) {
ui->buttonX->setAutoExclusive(false);
ui->buttonY->setAutoExclusive(false);
ui->buttonZ->setAutoExclusive(false);
ui->buttonX->setChecked(false);
ui->buttonY->setChecked(false);
ui->buttonZ->setChecked(false);
ui->buttonReference->setDown(!featureSelectionMode);
ui->lineReference->setText(QString::fromAscii(axes.front().c_str()));
} else {
// Error message?
ui->lineReference->setText(tr(""));
}
if (referenceSelectionMode)
ui->lineReference->setText(tr("Select an edge"));
ui->checkReverse->setChecked(reverse);
ui->spinAngle->setValue(angle);
@@ -189,59 +185,32 @@ void TaskPolarPatternParameters::updateUI()
void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
{
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
App::DocumentObject* selectedObject = pcPolarPattern->getDocument()->getActiveObject();
if ((selectedObject == NULL) || !selectedObject->isDerivedFrom(Part::Feature::getClassTypeId()))
return;
if (featureSelectionMode) {
if (originalSelected(msg))
ui->listFeatures->addItem(QString::fromAscii(selectedObject->getNameInDocument()));
} else {
if (!msg.pSubName || msg.pSubName[0] == '\0')
return;
std::string element(msg.pSubName);
if (msg.Type == Gui::SelectionChanges::AddSelection) {
if (element.substr(0,4) != "Edge")
if (msg.Type == Gui::SelectionChanges::AddSelection) {
std::string subName(msg.pSubName);
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
if (originalSelectionMode) {
App::DocumentObject* selectedObject = pcPolarPattern->getDocument()->getActiveObject();
if ((selectedObject == NULL) || !selectedObject->isDerivedFrom(Part::Feature::getClassTypeId()))
return;
// TODO
// if (originalElementName == "") {
// Base::Console().Error("Element created by this pattern cannot be used for axis\n");
// return;
// }
if (originalSelected(msg))
ui->lineOriginal->setText(QString::fromAscii(selectedObject->getNameInDocument()));
} else if (referenceSelectionMode &&
(subName.size() > 4 && subName.substr(0,4) == "Edge")) {
std::vector<std::string> axes;
axes.push_back(element.c_str());
axes.push_back(subName.c_str());
pcPolarPattern->Axis.setValue(getOriginalObject(), axes);
pcPolarPattern->StdAxis.setValue("");
if (insideMultiTransform) {
if (parentTask->updateView())
recomputeFeature();
} else
if (ui->checkBoxUpdateView->isChecked())
recomputeFeature();
if (updateView())
recomputeFeature();
if (!insideMultiTransform)
featureSelectionMode = true; // Jump back to selection of originals
showObject();
hideOriginals();
exitSelectionMode();
updateUI();
}
}
}
void TaskPolarPatternParameters::onOriginalDeleted()
{
int row = ui->listFeatures->currentIndex().row();
TaskTransformedParameters::onOriginalDeleted(row);
ui->listFeatures->model()->removeRow(row);
}
void TaskPolarPatternParameters::onButtonX() {
onStdAxis("X");
}
@@ -255,55 +224,66 @@ void TaskPolarPatternParameters::onButtonZ() {
}
void TaskPolarPatternParameters::onCheckReverse(const bool on) {
if (updateUIinProgress) return;
if (updateUIinProgress)
return;
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
pcPolarPattern->Reversed.setValue(on);
exitSelectionMode();
updateUI();
if (insideMultiTransform && !parentTask->updateView())
return;
recomputeFeature();
if (updateView())
recomputeFeature();
}
void TaskPolarPatternParameters::onAngle(const double a) {
if (updateUIinProgress) return;
if (updateUIinProgress)
return;
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
pcPolarPattern->Angle.setValue(a);
exitSelectionMode();
updateUI();
if (insideMultiTransform && !parentTask->updateView())
return;
recomputeFeature();
if (updateView())
recomputeFeature();
}
void TaskPolarPatternParameters::onOccurrences(const int n) {
if (updateUIinProgress) return;
if (updateUIinProgress)
return;
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
pcPolarPattern->Occurrences.setValue(n);
exitSelectionMode();
updateUI();
if (insideMultiTransform && !parentTask->updateView())
return;
recomputeFeature();
if (updateView())
recomputeFeature();
}
void TaskPolarPatternParameters::onStdAxis(const std::string& axis) {
if (updateUIinProgress) return;
if (updateUIinProgress)
return;
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
pcPolarPattern->StdAxis.setValue(axis.c_str());
pcPolarPattern->Axis.setValue(NULL);
if (!insideMultiTransform)
featureSelectionMode = true;
exitSelectionMode();
updateUI();
if (insideMultiTransform && !parentTask->updateView())
return;
recomputeFeature();
if (updateView())
recomputeFeature();
}
void TaskPolarPatternParameters::onButtonReference()
void TaskPolarPatternParameters::onButtonReference(bool checked)
{
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
pcPolarPattern->StdAxis.setValue("");
featureSelectionMode = false;
hideObject();
showOriginals();
if (updateUIinProgress)
return;
if (checked ) {
hideObject();
showOriginals();
referenceSelectionMode = true;
Gui::Selection().clearSelection();
} else {
exitSelectionMode();
}
updateUI();
}
@@ -312,7 +292,6 @@ void TaskPolarPatternParameters::onUpdateView(bool on)
ui->buttonX->blockSignals(!on);
ui->buttonY->blockSignals(!on);
ui->buttonZ->blockSignals(!on);
ui->listFeatures->blockSignals(!on);
ui->checkReverse->blockSignals(!on);
ui->spinAngle->blockSignals(!on);
ui->spinOccurrences->blockSignals(!on);
@@ -370,6 +349,23 @@ const unsigned TaskPolarPatternParameters::getOccurrences(void) const
return ui->spinOccurrences->value();
}
const bool TaskPolarPatternParameters::updateView() const
{
if (insideMultiTransform)
return parentTask->updateView();
else
return ui->checkBoxUpdateView->isChecked();
}
void TaskPolarPatternParameters::exitSelectionMode()
{
originalSelectionMode = false;
referenceSelectionMode = false;
showObject();
hideOriginals();
}
TaskPolarPatternParameters::~TaskPolarPatternParameters()
{
delete ui;