Merge pull request #25920 from PaddleStroke/patch-840798
Sketcher: Fix warning when using dimension tool
This commit is contained in:
@@ -1948,9 +1948,7 @@ public:
|
||||
|
||||
if (selAllowed) {
|
||||
// If mouse is released on something allowed, select it
|
||||
Gui::Selection().addSelection(Obj->getDocument()->getName(),
|
||||
Obj->getNameInDocument(),
|
||||
ss.str().c_str(), onSketchPos.x, onSketchPos.y, 0.f);
|
||||
sketchgui->addSelection2(ss.str().c_str(), onSketchPos.x, onSketchPos.y, 0.f);
|
||||
sketchgui->draw(false, false); // Redraw
|
||||
}
|
||||
else {
|
||||
@@ -1967,9 +1965,7 @@ public:
|
||||
restartCommand(QT_TRANSLATE_NOOP("Command", "Dimension"));
|
||||
}
|
||||
|
||||
Gui::Selection().rmvSelection(Obj->getDocument()->getName(),
|
||||
Obj->getNameInDocument(),
|
||||
ss.str().c_str());
|
||||
sketchgui->rmvSelection(ss.str().c_str());
|
||||
sketchgui->draw(false, false); // Redraw
|
||||
}
|
||||
|
||||
|
||||
@@ -690,6 +690,11 @@ public:
|
||||
|
||||
void deleteSelected();
|
||||
|
||||
bool isSelected(const std::string& ss) const;
|
||||
void rmvSelection(const std::string& subNameSuffix);
|
||||
bool addSelection(const std::string& subNameSuffix, float x = 0, float y = 0, float z = 0);
|
||||
bool addSelection2(const std::string& subNameSuffix, float x = 0, float y = 0, float z = 0);
|
||||
|
||||
/// Control the overlays appearing on the Tree and reflecting different sketcher states
|
||||
QIcon mergeColorfulOverlayIcons(const QIcon& orig) const override;
|
||||
|
||||
@@ -829,10 +834,6 @@ private:
|
||||
void removeSelectPoint(int SelectPoint);
|
||||
void clearSelectPoints();
|
||||
|
||||
bool isSelected(const std::string& ss) const;
|
||||
void rmvSelection(const std::string& subNameSuffix);
|
||||
bool addSelection(const std::string& subNameSuffix, float x = 0, float y = 0, float z = 0);
|
||||
bool addSelection2(const std::string& subNameSuffix, float x = 0, float y = 0, float z = 0);
|
||||
void preselectToSelection(
|
||||
const std::stringstream& ss,
|
||||
boost::scoped_ptr<SoPickedPoint>& pp,
|
||||
|
||||
Reference in New Issue
Block a user