From ed47ae49165f9add98e3a8fd4ed0e774cbcc757f Mon Sep 17 00:00:00 2001 From: WandererFan Date: Sun, 17 Jan 2016 12:09:15 -0500 Subject: [PATCH] StatusBits -> setStatus --- src/Mod/TechDraw/App/DrawProjGroup.cpp | 8 ++++++-- src/Mod/TechDraw/App/DrawProjGroupItem.cpp | 12 +++++++---- src/Mod/TechDraw/App/DrawSVGTemplate.cpp | 9 ++++++--- src/Mod/TechDraw/App/DrawViewClip.cpp | 16 +++++++++------ src/Mod/TechDraw/App/DrawViewCollection.cpp | 7 +++++-- src/Mod/TechDraw/App/DrawViewDimension.cpp | 22 +++++++++++++-------- 6 files changed, 49 insertions(+), 25 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index 585b055e1..afd8cb05e 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -204,7 +204,10 @@ void DrawProjGroup::onChanged(const App::Property* prop) if ( prop == &ProjectionType || prop == &ScaleType || prop == &viewOrientationMatrix || - ((prop == &Scale) && !Scale.StatusBits.test(5)) ) { + ((prop == &Scale) && + //!Scale.StatusBits.test(5)) ) { + !(Scale.testStatus(App::Property::ReadOnly) && //TODO: do we really care about property status here? + Scale.testStatus(App::Property::Hidden))) ) { if (!isRestoring()) { execute(); } @@ -578,7 +581,8 @@ App::DocumentObjectExecReturn *DrawProjGroup::execute(void) view->ScaleType.setValue("Custom"); view->Scale.setValue(autoScale); view->Scale.touch(); - view->Scale.StatusBits.set(2); + //view->Scale.StatusBits.set(2); + view->Scale.setStatus(App::Property::ReadOnly,true); view->touch(); } } diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp index 2e472e10f..1896c5156 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp @@ -55,14 +55,18 @@ DrawProjGroupItem::DrawProjGroupItem(void) ADD_PROPERTY(Type, ((long)0)); // Set Hidden - Direction.StatusBits.set(3); + //Direction.StatusBits.set(3); + Direction.setStatus(App::Property::Hidden,true); // Set Hidden - XAxisDirection.StatusBits.set(3); + //XAxisDirection.StatusBits.set(3); + XAxisDirection.setStatus(App::Property::Hidden,true); // Scale and ScaleType are Readonly - Scale.StatusBits.set(2); - ScaleType.StatusBits.set(2); + //Scale.StatusBits.set(2); + //ScaleType.StatusBits.set(2); + Scale.setStatus(App::Property::ReadOnly,true); + ScaleType.setStatus(App::Property::ReadOnly,true); } short DrawProjGroupItem::mustExecute() const diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp index 858e7e848..ea5d6f966 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp @@ -67,9 +67,12 @@ DrawSVGTemplate::DrawSVGTemplate() ADD_PROPERTY_TYPE(Template, (""), group, App::Prop_Transient, "Template for the page"); // Width and Height properties shouldn't be set by the user - Height.StatusBits.set(2); // Read Only - Width.StatusBits.set(2); // Read Only - Orientation.StatusBits.set(2); // Read Only + //Height.StatusBits.set(2); // Read Only + //Width.StatusBits.set(2); // Read Only + //Orientation.StatusBits.set(2); // Read Only + Height.setStatus(App::Property::ReadOnly,true); + Width.setStatus(App::Property::ReadOnly,true); + Orientation.setStatus(App::Property::ReadOnly,true); } DrawSVGTemplate::~DrawSVGTemplate() diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp index d152e6e0e..e8d459318 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.cpp +++ b/src/Mod/TechDraw/App/DrawViewClip.cpp @@ -67,12 +67,16 @@ DrawViewClip::DrawViewClip(void) ADD_PROPERTY_TYPE(Visible, (true),group,propType,"Control whether Clip is visible in page object"); // hide N/A properties - int bitReadOnly = 2; - int bitHidden = 3; - ScaleType.StatusBits.set(bitReadOnly, true); - ScaleType.StatusBits.set(bitHidden, true); - Scale.StatusBits.set(bitReadOnly, true); - Scale.StatusBits.set(bitHidden,true); + //int bitReadOnly = 2; + //int bitHidden = 3; + //ScaleType.StatusBits.set(bitReadOnly, true); + //ScaleType.StatusBits.set(bitHidden, true); + //Scale.StatusBits.set(bitReadOnly, true); + //Scale.StatusBits.set(bitHidden,true); + ScaleType.setStatus(App::Property::ReadOnly,true); + ScaleType.setStatus(App::Property::Hidden,true); + Scale.setStatus(App::Property::ReadOnly,true); + Scale.setStatus(App::Property::Hidden,true); } DrawViewClip::~DrawViewClip() diff --git a/src/Mod/TechDraw/App/DrawViewCollection.cpp b/src/Mod/TechDraw/App/DrawViewCollection.cpp index d040243f5..e54bf0dce 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.cpp +++ b/src/Mod/TechDraw/App/DrawViewCollection.cpp @@ -127,7 +127,9 @@ App::DocumentObjectExecReturn *DrawViewCollection::execute(void) { if (ScaleType.isValue("Document")) { // Recalculate scale - Scale.StatusBits.set(App::Prop_ReadOnly); + //Scale.StatusBits.set(App::Prop_ReadOnly); + Scale.setStatus(App::Property::ReadOnly,true); + const std::vector &views = Views.getValues(); for(std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { @@ -142,7 +144,8 @@ App::DocumentObjectExecReturn *DrawViewCollection::execute(void) } } else if(strcmp(ScaleType.getValueAsString(), "Custom") == 0) { // Rebuild the view - Scale.StatusBits.set(App::Prop_ReadOnly, false); + //Scale.StatusBits.set(App::Prop_ReadOnly, false); + Scale.setStatus(App::Property::ReadOnly,false); const std::vector &views = Views.getValues(); for(std::vector::const_iterator it = views.begin(); it != views.end(); ++it) { diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index 14262f3d3..39a90c212 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -98,14 +98,20 @@ DrawViewDimension::DrawViewDimension(void) //hide the DrawView properties that don't apply to Dimensions //App::PropertyType propType = static_cast(App::Prop_Hidden|App::Prop_Output); - int bitReadOnly = 2; - int bitHidden = 3; - ScaleType.StatusBits.set(bitReadOnly, true); - ScaleType.StatusBits.set(bitHidden, true); - Scale.StatusBits.set(bitReadOnly, true); - Scale.StatusBits.set(bitHidden,true); - Rotation.StatusBits.set(bitReadOnly, true); - Rotation.StatusBits.set(bitHidden, true); + //int bitReadOnly = 2; + //int bitHidden = 3; + //ScaleType.StatusBits.set(bitReadOnly, true); + //ScaleType.StatusBits.set(bitHidden, true); + //Scale.StatusBits.set(bitReadOnly, true); + //Scale.StatusBits.set(bitHidden,true); + //Rotation.StatusBits.set(bitReadOnly, true); + //Rotation.StatusBits.set(bitHidden, true); + ScaleType.setStatus(App::Property::ReadOnly,true); + ScaleType.setStatus(App::Property::Hidden,true); + Scale.setStatus(App::Property::ReadOnly,true); + Scale.setStatus(App::Property::Hidden,true); + Rotation.setStatus(App::Property::ReadOnly,true); + Rotation.setStatus(App::Property::Hidden,true); //TODO: hide Dimension X,Y? measurement = new Measure::Measurement();