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

+ 0000216: FreeCAD hangs on various operations

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5027 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
wmayer 2011-10-15 10:24:54 +00:00
parent 22d1503185
commit 174b75c2f7
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Part/Gui/ViewProviderExt.cpp
View File

@ -116,7 +116,8 @@ PROPERTY_SOURCE(PartGui::ViewProviderPartExt, Gui::ViewProviderGeometryObject)
//**************************************************************************
// Construction/Destruction
App::PropertyFloatConstraint::Constraints ViewProviderPartExt::floatRange = {1.0f,64.0f,1.0f};
App::PropertyFloatConstraint::Constraints ViewProviderPartExt::sizeRange = {1.0f,64.0f,1.0f};
App::PropertyFloatConstraint::Constraints ViewProviderPartExt::tessRange = {0.0001f,100.0f,0.01f};
const char* ViewProviderPartExt::LightingEnums[]= {"One side","Two side",NULL};
ViewProviderPartExt::ViewProviderPartExt()
@ -136,9 +137,11 @@ ViewProviderPartExt::ViewProviderPartExt()
ADD_PROPERTY(PointColor,(mat.diffuseColor));
ADD_PROPERTY(DiffuseColor,(ShapeColor.getValue()));
ADD_PROPERTY(LineWidth,(2.0f));
LineWidth.setConstraints(&floatRange);
PointSize.setConstraints(&floatRange);
LineWidth.setConstraints(&sizeRange);
PointSize.setConstraints(&sizeRange);
ADD_PROPERTY(PointSize,(2.0f));
ADD_PROPERTY(Deviation,(0.5f));
Deviation.setConstraints(&tessRange);
ADD_PROPERTY(ControlPoints,(false));
ADD_PROPERTY(Lighting,(1));
Lighting.setEnums(LightingEnums);
@ -204,6 +207,9 @@ ViewProviderPartExt::~ViewProviderPartExt()
void ViewProviderPartExt::onChanged(const App::Property* prop)
{
if (prop == &Deviation) {
VisualTouched = true;
}
if (prop == &LineWidth) {
pcLineStyle->lineWidth = LineWidth.getValue();
}
@ -452,8 +458,8 @@ bool ViewProviderPartExt::loadParameter()
bool novertexnormals = hGrp->GetBool("NoPerVertexNormals",false);
bool qualitynormals = hGrp->GetBool("QualityNormals",false);
if (this->meshDeviation != deviation) {
this->meshDeviation = deviation;
if (Deviation.getValue() != deviation) {
Deviation.setValue(deviation);
changed = true;
}
if (this->noPerVertexNormals != novertexnormals) {
@ -561,7 +567,7 @@ void ViewProviderPartExt::updateVisual(const TopoDS_Shape& inputShape)
Standard_Real xMin, yMin, zMin, xMax, yMax, zMax;
bounds.Get(xMin, yMin, zMin, xMax, yMax, zMax);
Standard_Real deflection = ((xMax-xMin)+(yMax-yMin)+(zMax-zMin))/300.0 *
this->meshDeviation;
Deviation.getValue();
// create or use the mesh on the data structure
BRepMesh_IncrementalMesh myMesh(cShape,deflection);

5
src/Mod/Part/Gui/ViewProviderExt.h
View File

@ -70,6 +70,7 @@ public:
// Display properties
App::PropertyFloatConstraint LineWidth;
App::PropertyFloatConstraint PointSize;
App::PropertyFloatConstraint Deviation;
App::PropertyColor LineColor;
App::PropertyColor PointColor;
App::PropertyMaterial LineMaterial;
@ -139,10 +140,10 @@ protected:
private:
// settings stuff
float meshDeviation;
bool noPerVertexNormals;
bool qualityNormals;
static App::PropertyFloatConstraint::Constraints floatRange;
static App::PropertyFloatConstraint::Constraints sizeRange;
static App::PropertyFloatConstraint::Constraints tessRange;
static const char* LightingEnums[];
std::map<SoVertexShape*, TopoDS_Shape> vertexShapeMap;
};