From d9b71fb754a7879d31ed5132952a734cf0729b5b Mon Sep 17 00:00:00 2001 From: WandererFan Date: Mon, 18 Dec 2017 10:21:36 -0500 Subject: [PATCH] LinkScope clean up --- src/Mod/Measure/App/Measurement.cpp | 2 ++ src/Mod/Measure/App/Measurement.h | 2 +- src/Mod/TechDraw/App/DrawViewArch.cpp | 1 + src/Mod/TechDraw/App/DrawViewArch.h | 2 +- src/Mod/TechDraw/App/DrawViewDimension.cpp | 2 ++ src/Mod/TechDraw/App/DrawViewDimension.h | 2 +- src/Mod/TechDraw/App/DrawViewDraft.cpp | 1 + src/Mod/TechDraw/App/DrawViewDraft.h | 2 +- src/Mod/TechDraw/App/DrawViewMulti.cpp | 2 +- src/Mod/TechDraw/App/DrawViewMulti.h | 4 ++-- 10 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index 8d96f6d172..4c03adf8ce 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -65,6 +65,7 @@ TYPESYSTEM_SOURCE(Measure::Measurement, Base::BaseClass) Measurement::Measurement() { measureType = Invalid; + References3D.setScope(App::LinkScope::Global); } Measurement::~Measurement() @@ -229,6 +230,7 @@ TopoDS_Shape Measurement::getShape(App::DocumentObject *obj , const char *subNam } } +//TODO:: add lengthX, lengthY (and lengthZ??) support // Methods for distances (edge length, two points, edge and a point double Measurement::length() const { diff --git a/src/Mod/Measure/App/Measurement.h b/src/Mod/Measure/App/Measurement.h index ceef0c6bb8..bfbd1575f5 100644 --- a/src/Mod/Measure/App/Measurement.h +++ b/src/Mod/Measure/App/Measurement.h @@ -48,7 +48,7 @@ class MeasureExport Measurement : public Base::BaseClass { TYPESYSTEM_HEADER(); public: - App::PropertyLinkSubListGlobal References3D; + App::PropertyLinkSubList References3D; public: Measurement(); diff --git a/src/Mod/TechDraw/App/DrawViewArch.cpp b/src/Mod/TechDraw/App/DrawViewArch.cpp index 8e15655098..e0f9228a5d 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.cpp +++ b/src/Mod/TechDraw/App/DrawViewArch.cpp @@ -55,6 +55,7 @@ DrawViewArch::DrawViewArch(void) static const char *group = "Arch view"; ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"Section Plane object for this view"); + Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(AllOn ,(false),group,App::Prop_None,"If hidden objects must be shown or not"); RenderMode.setEnums(RenderModeEnums); ADD_PROPERTY_TYPE(RenderMode, ((long)0),group,App::Prop_None,"The render mode to use"); diff --git a/src/Mod/TechDraw/App/DrawViewArch.h b/src/Mod/TechDraw/App/DrawViewArch.h index 96efd0ed0a..826b8ed33b 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.h +++ b/src/Mod/TechDraw/App/DrawViewArch.h @@ -42,7 +42,7 @@ public: DrawViewArch(void); virtual ~DrawViewArch(); - App::PropertyLinkGlobal Source; + App::PropertyLink Source; App::PropertyBool AllOn; App::PropertyEnumeration RenderMode; // "Wireframe","Solid" App::PropertyBool ShowHidden; diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index d71f9f530a..da11ef62d2 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -95,7 +95,9 @@ DrawViewDimension::DrawViewDimension(void) double fontSize = hGrp->GetFloat("FontSize", 3.5); ADD_PROPERTY_TYPE(References2D,(0,0),"",(App::PropertyType)(App::Prop_None),"Projected Geometry References"); + References2D.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(References3D,(0,0),"",(App::PropertyType)(App::Prop_None),"3D Geometry References"); + References3D.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(Font ,(fontName.c_str()),"Format",App::Prop_None, "The name of the font to use"); ADD_PROPERTY_TYPE(Fontsize,(fontSize) ,"Format",(App::PropertyType)(App::Prop_None),"Dimension text size in mm"); ADD_PROPERTY_TYPE(FormatSpec,(getDefaultFormatSpec().c_str()) , diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index a41f5cc779..9f691724b3 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -55,7 +55,7 @@ public: App::PropertyEnumeration MeasureType; //True/Projected App::PropertyLinkSubList References2D; //Points to Projection SubFeatures - App::PropertyLinkSubListGlobal References3D; //Points to 3D Geometry SubFeatures + App::PropertyLinkSubList References3D; //Points to 3D Geometry SubFeatures App::PropertyEnumeration Type; //DistanceX,DistanceY,Diameter, etc /// Properties for Visualisation diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp index 906d592f2c..167537308e 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.cpp +++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp @@ -52,6 +52,7 @@ DrawViewDraft::DrawViewDraft(void) static const char *group = "Draft view"; ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"Draft object for this view"); + Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(LineWidth,(0.35),group,App::Prop_None,"Line width of this view"); ADD_PROPERTY_TYPE(FontSize,(12.0),group,App::Prop_None,"Text size for this view"); ADD_PROPERTY_TYPE(Direction ,(0,0,1.0),group,App::Prop_None,"Projection direction. The direction you are looking from."); diff --git a/src/Mod/TechDraw/App/DrawViewDraft.h b/src/Mod/TechDraw/App/DrawViewDraft.h index 354fdc2c8d..5557dad654 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.h +++ b/src/Mod/TechDraw/App/DrawViewDraft.h @@ -43,7 +43,7 @@ public: DrawViewDraft(void); virtual ~DrawViewDraft(); - App::PropertyLinkGlobal Source; + App::PropertyLink Source; App::PropertyFloat LineWidth; App::PropertyFloat FontSize; App::PropertyVector Direction; diff --git a/src/Mod/TechDraw/App/DrawViewMulti.cpp b/src/Mod/TechDraw/App/DrawViewMulti.cpp index 8a5bb5c8b2..07c9504019 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.cpp +++ b/src/Mod/TechDraw/App/DrawViewMulti.cpp @@ -80,7 +80,7 @@ DrawViewMulti::DrawViewMulti() //properties that affect Geometry ADD_PROPERTY_TYPE(Sources ,(0),group,App::Prop_None,"3D Shapes to view"); - + Sources.setScope(App::LinkScope::Global); //Source is replaced by Sources in Multi Source.setStatus(App::Property::ReadOnly,true); Source.setStatus(App::Property::Hidden,true); diff --git a/src/Mod/TechDraw/App/DrawViewMulti.h b/src/Mod/TechDraw/App/DrawViewMulti.h index 8b6aac2481..8c12da42a8 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.h +++ b/src/Mod/TechDraw/App/DrawViewMulti.h @@ -56,8 +56,8 @@ public: /// Constructor DrawViewMulti(void); virtual ~DrawViewMulti(); - - App::PropertyLinkListGlobal Sources; + + App::PropertyLinkList Sources; virtual short mustExecute() const override; /** @name methods override Feature */