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

Changes override draw style when entering sketch edit mode.

Browse Source
This commit is contained in:
Max Wilfinger
2024-05-30 11:17:35 +02:00
parent 0f6dbdb3d4
commit 5c7d287f6b
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/View3DSettings.cpp
View File

@@ -69,14 +69,6 @@ int View3DSettings::stopAnimatingIfDeactivated() const
void View3DSettings::applySettings()
{
// Check if Sketcher Edit Mode exited cleanly
const int overMaxHeadlightIntensity = 101;
int sketcherEditLastExit = hGrp->GetInt("HeadlightIntensityExisting", overMaxHeadlightIntensity);
if (sketcherEditLastExit != overMaxHeadlightIntensity) {
// must mean a seg fault or abnormal exit last time
hGrp->SetInt("HeadlightIntensity", sketcherEditLastExit);
hGrp->RemoveInt("HeadlightIntensityExisting");
}
// apply the user settings
OnChange(*hGrp,"EyeDistance");
OnChange(*hGrp,"CornerCoordSystem");

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

@@ -3225,19 +3225,22 @@ void ViewProviderSketch::unsetEdit(int ModNum)
if (sketchHandler)
deactivateHandler();
// Resets the override draw style mode when leaving the sketch edit mode.
// TODO: This could maybe also be a preference (enable auto switch of draw style). Additionally the previous override draw style could be saved and applied when leaving the edit mode.
Gui::MDIView* mdi = Gui::Application::Instance->editViewOfNode(editCoinManager->getRootEditNode());
Gui::View3DInventorViewer* viewer = static_cast<Gui::View3DInventor*>(mdi)->getViewer();
if (viewer)
{
viewer->updateOverrideMode("As Is");
viewer->setOverrideMode("As Is");
}
editCoinManager = nullptr;
snapManager = nullptr;
preselection.reset();
selection.reset();
this->detachSelection();
ParameterGrp::handle hGrpView = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/View");
auto headlightIntensityExisting = hGrpView->GetInt("HeadlightIntensityExisting", 100);
hGrpView->SetInt("HeadlightIntensity", headlightIntensityExisting);
hGrpView->RemoveInt("HeadlightIntensityExisting");
App::AutoTransaction trans("Sketch recompute");
try {
// and update the sketch
@@ -3308,13 +3311,13 @@ void ViewProviderSketch::setEditViewer(Gui::View3DInventorViewer* viewer, int Mo
}
}
ParameterGrp::handle hGrpView = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/View");
auto headlightIntensityExisting = hGrpView->GetInt("HeadlightIntensity", 100);
auto headlightIntensityTemp = 50;
hGrpView->SetInt("HeadlightIntensity", headlightIntensityTemp);
hGrpView->SetInt("HeadlightIntensityExisting", headlightIntensityExisting);
// Sets the view mode to no shading to prevent visibility issues against parallel surfaces with shininess when entering the sketch mode.
// TODO: This could maybe also be a preference (enable auto switch of draw style) and further improved if the user has already an override draw style enabled which has no shading (e.g. wireframe). Additionally the current override draw style could be saved and applied when leaving the edit mode.
if (viewer)
{
viewer->updateOverrideMode("No Shading");
viewer->setOverrideMode("No Shading");
}
auto editDoc = Gui::Application::Instance->editDocument();
editDocName.clear();