Changeset 1115 for cpp/frams

Timestamp:

03/25/21 16:21:43 (4 years ago)

Author:

Maciej Komosinski

Message:

Use default stick thickness when converting "ball-and-stick" models to "solid-shape" models

Location:

cpp/frams

Files:

• _demos/shapeconvert.cpp (modified) (1 diff)
• model/geometry/modelgeoclass.cpp (modified) (2 diffs)
• model/model.h (modified) (1 diff)

cpp/frams/_demos/shapeconvert.cpp

@@ -38 +38 @@
         PreconfiguredGenetics genetics;
         Part::Shape shape = Part::SHAPE_CYLINDER;
-        float thickness = 0.2;
+        float thickness = 0.1;
 
         char* gen_arg = 0;

cpp/frams/model/geometry/modelgeoclass.cpp

@@ -18 +18 @@
         "To set geom_density for individual ModelGeometry objects:\n"
         "var mg=ModelGeometry.forModel(GenePools[0][0].getModel()); mg.geom_density=2; GenePools[0][0].data->area=mg.area();\n" },
-        { "geom_density", 0, 0, "Density", "f 0.01 100.0 1.0", FIELD(density), "Affects the geometry calculation precision" }, //note: we used 'geom_density' instead of 'density' to make the name more unique - because sim_params merges all configuration fields in a single namespace.
+        { "geom_density", 0, 0, "Density", "f 0.01 100.0 1.0", FIELD(density), "The number of samples (per unit length in one dimension) that affects the precision of estimation of geometrical properties." }, //note: we used 'geom_density' instead of 'density' to make the name more unique - because sim_params merges all configuration fields in a single namespace.
         { "forModel", 0, PARAM_USERHIDDEN, "", "p oModelGeometry(oModel)", PROCEDURE(p_formodel), "The returned ModelGeometry object can be used to calculate geometric properties (volume, area, sizes) of the associated model. The density is copied from the current global ModelGeometry.geom_density on object creation." },
         { "volume", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "volume", "p f()", PROCEDURE(p_volume), },
         { "area", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "area", "p f()", PROCEDURE(p_area), },
-        { "voxels", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "voxels", "p oVector()", PROCEDURE(p_voxels), },
+        { "voxels", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "voxels", "p oVector()", PROCEDURE(p_voxels), "Returns a Vector of Pt3D objects from a regular 3D grid (sampled according to ModelGeometry.geom_density) that are inside of the Model body (Parts and Joints)."},
         { "sizesAndAxes", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "sizesAndAxes", "p oVector()", PROCEDURE(p_sizesandaxes), "The returned vector contains XYZ (sizes) and Orient (axes) objects." },
         { 0, 0, 0, },
@@ -80 +80 @@
                         Model *converted = new Model;
                         converted->open();
-                        converted->buildUsingSolidShapeTypes(*m, Part::SHAPE_CYLINDER, 0.2);
+                        converted->buildUsingSolidShapeTypes(*m, Part::SHAPE_CYLINDER);
                         converted->close();
                         m = converted;

cpp/frams/model/model.h

@@ -389 +389 @@
 
         /// build this model using solid shape types, based on the provided ball-and-stick model. See also shapeconvert.cpp.
-        void buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.2);
+        void buildUsingSolidShapeTypes(const Model &src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, double thickness = 0.1);
 
 protected: