TechDraw: Insert tool insert DrawViewProjGroupItem that can then be transfered into groups and back.

This commit is contained in:
PaddleStroke
2024-04-05 09:42:52 +02:00
parent 4ebe22f166
commit 55fbbb5d6e
11 changed files with 245 additions and 239 deletions

View File

@@ -422,7 +422,7 @@ void CmdTechDrawView::activated(int iMsg)
bool dontShowAgain = hGrp->GetBool("DontShowInsertFileMessage", false);
if (!dontShowAgain) {
QMessageBox msgBox;
msgBox.setText(msgBox.tr("Note: If you want to insert a shape you need to select it before starting the tool, else it opens a file browser to insert SVG or Images."));
msgBox.setText(msgBox.tr("If you want to insert a view from existing objects, please select them before evoking this tool. Without a selection, a file browser will open, to insert a SVG or image file."));
QCheckBox dontShowCheckBox(msgBox.tr("Do not show this message again"), &msgBox);
msgBox.setCheckBox(&dontShowCheckBox);
QPushButton* okButton = msgBox.addButton(QMessageBox::Ok);
@@ -478,71 +478,36 @@ void CmdTechDrawView::activated(int iMsg)
}
Gui::WaitCursor wc;
bool createProjGroup = hGrp->GetBool("InsertAsProjGroup", true);
if (createProjGroup) {
openCommand(QT_TRANSLATE_NOOP("Command", "Create Projection Group"));
openCommand(QT_TRANSLATE_NOOP("Command", "Create view"));
std::string FeatName = getUniqueObjectName("View");
doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawProjGroupItem', '%s')",
FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.translateLabel('DrawProjGroupItem', 'View', '%s')",
FeatName.c_str(), FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(),
FeatName.c_str());
std::string multiViewName = getUniqueObjectName("ProjGroup");
doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawProjGroup', '%s')",
multiViewName.c_str());
doCommand(Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(),
multiViewName.c_str());
App::DocumentObject* docObj = getDocument()->getObject(multiViewName.c_str());
auto multiView(static_cast<TechDraw::DrawProjGroup*>(docObj));
multiView->Source.setValues(shapes);
multiView->XSource.setValues(xShapes);
doCommand(Doc, "App.activeDocument().%s.addProjection('Front')", multiViewName.c_str());
getDocument()->setStatus(App::Document::Status::SkipRecompute, true);
doCommand(Doc,
"App.activeDocument().%s.Anchor.Direction = FreeCAD.Vector(0.0, -1.0, 0.0)",
multiViewName.c_str());
doCommand(Doc,
"App.activeDocument().%s.Anchor.RotationVector = FreeCAD.Vector(1.0, 0.0, 0.0)",
multiViewName.c_str());
doCommand(Doc,
"App.activeDocument().%s.Anchor.XDirection = FreeCAD.Vector(1.0, 0.0, 0.0)",
multiViewName.c_str());
getDocument()->setStatus(App::Document::Status::SkipRecompute, false);
doCommand(Doc, "App.activeDocument().%s.Anchor.recompute()", multiViewName.c_str());
commitCommand();
updateActive();
// create the rest of the desired views
Gui::Control().showDialog(new TaskDlgProjGroup(multiView, true));
App::DocumentObject* docObj = getDocument()->getObject(FeatName.c_str());
auto* dvp = dynamic_cast<TechDraw::DrawViewPart*>(docObj);
if (!dvp) {
throw Base::TypeError("CmdTechDrawView DVP not found\n");
}
else {
openCommand(QT_TRANSLATE_NOOP("Command", "Create view"));
std::string FeatName = getUniqueObjectName("View");
doCommand(Doc, "App.activeDocument().addObject('TechDraw::DrawViewPart', '%s')",
FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.translateLabel('DrawViewPart', 'View', '%s')",
FeatName.c_str(), FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(),
FeatName.c_str());
dvp->Source.setValues(shapes);
dvp->XSource.setValues(xShapes);
App::DocumentObject* docObj = getDocument()->getObject(FeatName.c_str());
auto* dvp = dynamic_cast<TechDraw::DrawViewPart*>(docObj);
if (!dvp) {
throw Base::TypeError("CmdTechDrawView DVP not found\n");
}
dvp->Source.setValues(shapes);
dvp->XSource.setValues(xShapes);
getDocument()->setStatus(App::Document::Status::SkipRecompute, true);
doCommand(Doc, "App.activeDocument().%s.Direction = FreeCAD.Vector(0.0, -1.0, 0.0)",
FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.RotationVector = FreeCAD.Vector(1.0, 0.0, 0.0)",
FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.XDirection = FreeCAD.Vector(1.0, 0.0, 0.0)",
FeatName.c_str());
getDocument()->setStatus(App::Document::Status::SkipRecompute, false);
doCommand(Doc, "App.activeDocument().%s.recompute()", FeatName.c_str());
commitCommand();
getDocument()->setStatus(App::Document::Status::SkipRecompute, true);
doCommand(Doc, "App.activeDocument().%s.Direction = FreeCAD.Vector(0.0, -1.0, 0.0)",
FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.XDirection = FreeCAD.Vector(1.0, 0.0, 0.0)",
FeatName.c_str());
getDocument()->setStatus(App::Document::Status::SkipRecompute, false);
doCommand(Doc, "App.activeDocument().%s.recompute()", FeatName.c_str());
commitCommand();
// create the rest of the desired views
Gui::Control().showDialog(new TaskDlgProjGroup(dvp, true));
}
// create the rest of the desired views
Gui::Control().showDialog(new TaskDlgProjGroup(dvp, true));
}
bool CmdTechDrawView::isActive() { return DrawGuiUtil::needPage(this); }

View File

@@ -65,7 +65,7 @@ bool QGIProjGroup::sceneEventFilter(QGraphicsItem* watched, QEvent *event)
QGIView *qAnchor = getAnchorQItem();
if(qAnchor && watched == qAnchor) {
QGraphicsSceneMouseEvent *mEvent = dynamic_cast<QGraphicsSceneMouseEvent*>(event);
auto *mEvent = dynamic_cast<QGraphicsSceneMouseEvent*>(event);
switch(event->type()) {
case QEvent::GraphicsSceneMousePress:
@@ -99,23 +99,27 @@ QVariant QGIProjGroup::itemChange(GraphicsItemChange change, const QVariant &val
if(gView) {
TechDraw::DrawView *fView = gView->getViewObject();
if(fView->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
TechDraw::DrawProjGroupItem *projItemPtr = static_cast<TechDraw::DrawProjGroupItem *>(fView);
auto *projItemPtr = static_cast<TechDraw::DrawProjGroupItem *>(fView);
QString type = QString::fromLatin1(projItemPtr->Type.getValueAsString());
if (type == QString::fromLatin1("Front")) {
gView->alignTo(m_origin, QString::fromLatin1("None"));
installSceneEventFilter(gView);
} else if ( type == QString::fromLatin1("Top") ||
}
else if ( type == QString::fromLatin1("Top") ||
type == QString::fromLatin1("Bottom")) {
gView->alignTo(m_origin, QString::fromLatin1("Vertical"));
} else if ( type == QString::fromLatin1("Left") ||
}
else if ( type == QString::fromLatin1("Left") ||
type == QString::fromLatin1("Right") ||
type == QString::fromLatin1("Rear") ) {
gView->alignTo(m_origin, QString::fromLatin1("Horizontal"));
} else if ( type == QString::fromLatin1("FrontTopRight") ||
}
else if ( type == QString::fromLatin1("FrontTopRight") ||
type == QString::fromLatin1("FrontBottomLeft") ) {
gView->alignTo(m_origin, QString::fromLatin1("45slash"));
} else if ( type == QString::fromLatin1("FrontTopLeft") ||
}
else if ( type == QString::fromLatin1("FrontTopLeft") ||
type == QString::fromLatin1("FrontBottomRight") ) {
gView->alignTo(m_origin, QString::fromLatin1("45backslash"));
}
@@ -158,7 +162,8 @@ void QGIProjGroup::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
event->ignore();
qAnchor->mouseReleaseEvent(event);
}
} else if(scene() && qAnchor) {
}
else if(scene() && qAnchor) {
// End of Drag
getViewObject()->setPosition(Rez::appX(x()), Rez::appX(getY()));
}

View File

@@ -62,6 +62,7 @@
#include "MDIViewPage.h"
#include "ViewProviderPage.h"
#include "ViewProviderDrawingView.h"
#include "ViewProviderProjGroupItem.h"
using namespace Gui;
@@ -72,7 +73,8 @@ TaskProjGroup::TaskProjGroup(TechDraw::DrawView* featView, bool mode) :
ui(new Ui_TaskProjGroup),
view(featView),
multiView(nullptr),
m_createMode(mode)
m_createMode(mode),
blockCheckboxes(false)
{
ui->setupUi(this);
@@ -80,6 +82,16 @@ TaskProjGroup::TaskProjGroup(TechDraw::DrawView* featView, bool mode) :
multiView = dynamic_cast<TechDraw::DrawProjGroup*>(view);
updateUi();
if (multiView) {
ui->projection->setCurrentIndex(multiView->ProjectionType.getValue());
ui->cbAutoDistribute->setChecked(multiView->AutoDistribute.getValue());
// disable if no AutoDistribute
ui->sbXSpacing->setEnabled(multiView->AutoDistribute.getValue());
ui->sbYSpacing->setEnabled(multiView->AutoDistribute.getValue());
ui->sbXSpacing->setValue(multiView->spacingX.getValue());
ui->sbYSpacing->setValue(multiView->spacingY.getValue());
}
setFractionalScale(view->getScale());
ui->cmbScaleType->setCurrentIndex(view->ScaleType.getValue());
@@ -157,14 +169,6 @@ void TaskProjGroup::updateUi()
ui->label_7->show();
ui->label_10->show();
ui->label_11->show();
ui->projection->setCurrentIndex(multiView->ProjectionType.getValue());
ui->cbAutoDistribute->setChecked(multiView->AutoDistribute.getValue());
// disable if no AutoDistribute
ui->sbXSpacing->setEnabled(multiView->AutoDistribute.getValue());
ui->sbYSpacing->setEnabled(multiView->AutoDistribute.getValue());
ui->sbXSpacing->setValue(multiView->spacingX.getValue());
ui->sbYSpacing->setValue(multiView->spacingY.getValue());
}
else {
setWindowTitle(QObject::tr("Part View"));
@@ -175,6 +179,12 @@ void TaskProjGroup::updateUi()
ui->label_7->hide();
ui->label_10->hide();
ui->label_11->hide();
// if the view is not a proj group item, then we disable secondary projs.
auto* dpgi = dynamic_cast<TechDraw::DrawProjGroupItem*>(view);
if (!dpgi) {
ui->secondaryProjGroupbox->hide();
}
}
}
@@ -237,49 +247,20 @@ void TaskProjGroup::viewToggled(bool toggle)
int index = sender()->objectName().mid(7).toInt();
const char *viewNameCStr = viewChkIndexToCStr(index);
if (multiView) {
// Check if only front is now available. If so switch to normal view.
if (!blockCheckboxes) {
if (multiView) {
// Check if only front is left. If so switch to normal view.
if (multiView->Views.getValues().size() == 2 && !toggle) {
turnProjGroupToView();
wc.restoreCursor();
return;
}
}
else {
// If toggle then we remove the view object and create a proj group instead.
turnViewToProjGroup();
}
}
else {
// If toggle then we remove the view object and create a proj group instead.
App::Document* doc = view->getDocument();
std::string multiViewName = doc->getUniqueObjectName("ProjGroup");
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().addObject('TechDraw::DrawProjGroup', '%s')", multiViewName.c_str());
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().%s.addView(App.activeDocument().%s)", view->findParentPage()->getNameInDocument(), multiViewName.c_str());
auto* viewPart = static_cast<TechDraw::DrawViewPart*>(view);
multiView = static_cast<TechDraw::DrawProjGroup*>(doc->getObject(multiViewName.c_str()));
multiView->Source.setValues(viewPart->Source.getValues());
multiView->XSource.setValues(viewPart->XSource.getValues());
multiView->X.setValue(viewPart->X.getValue());
multiView->Y.setValue(viewPart->Y.getValue());
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().%s.addProjection('Front')", multiViewName.c_str());
Base::Vector3d dir1 = viewPart->Direction.getValue();
Base::Vector3d dir2 = viewPart->XDirection.getValue();
doc->setStatus(App::Document::Status::SkipRecompute, true);
Gui::Command::doCommand(Gui::Command::Gui,
"App.activeDocument().%s.Anchor.Direction = FreeCAD.Vector(%.12f, %.12f, %.12f)",
multiViewName.c_str(), dir1.x, dir1.y, dir1.z);
Gui::Command::doCommand(Gui::Command::Gui,
"App.activeDocument().%s.Anchor.RotationVector = FreeCAD.Vector(%.12f, %.12f, %.12f)",
multiViewName.c_str(), dir2.x, dir2.y, dir2.z);
Gui::Command::doCommand(Gui::Command::Gui,
"App.activeDocument().%s.Anchor.XDirection = FreeCAD.Vector(%.12f, %.12f, %.12f)",
multiViewName.c_str(), dir2.x, dir2.y, dir2.z);
doc->setStatus(App::Document::Status::SkipRecompute, false);
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().%s.Anchor.recompute()", multiViewName.c_str());
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().removeObject('%s')", view->getNameInDocument());
view = multiView;
updateUi();
}
if (toggle && !multiView->hasProjection(viewNameCStr)) {
Gui::Command::doCommand(Gui::Command::Doc,
@@ -304,6 +285,81 @@ void TaskProjGroup::viewToggled(bool toggle)
wc.restoreCursor();
}
void TaskProjGroup::turnViewToProjGroup()
{
App::Document* doc = view->getDocument();
std::string multiViewName = doc->getUniqueObjectName("ProjGroup");
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().addObject('TechDraw::DrawProjGroup', '%s')", multiViewName.c_str());
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().%s.addView(App.activeDocument().%s)", view->findParentPage()->getNameInDocument(), multiViewName.c_str());
auto* viewPart = static_cast<TechDraw::DrawViewPart*>(view);
m_page->removeView(viewPart);
multiView = static_cast<TechDraw::DrawProjGroup*>(doc->getObject(multiViewName.c_str()));
multiView->Source.setValues(viewPart->Source.getValues());
multiView->XSource.setValues(viewPart->XSource.getValues());
multiView->X.setValue(viewPart->X.getValue());
multiView->Y.setValue(viewPart->Y.getValue());
multiView->Scale.setValue(viewPart->Scale.getValue());
multiView->ScaleType.setValue(viewPart->ScaleType.getValue());
viewPart->X.setValue(0.0);
viewPart->Y.setValue(0.0);
viewPart->ScaleType.setValue("Custom");
viewPart->Scale.setStatus(App::Property::Hidden, true);
viewPart->ScaleType.setStatus(App::Property::Hidden, true);
viewPart->Label.setValue("Front");
multiView->addView(viewPart);
multiView->Anchor.setValue(view);
multiView->Anchor.purgeTouched();
viewPart->LockPosition.setValue(true);
viewPart->LockPosition.setStatus(App::Property::ReadOnly, true); //Front should stay locked.
viewPart->LockPosition.purgeTouched();
multiView->requestPaint();//make sure the group object is on the Gui page
view = multiView;
updateUi();
}
void TaskProjGroup::turnProjGroupToView()
{
TechDraw::DrawViewPart* viewPart = multiView->getAnchor();
viewPart->Scale.setValue(multiView->Scale.getValue());
viewPart->ScaleType.setValue(multiView->ScaleType.getValue());
viewPart->Scale.setStatus(App::Property::Hidden, true);
viewPart->ScaleType.setStatus(App::Property::Hidden, true);
viewPart->Scale.purgeTouched();
viewPart->ScaleType.purgeTouched();
viewPart->Label.setValue("View");
viewPart->LockPosition.setValue(false);
viewPart->LockPosition.setStatus(App::Property::ReadOnly, false);
viewPart->LockPosition.purgeTouched();
viewPart->X.setValue(multiView->X.getValue());
viewPart->Y.setValue(multiView->Y.getValue());
m_page->addView(viewPart);
// remove viewPart from views before deleting the group.
multiView->removeView(viewPart);
Gui::Command::doCommand(Gui::Command::Gui, "App.activeDocument().removeObject('%s')", multiView->getNameInDocument());
Gui::Document* activeGui = Gui::Application::Instance->getDocument(m_page->getDocument());
auto* vp = static_cast<ViewProviderProjGroupItem*>(activeGui->getViewProvider(viewPart));
if (vp) {
vp->updateIcon();
}
viewPart->recomputeFeature();
view = viewPart;
multiView = nullptr;
updateUi();
}
void TaskProjGroup::customDirectionClicked()
{
auto* dirEditDlg = new DirectionEditDialog();
@@ -421,13 +477,16 @@ void TaskProjGroup::projectionTypeChanged(QString qText)
if (qText == QString::fromUtf8("Page")) {
multiView->ProjectionType.setValue("Default");
} else {
}
else {
std::string text = qText.toStdString();
multiView->ProjectionType.setValue(text.c_str());
}
// Update checkboxes so checked state matches the drawing
blockCheckboxes = true;
setupViewCheckboxes();
blockCheckboxes = false;
// set the tooltips of the checkboxes
ui->chkView0->setToolTip(getToolTipForBox(0));
@@ -630,7 +689,8 @@ void TaskProjGroup::setupViewCheckboxes(bool addConnections)
if (!multiView->canDelete(viewStr)) {
box->setEnabled(false);
}
} else {
}
else {
box->setCheckState(Qt::Unchecked);
}
}

View File

@@ -83,6 +83,9 @@ protected:
void restoreGroupState();
void updateUi();
void turnViewToProjGroup();
void turnProjGroupToView();
QString formatVector(Base::Vector3d vec);
protected Q_SLOTS:
@@ -110,6 +113,7 @@ private:
bool m_createMode;
bool blockUpdate;
bool blockCheckboxes;
/// Translate a view checkbox index into represented view string, depending on projection type
const char * viewChkIndexToCStr(int index);
QString getToolTipForBox(int boxNumber);

View File

@@ -123,9 +123,12 @@ void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj)
//this code used to live in ViewProviderPage
void ViewProviderPageExtension::dropObject(App::DocumentObject* obj)
{
if (obj->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
//DPGI can not be dropped onto the Page as it belongs to DPG, not Page
return;
if (docObj->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
//DPGI can not be dropped onto the Page if it belongs to DPG
auto* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(docObj);
if (dpgi->getPGroup()) {
return;
}
}
if (obj->isDerivedFrom<App::Link>()) {
auto* link = static_cast<App::Link*>(obj);

View File

@@ -54,17 +54,25 @@ ViewProviderProjGroupItem::~ViewProviderProjGroupItem()
void ViewProviderProjGroupItem::updateData(const App::Property* prop)
{
Gui::ViewProviderDocumentObject::updateData(prop);
//TODO: Once we know that ProjType is valid, sPixMap = "Proj" + projType
updateIcon();
}
void ViewProviderProjGroupItem::updateIcon()
{
TechDraw::DrawProjGroupItem* proj = getObject();
if(!proj) {
if (!proj) {
return;
}
// Set the icon pixmap depending on the orientation
std::string projType = proj->Type.getValueAsString();
//TODO: Once we know that ProjType is valid, sPixMap = "Proj" + projType
if(strcmp(projType.c_str(), "Front") == 0) {
if (!getObject()->getPGroup()) {
sPixmap = "TechDraw_TreeView";
} else if(strcmp(projType.c_str(), "Front") == 0) {
sPixmap = "TechDraw_ProjFront";
} else if(strcmp(projType.c_str(), "Rear") == 0) {
sPixmap = "TechDraw_ProjRear";
@@ -99,8 +107,9 @@ void ViewProviderProjGroupItem::setupContextMenu(QMenu* menu, QObject* receiver,
bool ViewProviderProjGroupItem::setEdit(int ModNum)
{
Q_UNUSED(ModNum);
doubleClicked();
if (!getObject()->getPGroup()) {
return ViewProviderViewPart::setEdit(ModNum);
}
return true;
}
@@ -112,6 +121,7 @@ void ViewProviderProjGroupItem::unsetEdit(int ModNum)
bool ViewProviderProjGroupItem::doubleClicked()
{
setEdit(ViewProvider::Default);
return true;
}
@@ -125,19 +135,16 @@ bool ViewProviderProjGroupItem::onDelete(const std::vector<std::string> &)
bool isAnchor = false;
// get the item and group
TechDraw::DrawProjGroupItem* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(getViewObject());
TechDraw::DrawProjGroupItem* dpgi = getObject();
TechDraw::DrawProjGroup* dpg = dpgi->getPGroup();
// get the projection
TechDraw::DrawProjGroupItem* proj = getObject();
// check if it is the anchor projection
if (dpg && (dpg->hasProjection(proj->Type.getValueAsString()))
&& (dpg->getAnchor() == dpgi))
if (dpg && (dpg->getAnchor() == dpgi))
isAnchor = true;
// get child views
auto viewSection = getObject()->getSectionRefs();
auto viewDetail = getObject()->getDetailRefs();
auto viewLeader = getObject()->getLeaders();
auto viewSection = dpgi->getSectionRefs();
auto viewDetail = dpgi->getDetailRefs();
auto viewLeader = dpgi->getLeaders();
if (isAnchor)
{

View File

@@ -48,6 +48,7 @@ public:
bool doubleClicked() override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
void updateData(const App::Property*) override;
void updateIcon();
TechDraw::DrawProjGroupItem* getViewObject() const override;
TechDraw::DrawProjGroupItem* getObject() const;

View File

@@ -123,8 +123,11 @@ void ViewProviderViewClip::dragObject(App::DocumentObject* docObj)
void ViewProviderViewClip::dropObject(App::DocumentObject* docObj)
{
if (docObj->isDerivedFrom(TechDraw::DrawProjGroupItem::getClassTypeId())) {
//DPGI can not be dropped onto the Page as it belongs to DPG, not Page
return;
//DPGI can not be dropped onto the Page if it belongs to DPG
auto* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(docObj);
if (dpgi->getPGroup()) {
return;
}
}
if (!docObj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) {
return;