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

Sketcher: Grid rework. Include:

Browse Source 
- Adding 'auto spacing' option.
    - Drawing grid dynamically on viewer area only.
    - Moving code to coinManager.
    - Adding a 'grid tool' to sketcher-edit-mode toolbar.
This commit is contained in:
Paddle
2022-11-21 09:34:32 +01:00
committed by abdullahtahiriyo
parent a1d0d1dd76
commit 40271a29ea
23 changed files with 3205 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -201,14 +201,16 @@ void ViewProviderSketch::ParameterObserver::initParameters()
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, false);}, &Client.ForceOrtho }},
{"SectionView",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, false);}, &Client.SectionView }},
{"ShowGrid",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, false);}, &Client.ShowGrid }},
{"GridSnap",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, false);}, &Client.GridSnap }},
{"AutoConstraints",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, true);}, &Client.Autoconstraints }},
{"AvoidRedundantAutoconstraints",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, true);}, &Client.AvoidRedundant }},
{"ShowGrid",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, false);}, &Client.ShowGrid }},
{"GridSnap",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, false);}, &Client.GridSnap }},
{"GridAuto",
{[this](const std::string & string, App::Property * property){ updateBoolProperty(string, property, true); }, &Client.GridAuto }},
{"GridSize",
{[this](const std::string & string, App::Property * property){ updateGridSize(string, property);}, &Client.GridSize }},
{"SketchEdgeColor",
@@ -260,8 +262,10 @@ SbVec2s ViewProviderSketch::DoubleClick::newCursorPos;
// Construction/Destruction
/* TRANSLATOR SketcherGui::ViewProviderSketch */
const char* ViewProviderSketch::GridStyleEnums[] = { "Dashed","Light",nullptr };
App::PropertyQuantityConstraint::Constraints ViewProviderSketch::GridSizeRange = { 0.001,DBL_MAX,1.0 };
PROPERTY_SOURCE_WITH_EXTENSIONS(SketcherGui::ViewProviderSketch, PartGui::ViewProvider2DObjectGrid)
PROPERTY_SOURCE_WITH_EXTENSIONS(SketcherGui::ViewProviderSketch, PartGui::ViewProvider2DObject)
ViewProviderSketch::ViewProviderSketch()
@@ -285,6 +289,11 @@ ViewProviderSketch::ViewProviderSketch()
ADD_PROPERTY_TYPE(ForceOrtho,(false),"Visibility automation",(App::PropertyType)(App::Prop_ReadOnly),"If true, camera type will be forced to orthographic view when entering editing mode.");
ADD_PROPERTY_TYPE(SectionView,(false),"Visibility automation",(App::PropertyType)(App::Prop_ReadOnly),"If true, only objects (or part of) located behind the sketch plane are visible.");
ADD_PROPERTY_TYPE(EditingWorkbench,("SketcherWorkbench"),"Visibility automation",(App::PropertyType)(App::Prop_ReadOnly),"Name of the workbench to activate when editing this sketch.");
ADD_PROPERTY_TYPE(ShowGrid, (false), "Grid", (App::PropertyType)(App::Prop_None), "Switch the grid on/off");
ADD_PROPERTY_TYPE(GridSize, (10.0), "Grid", (App::PropertyType)(App::Prop_None), "Gap size of the grid");
ADD_PROPERTY_TYPE(GridStyle, (0L), "Grid", (App::PropertyType)(App::Prop_None), "Appearance style of the grid");
ADD_PROPERTY_TYPE(GridSnap, (false), "Grid", (App::PropertyType)(App::Prop_None), "Switch the grid snap on/off");
ADD_PROPERTY_TYPE(GridAuto, (true), "Grid", (App::PropertyType)(App::Prop_None), "Change size of grid based on view area.");
// Default values that will be overridden by preferences (if existing)
PointSize.setValue(4);
@@ -293,7 +302,8 @@ ViewProviderSketch::ViewProviderSketch()
pObserver->initParameters();
pObserver->subscribeToParameters();
this->GridAutoSize.setValue(false); //Grid size is managed by this class
GridStyle.setEnums(GridStyleEnums);
GridSize.setConstraints(&GridSizeRange);
sPixmap = "Sketcher_Sketch";
@@ -1553,7 +1563,7 @@ bool ViewProviderSketch::isSelectable() const
if (isEditing())
return false;
else
return PartGui::ViewProvider2DObjectGrid::isSelectable();
return PartGui::ViewProvider2DObject::isSelectable();
}
void ViewProviderSketch::onSelectionChanged(const Gui::SelectionChanges& msg)
@@ -2686,7 +2696,12 @@ void ViewProviderSketch::drawEditMarkers(const std::vector<Base::Vector2d> &Edit
void ViewProviderSketch::updateData(const App::Property *prop)
{
ViewProvider2DObjectGrid::updateData(prop);
ViewProvider2DObject::updateData(prop);
if (prop->getTypeId() == Part::PropertyPartShape::getClassTypeId()) {
if (isInEditMode())
editCoinManager->drawGrid();
}
// In the case of an undo/redo transaction, updateData is triggered by SketchObject::onUndoRedoFinished() in the solve()
// In the case of an internal transaction, touching the geometry results in a call to updateData.
@@ -2721,7 +2736,16 @@ void ViewProviderSketch::updateData(const App::Property *prop)
void ViewProviderSketch::onChanged(const App::Property *prop)
{
// call father
PartGui::ViewProvider2DObjectGrid::onChanged(prop);
ViewProviderPart::onChanged(prop);
if (prop == &ShowGrid && isInEditMode())
editCoinManager->drawGrid();
if (prop == &GridSize && isInEditMode())
editCoinManager->drawGrid();
if (prop == &GridStyle && isInEditMode())
editCoinManager->drawGrid();
}
void ViewProviderSketch::attach(App::DocumentObject *pcFeat)
@@ -2853,10 +2877,6 @@ bool ViewProviderSketch::setEdit(int ModNum)
Base::Console().Warning("ViewProviderSketch::setEdit: could not import Show module. Visibility automation will not work.\n");
}
TightGrid.setValue(false);
ViewProvider2DObjectGrid::setEdit(ModNum); // notify to handle grid according to edit mode property
// start the edit dialog
if (sketchDlg)
Gui::Control().showDialog(sketchDlg);
@@ -3044,8 +3064,6 @@ void ViewProviderSketch::unsetEdit(int ModNum)
Gui::ToolBarManager::getInstance()->setToolbarVisibility(false, editModeToolbarNames());
Gui::ToolBarManager::getInstance()->setToolbarVisibility(true, nonEditModeToolbarNames());
TightGrid.setValue(true);
if(listener) {
Gui::getMainWindow()->removeEventFilter(listener);
delete listener;
@@ -3098,8 +3116,6 @@ void ViewProviderSketch::unsetEdit(int ModNum)
Base::Console().Error("ViewProviderSketch::unsetEdit: visibility automation failed with an error: \n");
e.ReportException();
}
ViewProvider2DObjectGrid::unsetEdit(ModNum); // notify grid that edit mode is being left
}
void ViewProviderSketch::setEditViewer(Gui::View3DInventorViewer* viewer, int ModNum)
@@ -3207,24 +3223,31 @@ void ViewProviderSketch::camSensCB(void *data, SoSensor *)
auto vp = proxyVPrdr->vp;
auto cam = proxyVPrdr->renderMgr->getCamera();
auto rotSk = Base::Rotation(vp->getDocument()->getEditingTransform()); //sketch orientation
vp->onCameraChanged(cam);
}
void ViewProviderSketch::onCameraChanged(SoCamera* cam)
{
auto rotSk = Base::Rotation(getDocument()->getEditingTransform()); //sketch orientation
auto rotc = cam->orientation.getValue().getValue();
auto rotCam = Base::Rotation(rotc[0], rotc[1], rotc[2], rotc[3]); // camera orientation (needed because float to double conversion)
// Is camera in the same hemisphere as positive sketch normal ?
auto orientation = (rotCam.invert()*rotSk).multVec(Base::Vector3d(0,0,1));
auto tmpFactor = orientation.z<0?-1:1;
auto orientation = (rotCam.invert() * rotSk).multVec(Base::Vector3d(0, 0, 1));
auto tmpFactor = orientation.z < 0 ? -1 : 1;
if (tmpFactor != vp->viewOrientationFactor) { // redraw only if viewing side changed
if (tmpFactor != viewOrientationFactor) { // redraw only if viewing side changed
Base::Console().Log("Switching side, now %s, redrawing\n", tmpFactor < 0 ? "back" : "front");
vp->viewOrientationFactor = tmpFactor;
vp->draw();
viewOrientationFactor = tmpFactor;
draw();
QString cmdStr = QStringLiteral(
"ActiveSketch.ViewObject.TempoVis.sketchClipPlane(ActiveSketch, ActiveSketch.ViewObject.SectionView, %1)\n")
.arg(tmpFactor<0?QLatin1String("True"):QLatin1String("False"));
.arg(tmpFactor < 0 ? QLatin1String("True") : QLatin1String("False"));
Base::Interpreter().runStringObject(cmdStr.toLatin1());
}
editCoinManager->drawGrid(true);
}
int ViewProviderSketch::getPreselectPoint() const
@@ -3466,6 +3489,28 @@ QIcon ViewProviderSketch::mergeColorfulOverlayIcons (const QIcon & orig) const
return Gui::ViewProvider::mergeColorfulOverlayIcons (mergedicon);
}
void ViewProviderSketch::handleChangedPropertyType(Base::XMLReader& reader,
const char* TypeName,
App::Property* prop)
{
Base::Type inputType = Base::Type::fromName(TypeName);
if (prop->getTypeId().isDerivedFrom(App::PropertyFloat::getClassTypeId()) &&
inputType.isDerivedFrom(App::PropertyFloat::getClassTypeId())) {
// Do not directly call the property's Restore method in case the implementation
// has changed. So, create a temporary PropertyFloat object and assign the value.
App::PropertyFloat floatProp;
floatProp.Restore(reader);
static_cast<App::PropertyFloat*>(prop)->setValue(floatProp.getValue());
}
else {
ViewProviderPart::handleChangedPropertyType(reader, TypeName, prop);
}
}
void ViewProviderSketch::Restore(Base::XMLReader& reader)
{
ViewProviderPart::Restore(reader);
}
/*************************** functions ViewProviderSketch offers to friends such as DrawHandlerSketch ************************/