Changeset 8592c9 for src/UIElements/Views/Qt4/Qt3D

Timestamp:

Sep 8, 2014, 9:36:29 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

ce4126

Parents:

42ffb5

git-author:

Frederik Heber <heber@…> (08/26/14 07:40:55)

git-committer:

Frederik Heber <heber@…> (09/08/14 21:36:29)

Message:

FIX: GLMoleculeObject_shape might use empty point list for tesselation.

• this causes segfault if a "nowhere" shape was created. Signal ShapedAdded causes tesselation of this shape and storing the mesh but the tesselation routine does not work if less than three points are given.
• added check to Tesselation::operator() for at least three points.
• MEMFIX: Tesselation object never deleted.

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.cpp (modified) (1 diff)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_shape.cpp ¶

@@ -80 +80 @@
   std::vector<Vector> points = shape.getHomogeneousPointsOnSurface(NumPointsonSurface);
 
-  // Fill the points into a tesselate-able container.
-  TesselPointSTLList Corners;
-  for (size_t i=0;i<points.size();++i){
-    TesselPoint *Walker = new TesselPoint;
-    Walker->setPosition(points[i]);
-    Walker->setName(toString(i));
-    Walker->setNr(i);
-    Corners.push_back(Walker);
-  }
-
-  // Tesselate the points.
-  Tesselation *T = new Tesselation;
-  PointCloudAdaptor<TesselPointSTLList> cloud(&Corners, "TesselPointSTLList");
-  (*T)(cloud, minradius);
-
-  // Fill the points into a Qt geometry.
   QGeometryData geo;
-  LinkedCell_deprecated LinkedList(cloud, minradius);
-  std::vector<Vector> normals;
-  normals.resize(points.size(), zeroVec);
-  for(size_t i=0;i<points.size();++i){
-    // add data to the primitive
-    geo.appendVertex(QVector3D(points[i][0], points[i][1], points[i][2]));
-    if (ShapeFactory::getInstance().isSimpleShape(shape.getType()))
-      normals[i] = shape.getNormal(points[i]);
-    else
-      normals[i] = T->getNormal(points[i], &LinkedList);
-    geo.appendNormal(QVector3D(normals[i][0], normals[i][1], normals[i][2]));
-    geo.appendColor(QColor(1, 1, 1, 1));
-    geo.appendTexCoord(QVector2D(0, 0));
-  }
-
-  // Fill the tesselated triangles into the geometry.
-  for (TriangleMap::const_iterator runner = T->TrianglesOnBoundary.begin(); runner != T->TrianglesOnBoundary.end(); runner++) {
-    int v[3];
-    for (size_t i=0; i<3; ++i)
-      v[i] = runner->second->endpoints[i]->node->getNr();
-
-    // Sort the vertices so the triangle is clockwise (relative to the normal vector).
-    Vector cross = points[v[1]] - points[v[0]];
-    cross.VectorProduct(points[v[2]] - points[v[0]]);
-    if (cross.ScalarProduct(normals[v[0]] + normals[v[1]] + normals[v[2]]) > 0)
-      geo.appendIndices(v[0], v[1], v[2]);
-    else
-      geo.appendIndices(v[0], v[2], v[1]);
+  // we need at least three points for tesselation
+  if (points.size() >= 3) {
+    // Fill the points into a tesselate-able container.
+    TesselPointSTLList Corners;
+    for (size_t i=0;i<points.size();++i){
+      TesselPoint *Walker = new TesselPoint;
+      Walker->setPosition(points[i]);
+      Walker->setName(toString(i));
+      Walker->setNr(i);
+      Corners.push_back(Walker);
+    }
+  
+    // Tesselate the points.
+    Tesselation T;
+    PointCloudAdaptor<TesselPointSTLList> cloud(&Corners, "TesselPointSTLList");
+    T(cloud, minradius);
+  
+    // Fill the points into a Qt geometry.
+    LinkedCell_deprecated LinkedList(cloud, minradius);
+    std::vector<Vector> normals;
+    normals.resize(points.size(), zeroVec);
+    for(size_t i=0;i<points.size();++i){
+      // add data to the primitive
+      geo.appendVertex(QVector3D(points[i][0], points[i][1], points[i][2]));
+      if (ShapeFactory::getInstance().isSimpleShape(shape.getType()))
+        normals[i] = shape.getNormal(points[i]);
+      else
+        normals[i] = T.getNormal(points[i], &LinkedList);
+      geo.appendNormal(QVector3D(normals[i][0], normals[i][1], normals[i][2]));
+      geo.appendColor(QColor(1, 1, 1, 1));
+      geo.appendTexCoord(QVector2D(0, 0));
+    }
+  
+    // Fill the tesselated triangles into the geometry.
+    for (TriangleMap::const_iterator runner = T.TrianglesOnBoundary.begin(); runner != T.TrianglesOnBoundary.end(); runner++) {
+      int v[3];
+      for (size_t i=0; i<3; ++i)
+        v[i] = runner->second->endpoints[i]->node->getNr();
+  
+      // Sort the vertices so the triangle is clockwise (relative to the normal vector).
+      Vector cross = points[v[1]] - points[v[0]];
+      cross.VectorProduct(points[v[2]] - points[v[0]]);
+      if (cross.ScalarProduct(normals[v[0]] + normals[v[1]] + normals[v[2]]) > 0)
+        geo.appendIndices(v[0], v[1], v[2]);
+      else
+        geo.appendIndices(v[0], v[2], v[1]);
+    }
   }