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

add GUI functions to flip orientation of input curves

Browse Source
This commit is contained in:
wmayer
2018-09-07 23:03:07 +02:00
parent 864767221d
commit a624fee2c2
4 changed files with 104 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Surface/App/FeatureGeomFillSurface.cpp
View File

@@ -149,10 +149,12 @@ short GeomFillSurface::mustExecute() const
void GeomFillSurface::onChanged(const App::Property* prop)
{
if (prop == &BoundaryList) {
// auto-adjusting size of this list
if (BoundaryList.getSize() != ReversedList.getSize()) {
ReversedList.setSize(BoundaryList.getSize());
if (isRestoring()) {
if (prop == &BoundaryList) {
// auto-adjusting size of this list
if (BoundaryList.getSize() != ReversedList.getSize()) {
ReversedList.setSize(BoundaryList.getSize());
}
}
}
Part::Spline::onChanged(prop);

2
src/Mod/Surface/App/FeatureGeomFillSurface.h
View File

@@ -64,7 +64,7 @@ class GeomFillSurface : public Part::Spline
public:
GeomFillSurface();
App::PropertyLinkSubList BoundaryList; // Curves to be turned into a face (2-4 curves allowed).
App::PropertyBoolList ForwardList; // Booleans to handle orientation of the curves
App::PropertyBoolList ReversedList; // Booleans to handle orientation of the curves
App::PropertyEnumeration FillType; // Fill method (1, 2, or 3 for Stretch, Coons, and Curved)
short mustExecute() const;

97
src/Mod/Surface/Gui/TaskGeomFillSurface.cpp
View File

@@ -194,10 +194,15 @@ GeomFillSurface::GeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomF
setEditedObject(obj);
// Create context menu
QAction* action = new QAction(tr("Remove"), this);
action->setShortcut(QString::fromLatin1("Del"));
ui->listWidget->addAction(action);
connect(action, SIGNAL(triggered()), this, SLOT(onDeleteEdge()));
QAction* remove = new QAction(tr("Remove"), this);
remove->setShortcut(QString::fromLatin1("Del"));
ui->listWidget->addAction(remove);
connect(remove, SIGNAL(triggered()), this, SLOT(onDeleteEdge()));
QAction* orientation = new QAction(tr("Flip orientation"), this);
ui->listWidget->addAction(orientation);
connect(orientation, SIGNAL(triggered()), this, SLOT(onFlipOrientation()));
ui->listWidget->setContextMenuPolicy(Qt::ActionsContextMenu);
}
@@ -232,12 +237,23 @@ void GeomFillSurface::setEditedObject(Surface::GeomFillSurface* obj)
auto objects = editedObject->BoundaryList.getValues();
auto element = editedObject->BoundaryList.getSubValues();
auto boolean = editedObject->ReversedList.getValues();
auto it = objects.begin();
auto jt = element.begin();
std::size_t index = 0;
QPixmap rotateLeft = Gui::BitmapFactory().pixmap("view-rotate-left");
QPixmap rotateRight = Gui::BitmapFactory().pixmap("view-rotate-right");
App::Document* doc = editedObject->getDocument();
for (; it != objects.end() && jt != element.end(); ++it, ++jt) {
for (; it != objects.end() && jt != element.end(); ++it, ++jt, ++index) {
QListWidgetItem* item = new QListWidgetItem(ui->listWidget);
if (index < boolean.size()) {
if (boolean[index])
item->setIcon(rotateLeft);
else
item->setIcon(rotateRight);
}
ui->listWidget->addItem(item);
QString text = QString::fromLatin1("%1.%2")
@@ -402,6 +418,7 @@ void GeomFillSurface::onSelectionChanged(const Gui::SelectionChanges& msg)
checkOpenCommand();
if (selectionMode == Append) {
QListWidgetItem* item = new QListWidgetItem(ui->listWidget);
item->setIcon(Gui::BitmapFactory().pixmap("view-rotate-right"));
ui->listWidget->addItem(item);
Gui::SelectionObject sel(msg);
@@ -421,17 +438,22 @@ void GeomFillSurface::onSelectionChanged(const Gui::SelectionChanges& msg)
auto element = editedObject->BoundaryList.getSubValues();
element.push_back(msg.pSubName);
editedObject->BoundaryList.setValues(objects, element);
auto booleans = editedObject->ReversedList.getValues();
booleans.push_back(false);
editedObject->ReversedList.setValues(booleans);
this->vp->highlightReferences(true);
}
else {
Gui::SelectionObject sel(msg);
QList<QVariant> data;
int row = 0;
data << QByteArray(msg.pDocName);
data << QByteArray(msg.pObjectName);
data << QByteArray(msg.pSubName);
for (int i=0; i<ui->listWidget->count(); i++) {
QListWidgetItem* item = ui->listWidget->item(i);
if (item && item->data(Qt::UserRole) == data) {
row = i;
ui->listWidget->takeItem(i);
delete item;
}
@@ -444,11 +466,24 @@ void GeomFillSurface::onSelectionChanged(const Gui::SelectionChanges& msg)
auto element = editedObject->BoundaryList.getSubValues();
auto it = objects.begin();
auto jt = element.begin();
// remove the element of the bitset at position 'row'
const boost::dynamic_bitset<>& old_booleans = editedObject->ReversedList.getValues();
boost::dynamic_bitset<> new_booleans = old_booleans >> 1;
new_booleans.resize(objects.size()-1);
// double-check in case 'old_booleans' is out of sync
if (new_booleans.size() < old_booleans.size()) {
for (int i=0; i<row; i++)
new_booleans[i] = old_booleans[i];
}
for (; it != objects.end() && jt != element.end(); ++it, ++jt) {
if (*it == obj && *jt == sub) {
objects.erase(it);
element.erase(jt);
editedObject->BoundaryList.setValues(objects, element);
editedObject->ReversedList.setValues(new_booleans);
break;
}
}
@@ -479,11 +514,24 @@ void GeomFillSurface::onDeleteEdge()
auto it = objects.begin();
auto jt = element.begin();
this->vp->highlightReferences(false);
// remove the element of the bitset at position 'row'
const boost::dynamic_bitset<>& old_booleans = editedObject->ReversedList.getValues();
boost::dynamic_bitset<> new_booleans = old_booleans >> 1;
new_booleans.resize(objects.size()-1);
// double-check in case 'old_booleans' is out of sync
if (new_booleans.size() < old_booleans.size()) {
for (int i=0; i<row; i++)
new_booleans[i] = old_booleans[i];
}
for (; it != objects.end() && jt != element.end(); ++it, ++jt) {
if (*it == obj && *jt == sub) {
objects.erase(it);
element.erase(jt);
editedObject->BoundaryList.setValues(objects, element);
editedObject->ReversedList.setValues(new_booleans);
break;
}
}
@@ -491,6 +539,45 @@ void GeomFillSurface::onDeleteEdge()
}
}
void GeomFillSurface::flipOrientation(QListWidgetItem* item)
{
// toggle the orientation of the input curve
//
QPixmap rotateLeft = Gui::BitmapFactory().pixmap("view-rotate-left");
QPixmap rotateRight = Gui::BitmapFactory().pixmap("view-rotate-right");
int row = ui->listWidget->row(item);
if (row < editedObject->ReversedList.getSize()) {
auto booleans = editedObject->ReversedList.getValues();
bool reversed = !booleans[row];
booleans[row] = reversed;
if (reversed) {
item->setIcon(rotateLeft);
}
else {
item->setIcon(rotateRight);
}
editedObject->ReversedList.setValues(booleans);
editedObject->recomputeFeature();
}
}
void GeomFillSurface::on_listWidget_itemDoubleClicked(QListWidgetItem* item)
{
if (item) {
flipOrientation(item);
}
}
void GeomFillSurface::onFlipOrientation()
{
QListWidgetItem* item = ui->listWidget->currentItem();
if (item) {
flipOrientation(item);
}
}
// ----------------------------------------------------------------------------
TaskGeomFillSurface::TaskGeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj)

5
src/Mod/Surface/Gui/TaskGeomFillSurface.h
View File

@@ -32,6 +32,8 @@
#include <Mod/Surface/App/FeatureGeomFillSurface.h>
#include <GeomFill_FillingStyle.hxx>
class QListWidgetItem;
namespace SurfaceGui
{
@@ -85,6 +87,7 @@ protected:
/** Notifies when the object is about to be removed. */
virtual void slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj);
void changeFillType(GeomFill_FillingStyle);
void flipOrientation(QListWidgetItem*);
private Q_SLOTS:
void on_fillType_stretch_clicked();
@@ -92,7 +95,9 @@ private Q_SLOTS:
void on_fillType_curved_clicked();
void on_buttonEdgeAdd_clicked();
void on_buttonEdgeRemove_clicked();
void on_listWidget_itemDoubleClicked(QListWidgetItem*);
void onDeleteEdge(void);
void onFlipOrientation();
void clearSelection();
};