diff options
author | Ruben Undheim <ruben.undheim@gmail.com> | 2019-02-10 08:49:27 +0000 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2019-02-10 08:49:27 +0000 |
commit | 94cdcb9013e4862560945c14dbe762daa2baea07 (patch) | |
tree | 6e2a3a3dad7a0800109f911c70c100daa6502d22 /CSXCAD/src/ContinuousStructure.h | |
parent | ffda26309128be5d112df61a03e4827e47ecfac8 (diff) |
Import GIT HEAD of CSXCAD sub-project (with Python interface)
Diffstat (limited to 'CSXCAD/src/ContinuousStructure.h')
-rw-r--r-- | CSXCAD/src/ContinuousStructure.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CSXCAD/src/ContinuousStructure.h b/CSXCAD/src/ContinuousStructure.h index aa986c5..6d2b25b 100644 --- a/CSXCAD/src/ContinuousStructure.h +++ b/CSXCAD/src/ContinuousStructure.h @@ -78,7 +78,7 @@ public: //! Get a primitive by its unique ID. CSPrimitives* GetPrimitiveByID(unsigned int ID); - //! Get all primitives with the given name + //! Get all properties with the given name std::vector<CSProperties*> GetPropertiesByName(std::string name); //! Get a property by its internal index number. \sa GetQtyProperties @@ -135,7 +135,6 @@ public: //! Get a primitives array of a certian type std::vector<CSPrimitives*> GetPrimitivesByType(CSPrimitives::PrimitiveType type); - //! Get a primitives array inside a bounding box and with a certian property type (default is any) std::vector<CSPrimitives*> GetPrimitivesByBoundBox(const double* boundbox, bool sorted=false, CSProperties::PropertyType type=CSProperties::ANY); @@ -160,7 +159,7 @@ public: std::string Update(); //! Get an array containing the absolute size of the current structure. - double* GetObjectArea(); + double* GetObjectArea(CSProperties::PropertyType type=CSProperties::ANY); //! Delete and clear all objects includes. This will result in an empty structure. void clear(); @@ -185,7 +184,9 @@ public: \param file Filename to read this structure from. */ const char* ReadFromXML(const char* file); - //! Read a structure from a given XML-node. + std::string ReadFromXML(std::string file); + + //! Read a structure from a given XML-node. /*! \return Will return a string with possible error-messages! \param rootNode XML-node to read this structure from. |