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

Attacher: change suggestion routine interface

Browse Source 
When another bit of information was needed to be extracted from mode
suggestion routine, it felt like listMapModes had too many arguments.
So, the arguments have been collapsed into a struct. This triggered a
few namespace-related changes, which lead to massive search-and-replace
changes all over FreeCAD.

So the only functional change carried out is the addition of reference
types readout to info returned by suggestor.
This commit is contained in:
DeepSOIC
2016-05-04 17:03:18 +03:00
committed by wmayer
parent 22480effeb
commit 39249581eb
6 changed files with 123 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Mod/Part/App/Attacher.cpp
View File

@@ -258,31 +258,21 @@ Base::Placement AttachEngine::placementFactory(const gp_Dir &ZAxis,
}
eMapMode AttachEngine::listMapModes(eSuggestResult& msg,
std::vector<eMapMode>* allApplicableModes,
std::set<eRefType>* nextRefTypeHint,
std::map<eMapMode,refTypeStringList>* reachableModes) const
void AttachEngine::suggestMapModes(SuggestResult &result) const
{
//replace a pointer with a valid reference, to avoid checks for zero pointer everywhere
std::vector<eMapMode> buf;
if (allApplicableModes == 0)
allApplicableModes = &buf;
std::vector<eMapMode> &mlist = *allApplicableModes;
std::vector<eMapMode> &mlist = result.allApplicableModes;
mlist.clear();
mlist.reserve(mmDummy_NumberOfModes);
std::set<eRefType> buf2;
if (nextRefTypeHint == 0)
nextRefTypeHint = &buf2;
std::set<eRefType> &hints = *nextRefTypeHint;
std::set<eRefType> &hints = result.nextRefTypeHint;
hints.clear();
std::map<eMapMode,refTypeStringList> buf3;
if (reachableModes == 0)
reachableModes = &buf3;
std::map<eMapMode,refTypeStringList> &mlist_reachable = *reachableModes;
std::map<eMapMode,refTypeStringList> &mlist_reachable = result.reachableModes;
mlist_reachable.clear();
result.message = SuggestResult::srLinkBroken;
result.bestFitMode = mmDeactivated;
std::vector<App::GeoFeature*> parts;
std::vector<const TopoDS_Shape*> shapes;
@@ -290,15 +280,18 @@ eMapMode AttachEngine::listMapModes(eSuggestResult& msg,
std::vector<eRefType> typeStr;
try{
readLinks(this->references, parts, shapes, shapeStorage, typeStr);
} catch (Base::Exception) {
msg = srLinkBroken;
return mmDeactivated;
} catch (Base::Exception &err) {
result.references_Types = typeStr;
result.message = SuggestResult::srLinkBroken;
result.error = err;
return;
}
result.references_Types = typeStr;
//search valid modes.
eMapMode bestMatchType = mmDeactivated;
int bestMatchScore = -1;
msg = srNoModesFit;
result.message = SuggestResult::srNoModesFit;
for (std::size_t iMode = 0; iMode < this->modeRefTypes.size(); ++iMode) {
if (! this->modeEnabled[iMode])
continue;
@@ -352,8 +345,8 @@ eMapMode AttachEngine::listMapModes(eSuggestResult& msg,
if (score > -1){//still output a best match, even if it is not completely compatible
if (score > bestMatchScore){
bestMatchScore = score;
bestMatchType = eMapMode(iMode);
msg = score > 0 ? srOK : srIncompatibleGeometry;
result.bestFitMode = eMapMode(iMode);
result.message = score > 0 ? SuggestResult::srOK : SuggestResult::srIncompatibleGeometry;
}
}
if (score > 0){
@@ -365,16 +358,6 @@ eMapMode AttachEngine::listMapModes(eSuggestResult& msg,
}
}
return bestMatchType;
}
const std::set<eRefType> AttachEngine::getHint(bool forCurrentModeOnly) const
{
eSuggestResult msg;
std::set<eRefType> ret;
this->listMapModes(msg, 0, &ret);
return ret;
}
void AttachEngine::EnableAllSupportedModes()