Changeset 1045 for cpp/frams/_demos/geometry

Timestamp:

12/11/20 20:23:42 (4 years ago)

Author:

oriona

Message:

Part of GeometryTestUtils? functions moved to GeometryUtils?.

Location:

cpp/frams/_demos/geometry

Files:

• apices_test.cpp (modified) (2 diffs)
• geometrytestutils.cpp (modified) (3 diffs)
• geometrytestutils.h (modified) (1 diff)
• info_test.cpp (modified) (2 diffs)
• surface_test.cpp (modified) (3 diffs)
• volume_test.cpp (modified) (2 diffs)

cpp/frams/_demos/geometry/apices_test.cpp

@@ -14 +14 @@
         Model resultModel;
         resultModel.open();
-        GeometryTestUtils::addAnchorToModel(resultModel);
+        GeometryUtils::addAnchorToModel(resultModel);
         
         // Creating instance of Iterator class (MeshBuilder::ModelApices in this case). Object is
@@ -31 +31 @@
                 // Processing points created by iterator. In this case, they are added to result model as
                 // small spheres.
-                GeometryTestUtils::addPointToModel(point, resultModel);
+                GeometryUtils::addPointToModel(point, resultModel);
         }
         

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -4 +4 @@
 
 #include "geometrytestutils.h"
-
 #include "../genotypeloader.h"
 #include "frams/genetics/preconfigured.h"
 #include <common/virtfile/stdiofile.h>
 #include <common/loggers/loggertostdout.h>
+#include <frams/model/geometry/geometryutils.h>
 #include <math.h>
 #include <stdio.h>
@@ -99 +99 @@
 
         Part *part = model.addNewPart(Part::Shape(shape));
-        GeometryTestUtils::randomizePositionScaleAndOrient(part);
+        GeometryUtils::randomizePositionScaleAndOrient(part);
 
         model.close();
@@ -233 +233 @@
 }
 
-void GeometryTestUtils::addAnchorToModel(Model &model)
-{
-        Part *part = model.addNewPart(Part::SHAPE_ELLIPSOID);
-
-        part->p = Pt3D(0);
-        part->scale = Pt3D(0.1);
-        part->vcolor = Pt3D(1.0, 0.0, 1.0);
-
-        addAxesToModel(Pt3D(0.5), Orient(Orient_1), Pt3D(0.0), model);
-}
-
-void GeometryTestUtils::addPointToModel(const Pt3D &markerLocation, Model &model)
-{
-        Part *anchor = model.getPart(0);
-        Part *part = model.addNewPart(Part::SHAPE_ELLIPSOID);
-
-        part->p = Pt3D(markerLocation);
-        part->scale = Pt3D(0.05);
-        part->vcolor = Pt3D(1.0, 1.0, 0.0);
-
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-}
-
-void GeometryTestUtils::addAxesToModel(const Pt3D &sizes, const Orient &axes, const Pt3D &center,
-        Model &model)
-{
-        Part *anchor = model.getPart(0);
-        Part *part;
-
-        part = model.addNewPart(Part::SHAPE_CUBOID);
-        part->scale = Pt3D(sizes.x, 0.05, 0.05);
-        part->setOrient(axes);
-        part->p = center;
-        part->vcolor = Pt3D(1.0, 0.0, 0.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-
-        part = model.addNewPart(Part::SHAPE_CUBOID);
-        part->scale = Pt3D(0.05, sizes.y, 0.05);
-        part->setOrient(axes);
-        part->p = center;
-        part->vcolor = Pt3D(0.0, 1.0, 0.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-
-        part = model.addNewPart(Part::SHAPE_CUBOID);
-        part->scale = Pt3D(0.05, 0.05, sizes.z);
-        part->setOrient(axes);
-        part->p = center;
-        part->vcolor = Pt3D(0.0, 0.0, 1.0);
-        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
-}
-
-void GeometryTestUtils::mergeModels(Model &target, Model &source)
-{
-        Part *targetAnchor = target.getPart(0);
-        Part *sourceAnchor = source.getPart(0);
-
-        target.moveElementsFrom(source);
-
-        target.addNewJoint(targetAnchor, sourceAnchor, Joint::SHAPE_FIXED);
-}
-
-double frand(double from, double width)
-{
-        return from + width * ((rand() % 10000) / 10000.0);
-}
-
-void GeometryTestUtils::randomizePositionScaleAndOrient(Part *part)
-{
-        part->p = Pt3D(frand(1.5, 1.0), frand(1.5, 1.0), frand(1.5, 1.0));
-        part->scale = Pt3D(frand(0.1, 0.9), frand(0.1, 0.9), frand(0.1, 0.9));
-        part->setRot(Pt3D(frand(0.0, M_PI), frand(0.0, M_PI), frand(0.0, M_PI)));
-}
-
 void GeometryTestUtils::describePart(const Part *part, FILE *output)
 {

cpp/frams/_demos/geometry/geometrytestutils.h

@@ -47 +47 @@
          */
         int execute(const SString header, int argc, char *argv[], void (*test)(Model &, const double));
-        
-        /**
-         * @brief Adds anchor to the specified Model.
-         * @details An anchor has two functions. First is to provide Model consistency. Some functions in
-         *     GeometryTestUtils namespace requires Model passed to them as an argument to contain at
-         *     least one Part. All new Parts are bonded to the rest of Model using Joint connecting them
-         *     with first Part of Model. Second is to provide reference which helps to understand Model
-         *     position, scale and orientation. Anchor is built from four Parts: small sphere placed in
-         *     global coordinate system origin and three cuboids visualising global coordinate system
-         *     axes.
-         * @see addAxesToModel.
-         * @param[in] model Owner of Parts to be created.
-         */
-        void addAnchorToModel(Model &model);
-        
-        /**
-         * @brief Adds point marker to Model.
-         * @details Marker of point is a small sphere (radius = 0.05).
-         * @param[in] point Location of marker.
-         * @param[in] model Owner of Part to be created, must contain at least one part.
-         */
-        void addPointToModel(const Pt3D &point, Model &model);
-        
-        /**
-         * @brief Adds axes markers to Model.
-         * @details Axes markers are three streched (one of scales = 0.5, others = 0.05) and colored
-         *     cuboids. Cuboid visualising OX axis is red, OY - green, and OZ - blue.
-         * @param[in] sizes Axes visual lengths.
-         * @param[in] axes Axes orientation, relatively to global coordinate system axes.
-         * @param[in] center Axes intersection point, relatively to global coordinate system origin.
-         * @param[in] model Owner of Parts to be created, must contain at least one part.
-         */
-        void addAxesToModel(const Pt3D &sizes, const Orient &axes, const Pt3D &center, Model &model);
-        
-        /**
-         * @brief Merges two Models.
-         * @details Moves all parts from source Model to target Model and - to provide Model
-         *     consistency - creates Joint between firsts Parts of each of them. Each model must contain
-         *     at least one Part.
-         * @param[in] target Target Model, must contain at least one part.
-         * @param[in] source Source Model, must contain at least one part.
-         */
-        void mergeModels(Model &target, Model &source);
-        
-        /**
-         * @brief Randomizes position, scale and rotations of Part.
-         * @details Sets coords of Part position to random values from range (1.5, 2.5), scales to
-         *     random values from range (0.1, 1.0), and rotations around each axis to random values from
-         *     range (0, M_PI).
-         * @param[in] part Part which position, scale and orient should be randomized.
-         */
-        void randomizePositionScaleAndOrient(Part *part);
-        
+
         /**
          * @brief Prints description of given Part to specified file.

cpp/frams/_demos/geometry/info_test.cpp

@@ -51 +51 @@
         Model resultModel;
         resultModel.open();
-        GeometryTestUtils::addAnchorToModel(resultModel);
+        GeometryUtils::addAnchorToModel(resultModel);
         
         // Adding bounding markers of bounding box apices.
@@ -60 +60 @@
                 apex.y = Octants::isPositiveY(o) ? upperBoundary.y : lowerBoundary.y;
                 apex.z = Octants::isPositiveZ(o) ? upperBoundary.z : lowerBoundary.z;
-                GeometryTestUtils::addPointToModel(apex, resultModel);
+                GeometryUtils::addPointToModel(apex, resultModel);
         }
         
         // Adding markers of axes (intersection of axes is in the center of bounding box).
         Pt3D intersection = (lowerBoundary + upperBoundary) * 0.5;
-        GeometryTestUtils::addAxesToModel(sizes, axes, intersection, resultModel);
+        GeometryUtils::addAxesToModel(sizes, axes, intersection, resultModel);
         
         // Merging with original model.
-        GeometryTestUtils::mergeModels(resultModel, model);
+        GeometryUtils::mergeModels(resultModel, model);
         
         // Finishing result Model and printing its genotype.

cpp/frams/_demos/geometry/surface_test.cpp

@@ -4 +4 @@
 
 #include "geometrytestutils.h"
+#include <frams/model/geometry/geometryutils.h>
 #include <frams/model/geometry/meshbuilder.h>
 #include <frams/model/model.h>
@@ -14 +15 @@
         Model resultModel;
         resultModel.open();
-        GeometryTestUtils::addAnchorToModel(resultModel);
+        GeometryUtils::addAnchorToModel(resultModel);
         
         // Creating instance of Iterator class (MeshBuilder::ModelSurface in this case). Object is
@@ -31 +32 @@
                 // Processing points created by iterator. In this case, they are added to result model as
                 // small spheres.
-                GeometryTestUtils::addPointToModel(point, resultModel);
+                GeometryUtils::addPointToModel(point, resultModel);
         }
         

cpp/frams/_demos/geometry/volume_test.cpp

@@ -14 +14 @@
         Model resultModel;
         resultModel.open();
-        GeometryTestUtils::addAnchorToModel(resultModel);
+        GeometryUtils::addAnchorToModel(resultModel);
         
         // Creating instance of Iterator class (MeshBuilder::ModelApices in this case). Object is
@@ -33 +33 @@
                 if (GeometryUtils::isPointInsideModel(point, model))
                 {
-                        GeometryTestUtils::addPointToModel(point, resultModel);
+                        GeometryUtils::addPointToModel(point, resultModel);
                 }
         }