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

Merge branch 'master' into master

Browse Source
This commit is contained in:
MisterMaker
2023-06-16 21:51:25 +02:00
committed by GitHub
parent b8c7a827a4 4b562b0082
commit 17f6dd6fad
32 changed files with 2463 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/CommandLink.cpp
View File

@@ -28,7 +28,7 @@
#endif
#include <App/Application.h>
#include <App/ComplexGeoData.h>
#include <App/ElementNamingUtils.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <App/Link.h>
@@ -294,8 +294,8 @@ void StdCmdLinkMakeRelative::activated(int) {
if(!sel.pObject || !sel.pObject->getNameInDocument())
continue;
auto key = std::make_pair(sel.pObject,
Data::ComplexGeoData::noElementName(sel.SubName));
auto element = Data::ComplexGeoData::findElementName(sel.SubName);
Data::noElementName(sel.SubName));
auto element = Data::findElementName(sel.SubName);
auto &info = linkInfo[key];
info.first = sel.pResolvedObject;
if(element && element[0])

4
src/Gui/Document.cpp
View File

@@ -36,11 +36,11 @@
#endif
#include <App/AutoTransaction.h>
#include <App/ComplexGeoData.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <App/DocumentObjectGroup.h>
#include <App/Transactions.h>
#include <App/ElementNamingUtils.h>
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Base/Matrix.h>
@@ -408,7 +408,7 @@ bool Document::setEdit(Gui::ViewProvider* p, int ModNum, const char *subname)
d->_editSubname.clear();
if (subname) {
const char *element = Data::ComplexGeoData::findElementName(subname);
const char *element = Data::findElementName(subname);
if (element) {
d->_editSubname = std::string(subname,element-subname);
d->_editSubElement = element;

4
src/Gui/NaviCube.cpp
View File

@@ -667,8 +667,8 @@ void NaviCubeImplementation::prepare() {
addCubeFace(y,-z-x, ShapeId::Edge, PickId::BottomLeft, M_PI);
// create the flat buttons
addButtonFace(PickId::ArrowNorth, SbVec3f(1, 0, 0));
addButtonFace(PickId::ArrowSouth, SbVec3f(-1, 0, 0));
addButtonFace(PickId::ArrowNorth, SbVec3f(-1, 0, 0));
addButtonFace(PickId::ArrowSouth, SbVec3f(1, 0, 0));
addButtonFace(PickId::ArrowEast, SbVec3f(0, 1, 0));
addButtonFace(PickId::ArrowWest, SbVec3f(0, -1, 0));
addButtonFace(PickId::ArrowLeft, SbVec3f(0, 0, 1));

4
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -71,7 +71,7 @@
#endif
#include <App/Document.h>
#include <App/ComplexGeoData.h>
#include <App/ElementNamingUtils.h>
#include <Base/Tools.h>
#include "SoFCUnifiedSelection.h"
@@ -624,7 +624,7 @@ bool SoFCUnifiedSelection::setSelection(const std::vector<PickedInfo> &infos, bo
objectName << ", " << subName);
std::string newElement;
if(subSelected) {
newElement = Data::ComplexGeoData::newElementName(subSelected);
newElement = Data::newElementName(subSelected);
subSelected = newElement.c_str();
std::string nextsub;
const char *next = strrchr(subSelected,'.');

8
src/Gui/TaskElementColors.cpp
View File

@@ -28,7 +28,7 @@
# include <sstream>
#endif
#include <App/ComplexGeoData.h>
#include <App/ElementNamingUtils.h>
#include <App/Document.h>
#include "TaskElementColors.h"
@@ -84,7 +84,7 @@ public:
auto obj = vpParent->getObject();
editDoc = obj->getDocument()->getName();
editObj = obj->getNameInDocument();
editSub = Data::ComplexGeoData::noElementName(editSub.c_str());
editSub = Data::noElementName(editSub.c_str());
}
}
if(editDoc.empty()) {
@@ -162,7 +162,7 @@ public:
c.setRgbF(color.r,color.g,color.b,1.0-color.a);
px.fill(c);
auto item = new QListWidgetItem(QIcon(px),
QString::fromLatin1(Data::ComplexGeoData::oldElementName(v.first.c_str()).c_str()),
QString::fromLatin1(Data::oldElementName(v.first.c_str()).c_str()),
ui->elementList);
item->setData(Qt::UserRole,c);
item->setData(Qt::UserRole+1,QString::fromLatin1(v.first.c_str()));
@@ -419,7 +419,7 @@ void ElementColors::onHideSelectionClicked() {
if(!subs.empty()) {
for(auto &sub : subs) {
if(boost::starts_with(sub,d->editSub)) {
auto name = Data::ComplexGeoData::noElementName(sub.c_str()+d->editSub.size());
auto name = Data::noElementName(sub.c_str()+d->editSub.size());
name += ViewProvider::hiddenMarker();
d->addItem(-1,name.c_str());
}

6
src/Gui/ViewProviderLink.cpp
View File

@@ -48,7 +48,7 @@
#endif
#include <boost/range.hpp>
#include <App/ComplexGeoData.h>
#include <App/ElementNamingUtils.h>
#include <App/Document.h>
#include <Base/BoundBoxPy.h>
#include <Base/MatrixPy.h>
@@ -635,7 +635,7 @@ public:
break;
}
// new style mapped sub-element
if(Data::ComplexGeoData::isMappedElement(dot+1))
if(Data::isMappedElement(dot+1))
break;
auto next = strchr(dot+1,'.');
if(!next) {
@@ -1031,7 +1031,7 @@ void LinkView::setLinkViewObject(ViewProviderDocumentObject *vpd,
subInfo.clear();
for(const auto &sub : subs) {
if(sub.empty()) continue;
const char *subelement = Data::ComplexGeoData::findElementName(sub.c_str());
const char *subelement = Data::findElementName(sub.c_str());
std::string subname = sub.substr(0,subelement-sub.c_str());
auto it = subInfo.find(subname);
if(it == subInfo.end()) {