TestEGr 1.5f1 :

- ricompilato con piccole modifiche.

GeomDBTree.cpp

@@ -33,7 +33,7 @@ static char THIS_FILE[] = __FILE__;
 //--------------------------- Constants --------------------------------------
 // indici icone per Tree
 enum { ICO_MATERS = 0, ICO_ONEMATER, ICO_NOGEO, ICO_GROUP, ICO_VECTOR, ICO_POINT,
-       ICO_FRAME, ICO_LINE, ICO_ARC, ICO_CBEZIER, ICO_CCOMPO, ICO_STRIMESH} ;
+       ICO_FRAME, ICO_LINE, ICO_ARC, ICO_CBEZIER, ICO_CCOMPO, ICO_STRIMESH, ICO_TEXT} ;
 // costanti per materiali custom/ geometrie
 static const int GEOM = 0x0000000 ;
 static const int CMAT = 0x1000000 ;
@@ -62,6 +62,7 @@ CTestEGrDlg::PrepareTree( void)
    m_pImgList->Add( AfxGetApp()->LoadIcon( IDI_CBEZIER)) ;
    m_pImgList->Add( AfxGetApp()->LoadIcon( IDI_CCOMPO)) ;
    m_pImgList->Add( AfxGetApp()->LoadIcon( IDI_STRIMESH)) ;
+   m_pImgList->Add( AfxGetApp()->LoadIcon( IDI_TEXT)) ;
    m_Tree.SetImageList( m_pImgList, TVSIL_NORMAL) ;
 
    return true ;
@@ -221,6 +222,7 @@ CTestEGrDlg::GetGeoObjImage( int nType)
    case CRV_BEZ :     return ICO_CBEZIER ;
    case CRV_COMPO :   return ICO_CCOMPO ;
    case SRF_TRIMESH : return ICO_STRIMESH ;
+   case EXT_TEXT :    return ICO_TEXT ;
    }
    return ICO_NOGEO ;
 }

TestEGr.cpp

@@ -99,6 +99,11 @@ CTestEGrApp::InitInstance( void)
    SetEExLogger( &logGen) ;
    SetEGrLogger( &logGen) ;
 
+  // inizializzo il font manager
+   string sNfeFontDir = GetPrivateProfileStringUtf8( "GeomDB", "NfeFontDir", "", sFileIni.c_str()) ;
+   string sDefaultFont = GetPrivateProfileStringUtf8( "GeomDB", "DefaultFont", "", sFileIni.c_str()) ;
+   InitFontManager( sNfeFontDir, sDefaultFont) ;
+
   // inizio programma
    LOG_DATETIME( &logGen, " Start")
 

TestEGr.vcxproj

@@ -215,6 +215,7 @@
     <None Include="res\STriMesh.ico" />
     <None Include="res\TestEGr.ico" />
     <None Include="res\TestEGr.rc2" />
+    <None Include="res\text.ico" />
     <None Include="res\Vector.ico" />
     <None Include="res\zoomwin.cur" />
   </ItemGroup>

TestEGr.vcxproj.filters

@@ -75,6 +75,9 @@
     <None Include="res\OneMater.ico">
       <Filter>File di risorse</Filter>
     </None>
+    <None Include="res\text.ico">
+      <Filter>File di risorse</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="TestEGr.h">

TestEGrDlg.cpp

@@ -286,7 +286,7 @@ CTestEGrDlg::OnInitDialog( void)
       SplitLast( m_sFileToOpen, ".", sDummy, sEst) ;
       ToUpper( sEst) ;
      // apro il file
-      if ( sEst == "NGE") {
+      if ( sEst == "NGE"  ||  sEst == "NFE") {
          if ( ! FileOpen( m_sFileToOpen))
             AfxMessageBox( L"Error loading file (look at Log file)", MB_ICONSTOP|MB_OK) ;
       }
@@ -669,7 +669,7 @@ CTestEGrDlg::OnFileOpen( void)
   // visualizzo il dialogo di scelta file
    CFileDialog dlg( TRUE, L"*.Nge", NULL,
                     OFN_FILEMUSTEXIST|OFN_PATHMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR,
-                    L"New geometry EgalTech (*.Nge) |*.Nge||", NULL, 0, FALSE) ;
+                    L"New geometry EgalTech (*.Nge)|*.Nge|New font EgalTech (*.Nfe)|*.Nfe||", NULL, 0, FALSE) ;
 
   // imposto il direttorio iniziale
    wstring wsDir = stringtoW( GetPrivateProfileStringUtf8( "General", "LastNgeDir", "", AfxGetApp()->m_pszProfileName)) ;
@@ -705,12 +705,15 @@ CTestEGrDlg::OnFileSave( void)
    string sFileTitle ;
    string sFileExt ;
    SplitLast( m_sFileName, ".", sFileTitle, sFileExt) ;
-   m_sFileName = sFileTitle + ".Nge" ;
+   string sTemp = sFileExt ;
+   ToUpper( sTemp) ;
+   if ( sTemp != "NGE"  &&  sTemp != "NFE")
+      m_sFileName = sFileTitle + ".Nge" ;
 
   // visualizzo il dialogo di scelta file
    CFileDialog dlg( FALSE, L"*.Nge", stringtoW( m_sFileName),
                     OFN_PATHMUSTEXIST|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_NOCHANGEDIR,
-                    L"New geometry EgalTech (*.Nge) |*.Nge||", NULL, 0, FALSE) ;
+                    L"New geometry EgalTech (*.Nge)|*.Nge|New font EgalTech (*.Nfe)|*.Nfe||", NULL, 0, FALSE) ;
 
   // imposto il direttorio iniziale
    wstring wsDir = stringtoW( GetPrivateProfileStringUtf8( "General", "LastNgeDir", "", AfxGetApp()->m_pszProfileName)) ;