mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-26 19:20:33 +05:00
IPAL54434: TC9.2.0: GEOM: Textured point marker is not set
This commit is contained in:
parent
8c9ebd878e
commit
c4999d1655
@ -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,11 +2218,8 @@ 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 ];
|
|
||||||
if ( aTexture.IsNull() ) {
|
|
||||||
GEOM::GEOM_IInsertOperations_var aInsOp = GeometryGUI::GetGeomGen()->GetIInsertOperations();
|
GEOM::GEOM_IInsertOperations_var aInsOp = GeometryGUI::GetGeomGen()->GetIInsertOperations();
|
||||||
if ( !aInsOp->_is_nil() ) {
|
if ( !aInsOp->_is_nil() ) {
|
||||||
CORBA::Long aWidth, aHeight;
|
CORBA::Long aWidth, aHeight;
|
||||||
@ -2237,8 +2232,6 @@ Handle(TColStd_HArray1OfByte) GeometryGUI::getTexture (int theId, int& theWidth,
|
|||||||
|
|
||||||
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;
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user