Applying ITAGeo namespaces for city gml classes

parent 784b447e
......@@ -39,7 +39,6 @@
namespace ITAGeo
{
class IAcousticMaterial;
class CMaterialManager;
......@@ -77,17 +76,17 @@ namespace ITAGeo
/**
* @param[in] iType Anchor type
*/
static std::string GetAnchorTypeStr( ITAGeo::CPropagationAnchor::EAnchorType iType );
static std::string GetAnchorTypeStr( CPropagationAnchor::EAnchorType iType );
//! Output stream operator for console formatting etc.
friend std::ostream& operator<<( std::ostream&, const ITAGeo::CPropagationAnchor& );
friend std::ostream& operator<<( std::ostream&, const CPropagationAnchor& );
virtual std::string ToString() const;
};
//! A sound source propagation anchor
class ITA_GEO_API CEmitter : public ITAGeo::CPropagationAnchor
class ITA_GEO_API CEmitter : public CPropagationAnchor
{
public:
std::string sName; //!< Versatile source name (for debugging)
......@@ -235,7 +234,7 @@ namespace ITAGeo
ITA_GEO_API typedef std::vector< std::shared_ptr< CPropagationAnchor > > CPropagationPath; //!< Geometric propagation path
}
};
//! STL stream output operator
......
......@@ -29,10 +29,10 @@
// Forwards
struct ITA_GEO_API CITAMeshPtr;
class IAcousticMaterial;
namespace ITAGeo
{
class IAcousticMaterial;
//! Halfedge mesh model using OpenMesh
/**
......
......@@ -31,7 +31,6 @@
namespace ITAGeo
{
class IAcousticMaterial;
//! Acoustic material basic manager
......@@ -46,7 +45,7 @@ namespace ITAGeo
* @param[in] sMaterialIdentifier Text-based material identifier (usually the name of the material)
* @return Pointer to material or nullptr, if not available
*/
virtual std::shared_ptr< ITAGeo::IAcousticMaterial > GetMaterial( const std::string& sMaterialIdentifier ) const = 0;
virtual std::shared_ptr< IAcousticMaterial > GetMaterial( const std::string& sMaterialIdentifier ) const = 0;
//! Checks if material can be found
virtual bool HasMaterial( const std::string& sMaterialIdentifier ) const;
......@@ -55,7 +54,7 @@ namespace ITAGeo
/**
* @return True, if possible, false if already existing or manager is read-only
*/
virtual bool AddMaterial( const std::string& sIdentifier, std::shared_ptr< ITAGeo::IAcousticMaterial > pMat ) = 0;
virtual bool AddMaterial( const std::string& sIdentifier, std::shared_ptr< IAcousticMaterial > pMat ) = 0;
virtual bool GetReadOnly() const = 0;
};
......@@ -71,15 +70,15 @@ namespace ITAGeo
std::vector< std::string > GetPaths() const;
void AddMaterialsFromFolder( const std::string& sFolderPath, const bool bRecursive = false );
std::shared_ptr< ITAGeo::IAcousticMaterial > GetMaterial( const std::string& sMaterialIdentifier ) const;
std::shared_ptr< IAcousticMaterial > GetMaterial( const std::string& sMaterialIdentifier ) const;
int GetNumMaterials() const;
std::vector< std::string > GetMaterialIdentifier() const;
bool AddMaterial( const std::string&, std::shared_ptr< ITAGeo::IAcousticMaterial > );
bool AddMaterial( const std::string&, std::shared_ptr< IAcousticMaterial > );
bool GetReadOnly() const;
private:
std::map< std::string, std::shared_ptr< ITAGeo::IAcousticMaterial > > m_mMaterials;
std::map< std::string, std::shared_ptr< IAcousticMaterial > > m_mMaterials;
std::vector< std::string > m_vsPaths;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment