From cd2a7cc921e7f8d6837719d77e86ff7d563b6e59 Mon Sep 17 00:00:00 2001
From: Riccardo Elitropi <riccardo.elitropi@egalware.com>
Date: Mon, 3 Jul 2023 13:35:53 +0200
Subject: [PATCH] EgtMachKernel : - Merge con Master.

---
 ChiselingData.h     | 8 ++++++--
 DrillingData.h      | 8 ++++++--
 GenMachiningData.h  | 8 ++++++--
 MillingData.h       | 8 ++++++--
 MortisingData.h     | 8 ++++++--
 PocketingData.h     | 8 ++++++--
 SawFinishingData.h  | 8 ++++++--
 SawRoughingData.h   | 8 ++++++--
 SawingData.h        | 8 ++++++--
 SurfFinishingData.h | 8 ++++++--
 WaterJettingData.h  | 8 ++++++--
 11 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/ChiselingData.h b/ChiselingData.h
index fc48d40..3823834 100644
--- a/ChiselingData.h
+++ b/ChiselingData.h
@@ -71,6 +71,10 @@ struct ChiselingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const ChiselingData* GetChiselingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const ChiselingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_CHISELING)
+                    return nullptr ;
+                 return ( static_cast<const ChiselingData*>( pMdata)) ; }
 inline ChiselingData* GetChiselingData( MachiningData* pMdata)
-               { return (dynamic_cast<ChiselingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_CHISELING)
+                    return nullptr ;
+                 return ( static_cast<ChiselingData*>( pMdata)) ; }
diff --git a/DrillingData.h b/DrillingData.h
index 179a872..79bfed4 100644
--- a/DrillingData.h
+++ b/DrillingData.h
@@ -75,6 +75,10 @@ struct DrillingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const DrillingData* GetDrillingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const DrillingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_DRILLING)
+                    return nullptr ;
+                 return ( static_cast<const DrillingData*>( pMdata)) ; }
 inline DrillingData* GetDrillingData( MachiningData* pMdata)
-               { return (dynamic_cast<DrillingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_DRILLING)
+                    return nullptr ;
+                 return ( static_cast<DrillingData*>( pMdata)) ; }
diff --git a/GenMachiningData.h b/GenMachiningData.h
index 3af6e7f..2608c75 100644
--- a/GenMachiningData.h
+++ b/GenMachiningData.h
@@ -67,6 +67,10 @@ struct GenMachiningData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const GenMachiningData* GetGenMachiningData( const MachiningData* pMdata)
-               { return (dynamic_cast<const GenMachiningData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_GENMACHINING)
+                    return nullptr ;
+                 return ( static_cast<const GenMachiningData*>( pMdata)) ; }
 inline GenMachiningData* GetGenMachiningData( MachiningData* pMdata)
-               { return (dynamic_cast<GenMachiningData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_GENMACHINING)
+                    return nullptr ;
+                 return ( static_cast<GenMachiningData*>( pMdata)) ; }
diff --git a/MillingData.h b/MillingData.h
index 98df5cd..e076bbc 100644
--- a/MillingData.h
+++ b/MillingData.h
@@ -110,6 +110,10 @@ struct MillingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const MillingData* GetMillingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const MillingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_MILLING)
+                    return nullptr ;
+                 return ( static_cast<const MillingData*>( pMdata)) ; }
 inline MillingData* GetMillingData( MachiningData* pMdata)
-               { return (dynamic_cast<MillingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_MILLING)
+                    return nullptr ;
+                 return ( static_cast<MillingData*>( pMdata)) ; }
diff --git a/MortisingData.h b/MortisingData.h
index 1040cae..b5a22aa 100644
--- a/MortisingData.h
+++ b/MortisingData.h
@@ -77,6 +77,10 @@ struct MortisingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const MortisingData* GetMortisingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const MortisingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_MORTISING)
+                    return nullptr ;
+                 return ( static_cast<const MortisingData*>( pMdata)) ; }
 inline MortisingData* GetMortisingData( MachiningData* pMdata)
-               { return (dynamic_cast<MortisingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_MORTISING)
+                    return nullptr ;
+                 return ( static_cast<MortisingData*>( pMdata)) ; }
diff --git a/PocketingData.h b/PocketingData.h
index a96054d..2497fab 100644
--- a/PocketingData.h
+++ b/PocketingData.h
@@ -83,6 +83,10 @@ struct PocketingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const PocketingData* GetPocketingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const PocketingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_POCKETING)
+                    return nullptr ;
+                 return ( static_cast<const PocketingData*>( pMdata)) ; }
 inline PocketingData* GetPocketingData( MachiningData* pMdata)
-               { return (dynamic_cast<PocketingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_POCKETING)
+                    return nullptr ;
+                 return ( static_cast<PocketingData*>( pMdata)) ; }
diff --git a/SawFinishingData.h b/SawFinishingData.h
index 20da677..9c82ff2 100644
--- a/SawFinishingData.h
+++ b/SawFinishingData.h
@@ -81,6 +81,10 @@ struct SawFinishingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const SawFinishingData* GetSawFinishingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const SawFinishingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SAWFINISHING)
+                    return nullptr ;
+                 return ( static_cast<const SawFinishingData*>( pMdata)) ; }
 inline SawFinishingData* GetSawFinishingData( MachiningData* pMdata)
-               { return (dynamic_cast<SawFinishingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SAWFINISHING)
+                    return nullptr ;
+                 return ( static_cast<SawFinishingData*>( pMdata)) ; }
diff --git a/SawRoughingData.h b/SawRoughingData.h
index 86f955f..49dcf7c 100644
--- a/SawRoughingData.h
+++ b/SawRoughingData.h
@@ -78,6 +78,10 @@ struct SawRoughingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const SawRoughingData* GetSawRoughingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const SawRoughingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SAWROUGHING)
+                    return nullptr ;
+                 return ( static_cast<const SawRoughingData*>( pMdata)) ; }
 inline SawRoughingData* GetSawRoughingData( MachiningData* pMdata)
-               { return (dynamic_cast<SawRoughingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SAWROUGHING)
+                    return nullptr ;
+                 return ( static_cast<SawRoughingData*>( pMdata)) ; }
diff --git a/SawingData.h b/SawingData.h
index f1d915a..bee2339 100644
--- a/SawingData.h
+++ b/SawingData.h
@@ -99,6 +99,10 @@ struct SawingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const SawingData* GetSawingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const SawingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SAWING)
+                    return nullptr ;
+                 return ( static_cast<const SawingData*>( pMdata)) ; }
 inline SawingData* GetSawingData( MachiningData* pMdata)
-               { return (dynamic_cast<SawingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SAWING)
+                    return nullptr ;
+                 return ( static_cast<SawingData*>( pMdata)) ; }
diff --git a/SurfFinishingData.h b/SurfFinishingData.h
index 72bce50..001d471 100644
--- a/SurfFinishingData.h
+++ b/SurfFinishingData.h
@@ -83,6 +83,10 @@ struct SurfFinishingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const SurfFinishingData* GetSurfFinishingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const SurfFinishingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SURFFINISHING)
+                    return nullptr ;
+                 return ( static_cast<const SurfFinishingData*>( pMdata)) ; }
 inline SurfFinishingData* GetSurfFinishingData( MachiningData* pMdata)
-               { return (dynamic_cast<SurfFinishingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_SURFFINISHING)
+                    return nullptr ;
+                 return ( static_cast<SurfFinishingData*>( pMdata)) ; }
diff --git a/WaterJettingData.h b/WaterJettingData.h
index 319ce6f..fcfb79d 100644
--- a/WaterJettingData.h
+++ b/WaterJettingData.h
@@ -102,6 +102,10 @@ struct WaterJettingData : public MachiningData
 
 //----------------------------------------------------------------------------
 inline const WaterJettingData* GetWaterJettingData( const MachiningData* pMdata)
-               { return (dynamic_cast<const WaterJettingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_WATERJETTING)
+                    return nullptr ;
+                 return ( static_cast<const WaterJettingData*>( pMdata)) ; }
 inline WaterJettingData* GetWaterJettingData( MachiningData* pMdata)
-               { return (dynamic_cast<WaterJettingData*>( pMdata)) ; }
+               { if ( pMdata == nullptr  ||  pMdata->GetType() != MT_WATERJETTING)
+                    return nullptr ;
+                 return ( static_cast<WaterJettingData*>( pMdata)) ; }