From e9d45f84df90be9739582e8f0520279fea7613f7 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 9 Jun 2014 08:26:39 +0000
Subject: [PATCH] EgtGeomKernel 1.5f3 : - agg. a Text ModifyText e ChangeFont.

---
 EgtGeomKernel.rc | Bin 11710 -> 11710 bytes
 ExtText.cpp      |  32 ++++++++++++++++++++++++++++++++
 ExtText.h        |   2 ++
 GdbExecutor.cpp  |  38 ++++++++++++++++++++++++++++++++++++++
 GdbExecutor.h    |   2 ++
 5 files changed, 74 insertions(+)

diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index 28dca1faeb99c9e5a2f43f9da918b0cab14e6f52..c0b7dc2d81f129a5924e6752bd90988b1029cc95 100644
GIT binary patch
delta 81
zcmdlNy)SyhH#SD&&FAG5nSs<t#Zt!2ecT=(_IbJUOp})h<^h?4Qb6G@VNBt@EXaD#
GasvRpbR1Ry

delta 81
zcmdlNy)SyhH#SD2&FAG5nSs<t#Zt!2ecT=(_IbJUOp})h<^h?4Qb6G@VNBt@EXaD#
GasvRoLL5#2

diff --git a/ExtText.cpp b/ExtText.cpp
index c7d0af6..40d22cd 100644
--- a/ExtText.cpp
+++ b/ExtText.cpp
@@ -721,6 +721,8 @@ ExtText::ApproxWithLines( double dLinTol, double dAngTolDeg, POLYLINELIST& lstPL
 bool
 ExtText::Flip( void)
 {
+  // imposto ricalcolo della grafica
+   m_OGrMgr.Reset() ; 
   // recupero il centro
    Point3d ptCen ;
    if ( ! GetCenterPoint( ptCen))
@@ -736,6 +738,8 @@ ExtText::Flip( void)
 bool
 ExtText::Mir( bool bOnLen)
 {
+  // imposto ricalcolo della grafica
+   m_OGrMgr.Reset() ; 
   // imposto il font corrente e i suoi dati
    FontManager& fntMgr = FontManager::GetFontManager() ;
    if ( ! fntMgr.SetCurrFont( m_sFont, m_nWeight, m_bItalic, m_dHeight, m_dRatio, m_dAddAdvance))
@@ -771,5 +775,33 @@ ExtText::Mir( bool bOnLen)
       m_vtN *= - 1 ;
    }
 
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+ExtText::ModifyText( const string& sText)
+{
+  // verifico che il testo sia valido
+   if ( sText.empty())
+      return false ;
+
+  // imposto ricalcolo della grafica
+   m_OGrMgr.Reset() ; 
+  // assegno nuovo test
+   m_sText = sText ;
+
+   return true ;
+}
+
+//----------------------------------------------------------------------------
+bool
+ExtText::ChangeFont( const string& sFont)
+{
+  // imposto ricalcolo della grafica
+   m_OGrMgr.Reset() ; 
+  // assegno nuovo font
+   m_sFont = sFont ;
+
    return true ;
 }
\ No newline at end of file
diff --git a/ExtText.h b/ExtText.h
index 6ca13d6..646ec2e 100644
--- a/ExtText.h
+++ b/ExtText.h
@@ -92,6 +92,8 @@ class ExtText : public IExtText, public IGeoObjRW
       virtual bool ApproxWithLines( double dLinTol, double dAngTolDeg, POLYLINELIST& lstPL) const ;
       virtual bool Flip( void) ;
       virtual bool Mir( bool bOnLen) ;
+      virtual bool ModifyText( const std::string& sText) ;
+      virtual bool ChangeFont( const std::string& sFont) ;
 
    public :                      // IGeoObjRW
       virtual int GetNgeId( void) const ;
diff --git a/GdbExecutor.cpp b/GdbExecutor.cpp
index 7635c7c..d960de9 100644
--- a/GdbExecutor.cpp
+++ b/GdbExecutor.cpp
@@ -1922,6 +1922,14 @@ GdbExecutor::ExecuteText( const string& sCmd2, const STRVECTOR& vsParams)
       else
          return TextComplete( vsParams) ;
    }
+  // modifica del testo
+   else if ( sCmd2 == "MT"  ||  sCmd2 == "MODIFYTEXT") {
+      return TextModifyText( vsParams) ;
+   }
+  // cambio del font
+   else if ( sCmd2 == "CF"  ||  sCmd2 == "CHANGEFONT") {
+      return TextChangeFont( vsParams) ;
+   }
   // flip del testo
    else if ( sCmd2 == "FLIP") {
       return TextFlip( vsParams) ;
@@ -2042,6 +2050,36 @@ GdbExecutor::TextComplete( const STRVECTOR& vsParams)
    return AddGeoObj( vsParams[0], vsParams[1], Release( pTXT)) ;
 }
 
+//----------------------------------------------------------------------------
+bool
+GdbExecutor::TextModifyText( const STRVECTOR& vsParams)
+{
+  // 2 parametri : Id, NewText
+   if ( vsParams.size() != 2)
+      return false ;
+  // recupero il testo
+   IExtText* pTXT = GetExtText( m_pGDB->GetGeoObj( GetIdParam( vsParams[0]))) ; 
+   if ( pTXT == nullptr)
+      return false ;
+  // eseguo l'operazione
+   return pTXT->ModifyText( vsParams[1]) ; 
+}
+
+//----------------------------------------------------------------------------
+bool
+GdbExecutor::TextChangeFont( const STRVECTOR& vsParams)
+{
+  // 2 parametri : Id, NewFont
+   if ( vsParams.size() != 2)
+      return false ;
+  // recupero il testo
+   IExtText* pTXT = GetExtText( m_pGDB->GetGeoObj( GetIdParam( vsParams[0]))) ; 
+   if ( pTXT == nullptr)
+      return false ;
+  // eseguo l'operazione
+   return pTXT->ChangeFont( vsParams[1]) ; 
+}
+
 //----------------------------------------------------------------------------
 bool
 GdbExecutor::TextFlip( const STRVECTOR& vsParams)
diff --git a/GdbExecutor.h b/GdbExecutor.h
index 09eabd7..8d86f9b 100644
--- a/GdbExecutor.h
+++ b/GdbExecutor.h
@@ -96,6 +96,8 @@ class GdbExecutor : public IGdbExecutor
       bool ExecuteText( const std::string& sCmd2, const STRVECTOR& vsParams) ;
       bool TextSimple( const STRVECTOR& vsParams) ;
       bool TextComplete( const STRVECTOR& vsParams) ;
+      bool TextModifyText( const STRVECTOR& vsParams) ;
+      bool TextChangeFont( const STRVECTOR& vsParams) ;
       bool TextFlip( const STRVECTOR& vsParams) ;
       bool TextMir( const STRVECTOR& vsParams) ;
       bool TextOutline( const STRVECTOR& vsParams) ;