suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StatusBits -> setStatus

Browse Source
This commit is contained in:
WandererFan 2016-01-17 12:09:15 -05:00 committed by wmayer
parent e40bbdad5b
commit ed47ae4916
6 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/TechDraw/App/DrawProjGroup.cpp
View File

@ -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();
}
}

12
src/Mod/TechDraw/App/DrawProjGroupItem.cpp
View File

@ -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

9
src/Mod/TechDraw/App/DrawSVGTemplate.cpp
View File

@ -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()

16
src/Mod/TechDraw/App/DrawViewClip.cpp
View File

@ -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()

7
src/Mod/TechDraw/App/DrawViewCollection.cpp
View File

@ -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<App::DocumentObject *> &views = Views.getValues();
for(std::vector<App::DocumentObject *>::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<App::DocumentObject *> &views = Views.getValues();
for(std::vector<App::DocumentObject *>::const_iterator it = views.begin(); it != views.end(); ++it) {

22
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@ -98,14 +98,20 @@ DrawViewDimension::DrawViewDimension(void)
//hide the DrawView properties that don't apply to Dimensions
//App::PropertyType propType = static_cast<App::PropertyType>(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();