ViewProviderOrigin: Renamed to ViewProviderCoordinateSystem

This commit is contained in:
PaddleStroke
2024-11-26 10:23:26 +01:00
parent 19702dcb21
commit b7f1a0c150
22 changed files with 67 additions and 67 deletions

View File

@@ -106,7 +106,7 @@ public:
/// returns the type name of the ViewProvider
const char* getViewProviderName() const override
{
return "Gui::ViewProviderOrigin";
return "Gui::ViewProviderCoordinateSystem";
}
bool getCameraAlignmentDirection(Base::Vector3d& direction, const char* subname) const override;

View File

@@ -45,7 +45,7 @@ public:
/// returns the type name of the ViewProvider
const char* getViewProviderName() const override
{
return "Gui::ViewProviderOrigin";
return "Gui::ViewProviderCoordinateSystem";
}
bool isOrigin() override

View File

@@ -115,7 +115,7 @@
#include "ViewProviderLink.h"
#include "ViewProviderLinkPy.h"
#include "ViewProviderMaterialObject.h"
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
#include "ViewProviderDatum.h"
#include "ViewProviderOriginGroup.h"
#include "ViewProviderPlacement.h"
@@ -2077,7 +2077,7 @@ void Application::initTypes()
Gui::ViewProviderGeoFeatureGroupPython ::init();
Gui::ViewProviderOriginGroup ::init();
Gui::ViewProviderPart ::init();
Gui::ViewProviderOrigin ::init();
Gui::ViewProviderCoordinateSystem ::init();
Gui::ViewProviderMaterialObject ::init();
Gui::ViewProviderMaterialObjectPython ::init();
Gui::ViewProviderTextDocument ::init();

View File

@@ -968,7 +968,7 @@ SET(Viewprovider_CPP_SRCS
ViewProviderGeoFeatureGroup.cpp
ViewProviderOriginGroup.cpp
ViewProviderPart.cpp
ViewProviderOrigin.cpp
ViewProviderCoordinateSystem.cpp
ViewProviderMaterialObject.cpp
ViewProviderTextDocument.cpp
ViewProviderTextureExtension.cpp
@@ -1006,7 +1006,7 @@ SET(Viewprovider_SRCS
ViewProviderGeoFeatureGroup.h
ViewProviderOriginGroup.h
ViewProviderPart.h
ViewProviderOrigin.h
ViewProviderCoordinateSystem.h
ViewProviderMaterialObject.h
ViewProviderTextDocument.h
ViewProviderTextureExtension.h

View File

@@ -33,7 +33,7 @@
#include "Base/Console.h"
#include <Base/Vector3D.h>
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
#include "Application.h"
#include "Command.h"
#include "Document.h"
@@ -45,12 +45,12 @@
using namespace Gui;
PROPERTY_SOURCE(Gui::ViewProviderOrigin, Gui::ViewProviderGeoFeatureGroup)
PROPERTY_SOURCE(Gui::ViewProviderCoordinateSystem, Gui::ViewProviderGeoFeatureGroup)
/**
* Creates the view provider for an object group.
*/
ViewProviderOrigin::ViewProviderOrigin()
ViewProviderCoordinateSystem::ViewProviderCoordinateSystem()
{
sPixmap = "Std_CoordinateSystem";
Visibility.setValue(false);
@@ -63,39 +63,39 @@ ViewProviderOrigin::ViewProviderOrigin()
pcRoot->insertChild(lm, 0);
}
ViewProviderOrigin::~ViewProviderOrigin() {
ViewProviderCoordinateSystem::~ViewProviderCoordinateSystem() {
pcGroupChildren->unref();
pcGroupChildren = nullptr;
}
std::vector<App::DocumentObject*> ViewProviderOrigin::claimChildren() const
std::vector<App::DocumentObject*> ViewProviderCoordinateSystem::claimChildren() const
{
return static_cast<App::Origin*>( getObject() )->OriginFeatures.getValues();
}
std::vector<App::DocumentObject*> ViewProviderOrigin::claimChildren3D() const {
std::vector<App::DocumentObject*> ViewProviderCoordinateSystem::claimChildren3D() const {
return claimChildren ();
}
void ViewProviderOrigin::attach(App::DocumentObject* pcObject)
void ViewProviderCoordinateSystem::attach(App::DocumentObject* pcObject)
{
Gui::ViewProviderDocumentObject::attach(pcObject);
addDisplayMaskMode(pcGroupChildren, "Base");
}
std::vector<std::string> ViewProviderOrigin::getDisplayModes() const
std::vector<std::string> ViewProviderCoordinateSystem::getDisplayModes() const
{
return { "Base" };
}
void ViewProviderOrigin::setDisplayMode(const char* ModeName)
void ViewProviderCoordinateSystem::setDisplayMode(const char* ModeName)
{
if (strcmp(ModeName, "Base") == 0)
setDisplayMaskMode("Base");
ViewProviderDocumentObject::setDisplayMode(ModeName);
}
void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
void ViewProviderCoordinateSystem::setTemporaryVisibility(bool axis, bool plane) {
auto origin = static_cast<App::Origin*>( getObject() );
bool saveState = tempVisMap.empty();
@@ -151,24 +151,24 @@ void ViewProviderOrigin::setTemporaryVisibility(bool axis, bool plane) {
}
void ViewProviderOrigin::resetTemporaryVisibility() {
void ViewProviderCoordinateSystem::resetTemporaryVisibility() {
for(std::pair<Gui::ViewProvider*, bool> pair : tempVisMap) {
pair.first->setVisible(pair.second);
}
tempVisMap.clear ();
}
double ViewProviderOrigin::defaultSize()
double ViewProviderCoordinateSystem::defaultSize()
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
return hGrp->GetFloat("DatumsSize", 25);
}
bool ViewProviderOrigin::isTemporaryVisibility() {
bool ViewProviderCoordinateSystem::isTemporaryVisibility() {
return !tempVisMap.empty();
}
void ViewProviderOrigin::updateData(const App::Property* prop) {
void ViewProviderCoordinateSystem::updateData(const App::Property* prop) {
auto* jcs = dynamic_cast<App::LocalCoordinateSystem*>(getObject());
if(jcs) {
if (prop == &jcs->Placement) {
@@ -178,7 +178,7 @@ void ViewProviderOrigin::updateData(const App::Property* prop) {
ViewProviderDocumentObject::updateData(prop);
}
bool ViewProviderOrigin::onDelete(const std::vector<std::string> &) {
bool ViewProviderCoordinateSystem::onDelete(const std::vector<std::string> &) {
auto lcs = static_cast<App::LocalCoordinateSystem*>(getObject());
auto origin = dynamic_cast<App::Origin*>(lcs);

View File

@@ -33,15 +33,15 @@ namespace Gui {
class Document;
class GuiExport ViewProviderOrigin : public ViewProviderGeoFeatureGroup
class GuiExport ViewProviderCoordinateSystem : public ViewProviderGeoFeatureGroup
{
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderOrigin);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderCoordinateSystem);
public:
/// constructor.
ViewProviderOrigin();
ViewProviderCoordinateSystem();
/// destructor.
~ViewProviderOrigin() override;
~ViewProviderCoordinateSystem() override;
/// @name Override methods
///@{

View File

@@ -40,7 +40,7 @@
#include "ViewProviderDatum.h"
#include "Inventor/SoAxisCrossKit.h"
#include "SoFCSelection.h"
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
using namespace Gui;
@@ -49,7 +49,7 @@ PROPERTY_SOURCE(Gui::ViewProviderDatum, Gui::ViewProviderGeometryObject)
ViewProviderDatum::ViewProviderDatum() {
// Set default color for origin (light-blue)
ShapeAppearance.setDiffuseColor(ViewProviderOrigin::defaultColor);
ShapeAppearance.setDiffuseColor(ViewProviderCoordinateSystem::defaultColor);
Transparency.setValue(0);
BoundingBox.setStatus(App::Property::Hidden, true); // Hide Boundingbox from the user due to it doesn't make sense
@@ -78,7 +78,7 @@ void ViewProviderDatum::attach(App::DocumentObject* pcObject)
{
ViewProviderGeometryObject::attach(pcObject);
float defaultSz = ViewProviderOrigin::defaultSize();
float defaultSz = ViewProviderCoordinateSystem::defaultSize();
// Create an external separator
auto sep = new SoSeparator();

View File

@@ -37,7 +37,7 @@
#include <Gui/ViewParams.h>
#include "ViewProviderLine.h"
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
using namespace Gui;
@@ -79,7 +79,7 @@ void ViewProviderLine::attach(App::DocumentObject *obj) {
noRole = true;
}
static const float size = ViewProviderOrigin::defaultSize();
static const float size = ViewProviderCoordinateSystem::defaultSize();
SbVec3f verts[2];
if (noRole) {

View File

@@ -38,7 +38,7 @@
#include "Document.h"
#include "View3DInventor.h"
#include "View3DInventorViewer.h"
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
#include "ViewProviderDatum.h"

View File

@@ -41,7 +41,7 @@
#include <Gui/ViewParams.h>
#include "ViewProviderPlane.h"
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
using namespace Gui;
@@ -92,7 +92,7 @@ void ViewProviderPlane::attach(App::DocumentObject * obj) {
noRole = true;
}
static const float size = ViewProviderOrigin::defaultSize() * 0.6; //NOLINT
static const float size = ViewProviderCoordinateSystem::defaultSize() * 0.6; //NOLINT
static const float startSize = 0.25 * size; //NOLINT

View File

@@ -33,7 +33,7 @@
#endif
#include "ViewProviderPoint.h"
#include "ViewProviderOrigin.h"
#include "ViewProviderCoordinateSystem.h"
using namespace Gui;

View File

@@ -37,7 +37,7 @@
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Control.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/ShapeBinder.h>
#include <Mod/PartDesign/App/DatumLine.h>
@@ -157,7 +157,7 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
for (const auto& originPair : originVisStatus) {
const auto& origin = originPair.first;
Gui::ViewProviderOrigin* vpo = static_cast<Gui::ViewProviderOrigin*>(
Gui::ViewProviderCoordinateSystem* vpo = static_cast<Gui::ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
if (vpo) {
vpo->setTemporaryVisibility(originVisStatus[origin][axisBit],
@@ -175,7 +175,7 @@ TaskFeaturePick::TaskFeaturePick(std::vector<App::DocumentObject*>& objects,
TaskFeaturePick::~TaskFeaturePick()
{
for (Gui::ViewProviderOrigin* vpo : origins) {
for (Gui::ViewProviderCoordinateSystem* vpo : origins) {
vpo->resetTemporaryVisibility();
}
}
@@ -573,7 +573,7 @@ void TaskFeaturePick::onDoubleClick(QListWidgetItem* item)
void TaskFeaturePick::slotDeletedObject(const Gui::ViewProviderDocumentObject& Obj)
{
std::vector<Gui::ViewProviderOrigin*>::iterator it;
std::vector<Gui::ViewProviderCoordinateSystem*>::iterator it;
it = std::find(origins.begin(), origins.end(), &Obj);
if (it != origins.end()) {
origins.erase(it);

View File

@@ -30,7 +30,7 @@
#include <Gui/DocumentObserver.h>
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
namespace PartDesignGui {
@@ -87,7 +87,7 @@ protected:
private:
std::unique_ptr<Ui_TaskFeaturePick> ui;
QWidget* proxy;
std::vector<Gui::ViewProviderOrigin*> origins;
std::vector<Gui::ViewProviderCoordinateSystem*> origins;
bool doSelection;
std::string documentName;

View File

@@ -33,7 +33,7 @@
#include <Gui/Document.h>
#include <Gui/Selection.h>
#include <Gui/WaitCursor.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/FeatureHelix.h>
@@ -171,8 +171,8 @@ void TaskHelixParameters::showCoordinateAxes()
if (PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject())) {
try {
App::Origin* origin = body->getOrigin();
ViewProviderOrigin* vpOrigin;
vpOrigin = static_cast<ViewProviderOrigin*>(
ViewProviderCoordinateSystem* vpOrigin;
vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, false);
}
@@ -582,8 +582,8 @@ TaskHelixParameters::~TaskHelixParameters()
PartDesign::Body* body = obj ? PartDesign::Body::findBodyOf(obj) : nullptr;
if (body) {
App::Origin* origin = body->getOrigin();
ViewProviderOrigin* vpOrigin {};
vpOrigin = static_cast<ViewProviderOrigin*>(
ViewProviderCoordinateSystem* vpOrigin {};
vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->resetTemporaryVisibility();
}

View File

@@ -35,7 +35,7 @@
#include <Gui/Application.h>
#include <Gui/Selection.h>
#include <Gui/Command.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/DatumLine.h>
#include <Mod/PartDesign/App/DatumPlane.h>
@@ -109,7 +109,7 @@ void TaskLinearPatternParameters::setupParameterUI(QWidget* widget)
if (body) {
try {
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderOrigin*>(
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, false);
}
@@ -394,7 +394,7 @@ TaskLinearPatternParameters::~TaskLinearPatternParameters()
PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
if (body) {
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderOrigin*>(
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->resetTemporaryVisibility();
}

View File

@@ -34,7 +34,7 @@
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/Selection.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/FeatureMirrored.h>
@@ -90,7 +90,7 @@ void TaskMirroredParameters::setupParameterUI(QWidget* widget)
if (body) {
try {
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderOrigin*>(
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(false, true);
}
@@ -225,7 +225,7 @@ TaskMirroredParameters::~TaskMirroredParameters()
PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
if (body) {
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderOrigin*>(
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->resetTemporaryVisibility();
}

View File

@@ -41,7 +41,7 @@
#include <Base/Console.h>
#include <Gui/Selection.h>
#include <Gui/Command.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/FeaturePolarPattern.h>
#include <Mod/Sketcher/App/SketchObject.h>
#include <Mod/PartDesign/App/DatumLine.h>
@@ -111,7 +111,7 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget* widget)
if (body) {
try {
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderOrigin*>(
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, false);
}
@@ -388,7 +388,7 @@ TaskPolarPatternParameters::~TaskPolarPatternParameters()
PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
if (body) {
App::Origin* origin = body->getOrigin();
auto vpOrigin = static_cast<ViewProviderOrigin*>(
auto vpOrigin = static_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->resetTemporaryVisibility();
}

View File

@@ -35,7 +35,7 @@
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/FeaturePrimitive.h>
@@ -260,8 +260,8 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
if(PartDesign::Body * body = PartDesign::Body::findBodyOf(getObject())) {
try {
App::Origin *origin = body->getOrigin();
Gui::ViewProviderOrigin* vpOrigin {};
vpOrigin = static_cast<Gui::ViewProviderOrigin*>(Gui::Application::Instance->getViewProvider(origin));
Gui::ViewProviderCoordinateSystem* vpOrigin {};
vpOrigin = static_cast<Gui::ViewProviderCoordinateSystem*>(Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(true, true);
} catch (const Base::Exception &ex) {
Base::Console().Error ("%s\n", ex.what () );
@@ -380,8 +380,8 @@ TaskBoxPrimitives::~TaskBoxPrimitives()
auto obj = getObject();
if (PartDesign::Body* body = obj ? PartDesign::Body::findBodyOf(obj) : nullptr) {
App::Origin* origin = body->getOrigin();
Gui::ViewProviderOrigin* vpOrigin;
vpOrigin = static_cast<Gui::ViewProviderOrigin*>(
Gui::ViewProviderCoordinateSystem* vpOrigin;
vpOrigin = static_cast<Gui::ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->resetTemporaryVisibility();
}

View File

@@ -32,7 +32,7 @@
#include <Gui/CommandT.h>
#include <Gui/Selection.h>
#include <Gui/ViewProvider.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/FeatureRevolution.h>
#include <Mod/PartDesign/App/FeatureGroove.h>
#include <Mod/PartDesign/App/Body.h>
@@ -108,13 +108,13 @@ TaskRevolutionParameters::TaskRevolutionParameters(PartDesignGui::ViewProvider*
}
}
Gui::ViewProviderOrigin* TaskRevolutionParameters::getOriginView() const
Gui::ViewProviderCoordinateSystem* TaskRevolutionParameters::getOriginView() const
{
// show the parts coordinate system axis for selection
PartDesign::Body * body = PartDesign::Body::findBodyOf(getObject());
if (body) {
App::Origin *origin = body->getOrigin();
return dynamic_cast<ViewProviderOrigin*>(
return dynamic_cast<ViewProviderCoordinateSystem*>(
Gui::Application::Instance->getViewProvider(origin));
}

View File

@@ -36,7 +36,7 @@ class Property;
namespace Gui {
class ViewProvider;
class ViewProviderOrigin;
class ViewProviderCoordinateSystem;
}
namespace PartDesignGui {
@@ -105,7 +105,7 @@ private:
// TODO: This is common with extrude. Maybe send to superclass.
void translateFaceName();
void clearFaceName();
Gui::ViewProviderOrigin* getOriginView() const;
Gui::ViewProviderCoordinateSystem* getOriginView() const;
private:
std::unique_ptr<Ui_TaskRevolutionParameters> ui;

View File

@@ -42,7 +42,7 @@
#include <Gui/MDIView.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Gui/ViewProviderDatum.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/DatumCS.h>

View File

@@ -48,7 +48,7 @@
#include <Gui/Control.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderCoordinateSystem.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/DatumCS.h>
#include <Mod/PartDesign/App/DatumLine.h>
@@ -66,7 +66,7 @@ using namespace PartDesignGui;
PROPERTY_SOURCE_WITH_EXTENSIONS(PartDesignGui::ViewProviderDatum,Gui::ViewProviderGeometryObject)
// static data
const double ViewProviderDatum::defaultSize = Gui::ViewProviderOrigin::defaultSize ();
const double ViewProviderDatum::defaultSize = Gui::ViewProviderCoordinateSystem::defaultSize ();
ViewProviderDatum::ViewProviderDatum()
{