From 16af35adbc72b7945aa54789d41f19200ee37066 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 30 Jan 2018 20:08:21 +0000 Subject: [PATCH] =?UTF-8?q?EgtMachKernel=20:=20-=20aggiornata=20anche=20en?= =?UTF-8?q?tit=C3=A0=20CamData=20di=20tipo=20UserObj=20per=20nBaseId=20-?= =?UTF-8?q?=20inserito=20attributo=20overwrite=20in=20metodi=20di=20oggett?= =?UTF-8?q?i=20derivati.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Axis.h | 12 ++++++------ CamData.cpp | 2 +- CamData.h | 42 +++++++++++++++++++++--------------------- Exit.h | 12 ++++++------ Head.h | 12 ++++++------ 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Axis.h b/Axis.h index 37b420c..55aee10 100644 --- a/Axis.h +++ b/Axis.h @@ -21,12 +21,12 @@ class Axis : public IUserObj { public : // IUserObj - virtual Axis* Clone( void) const ; - virtual const std::string& GetClassName( void) const ; - virtual bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const ; - virtual bool SetOwner( int nId, IGeomDB* pGDB) ; - virtual int GetOwner( void) const ; - virtual IGeomDB* GetGeomDB( void) const ; + Axis* Clone( void) const override ; + const std::string& GetClassName( void) const override ; + bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const override ; + bool SetOwner( int nId, IGeomDB* pGDB) override ; + int GetOwner( void) const override ; + IGeomDB* GetGeomDB( void) const override ; public : Axis( void) ; diff --git a/CamData.cpp b/CamData.cpp index 1b6ab5c..adfd6c5 100644 --- a/CamData.cpp +++ b/CamData.cpp @@ -154,7 +154,7 @@ CamData::GetGeomDB( void) const //---------------------------------------------------------------------------- bool -CamData::Save( STRVECTOR& vString) const +CamData::Save( int nBaseId, STRVECTOR& vString) const { try { vString.insert( vString.begin(), CAM_TOTPARAM, "") ; diff --git a/CamData.h b/CamData.h index 005a594..8988e47 100644 --- a/CamData.h +++ b/CamData.h @@ -21,27 +21,27 @@ class CamData : public IUserObj { public : // IUserObj - virtual CamData* Clone( void) const ; - virtual const std::string& GetClassName( void) const ; - virtual bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const ; - virtual bool SetOwner( int nId, IGeomDB* pGDB) ; - virtual int GetOwner( void) const ; - virtual IGeomDB* GetGeomDB( void) const ; - virtual bool ToSave( void) const { return true ; } - virtual bool Save( STRVECTOR& vString) const ; - virtual bool Load( const STRVECTOR& vString, int nBaseGdbId) ; - virtual bool GetDrawPolyLines( POLYLINELIST& lstPL) const ; - virtual bool Translate( const Vector3d& vtMove) ; - virtual bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) - { double dAngRad = dAngDeg * DEGTORAD ; - return Rotate( ptAx, vtAx, cos( dAngRad), sin( dAngRad)) ; } - virtual bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) ; - virtual bool Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoeffZ) ; - virtual bool Mirror( const Point3d& ptOn, const Vector3d& vtNorm) ; - virtual bool Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d& vtDir, double dCoeff) ; - virtual bool ToGlob( const Frame3d& frRef) ; - virtual bool ToLoc( const Frame3d& frRef) ; - virtual bool LocToLoc( const Frame3d& frOri, const Frame3d& frDest) ; + CamData* Clone( void) const override ; + const std::string& GetClassName( void) const override ; + bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const override ; + bool SetOwner( int nId, IGeomDB* pGDB) override ; + int GetOwner( void) const override ; + IGeomDB* GetGeomDB( void) const override ; + bool ToSave( void) const override { return true ; } + bool Save( int nBaseId, STRVECTOR& vString) const override ; + bool Load( const STRVECTOR& vString, int nBaseGdbId) override ; + bool GetDrawPolyLines( POLYLINELIST& lstPL) const override ; + bool Translate( const Vector3d& vtMove) override ; + bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) override + { double dAngRad = dAngDeg * DEGTORAD ; + return Rotate( ptAx, vtAx, cos( dAngRad), sin( dAngRad)) ; } + bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) override ; + bool Scale( const Frame3d& frRef, double dCoeffX, double dCoeffY, double dCoeffZ) override ; + bool Mirror( const Point3d& ptOn, const Vector3d& vtNorm) override ; + bool Shear( const Point3d& ptOn, const Vector3d& vtNorm, const Vector3d& vtDir, double dCoeff) override ; + bool ToGlob( const Frame3d& frRef) override ; + bool ToLoc( const Frame3d& frRef) override ; + bool LocToLoc( const Frame3d& frOri, const Frame3d& frDest) override ; public : CamData( void) ; diff --git a/Exit.h b/Exit.h index c9d9496..0aff4b3 100644 --- a/Exit.h +++ b/Exit.h @@ -21,12 +21,12 @@ class Exit : public IUserObj { public : // IUserObj - virtual Exit* Clone( void) const ; - virtual const std::string& GetClassName( void) const ; - virtual bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const ; - virtual bool SetOwner( int nId, IGeomDB* pGDB) ; - virtual int GetOwner( void) const ; - virtual IGeomDB* GetGeomDB( void) const ; + Exit* Clone( void) const override ; + const std::string& GetClassName( void) const override ; + bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const override ; + bool SetOwner( int nId, IGeomDB* pGDB) override ; + int GetOwner( void) const override ; + IGeomDB* GetGeomDB( void) const override ; public : Exit( void) ; diff --git a/Head.h b/Head.h index dc64eda..79df95c 100644 --- a/Head.h +++ b/Head.h @@ -21,12 +21,12 @@ class Head : public IUserObj { public : // IUserObj - virtual Head* Clone( void) const ; - virtual const std::string& GetClassName( void) const ; - virtual bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const ; - virtual bool SetOwner( int nId, IGeomDB* pGDB) ; - virtual int GetOwner( void) const ; - virtual IGeomDB* GetGeomDB( void) const ; + Head* Clone( void) const override ; + const std::string& GetClassName( void) const override ; + bool Dump( std::string& sOut, bool bMM = true, const char* szNewLine = "\n") const override ; + bool SetOwner( int nId, IGeomDB* pGDB) override ; + int GetOwner( void) const override ; + IGeomDB* GetGeomDB( void) const override ; public : Head( void) ;