Skip to content

Commit

Permalink
Sketcher: allow copying of external geometry
Browse files Browse the repository at this point in the history 
Closes #1006
  • Loading branch information
@realthunder
realthunder committed Sep 28, 2024
1 parent ec878c9 commit 4f6e7e5
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 37 deletions.
28 changes: 26 additions & 2 deletions src/Mod/Sketcher/App/SketchObject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5358,12 +5358,30 @@ int SketchObject::addCopy(const std::vector<int>& geoIdList, const Base::Vector3
newgeoVals.reserve(geovals.size() + geoIdList.size());
}

std::vector<int> newgeoIdList(geoIdList);
std::vector<int> newgeoIdList;

if (newgeoIdList.empty()) {// default option to operate on all the geometry
if (geoIdList.empty()) {// default option to operate on all the geometry
for (int i = 0; i < int(geovals.size()); i++)
newgeoIdList.push_back(i);
}
else {
for (const auto &GeoId : geoIdList) {
if ((GeoId >= 0 && GeoId >= static_cast<int>(geovals.size()))
|| (GeoId < 0 && -GeoId-1 >= ExternalGeo.getSize())) {
FC_ERR("Invalid geometry index");
break;
}
else if (moveonly && GeoId < 0) {
FC_ERR("Cannot move external geometry");
break;
}
newgeoIdList.push_back(GeoId);
}
if (newgeoIdList.size() != geoIdList.size()) {
return Geometry.getSize() - 1;
}
}


int cgeoid = getHighestCurveIndex() + 1;

Expand Down Expand Up @@ -5476,6 +5494,12 @@ int SketchObject::addCopy(const std::vector<int>& geoIdList, const Base::Vector3
// moving
if (!moveonly) {
geocopy = geo->copy();
if (auto egf = ExternalGeometryFacade::getFacade(geo)) {
if(egf->testFlag(ExternalGeometryExtension::Defining)) {
GeometryFacade::setConstruction(geocopy, false);
}
geocopy->deleteExtension(ExternalGeometryExtension::getClassTypeId());
}
generateId(geocopy);
} else
geocopy = newgeoVals[*it];
Expand Down
71 changes: 36 additions & 35 deletions src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -961,16 +961,17 @@ void CmdSketcherSymmetry::activated(int iMsg)

for (std::vector<std::string>::const_iterator it = SubNames.begin(); it != SubNames.end();
++it) {
bool external = false;
// only handle non-external edges
if ((it->size() > 4 && it->substr(0, 4) == "Edge")
|| (it->size() > 12 && it->substr(0, 12) == "ExternalEdge")) {
if (boost::starts_with(*it, "Edge")
|| (external = boost::starts_with(*it, "ExternalEdge"))) {

if (it->substr(0, 4) == "Edge") {
LastGeoId = std::atoi(it->substr(4, 4000).c_str()) - 1;
if (!external) {
LastGeoId = std::atoi(it->c_str()+4) - 1;
LastPointPos = Sketcher::PointPos::none;
}
else {
LastGeoId = -std::atoi(it->substr(12, 4000).c_str()) - 2;
LastGeoId = -std::atoi(it->c_str()+12) - 2;
LastPointPos = Sketcher::PointPos::none;
}

Expand All @@ -983,10 +984,8 @@ void CmdSketcherSymmetry::activated(int iMsg)
lastgeotype = invalid;

// lines to make symmetric (only non-external)
if (LastGeoId >= 0) {
geoids++;
stream << LastGeoId << ",";
}
geoids++;
stream << LastGeoId << ",";
}
else if (it->size() > 6 && it->substr(0, 6) == "Vertex") {
// only if it is a GeomPoint
Expand All @@ -1001,10 +1000,8 @@ void CmdSketcherSymmetry::activated(int iMsg)
lastgeotype = point;

// points to make symmetric
if (LastGeoId >= 0) {
geoids++;
stream << LastGeoId << ",";
}
geoids++;
stream << LastGeoId << ",";
}
}
}
Expand Down Expand Up @@ -1344,16 +1341,20 @@ void SketcherCopy::activate(SketcherCopy::Op op)
int geoids = 0;
for (std::vector<std::string>::const_iterator it = SubNames.begin(); it != SubNames.end();
++it) {
// only handle non-external edges
if (it->size() > 4 && it->substr(0, 4) == "Edge") {
LastGeoId = std::atoi(it->substr(4, 4000).c_str()) - 1;
bool external = false;
if (boost::starts_with(*it, "Edge")
|| (external = boost::starts_with(*it, "ExternalEdge"))) {
if (!external) {
LastGeoId = std::atoi(it->c_str()+4) - 1;
}
else {
LastGeoId = -std::atoi(it->c_str()+12) - 2;
}
LastPointPos = Sketcher::PointPos::none;
LastGeo = Obj->getGeometry(LastGeoId);
// lines to copy
if (LastGeoId >= 0) {
geoids++;
stream << LastGeoId << ",";
}
geoids++;
stream << LastGeoId << ",";
}
else if (it->size() > 6 && it->substr(0, 6) == "Vertex") {
// only if it is a GeomPoint
Expand All @@ -1365,10 +1366,8 @@ void SketcherCopy::activate(SketcherCopy::Op op)
LastGeoId = GeoId;
LastPointPos = Sketcher::PointPos::start;
// points to copy
if (LastGeoId >= 0) {
geoids++;
stream << LastGeoId << ",";
}
geoids++;
stream << LastGeoId << ",";
}
}
}
Expand Down Expand Up @@ -1860,17 +1859,21 @@ void CmdSketcherRectangularArray::activated(int iMsg)

for (std::vector<std::string>::const_iterator it = SubNames.begin(); it != SubNames.end();
++it) {
// only handle non-external edges
if (it->size() > 4 && it->substr(0, 4) == "Edge") {
LastGeoId = std::atoi(it->substr(4, 4000).c_str()) - 1;
bool external = false;
if (boost::starts_with(*it, "Edge")
|| (external = boost::starts_with(*it, "ExternalEdge"))) {
if (!external) {
LastGeoId = std::atoi(it->c_str()+4) - 1;
}
else {
LastGeoId = -std::atoi(it->c_str()+12) - 2;
}
LastPointPos = Sketcher::PointPos::none;
LastGeo = Obj->getGeometry(LastGeoId);

// lines to copy
if (LastGeoId >= 0) {
geoids++;
stream << LastGeoId << ",";
}
geoids++;
stream << LastGeoId << ",";
}
else if (it->size() > 6 && it->substr(0, 6) == "Vertex") {
// only if it is a GeomPoint
Expand All @@ -1882,10 +1885,8 @@ void CmdSketcherRectangularArray::activated(int iMsg)
LastGeoId = GeoId;
LastPointPos = Sketcher::PointPos::start;
// points to copy
if (LastGeoId >= 0) {
geoids++;
stream << LastGeoId << ",";
}
geoids++;
stream << LastGeoId << ",";
}
}
}
Expand Down

0 comments on commit 4f6e7e5

Please sign in to comment.