X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYBRIDPlugin%2FMG_HYBRID_API.cxx;h=3288283bfe72ec32c432576f873da4d8595b7eb1;hb=7972d6e3ce34777547876d3f4d52fc7c09d39334;hp=d2b9ed8b26eadaff3ceeea876f98e3af3de1ec27;hpb=a09dab2a68068b75ef04428d1deedc7bd0823949;p=plugins%2Fhybridplugin.git diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.cxx b/src/HYBRIDPlugin/MG_HYBRID_API.cxx index d2b9ed8..3288283 100644 --- a/src/HYBRIDPlugin/MG_HYBRID_API.cxx +++ b/src/HYBRIDPlugin/MG_HYBRID_API.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2022 CEA/DEN, EDF R&D +// Copyright (C) 2004-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -36,9 +36,6 @@ extern "C"{ #include } -#define MESHGEMS_VERSION_HEX (MESHGEMS_VERSION_MAJOR << 16 | MESHGEMS_VERSION_MINOR << 8 | MESHGEMS_VERSION_PATCH) -#define MESHGEMS_215 (2 << 16 | 15 << 8 | 0) - struct MG_HYBRID_API::LibData { // MG objects @@ -702,24 +699,12 @@ bool MG_HYBRID_API::LibData::Compute() // MG license std::string errorTxt; status_t ret; -#if MESHGEMS_VERSION_HEX > MESHGEMS_215 - // unlock Hybrid license - std::string SPATIAL_LICENSE = SMESHUtils_MGLicenseKeyGen::GetKey(errorTxt); - ret = meshgems_hybrid_unlock_product(SPATIAL_LICENSE.c_str()); - if STATUS_IS_ERROR( ret ) - { - AddError( SMESH_Comment( "Problem with SPATIAL_LICENSE to unlock Hybrid: ") << errorTxt ); - return false; - } - else - MESSAGE("SPATIAL_LICENSE unlock Hybrid: " << ret); -#else - if ( !SMESHUtils_MGLicenseKeyGen::SignMesh( _surf_mesh, errorTxt )) + + if ( !SMESHUtils_MGLicenseKeyGen::SignMesh( _surf_mesh, "hybrid", errorTxt )) { AddError( SMESH_Comment( "Problem with library SalomeMeshGemsKeyGenerator: ") << errorTxt ); return false; } -#endif // Set surface mesh ret = hybrid_set_surface_mesh( _session, _surf_mesh );