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

fix for edit tracker draw styles

Browse Source
This commit is contained in:
Joel Graff
2019-04-22 21:22:53 -05:00
committed by Yorik van Havre
parent acf12ee8f0
commit 6e5fac08fb
2 changed files with 16037 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16000
gitlog.log Normal file
View File

File diff suppressed because it is too large Load Diff

38
src/Gui/ApplicationPy.cpp
View File

@@ -1267,6 +1267,42 @@ PyObject* Application::sGetMarkerIndex(PyObject * /*self*/, PyObject *args)
PY_TRY {
ParameterGrp::handle const hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
//find the appropriate marker style string token
std::string marker_arg = pstr;
std::list<std::pair<std::string, std::string> > markerList = {
{"square", "DIAMOND_FILLED"},
{"cross", "CROSS"},
{"plus", "PLUS"},
{"empty", "SQUARE_LINE"},
{"quad", "SQUARE_FILLED"},
{"circle", "CIRCLE_LINE"},
{"default", "CIRCLE_FILLED"}
};
std::list<std::pair<std::string, std::string>>::iterator markerStyle;
for (markerStyle = markerList.begin(); markerStyle != markerList.end(); ++markerStyle)
{
if (marker_arg == (*markerStyle).first || marker_arg == (*markerStyle).second)
break;
}
marker_arg = "CIRCLE_FILLED";
if (markerStyle != markerList.end())
marker_arg = (*markerStyle).second;
//get the marker size
int sizeList[]={5, 7, 9};
if (std::find(std::begin(sizeList), std::end(sizeList), defSize) == std::end(sizeList))
defSize = 9;
return Py_BuildValue("i", Gui::Inventor::MarkerBitmaps::getMarkerIndex(marker_arg, defSize));
/*
if (strcmp(pstr, "square") == 0)
return Py_BuildValue("i", Gui::Inventor::MarkerBitmaps::getMarkerIndex("DIAMOND_FILLED", hGrp->GetInt("MarkerSize", defSize)));
else if (strcmp(pstr, "cross") == 0)
@@ -1280,7 +1316,7 @@ PyObject* Application::sGetMarkerIndex(PyObject * /*self*/, PyObject *args)
else if (strcmp(pstr, "circle") == 0)
return Py_BuildValue("i", Gui::Inventor::MarkerBitmaps::getMarkerIndex("CIRCLE_LINE", hGrp->GetInt("MarkerSize", defSize)));
else
return Py_BuildValue("i", Gui::Inventor::MarkerBitmaps::getMarkerIndex("CIRCLE_FILLED", hGrp->GetInt("MarkerSize", defSize)));
return Py_BuildValue("i", Gui::Inventor::MarkerBitmaps::getMarkerIndex("CIRCLE_FILLED", hGrp->GetInt("MarkerSize", defSize)));*/
}PY_CATCH;
}