kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

py3: FEM, PyMods, preprocessor conditions, Py::Long vs Py::Int

Browse Source
This commit is contained in:
looooo
2017-02-18 20:58:58 +01:00
committed by wmayer
parent 3fab41f567
commit 5c0bcf611f
6 changed files with 135 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp
View File

@@ -145,7 +145,7 @@ void ViewProviderFemMeshPy::setNodeColor(Py::Dict arg)
//std::map<long,App::Color> NodeColorMap;
//for( Py::Dict::iterator it = arg.begin(); it!= arg.end();++it){
// Py::Int id((*it).first);
// Py::Long id((*it).first);
// Py::Tuple color((*it).second);
// NodeColorMap[id] = App::Color(Py::Float(color[0]),Py::Float(color[1]),Py::Float(color[2]),0);
//}
@@ -154,7 +154,7 @@ void ViewProviderFemMeshPy::setNodeColor(Py::Dict arg)
long i = 0;
for( Py::Dict::iterator it = arg.begin(); it!= arg.end();++it,i++){
Py::Int id((*it).first);
Py::Long id((*it).first);
Py::Tuple color((*it).second);
NodeIds[i] = id;
NodeColors[i] = App::Color(Py::Float(color[0]),Py::Float(color[1]),Py::Float(color[2]),0);
@@ -181,7 +181,7 @@ void ViewProviderFemMeshPy::setElementColor(Py::Dict arg)
std::map<long,App::Color> NodeColorMap;
for( Py::Dict::iterator it = arg.begin(); it!= arg.end();++it){
Py::Int id((*it).first);
Py::Long id((*it).first);
Py::Tuple color((*it).second);
NodeColorMap[id] = App::Color(Py::Float(color[0]),Py::Float(color[1]),Py::Float(color[2]),0);
}
@@ -205,7 +205,7 @@ void ViewProviderFemMeshPy::setNodeDisplacement(Py::Dict arg)
Py::Type vType(pyType.o);
for( Py::Dict::iterator it = arg.begin(); it!= arg.end();++it){
Py::Int id((*it).first);
Py::Long id((*it).first);
if ((*it).second.isType(vType)) {
Py::Vector p((*it).second);
NodeDispMap[id] = p.toVector();
@@ -229,7 +229,7 @@ void ViewProviderFemMeshPy::setHighlightedNodes(Py::List arg)
std::set<long> res;
for(Py::List::iterator it = arg.begin(); it!= arg.end();++it){
long id = static_cast<long>(Py::Int(*it));
long id = static_cast<long>(Py::Long(*it));
const SMDS_MeshNode *node = data->FindNode(id);
if(node)
res.insert(id);
@@ -265,8 +265,8 @@ Py::List ViewProviderFemMeshPy::getVisibleElementFaces(void) const
Py::Tuple tup(2);
long element = *it>>3;
long face = (*it&7)+1;
tup.setItem( 0,Py::Int( element ) );
tup.setItem( 1,Py::Int( face ) );
tup.setItem( 0,Py::Long( element ) );
tup.setItem( 1,Py::Long( face ) );
result.setItem(i,tup);
}