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

Gui: Use bitmask instead of three booleans in setTemporaryVisibility to improve readability

Browse Source
This commit is contained in:
wmayer
2024-12-31 13:29:01 +01:00
parent 63088a29a9
commit cbd116b451
9 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/ViewProviderCoordinateSystem.cpp
View File

@@ -97,7 +97,7 @@ void ViewProviderCoordinateSystem::setDisplayMode(const char* ModeName)
ViewProviderDocumentObject::setDisplayMode(ModeName);
}
void ViewProviderCoordinateSystem::setTemporaryVisibility(bool axis, bool plane, bool points)
void ViewProviderCoordinateSystem::setTemporaryVisibility(DatumElements elements)
{
auto origin = getObject<App::Origin>();
@@ -110,7 +110,7 @@ void ViewProviderCoordinateSystem::setTemporaryVisibility(bool axis, bool plane,
if (saveState) {
tempVisMap[vp] = vp->isVisible();
}
vp->setVisible(axis);
vp->setVisible(elements.testFlag(DatumElement::Axes));
}
}
@@ -120,7 +120,7 @@ void ViewProviderCoordinateSystem::setTemporaryVisibility(bool axis, bool plane,
if (saveState) {
tempVisMap[vp] = vp->isVisible();
}
vp->setVisible(plane);
vp->setVisible(elements.testFlag(DatumElement::Planes));
}
}
@@ -130,7 +130,7 @@ void ViewProviderCoordinateSystem::setTemporaryVisibility(bool axis, bool plane,
if (saveState) {
tempVisMap[vp] = vp->isVisible();
}
vp->setVisible(points);
vp->setVisible(elements.testFlag(DatumElement::Origin));
}
}
catch (const Base::Exception &ex) {

16
src/Gui/ViewProviderCoordinateSystem.h
View File

@@ -25,6 +25,7 @@
#define GUI_VIEWPROVIDER_ViewProviderOrigin_H
#include <functional>
#include <Base/Bitmask.h>
#include <App/PropertyGeo.h>
#include "ViewProviderGeoFeatureGroup.h"
@@ -35,6 +36,17 @@ namespace Gui {
class Document;
class ViewProviderDatum;
enum class DatumElement
{
// clang-format off
Origin = 1 << 0,
Axes = 1 << 1,
Planes = 1 << 2
// clang-format on
};
using DatumElements = Base::Flags<DatumElement>;
class GuiExport ViewProviderCoordinateSystem : public ViewProviderGeoFeatureGroup
{
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderCoordinateSystem);
@@ -62,7 +74,7 @@ public:
*/
///@{
/// Set temporary visibility of some of origin's objects e.g. while rotating or mirroring
void setTemporaryVisibility (bool axis, bool planes, bool points = false);
void setTemporaryVisibility (DatumElements elements);
/// Returns true if the origin in temporary visibility mode
bool isTemporaryVisibility ();
/// Reset the visibility
@@ -103,5 +115,7 @@ private:
} // namespace Gui
ENABLE_BITMASK_OPERATORS(Gui::DatumElement)
#endif // GUI_VIEWPROVIDER_ViewProviderOrigin_H

15
src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
View File

@@ -110,14 +110,8 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
ui->listWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
}
enum
{
axisBit = 0,
planeBit = 1
};
// NOTE: generally there shouldn't be more then one origin
std::map<App::Origin*, std::bitset<2>> originVisStatus;
std::map<App::Origin*, Gui::DatumElements> originVisStatus;
auto statusIt = status.cbegin();
auto objIt = objects.begin();
@@ -144,10 +138,10 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
App::Origin* origin = dynamic_cast<App::Origin*>(datum->getLCS());
if (origin) {
if ((*objIt)->isDerivedFrom(App::Plane::getClassTypeId())) {
originVisStatus[origin].set(planeBit, true);
originVisStatus[origin].setFlag(Gui::DatumElement::Planes, true);
}
else if ((*objIt)->isDerivedFrom(App::Line::getClassTypeId())) {
originVisStatus[origin].set(axisBit, true);
originVisStatus[origin].setFlag(Gui::DatumElement::Axes, true);
}
}
}
@@ -160,8 +154,7 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
Gui::ViewProviderCoordinateSystem* vpo = static_cast<Gui::ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
if (vpo) {
vpo->setTemporaryVisibility(originVisStatus[origin][axisBit],
originVisStatus[origin][planeBit]);
vpo->setTemporaryVisibility(originVisStatus[origin]);
vpo->setTemporaryScale(4.0); // NOLINT
vpo->setPlaneLabelVisibility(true);
origins.push_back(vpo);

2
src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
View File

@@ -174,7 +174,7 @@ void TaskHelixParameters::showCoordinateAxes()
ViewProviderCoordinateSystem* vpOrigin;
vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, false);
vpOrigin->setTemporaryVisibility(Gui::DatumElement::Axes);
}
catch (const Base::Exception& ex) {
ex.ReportException();

2
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
View File

@@ -111,7 +111,7 @@ void TaskLinearPatternParameters::setupParameterUI(QWidget* widget)
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, false);
vpOrigin->setTemporaryVisibility(Gui::DatumElement::Axes);
}
catch (const Base::Exception& ex) {
Base::Console().Error("%s\n", ex.what());

2
src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
View File

@@ -92,7 +92,7 @@ void TaskMirroredParameters::setupParameterUI(QWidget* widget)
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(false, true);
vpOrigin->setTemporaryVisibility(Gui::DatumElement::Planes);
}
catch (const Base::Exception& ex) {
Base::Console().Error("%s\n", ex.what());

2
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@@ -113,7 +113,7 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget* widget)
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, false);
vpOrigin->setTemporaryVisibility(Gui::DatumElement::Axes);
}
catch (const Base::Exception& ex) {
Base::Console().Error("%s\n", ex.what());

2
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -262,7 +262,7 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
App::Origin *origin = body->getOrigin();
Gui::ViewProviderCoordinateSystem* vpOrigin {};
vpOrigin = static_cast<Gui::ViewProviderCoordinateSystem*>(Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, true);
vpOrigin->setTemporaryVisibility(Gui::DatumElement::Planes | Gui::DatumElement::Axes);
} catch (const Base::Exception &ex) {
Base::Console().Error ("%s\n", ex.what () );
}

2
src/Mod/PartDesign/Gui/TaskRevolutionParameters.cpp
View File

@@ -100,7 +100,7 @@ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider*
// show the parts coordinate system axis for selection
try {
if (auto vpOrigin = getOriginView()) {
vpOrigin->setTemporaryVisibility(true, false);
vpOrigin->setTemporaryVisibility(Gui::DatumElement::Axes);
}
}
catch (const Base::Exception &ex) {