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

FEM: vtk color bar: fix change of min max value

Browse Source
This commit is contained in:
Bernd Hahnebach 2016-06-15 07:18:28 +02:00
parent 78e4a96f6d
commit 999330f07b
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
View File

@ -320,7 +320,8 @@ void ViewProviderFemPostObject::update3D() {
// write out point data if any // write out point data if any
WritePointData(points, normals, tcoords); WritePointData(points, normals, tcoords);
WriteColorData(); bool ResetColorBarRange = true;
WriteColorData(ResetColorBarRange);
WriteTransperency(); WriteTransperency();
// write out polys if any // write out polys if any
@ -345,7 +346,6 @@ void ViewProviderFemPostObject::update3D() {
m_faces->coordIndex.setNum(0); m_faces->coordIndex.setNum(0);
// write out tstrips if any // write out tstrips if any
if (pd->GetNumberOfStrips() > 0) { if (pd->GetNumberOfStrips() > 0) {
@ -437,7 +437,7 @@ void ViewProviderFemPostObject::WritePointData(vtkPoints* points, vtkDataArray*
} }
} }
void ViewProviderFemPostObject::WriteColorData() { void ViewProviderFemPostObject::WriteColorData(bool ResetColorBarRange) {
if(!setupPipeline()) if(!setupPipeline())
return; return;
@ -461,9 +461,11 @@ void ViewProviderFemPostObject::WriteColorData() {
component = 0; component = 0;
//build the lookuptable //build the lookuptable
double range[2]; if (ResetColorBarRange == true) {
data->GetRange(range, component); double range[2];
m_colorBar->setRange(range[0], range[1]); data->GetRange(range, component);
m_colorBar->setRange(range[0], range[1]);
}
m_material->diffuseColor.startEditing(); m_material->diffuseColor.startEditing();
@ -523,13 +525,14 @@ void ViewProviderFemPostObject::onChanged(const App::Property* prop) {
if(m_blockPropertyChanges) if(m_blockPropertyChanges)
return; return;
bool ResetColorBarRange = true;
if(prop == &Field && setupPipeline()) { if(prop == &Field && setupPipeline()) {
updateProperties(); updateProperties();
WriteColorData(); WriteColorData(ResetColorBarRange);
WriteTransperency(); WriteTransperency();
} }
else if(prop == &VectorMode && setupPipeline()) { else if(prop == &VectorMode && setupPipeline()) {
WriteColorData(); WriteColorData(ResetColorBarRange);
WriteTransperency(); WriteTransperency();
} }
else if(prop == &Transperency) { else if(prop == &Transperency) {
@ -613,6 +616,6 @@ void ViewProviderFemPostObject::show(void) {
void ViewProviderFemPostObject::OnChange(Base::Subject< int >& rCaller, int rcReason) { void ViewProviderFemPostObject::OnChange(Base::Subject< int >& rCaller, int rcReason) {
bool ResetColorBarRange = false;
WriteColorData(); WriteColorData(ResetColorBarRange);
} }

2
src/Mod/Fem/Gui/ViewProviderFemPostObject.h
View File

@ -149,7 +149,7 @@ private:
void update3D(); void update3D();
void WritePointData(vtkPoints *points, vtkDataArray *normals, void WritePointData(vtkPoints *points, vtkDataArray *normals,
vtkDataArray *tcoords); vtkDataArray *tcoords);
void WriteColorData(); void WriteColorData(bool ResetColorBarRange);
void WriteTransperency(); void WriteTransperency();
App::Enumeration m_coloringEnum, m_vectorEnum; App::Enumeration m_coloringEnum, m_vectorEnum;