PartGui: new Revolve task dialog.
Updated to support Axis link, and Symmetric properties. Layout was completely changed.
This commit is contained in:
DeepSOIC
parent
779b7eedb2
commit
50af9efa9f
|
|
@ -32,6 +32,7 @@
|
|||
# include <TopoDS.hxx>
|
||||
# include <TopoDS_Edge.hxx>
|
||||
# include <Inventor/system/inttypes.h>
|
||||
# include <Precision.hxx>
|
||||
#endif
|
||||
|
||||
#include "ui_DlgRevolution.h"
|
||||
|
|
@ -48,6 +49,7 @@
|
|||
#include <Gui/ViewProvider.h>
|
||||
#include <Gui/WaitCursor.h>
|
||||
#include <Mod/Part/App/Tools.h>
|
||||
#include <Mod/Part/App/FeatureRevolution.h>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/UnitsApi.h>
|
||||
|
||||
|
|
@ -58,8 +60,6 @@ using namespace PartGui;
|
|||
class DlgRevolution::EdgeSelection : public Gui::SelectionFilterGate
|
||||
{
|
||||
public:
|
||||
gp_Pnt loc;
|
||||
gp_Dir dir;
|
||||
bool canSelect;
|
||||
|
||||
EdgeSelection()
|
||||
|
|
@ -82,10 +82,7 @@ public:
|
|||
if (!sub.IsNull() && sub.ShapeType() == TopAbs_EDGE) {
|
||||
const TopoDS_Edge& edge = TopoDS::Edge(sub);
|
||||
BRepAdaptor_Curve adapt(edge);
|
||||
if (adapt.GetType() == GeomAbs_Line) {
|
||||
gp_Lin line = adapt.Line();
|
||||
this->loc = line.Location();
|
||||
this->dir = line.Direction();
|
||||
if (adapt.GetType() == GeomAbs_Line || adapt.GetType() == GeomAbs_Circle) {
|
||||
this->canSelect = true;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -99,20 +96,36 @@ public:
|
|||
};
|
||||
|
||||
DlgRevolution::DlgRevolution(QWidget* parent, Qt::WindowFlags fl)
|
||||
: Gui::LocationDialog(parent, fl), filter(0)
|
||||
: QDialog(parent, fl), filter(0)
|
||||
{
|
||||
ui = new Ui_RevolutionComp(this);
|
||||
ui = new Ui_DlgRevolution();
|
||||
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->xPos->setRange(-DBL_MAX,DBL_MAX);
|
||||
ui->yPos->setRange(-DBL_MAX,DBL_MAX);
|
||||
ui->zPos->setRange(-DBL_MAX,DBL_MAX);
|
||||
ui->xPos->setUnit(Base::Unit::Length);
|
||||
ui->yPos->setUnit(Base::Unit::Length);
|
||||
ui->zPos->setUnit(Base::Unit::Length);
|
||||
|
||||
ui->xDir->setRange(-DBL_MAX,DBL_MAX);
|
||||
ui->yDir->setRange(-DBL_MAX,DBL_MAX);
|
||||
ui->zDir->setRange(-DBL_MAX,DBL_MAX);
|
||||
ui->xDir->setUnit(Base::Unit());
|
||||
ui->yDir->setUnit(Base::Unit());
|
||||
ui->zDir->setUnit(Base::Unit());
|
||||
ui->zDir->setValue(1.0);
|
||||
|
||||
ui->angle->setUnit(Base::Unit::Angle);
|
||||
ui->angle->setValue(360.0);
|
||||
findShapes();
|
||||
|
||||
Gui::ItemViewSelection sel(ui->treeWidget);
|
||||
sel.applyFrom(Gui::Selection().getObjectsOfType(Part::Feature::getClassTypeId()));
|
||||
|
||||
connect(ui->txtAxisLink, SIGNAL(textChanged(QString)), this, SLOT(on_txtAxisLink_textChanged(QString)));
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -125,20 +138,154 @@ DlgRevolution::~DlgRevolution()
|
|||
delete ui;
|
||||
}
|
||||
|
||||
void DlgRevolution::directionActivated(int index)
|
||||
{
|
||||
ui->directionActivated(this, index);
|
||||
}
|
||||
|
||||
Base::Vector3d DlgRevolution::getDirection() const
|
||||
{
|
||||
return ui->getDirection();
|
||||
return Base::Vector3d(
|
||||
ui->xDir->value().getValue(),
|
||||
ui->yDir->value().getValue(),
|
||||
ui->zDir->value().getValue());
|
||||
}
|
||||
|
||||
Base::Vector3d DlgRevolution::getPosition() const
|
||||
{
|
||||
return Base::Vector3d(
|
||||
ui->xPos->value().getValueAs(Base::Quantity::MilliMetre),
|
||||
ui->yPos->value().getValueAs(Base::Quantity::MilliMetre),
|
||||
ui->zPos->value().getValueAs(Base::Quantity::MilliMetre));
|
||||
}
|
||||
|
||||
void DlgRevolution::getAxisLink(App::PropertyLinkSub &lnk) const
|
||||
{
|
||||
QString text = ui->txtAxisLink->text();
|
||||
|
||||
if (text.length() == 0) {
|
||||
lnk.setValue(nullptr);
|
||||
} else {
|
||||
QStringList parts = text.split(QChar::fromLatin1(':'));
|
||||
App::DocumentObject* obj = App::GetApplication().getActiveDocument()->getObject(parts[0].toLatin1());
|
||||
if(!obj){
|
||||
throw Base::ValueError(tr("Object not found: %1").arg(parts[0]).toUtf8().constData());
|
||||
}
|
||||
lnk.setValue(obj);
|
||||
if (parts.size() == 1) {
|
||||
return;
|
||||
} else if (parts.size() == 2) {
|
||||
std::vector<std::string> subs;
|
||||
subs.push_back(std::string(parts[1].toLatin1().constData()));
|
||||
lnk.setValue(obj,subs);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
double DlgRevolution::getAngle() const
|
||||
{
|
||||
return ui->angle->value().getValueAs(Base::Quantity::Degree);
|
||||
}
|
||||
|
||||
void DlgRevolution::setDirection(Base::Vector3d dir)
|
||||
{
|
||||
ui->xDir->setValue(dir.x);
|
||||
ui->yDir->setValue(dir.y);
|
||||
ui->zDir->setValue(dir.z);
|
||||
}
|
||||
|
||||
void DlgRevolution::setPosition(Base::Vector3d pos)
|
||||
{
|
||||
ui->xPos->setValue(pos.x);
|
||||
ui->yPos->setValue(pos.y);
|
||||
ui->zPos->setValue(pos.z);
|
||||
}
|
||||
|
||||
void DlgRevolution::setAxisLink(const App::PropertyLinkSub& lnk)
|
||||
{
|
||||
if (!lnk.getValue()){
|
||||
ui->txtAxisLink->clear();
|
||||
return;
|
||||
}
|
||||
if (lnk.getSubValues().size() == 1){
|
||||
this->setAxisLink(lnk.getValue()->getNameInDocument(), lnk.getSubValues()[0].c_str());
|
||||
} else {
|
||||
this->setAxisLink(lnk.getValue()->getNameInDocument(), "");
|
||||
}
|
||||
}
|
||||
|
||||
void DlgRevolution::setAxisLink(const char* objname, const char* subname)
|
||||
{
|
||||
if(objname && strlen(objname) > 0){
|
||||
QString txt = QString::fromLatin1(objname);
|
||||
if (subname && strlen(subname) > 0){
|
||||
txt = txt + QString::fromLatin1(":") + QString::fromLatin1(subname);
|
||||
}
|
||||
ui->txtAxisLink->setText(txt);
|
||||
} else {
|
||||
ui->txtAxisLink->clear();
|
||||
}
|
||||
}
|
||||
|
||||
bool DlgRevolution::validate()
|
||||
{
|
||||
//check source shapes
|
||||
if (ui->treeWidget->selectedItems().isEmpty()) {
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Select a shape for revolution, first."));
|
||||
return false;
|
||||
}
|
||||
|
||||
//check axis link
|
||||
bool axisLinkIsValid = false;
|
||||
bool axisLinkHasAngle = false;
|
||||
try{
|
||||
App::PropertyLinkSub lnk;
|
||||
this->getAxisLink(lnk);
|
||||
double angle_edge = 1e100;
|
||||
Base::Vector3d axis, center;
|
||||
axisLinkIsValid = Part::Revolution::fetchAxisLink(lnk, center, axis, angle_edge);
|
||||
axisLinkHasAngle = angle_edge != 1e100;
|
||||
} catch(Base::Exception &err) {
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Revolution axis link is invalid.\n\n%1").arg(QString::fromUtf8(err.what())));
|
||||
ui->txtAxisLink->setFocus();
|
||||
return false;
|
||||
} catch(Standard_Failure &err) {
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Revolution axis link is invalid.\n\n%1").arg(QString::fromLocal8Bit(err.GetMessageString())));
|
||||
ui->txtAxisLink->setFocus();
|
||||
return false;
|
||||
} catch(...) {
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Revolution axis link is invalid.\n\n%1").arg(QString::fromUtf8("Unknown error")));
|
||||
ui->txtAxisLink->setFocus();
|
||||
return false;
|
||||
}
|
||||
|
||||
//check axis dir
|
||||
if (!axisLinkIsValid){
|
||||
if(this->getDirection().Length() < Precision::Confusion()){
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Revolution axis direction is zero-length. It must be non-zero."));
|
||||
ui->xDir->setFocus();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
//check angle
|
||||
if (!axisLinkHasAngle){
|
||||
if (fabs(this->getAngle() / 180.0 * M_PI) < Precision::Angular()){
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Revolution angle span is zero. It must be non-zero."));
|
||||
ui->angle->setFocus();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void DlgRevolution::changeEvent(QEvent *e)
|
||||
{
|
||||
if (e->type() == QEvent::LanguageChange) {
|
||||
ui->retranslate(this);
|
||||
ui->retranslateUi(this);
|
||||
}
|
||||
else {
|
||||
QDialog::changeEvent(e);
|
||||
|
|
@ -173,56 +320,89 @@ void DlgRevolution::findShapes()
|
|||
|
||||
void DlgRevolution::accept()
|
||||
{
|
||||
if (ui->treeWidget->selectedItems().isEmpty()) {
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Select a shape for revolution, first."));
|
||||
if (!this->validate())
|
||||
return;
|
||||
}
|
||||
|
||||
Gui::WaitCursor wc;
|
||||
App::Document* activeDoc = App::GetApplication().getActiveDocument();
|
||||
activeDoc->openTransaction("Revolve");
|
||||
|
||||
QString shape, type, name, solid;
|
||||
QList<QTreeWidgetItem *> items = ui->treeWidget->selectedItems();
|
||||
if (ui->checkSolid->isChecked()) {
|
||||
solid = QString::fromLatin1("True");}
|
||||
else {
|
||||
solid = QString::fromLatin1("False");}
|
||||
for (QList<QTreeWidgetItem *>::iterator it = items.begin(); it != items.end(); ++it) {
|
||||
shape = (*it)->data(0, Qt::UserRole).toString();
|
||||
type = QString::fromLatin1("Part::Revolution");
|
||||
name = QString::fromLatin1(activeDoc->getUniqueObjectName("Revolve").c_str());
|
||||
Base::Vector3d axis = this->getDirection();
|
||||
try{
|
||||
QString shape, type, name, solid;
|
||||
QList<QTreeWidgetItem *> items = ui->treeWidget->selectedItems();
|
||||
if (ui->checkSolid->isChecked()) {
|
||||
solid = QString::fromLatin1("True");}
|
||||
else {
|
||||
solid = QString::fromLatin1("False");}
|
||||
|
||||
QString code = QString::fromLatin1(
|
||||
"FreeCAD.ActiveDocument.addObject(\"%1\",\"%2\")\n"
|
||||
"FreeCAD.ActiveDocument.%2.Source = FreeCAD.ActiveDocument.%3\n"
|
||||
"FreeCAD.ActiveDocument.%2.Axis = (%4,%5,%6)\n"
|
||||
"FreeCAD.ActiveDocument.%2.Base = (%7,%8,%9)\n"
|
||||
"FreeCAD.ActiveDocument.%2.Angle = %10\n"
|
||||
"FreeCAD.ActiveDocument.%2.Solid = %11\n"
|
||||
"FreeCADGui.ActiveDocument.%3.Visibility = False\n")
|
||||
.arg(type).arg(name).arg(shape)
|
||||
.arg(axis.x,0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(axis.y,0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(axis.z,0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(ui->xPos->value().getValue(), 0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(ui->yPos->value().getValue(), 0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(ui->zPos->value().getValue(), 0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(ui->angle->value().getValue(),0,'f',Base::UnitsApi::getDecimals())
|
||||
.arg(solid)
|
||||
;
|
||||
Gui::Application::Instance->runPythonCode((const char*)code.toLatin1());
|
||||
QByteArray to = name.toLatin1();
|
||||
QByteArray from = shape.toLatin1();
|
||||
Gui::Command::copyVisual(to, "ShapeColor", from);
|
||||
Gui::Command::copyVisual(to, "LineColor", from);
|
||||
Gui::Command::copyVisual(to, "PointColor", from);
|
||||
App::PropertyLinkSub axisLink;
|
||||
this->getAxisLink(axisLink);
|
||||
QString strAxisLink;
|
||||
if (axisLink.getValue()){
|
||||
strAxisLink = QString::fromLatin1("(App.ActiveDocument.%1, %2)")
|
||||
.arg(QString::fromLatin1(axisLink.getValue()->getNameInDocument()))
|
||||
.arg(axisLink.getSubValues().size() == 1 ?
|
||||
QString::fromLatin1("\"%1\"").arg(QString::fromLatin1(axisLink.getSubValues()[0].c_str()))
|
||||
: QString() );
|
||||
} else {
|
||||
strAxisLink = QString::fromLatin1("None");
|
||||
}
|
||||
|
||||
QString symmetric;
|
||||
if (ui->checkSymmetric->isChecked()) {
|
||||
symmetric = QString::fromLatin1("True");}
|
||||
else {
|
||||
symmetric = QString::fromLatin1("False");}
|
||||
|
||||
for (QList<QTreeWidgetItem *>::iterator it = items.begin(); it != items.end(); ++it) {
|
||||
shape = (*it)->data(0, Qt::UserRole).toString();
|
||||
type = QString::fromLatin1("Part::Revolution");
|
||||
name = QString::fromLatin1(activeDoc->getUniqueObjectName("Revolve").c_str());
|
||||
Base::Vector3d axis = this->getDirection();
|
||||
Base::Vector3d pos = this->getPosition();
|
||||
|
||||
|
||||
QString code = QString::fromLatin1(
|
||||
"FreeCAD.ActiveDocument.addObject(\"%1\",\"%2\")\n"
|
||||
"FreeCAD.ActiveDocument.%2.Source = FreeCAD.ActiveDocument.%3\n"
|
||||
"FreeCAD.ActiveDocument.%2.Axis = (%4,%5,%6)\n"
|
||||
"FreeCAD.ActiveDocument.%2.Base = (%7,%8,%9)\n"
|
||||
"FreeCAD.ActiveDocument.%2.Angle = %10\n"
|
||||
"FreeCAD.ActiveDocument.%2.Solid = %11\n"
|
||||
"FreeCAD.ActiveDocument.%2.AxisLink = %12\n"
|
||||
"FreeCAD.ActiveDocument.%2.Symmetric = %13\n"
|
||||
"FreeCADGui.ActiveDocument.%3.Visibility = False\n")
|
||||
.arg(type).arg(name).arg(shape) //%1, 2, 3
|
||||
.arg(axis.x,0,'f',15) //%4
|
||||
.arg(axis.y,0,'f',15) //%5
|
||||
.arg(axis.z,0,'f',15) //%6
|
||||
.arg(pos.x, 0,'f',15) //%7
|
||||
.arg(pos.y, 0,'f',15) //%8
|
||||
.arg(pos.z, 0,'f',15) //%9
|
||||
.arg(getAngle(),0,'f',15) //%10
|
||||
.arg(solid) //%11
|
||||
.arg(strAxisLink) //%12
|
||||
.arg(symmetric) //13
|
||||
;
|
||||
Gui::Application::Instance->runPythonCode((const char*)code.toLatin1());
|
||||
QByteArray to = name.toLatin1();
|
||||
QByteArray from = shape.toLatin1();
|
||||
Gui::Command::copyVisual(to, "ShapeColor", from);
|
||||
Gui::Command::copyVisual(to, "LineColor", from);
|
||||
Gui::Command::copyVisual(to, "PointColor", from);
|
||||
}
|
||||
|
||||
activeDoc->commitTransaction();
|
||||
activeDoc->recompute();
|
||||
} catch (Base::Exception &err) {
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Creating Revolve failed.\n\n%1").arg(QString::fromUtf8(err.what())));
|
||||
return;
|
||||
} catch (...){
|
||||
QMessageBox::critical(this, windowTitle(),
|
||||
tr("Creating Revolve failed.\n\n%1").arg(QString::fromUtf8("Unknown error")));
|
||||
return;
|
||||
}
|
||||
|
||||
activeDoc->commitTransaction();
|
||||
activeDoc->recompute();
|
||||
QDialog::accept();
|
||||
}
|
||||
|
||||
|
|
@ -231,15 +411,71 @@ void DlgRevolution::on_selectLine_clicked()
|
|||
if (!filter) {
|
||||
filter = new EdgeSelection();
|
||||
Gui::Selection().addSelectionGate(filter);
|
||||
ui->selectLine->setText(tr("Selecting... (line or arc)"));
|
||||
} else {
|
||||
Gui::Selection().rmvSelectionGate();
|
||||
filter = nullptr;
|
||||
ui->selectLine->setText(tr("Select reference"));
|
||||
}
|
||||
}
|
||||
|
||||
void DlgRevolution::on_btnX_clicked()
|
||||
{
|
||||
setDirection(Base::Vector3d(1,0,0));
|
||||
if (!ui->xDir->isEnabled())
|
||||
ui->txtAxisLink->clear();
|
||||
}
|
||||
|
||||
void DlgRevolution::on_btnY_clicked()
|
||||
{
|
||||
setDirection(Base::Vector3d(0,1,0));
|
||||
if (!ui->xDir->isEnabled())
|
||||
ui->txtAxisLink->clear();
|
||||
}
|
||||
|
||||
void DlgRevolution::on_btnZ_clicked()
|
||||
{
|
||||
setDirection(Base::Vector3d(0,0,1));
|
||||
if (!ui->xDir->isEnabled())
|
||||
ui->txtAxisLink->clear();
|
||||
}
|
||||
|
||||
void DlgRevolution::on_txtAxisLink_textChanged(QString)
|
||||
{
|
||||
bool en = true;
|
||||
try{
|
||||
Base::Vector3d pos, dir;
|
||||
double angle_edge = 1e100;
|
||||
App::PropertyLinkSub lnk; this->getAxisLink(lnk);
|
||||
bool fetched = Part::Revolution::fetchAxisLink(lnk, pos, dir, angle_edge);
|
||||
if (fetched){
|
||||
this->setDirection(dir);
|
||||
this->setPosition(pos);
|
||||
if (angle_edge != 1e100){
|
||||
ui->angle->setValue(0.0);
|
||||
} else if (fabs(ui->angle->value().getValue()) < 1e-12) {
|
||||
ui->angle->setValue(360.0);
|
||||
}
|
||||
en = false;
|
||||
}
|
||||
} catch (Base::Exception &err){
|
||||
|
||||
} catch (...){
|
||||
|
||||
}
|
||||
ui->xDir->setEnabled(en);
|
||||
ui->yDir->setEnabled(en);
|
||||
ui->zDir->setEnabled(en);
|
||||
ui->xPos->setEnabled(en);
|
||||
ui->yPos->setEnabled(en);
|
||||
ui->zPos->setEnabled(en);
|
||||
}
|
||||
|
||||
void DlgRevolution::onSelectionChanged(const Gui::SelectionChanges& msg)
|
||||
{
|
||||
if (msg.Type == Gui::SelectionChanges::AddSelection) {
|
||||
if (filter && filter->canSelect) {
|
||||
ui->setPosition (Base::convertTo<Base::Vector3d>(filter->loc));
|
||||
ui->setDirection(Base::convertTo<Base::Vector3d>(filter->dir));
|
||||
this->setAxisLink(msg.pObjectName, msg.pSubName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
namespace PartGui {
|
||||
|
||||
class Ui_DlgRevolution;
|
||||
class DlgRevolution : public Gui::LocationDialog, public Gui::SelectionObserver
|
||||
class DlgRevolution : public QDialog, public Gui::SelectionObserver
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
|
|
@ -41,21 +41,34 @@ public:
|
|||
void accept();
|
||||
|
||||
Base::Vector3d getDirection() const;
|
||||
Base::Vector3d getPosition() const;
|
||||
void getAxisLink(App::PropertyLinkSub &lnk) const;
|
||||
double getAngle() const;
|
||||
|
||||
void setDirection(Base::Vector3d dir);
|
||||
void setPosition(Base::Vector3d dir);
|
||||
void setAxisLink(const App::PropertyLinkSub &lnk);
|
||||
void setAxisLink(const char* objname, const char* subname);
|
||||
|
||||
bool validate();
|
||||
|
||||
protected:
|
||||
void changeEvent(QEvent *e);
|
||||
|
||||
private Q_SLOTS:
|
||||
void on_selectLine_clicked();
|
||||
void on_btnX_clicked();
|
||||
void on_btnY_clicked();
|
||||
void on_btnZ_clicked();
|
||||
void on_txtAxisLink_textChanged(QString);
|
||||
|
||||
private:
|
||||
void findShapes();
|
||||
void directionActivated(int);
|
||||
void onSelectionChanged(const Gui::SelectionChanges& msg);
|
||||
|
||||
private:
|
||||
typedef Gui::LocationInterfaceComp<Ui_DlgRevolution> Ui_RevolutionComp;
|
||||
Ui_RevolutionComp* ui;
|
||||
//typedef Gui::LocationInterfaceComp<Ui_DlgRevolution> Ui_RevolutionComp;
|
||||
Ui_DlgRevolution* ui;
|
||||
class EdgeSelection;
|
||||
EdgeSelection* filter;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,121 +6,46 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>307</width>
|
||||
<height>266</height>
|
||||
<width>320</width>
|
||||
<height>599</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Revolve</string>
|
||||
</property>
|
||||
<layout class="QGridLayout">
|
||||
<property name="margin">
|
||||
<property name="leftMargin">
|
||||
<number>9</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>9</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>9</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>9</number>
|
||||
</property>
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="3">
|
||||
<layout class="QGridLayout">
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
<item row="5" column="3">
|
||||
<widget class="QCheckBox" name="checkSolid">
|
||||
<property name="toolTip">
|
||||
<string>If checked, revolving wires will produce solids. If not, revolving a wire yeilds a shell.</string>
|
||||
</property>
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
<property name="text">
|
||||
<string>Create Solid</string>
|
||||
</property>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Y:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>X:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="zPos">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Angle:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="yPos">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QComboBox" name="direction"/>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Z:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Axis:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="xPos">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="angle">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">deg</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>-360.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
<property name="value">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" rowspan="4">
|
||||
<item row="0" column="3">
|
||||
<widget class="QTreeWidget" name="treeWidget">
|
||||
<property name="selectionMode">
|
||||
<enum>QAbstractItemView::ExtendedSelection</enum>
|
||||
|
|
@ -138,17 +63,250 @@
|
|||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QPushButton" name="selectLine">
|
||||
<property name="text">
|
||||
<string>Select line in 3D view</string>
|
||||
<item row="3" column="3">
|
||||
<layout class="QFormLayout" name="formLayout_3">
|
||||
<property name="horizontalSpacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="verticalSpacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Angle:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="angle" native="true">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">deg</string>
|
||||
</property>
|
||||
<property name="minimum" stdset="0">
|
||||
<double>-360.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum" stdset="0">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
<property name="value" stdset="0">
|
||||
<double>360.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="3" rowspan="2">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Revolution axis</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QFormLayout" name="formLayout_2">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Center X:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="xPos" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Center Y:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="yPos" native="true">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Center Z:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="zPos" native="true">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true">mm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QPushButton" name="btnX">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Click to set this as axis</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Dir. X:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="yDir" native="true">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="zDir" native="true">
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="Gui::QuantitySpinBox" name="xDir" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="unit" stdset="0">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QPushButton" name="btnY">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Click to set this as axis</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Dir. Y:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QPushButton" name="btnZ">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Dir. Z:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="selectLine">
|
||||
<property name="text">
|
||||
<string>Select reference</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="txtAxisLink"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<widget class="QCheckBox" name="checkSolid">
|
||||
<item row="4" column="3">
|
||||
<widget class="QCheckBox" name="checkSymmetric">
|
||||
<property name="toolTip">
|
||||
<string>If checked, revolution will extend forwards and backwards by half the angle.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Create Solid</string>
|
||||
<string>Symmetric angle</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -163,11 +321,12 @@
|
|||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>treeWidget</tabstop>
|
||||
<tabstop>angle</tabstop>
|
||||
<tabstop>xPos</tabstop>
|
||||
<tabstop>yPos</tabstop>
|
||||
<tabstop>zPos</tabstop>
|
||||
<tabstop>direction</tabstop>
|
||||
<tabstop>btnX</tabstop>
|
||||
<tabstop>btnY</tabstop>
|
||||
<tabstop>btnZ</tabstop>
|
||||
<tabstop>selectLine</tabstop>
|
||||
<tabstop>txtAxisLink</tabstop>
|
||||
<tabstop>checkSolid</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user