ViewProviderOrigin: Renamed to ViewProviderCoordinateSystem
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user