ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-09-22 18:52:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL54434: TC9.2.0: GEOM: Textured point marker is not set

Browse Source
This commit is contained in:
vsr 2018-09-28 11:58:25 +03:00
parent 8c9ebd878e
commit c4999d1655
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/GEOMGUI/GeometryGUI.cxx
View File

@ -138,8 +138,6 @@ extern "C" {
} }
} }
GeometryGUI::TextureMap GeometryGUI::myTextureMap;
GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil(); GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil();
GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen()
@ -2220,25 +2218,20 @@ QString GeometryGUI::engineIOR() const
Handle(TColStd_HArray1OfByte) GeometryGUI::getTexture (int theId, int& theWidth, int& theHeight) Handle(TColStd_HArray1OfByte) GeometryGUI::getTexture (int theId, int& theWidth, int& theHeight)
{ {
theWidth = theHeight = 0; theWidth = theHeight = 0;
Handle(TColStd_HArray1OfByte) aTexture; Handle(TColStd_HArray1OfByte) aTexture;
aTexture = myTextureMap[ theId ]; GEOM::GEOM_IInsertOperations_var aInsOp = GeometryGUI::GetGeomGen()->GetIInsertOperations();
if ( aTexture.IsNull() ) { if ( !aInsOp->_is_nil() ) {
GEOM::GEOM_IInsertOperations_var aInsOp = GeometryGUI::GetGeomGen()->GetIInsertOperations(); CORBA::Long aWidth, aHeight;
if ( !aInsOp->_is_nil() ) { SALOMEDS::TMPFile_var aStream = aInsOp->GetTexture( theId, aWidth, aHeight );
CORBA::Long aWidth, aHeight; if ( aWidth > 0 && aHeight > 0 && aStream->length() > 0 ) {
SALOMEDS::TMPFile_var aStream = aInsOp->GetTexture( theId, aWidth, aHeight ); theWidth = aWidth;
if ( aWidth > 0 && aHeight > 0 && aStream->length() > 0 ) { theHeight = aHeight;
theWidth = aWidth;
theHeight = aHeight;
aTexture = new TColStd_HArray1OfByte (1, aStream->length()); aTexture = new TColStd_HArray1OfByte (1, aStream->length());
for ( CORBA::ULong i = 0; i < aStream->length(); i++) for ( CORBA::ULong i = 0; i < aStream->length(); i++)
aTexture->SetValue( i+1, (Standard_Byte)aStream[i] ); aTexture->SetValue( i+1, (Standard_Byte)aStream[i] );
myTextureMap[ theId ] = aTexture;
}
} }
} }
return aTexture; return aTexture;

3
src/GEOMGUI/GeometryGUI.h
View File

@ -211,8 +211,6 @@ public:
private: private:
typedef QMap<long, Handle(TColStd_HArray1OfByte)> TextureMap;
typedef QMap<QString, GEOMGUI*> GUIMap; typedef QMap<QString, GEOMGUI*> GUIMap;
typedef QPair<QString, QString> PluginAction; typedef QPair<QString, QString> PluginAction;
@ -221,7 +219,6 @@ private:
QDialog* myActiveDialogBox; // active dialog box QDialog* myActiveDialogBox; // active dialog box
gp_Ax3 myWorkingPlane; gp_Ax3 myWorkingPlane;
//QMap<int,QString> myRules; // popup rules //QMap<int,QString> myRules; // popup rules
static TextureMap myTextureMap; // texture map
QMap<int, PluginAction> myPluginActions; // plugin actions QMap<int, PluginAction> myPluginActions; // plugin actions
QMap<QString, QString> myPluginLibs; // plugin name to plugin client library QMap<QString, QString> myPluginLibs; // plugin name to plugin client library