Rotate DSH : Polar pattern tool for sketcher.

This commit is contained in:
Paddle
2023-11-03 18:51:17 +01:00
committed by abdullahtahiriyo
parent 68dd184646
commit a5a77fc0fd
7 changed files with 1711 additions and 0 deletions

View File

@@ -77,6 +77,7 @@ SET(SketcherGui_SRCS
DrawSketchHandlerCarbonCopy.h
DrawSketchHandlerSlot.h
DrawSketchHandlerOffset.h
DrawSketchHandlerRotate.h
CommandCreateGeo.cpp
CommandConstraints.h
CommandConstraints.cpp

View File

@@ -51,6 +51,7 @@
#include "ViewProviderSketch.h"
#include "DrawSketchHandlerOffset.h"
#include "DrawSketchHandlerRotate.h"
// Hint: this is to prevent to re-format big parts of the file. Remove it later again.
// clang-format off
@@ -58,6 +59,76 @@ using namespace std;
using namespace SketcherGui;
using namespace Sketcher;
std::vector<int> getListOfSelectedGeoIds(bool forceInternalSelection)
{
std::vector<int> listOfGeoIds = {};
// get the selection
std::vector<Gui::SelectionObject> selection;
selection = Gui::Selection().getSelectionEx(0, Sketcher::SketchObject::getClassTypeId());
// only one sketch with its subelements are allowed to be selected
if (selection.size() != 1) {
QMessageBox::warning(Gui::getMainWindow(),
QObject::tr("Wrong selection"),
QObject::tr("Select elements from a single sketch."));
return {};
}
// get the needed lists and objects
auto* Obj = static_cast<Sketcher::SketchObject*>(selection[0].getObject());
const std::vector<std::string>& subNames = selection[0].getSubNames();
if (!subNames.empty()) {
for (auto& name : subNames) {
// only handle non-external edges
if (name.size() > 4 && name.substr(0, 4) == "Edge") {
int geoId = std::atoi(name.substr(4, 4000).c_str()) - 1;
if (geoId >= 0) {
listOfGeoIds.push_back(geoId);
}
}
else if (name.size() > 6 && name.substr(0, 6) == "Vertex") {
// only if it is a GeomPoint
int VtId = std::atoi(name.substr(6, 4000).c_str()) - 1;
int geoId;
Sketcher::PointPos PosId;
Obj->getGeoVertexIndex(VtId, geoId, PosId);
if (isPoint(*Obj->getGeometry(geoId))) {
if (geoId >= 0) {
listOfGeoIds.push_back(geoId);
}
}
}
}
}
if (forceInternalSelection) {
size_t loopSize = listOfGeoIds.size();
for (size_t i = 0; i < loopSize; i++) {
const Part::Geometry* geo = Obj->getGeometry(listOfGeoIds[i]);
if (isEllipse(*geo) || isArcOfEllipse(*geo) || isArcOfHyperbola(*geo) || isArcOfParabola(*geo) || isBSplineCurve(*geo)) {
const std::vector<Sketcher::Constraint*>& constraints = Obj->Constraints.getValues();
for (auto constr : constraints) {
if (constr->Type == InternalAlignment && constr->Second == listOfGeoIds[i]) {
if (std::find(listOfGeoIds.begin(), listOfGeoIds.end(), constr->First) == listOfGeoIds.end()) {
// If the value is not found, add it to the vector
listOfGeoIds.push_back(constr->First);
}
}
}
}
}
}
if (listOfGeoIds.empty()) {
Gui::NotifyUserError(Obj,
QT_TRANSLATE_NOOP("Notifications", "Invalid selection"),
QT_TRANSLATE_NOOP("Notifications", "Selection has no valid geometries."));
}
return listOfGeoIds;
}
Sketcher::SketchObject* getSketchObject()
{
@@ -2299,6 +2370,40 @@ bool CmdSketcherOffset::isActive()
return isCommandActive(getActiveGuiDocument(), true);
}
// Rotate tool =====================================================================
DEF_STD_CMD_A(CmdSketcherRotate)
CmdSketcherRotate::CmdSketcherRotate()
: Command("Sketcher_Rotate")
{
sAppModule = "Sketcher";
sGroup = "Sketcher";
sMenuText = QT_TR_NOOP("Polar transform");
sToolTipText = QT_TR_NOOP("Rotate selected geometries, making n copies, enable creation of circular patterns.");
sWhatsThis = "Sketcher_Rotate";
sStatusTip = sToolTipText;
sPixmap = "Sketcher_Rotate";
sAccel = "Z, P";
eType = ForEdit;
}
void CmdSketcherRotate::activated(int iMsg)
{
Q_UNUSED(iMsg);
std::vector<int> listOfGeoIds = getListOfSelectedGeoIds(true);
if (!listOfGeoIds.empty()) {
ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerRotate(listOfGeoIds));
}
getSelection().clearSelection();
}
bool CmdSketcherRotate::isActive()
{
return isCommandActive(getActiveGuiDocument(), true);
}
void CreateSketcherCommandsConstraintAccel()
@@ -2317,6 +2422,7 @@ void CreateSketcherCommandsConstraintAccel()
rcCmdMgr.addCommand(new CmdSketcherSelectElementsWithDoFs());
rcCmdMgr.addCommand(new CmdSketcherRestoreInternalAlignmentGeometry());
rcCmdMgr.addCommand(new CmdSketcherOffset());
rcCmdMgr.addCommand(new CmdSketcherRotate());
rcCmdMgr.addCommand(new CmdSketcherSymmetry());
rcCmdMgr.addCommand(new CmdSketcherCopy());
rcCmdMgr.addCommand(new CmdSketcherClone());

View File

@@ -0,0 +1,669 @@
/***************************************************************************
* Copyright (c) 2022 Boyer Pierre-Louis <pierrelouis.boyer@gmail.com> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef SKETCHERGUI_DrawSketchHandlerRotate_H
#define SKETCHERGUI_DrawSketchHandlerRotate_H
#include <QApplication>
#include <Gui/BitmapFactory.h>
#include <Gui/Notifications.h>
#include <Gui/Command.h>
#include <Gui/CommandT.h>
#include "DrawSketchDefaultWidgetController.h"
#include "DrawSketchControllableHandler.h"
#include "GeometryCreationMode.h"
#include "Utils.h"
using namespace Sketcher;
namespace SketcherGui
{
class DrawSketchHandlerRotate;
using DSHRotateController =
DrawSketchDefaultWidgetController<DrawSketchHandlerRotate,
StateMachines::ThreeSeekEnd,
/*PAutoConstraintSize =*/0,
/*OnViewParametersT =*/OnViewParameters<4>,
/*WidgetParametersT =*/WidgetParameters<1>,
/*WidgetCheckboxesT =*/WidgetCheckboxes<1>,
/*WidgetComboboxesT =*/WidgetComboboxes<0>>;
using DSHRotateControllerBase = DSHRotateController::ControllerBase;
using DrawSketchHandlerRotateBase = DrawSketchControllableHandler<DSHRotateController>;
class DrawSketchHandlerRotate: public DrawSketchHandlerRotateBase
{
friend DSHRotateController;
friend DSHRotateControllerBase;
public:
explicit DrawSketchHandlerRotate(std::vector<int> listOfGeoIds)
: listOfGeoIds(listOfGeoIds)
, deleteOriginal(false)
, cloneConstraints(false)
, length(0.0)
, startAngle(0.0)
, endAngle(0.0)
, totalAngle(0.0)
, individualAngle(0.0)
, numberOfCopies(0)
{}
DrawSketchHandlerRotate(const DrawSketchHandlerRotate&) = delete;
DrawSketchHandlerRotate(DrawSketchHandlerRotate&&) = delete;
DrawSketchHandlerRotate& operator=(const DrawSketchHandlerRotate&) = delete;
DrawSketchHandlerRotate& operator=(DrawSketchHandlerRotate&&) = delete;
~DrawSketchHandlerRotate() override = default;
private:
void updateDataAndDrawToPosition(Base::Vector2d onSketchPos) override
{
switch (state()) {
case SelectMode::SeekFirst: {
centerPoint = onSketchPos;
} break;
case SelectMode::SeekSecond: {
length = (onSketchPos - centerPoint).Length();
startAngle = (onSketchPos - centerPoint).Angle();
startPoint = onSketchPos;
CreateAndDrawShapeGeometry();
} break;
case SelectMode::SeekThird: {
endAngle = (onSketchPos - centerPoint).Angle();
endpoint = centerPoint + length * Base::Vector2d(cos(endAngle), sin(endAngle));
double angle1 = endAngle - startAngle;
double angle2 = angle1 + (angle1 < 0. ? 2 : -2) * M_PI;
totalAngle = abs(angle1 - totalAngle) < abs(angle2 - totalAngle) ? angle1 : angle2;
CreateAndDrawShapeGeometry();
} break;
default:
break;
}
}
void executeCommands() override
{
try {
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Rotate geometries"));
createShape(false);
commandAddShapeGeometryAndConstraints();
if (deleteOriginal) {
deleteOriginalGeos();
}
Gui::Command::commitCommand();
}
catch (const Base::Exception& e) {
e.ReportException();
Gui::NotifyError(sketchgui,
QT_TRANSLATE_NOOP("Notifications", "Error"),
QT_TRANSLATE_NOOP("Notifications", "Failed to rotate"));
Gui::Command::abortCommand();
THROWM(Base::RuntimeError,
QT_TRANSLATE_NOOP(
"Notifications",
"Tool execution aborted") "\n") // This prevents constraints from being
// applied on non existing geometry
}
}
void createAutoConstraints() override
{
// none
}
std::string getToolName() const override
{
return "DSH_Rotate";
}
QString getCrosshairCursorSVGName() const override
{
return QString::fromLatin1("Sketcher_Pointer_Create_Rotate");
}
std::unique_ptr<QWidget> createWidget() const override
{
return std::make_unique<SketcherToolDefaultWidget>();
}
bool isWidgetVisible() const override
{
return true;
};
QPixmap getToolIcon() const override
{
return Gui::BitmapFactory().pixmap("Sketcher_Rotate");
}
QString getToolWidgetText() const override
{
return QString(QObject::tr("Rotate parameters"));
}
void activated() override
{
DrawSketchDefaultHandler::activated();
continuousMode = false;
}
bool canGoToNextMode() override
{
if (state() == SelectMode::SeekThird && fabs(totalAngle) < Precision::Confusion()) {
// Prevent validation rotation of 0deg.
return false;
}
return true;
}
void angleSnappingControl() override
{
if (state() == SelectMode::SeekSecond || state() == SelectMode::SeekThird) {
setAngleSnapping(true, centerPoint);
}
else {
setAngleSnapping(false);
}
}
private:
std::vector<int> listOfGeoIds;
Base::Vector2d centerPoint, startPoint, endpoint;
bool deleteOriginal, cloneConstraints;
double length, startAngle, endAngle, totalAngle, individualAngle;
int numberOfCopies;
void deleteOriginalGeos()
{
std::stringstream stream;
for (size_t j = 0; j < listOfGeoIds.size() - 1; j++) {
stream << listOfGeoIds[j] << ",";
}
stream << listOfGeoIds[listOfGeoIds.size() - 1];
try {
Gui::cmdAppObjectArgs(sketchgui->getObject(),
"delGeometries([%s])",
stream.str().c_str());
}
catch (const Base::Exception& e) {
Base::Console().Error("%s\n", e.what());
}
}
void createShape(bool onlyeditoutline) override
{
SketchObject* Obj = sketchgui->getSketchObject();
ShapeGeometry.clear();
if (state() == SelectMode::SeekSecond) {
if (length > Precision::Confusion()) {
addLineToShapeGeometry(toVector3d(centerPoint),
toVector3d(startPoint),
isConstructionMode());
}
return;
}
int numberOfCopiesToMake = numberOfCopies;
if (numberOfCopies == 0) {
numberOfCopiesToMake = 1;
deleteOriginal = true;
}
else {
deleteOriginal = false;
}
individualAngle = totalAngle / numberOfCopiesToMake;
for (int i = 1; i <= numberOfCopiesToMake; i++) {
for (auto& geoId : listOfGeoIds) {
const Part::Geometry* pGeo = Obj->getGeometry(geoId);
auto geoUniquePtr = std::unique_ptr<Part::Geometry>(pGeo->copy());
Part::Geometry* geo = geoUniquePtr.get();
double angle = individualAngle * i;
if (isCircle(*geo)) {
auto* circle = static_cast<Part::GeomCircle*>(geo); // NOLINT
circle->setCenter(getRotatedPoint(circle->getCenter(), centerPoint, angle));
}
else if (isArcOfCircle(*geo)) {
auto* arcOfCircle = static_cast<Part::GeomArcOfCircle*>(geo); // NOLINT
arcOfCircle->setCenter(
getRotatedPoint(arcOfCircle->getCenter(), centerPoint, angle));
double arcStartAngle, arcEndAngle; // NOLINT
arcOfCircle->getRange(arcStartAngle, arcEndAngle, /*emulateCCWXY=*/true);
arcOfCircle->setRange(arcStartAngle + angle,
arcEndAngle + angle,
/*emulateCCWXY=*/true);
}
else if (isLineSegment(*geo)) {
auto* line = static_cast<Part::GeomLineSegment*>(geo); // NOLINT
line->setPoints(getRotatedPoint(line->getStartPoint(), centerPoint, angle),
getRotatedPoint(line->getEndPoint(), centerPoint, angle));
}
else if (isEllipse(*geo)) {
auto* ellipse = static_cast<Part::GeomEllipse*>(geo); // NOLINT
ellipse->setCenter(getRotatedPoint(ellipse->getCenter(), centerPoint, angle));
ellipse->setMajorAxisDir(
getRotatedPoint(ellipse->getMajorAxisDir(), Base::Vector2d(0., 0.), angle));
}
else if (isArcOfEllipse(*geo)) {
auto* arcOfEllipse = static_cast<Part::GeomArcOfEllipse*>(geo); // NOLINT
arcOfEllipse->setCenter(
getRotatedPoint(arcOfEllipse->getCenter(), centerPoint, angle));
arcOfEllipse->setMajorAxisDir(getRotatedPoint(arcOfEllipse->getMajorAxisDir(),
Base::Vector2d(0., 0.),
angle));
}
else if (isArcOfHyperbola(*geo)) {
auto* arcOfHyperbola = static_cast<Part::GeomArcOfHyperbola*>(geo); // NOLINT
arcOfHyperbola->setCenter(
getRotatedPoint(arcOfHyperbola->getCenter(), centerPoint, angle));
arcOfHyperbola->setMajorAxisDir(
getRotatedPoint(arcOfHyperbola->getMajorAxisDir(),
Base::Vector2d(0., 0.),
angle));
}
else if (isArcOfParabola(*geo)) {
auto* arcOfParabola = static_cast<Part::GeomArcOfParabola*>(geo); // NOLINT
arcOfParabola->setCenter(
getRotatedPoint(arcOfParabola->getCenter(), centerPoint, angle));
arcOfParabola->setAngleXU(arcOfParabola->getAngleXU() + angle);
}
else if (isBSplineCurve(*geo)) {
auto* bSpline = static_cast<Part::GeomBSplineCurve*>(geo); // NOLINT
std::vector<Base::Vector3d> poles = bSpline->getPoles();
for (size_t p = 0; p < poles.size(); p++) {
poles[p] = getRotatedPoint(std::move(poles[p]), centerPoint, angle);
}
bSpline->setPoles(poles);
}
else if (isPoint(*geo)) {
auto* point = static_cast<Part::GeomPoint*>(geo); // NOLINT
point->setPoint(getRotatedPoint(point->getPoint(), centerPoint, angle));
}
ShapeGeometry.emplace_back(std::move(geoUniquePtr));
}
}
if (onlyeditoutline) {
// Add the lines to show angle
addLineToShapeGeometry(toVector3d(centerPoint), toVector3d(startPoint), true);
addLineToShapeGeometry(toVector3d(centerPoint), toVector3d(endpoint), true);
}
else {
int firstCurveCreated = getHighestCurveIndex() + 1;
size_t size = listOfGeoIds.size();
using namespace Sketcher;
const std::vector<Constraint*>& vals = Obj->Constraints.getValues();
// avoid applying equal several times if cloning distanceX and distanceY of the
// same part.
std::vector<int> geoIdsWhoAlreadyHasEqual = {};
for (auto& cstr : vals) {
int firstIndex = indexInVec(listOfGeoIds, cstr->First);
int secondIndex = indexInVec(listOfGeoIds, cstr->Second);
int thirdIndex = indexInVec(listOfGeoIds, cstr->Third);
for (int i = 0; i < numberOfCopiesToMake; i++) {
int firstIndexi = firstCurveCreated + firstIndex + static_cast<int>(size) * i;
int secondIndexi = firstCurveCreated + secondIndex + static_cast<int>(size) * i;
int thirdIndexi = firstCurveCreated + thirdIndex + static_cast<int>(size) * i;
auto newConstr = std::unique_ptr<Constraint>(cstr->copy());
newConstr->First = firstIndexi;
if ((cstr->Type == Symmetric || cstr->Type == Tangent
|| cstr->Type == Perpendicular || cstr->Type == Angle)
&& firstIndex >= 0 && secondIndex >= 0 && thirdIndex >= 0) {
newConstr->Second = secondIndexi;
newConstr->Third = thirdIndexi;
}
else if ((cstr->Type == Coincident || cstr->Type == Tangent
|| cstr->Type == Symmetric || cstr->Type == Perpendicular
|| cstr->Type == Parallel || cstr->Type == Equal
|| cstr->Type == Angle || cstr->Type == PointOnObject
|| cstr->Type == InternalAlignment)
&& firstIndex >= 0 && secondIndex >= 0
&& thirdIndex == GeoEnum::GeoUndef) {
newConstr->Second = secondIndexi;
}
else if ((cstr->Type == Radius || cstr->Type == Diameter
|| cstr->Type == Weight)
&& firstIndex >= 0) {
if (deleteOriginal || !cloneConstraints) {
newConstr->setValue(cstr->getValue());
}
else {
newConstr->Type = Equal;
newConstr->First = cstr->First;
newConstr->Second = firstIndexi;
}
}
else if ((cstr->Type == Distance || cstr->Type == DistanceX
|| cstr->Type == DistanceY)
&& firstIndex >= 0 && secondIndex >= 0) {
if (!deleteOriginal && cloneConstraints
&& cstr->First == cstr->Second) { // only line distances
if (indexInVec(geoIdsWhoAlreadyHasEqual, secondIndexi) != -1) {
continue;
}
newConstr->Type = Equal;
newConstr->First = cstr->First;
newConstr->Second = secondIndexi;
geoIdsWhoAlreadyHasEqual.push_back(secondIndexi);
}
else {
newConstr->Second = secondIndexi;
}
}
else if ((cstr->Type == Block) && firstIndex >= 0) {
newConstr->First = firstIndexi;
}
else {
continue;
}
ShapeConstraints.push_back(std::move(newConstr));
}
}
}
}
int indexInVec(const std::vector<int>& vec, int elem) const
{
if (elem == GeoEnum::GeoUndef) {
return GeoEnum::GeoUndef;
}
for (size_t i = 0; i < vec.size(); i++) {
if (vec[i] == elem) {
return static_cast<int>(i);
}
}
return -1;
}
Base::Vector3d
getRotatedPoint(Base::Vector3d&& pointToRotate, const Base::Vector2d& centerPoint, double angle)
{
Base::Vector2d pointToRotate2D = Base::Vector2d(pointToRotate.x, pointToRotate.y);
double initialAngle = (pointToRotate2D - centerPoint).Angle();
double lengthToCenter = (pointToRotate2D - centerPoint).Length();
pointToRotate2D = centerPoint
+ lengthToCenter * Base::Vector2d(cos(angle + initialAngle), sin(angle + initialAngle));
pointToRotate.x = pointToRotate2D.x;
pointToRotate.y = pointToRotate2D.y;
return pointToRotate;
}
};
template<>
auto DSHRotateControllerBase::getState(int labelindex) const
{
switch (labelindex) {
case OnViewParameter::First:
case OnViewParameter::Second:
return SelectMode::SeekFirst;
break;
case OnViewParameter::Third:
return SelectMode::SeekSecond;
break;
case OnViewParameter::Fourth:
return SelectMode::SeekThird;
break;
default:
THROWM(Base::ValueError, "OnViewParameter index without an associated machine state")
}
}
template<>
void DSHRotateController::firstKeyShortcut()
{
auto value = toolWidget->getParameter(WParameter::First);
toolWidget->setParameterWithoutPassingFocus(OnViewParameter::First, value + 1);
}
template<>
void DSHRotateController::secondKeyShortcut()
{
auto value = toolWidget->getParameter(WParameter::First);
if (value > 0.0) {
toolWidget->setParameterWithoutPassingFocus(OnViewParameter::First, value - 1);
}
}
template<>
void DSHRotateController::configureToolWidget()
{
if (!init) { // Code to be executed only upon initialisation
toolWidget->setCheckboxLabel(
WCheckbox::FirstBox,
QApplication::translate("TaskSketcherTool_c1_offset", "Clone constraints"));
toolWidget->setCheckboxToolTip(
WCheckbox::FirstBox,
QApplication::translate(
"TaskSketcherTool_c1_offset",
"This concerns the datum constraints like distances. If you activate Clone, "
"then the tool will copy the datum. Else it will try to replace them with "
"equalities between the initial geometries and the new copies."));
}
onViewParameters[OnViewParameter::First]->setLabelType(Gui::SoDatumLabel::DISTANCEX);
onViewParameters[OnViewParameter::Second]->setLabelType(Gui::SoDatumLabel::DISTANCEY);
onViewParameters[OnViewParameter::Third]->setLabelType(
Gui::SoDatumLabel::ANGLE,
Gui::EditableDatumLabel::Function::Dimensioning);
onViewParameters[OnViewParameter::Fourth]->setLabelType(
Gui::SoDatumLabel::ANGLE,
Gui::EditableDatumLabel::Function::Dimensioning);
toolWidget->setParameterLabel(
WParameter::First,
QApplication::translate("TaskSketcherTool_p4_rotate", "Copies 'U'/'J'"));
toolWidget->setParameter(OnViewParameter::First, 0.0);
toolWidget->configureParameterUnit(OnViewParameter::First, Base::Unit());
toolWidget->configureParameterMin(OnViewParameter::First, 0.0); // NOLINT
toolWidget->configureParameterMax(OnViewParameter::First, 9999.0); // NOLINT
toolWidget->configureParameterDecimals(OnViewParameter::First, 0);
}
template<>
void DSHRotateController::adaptDrawingToParameterChange(int parameterindex, double value)
{
switch (parameterindex) {
case WParameter::First:
handler->numberOfCopies = floor(abs(value));
break;
}
}
template<>
void DSHRotateController::adaptDrawingToCheckboxChange(int checkboxindex, bool value)
{
switch (checkboxindex) {
case WCheckbox::FirstBox: {
handler->cloneConstraints = value;
} break;
}
}
template<>
void DSHRotateControllerBase::doEnforceControlParameters(Base::Vector2d& onSketchPos)
{
switch (handler->state()) {
case SelectMode::SeekFirst: {
if (onViewParameters[OnViewParameter::First]->isSet) {
onSketchPos.x = onViewParameters[OnViewParameter::First]->getValue();
}
if (onViewParameters[OnViewParameter::Second]->isSet) {
onSketchPos.y = onViewParameters[OnViewParameter::Second]->getValue();
}
} break;
case SelectMode::SeekSecond: {
if (onViewParameters[OnViewParameter::Third]->isSet) {
double arcAngle =
Base::toRadians(onViewParameters[OnViewParameter::Third]->getValue());
if (fmod(fabs(arcAngle), 2 * M_PI) < Precision::Confusion()) {
unsetOnViewParameter(onViewParameters[OnViewParameter::Third].get());
return;
}
onSketchPos.x = handler->centerPoint.x + 1;
onSketchPos.y = handler->centerPoint.y;
}
} break;
case SelectMode::SeekThird: {
if (onViewParameters[OnViewParameter::Fourth]->isSet) {
double arcAngle =
Base::toRadians(onViewParameters[OnViewParameter::Fourth]->getValue());
if (fmod(fabs(arcAngle), 2 * M_PI) < Precision::Confusion()) {
unsetOnViewParameter(onViewParameters[OnViewParameter::Fourth].get());
return;
}
onSketchPos.x = handler->centerPoint.x + cos((handler->startAngle + arcAngle));
onSketchPos.y = handler->centerPoint.y + sin((handler->startAngle + arcAngle));
}
} break;
default:
break;
}
}
template<>
void DSHRotateController::adaptParameters(Base::Vector2d onSketchPos)
{
switch (handler->state()) {
case SelectMode::SeekFirst: {
if (!onViewParameters[OnViewParameter::First]->isSet) {
setOnViewParameterValue(OnViewParameter::First, onSketchPos.x);
}
if (!onViewParameters[OnViewParameter::Second]->isSet) {
setOnViewParameterValue(OnViewParameter::Second, onSketchPos.y);
}
bool sameSign = onSketchPos.x * onSketchPos.y > 0.;
onViewParameters[OnViewParameter::First]->setLabelAutoDistanceReverse(!sameSign);
onViewParameters[OnViewParameter::Second]->setLabelAutoDistanceReverse(sameSign);
onViewParameters[OnViewParameter::First]->setPoints(Base::Vector3d(),
toVector3d(onSketchPos));
onViewParameters[OnViewParameter::Second]->setPoints(Base::Vector3d(),
toVector3d(onSketchPos));
} break;
case SelectMode::SeekSecond: {
double range = Base::toDegrees(handler->startAngle);
if (!onViewParameters[OnViewParameter::Third]->isSet) {
setOnViewParameterValue(OnViewParameter::Third, range, Base::Unit::Angle);
}
Base::Vector3d start = toVector3d(handler->centerPoint);
onViewParameters[OnViewParameter::Third]->setPoints(start, Base::Vector3d());
onViewParameters[OnViewParameter::Third]->setLabelRange(handler->startAngle);
} break;
case SelectMode::SeekThird: {
double range = Base::toDegrees(handler->totalAngle);
if (!onViewParameters[OnViewParameter::Fourth]->isSet) {
setOnViewParameterValue(OnViewParameter::Fourth, range, Base::Unit::Angle);
}
Base::Vector3d start = toVector3d(handler->centerPoint);
onViewParameters[OnViewParameter::Fourth]->setPoints(start, Base::Vector3d());
onViewParameters[OnViewParameter::Fourth]->setLabelStartAngle(handler->startAngle);
onViewParameters[OnViewParameter::Fourth]->setLabelRange(handler->totalAngle);
} break;
default:
break;
}
}
template<>
void DSHRotateController::doChangeDrawSketchHandlerMode()
{
switch (handler->state()) {
case SelectMode::SeekFirst: {
if (onViewParameters[OnViewParameter::First]->isSet
&& onViewParameters[OnViewParameter::Second]->isSet) {
handler->setState(SelectMode::SeekSecond);
}
} break;
case SelectMode::SeekSecond: {
if (onViewParameters[OnViewParameter::Third]->isSet) {
handler->totalAngle =
Base::toRadians(onViewParameters[OnViewParameter::Third]->getValue());
handler->setState(SelectMode::End);
}
} break;
case SelectMode::SeekThird: {
if (onViewParameters[OnViewParameter::Fourth]->isSet) {
handler->setState(SelectMode::End);
}
} break;
default:
break;
}
}
} // namespace SketcherGui
#endif // SKETCHERGUI_DrawSketchHandlerRotate_H

View File

@@ -232,6 +232,7 @@
<file>icons/pointers/Sketcher_Pointer_Create_Lineset.svg</file>
<file>icons/pointers/Sketcher_Pointer_Create_Point.svg</file>
<file>icons/pointers/Sketcher_Pointer_Create_Offset.svg</file>
<file>icons/pointers/Sketcher_Pointer_Create_Rotate.svg</file>
<file>icons/pointers/Sketcher_Pointer_Extension.svg</file>
<file>icons/pointers/Sketcher_Pointer_External.svg</file>
<file>icons/pointers/Sketcher_Pointer_InsertKnot.svg</file>
@@ -281,6 +282,7 @@
<file>icons/tools/Sketcher_SelectRedundantConstraints.svg</file>
<file>icons/tools/Sketcher_SelectVerticalAxis.svg</file>
<file>icons/tools/Sketcher_Symmetry.svg</file>
<file>icons/tools/Sketcher_Rotate.svg</file>
<file>icons/tools/Sketcher_Offset.svg</file>
<file>icons/tools/Sketcher_OffsetArc.svg</file>
<file>icons/tools/Sketcher_OffsetIntersection.svg</file>

View File

@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.1"
height="64"
width="64"
id="svg12"
sodipodi:docname="Sketcher_Pointer_Create_Rotate.svg"
inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview10"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
objecttolerance="10.0"
gridtolerance="10.0"
guidetolerance="10.0"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="8.3195532"
inkscape:cx="51.865766"
inkscape:cy="18.991404"
inkscape:window-width="3840"
inkscape:window-height="1570"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg12" />
<defs
id="defs16">
<marker
style="overflow:visible"
id="Arrow1Lstart"
refX="0.0"
refY="0.0"
orient="auto"
inkscape:stockid="Arrow1Lstart"
inkscape:isstock="true">
<path
transform="scale(0.8) translate(12.5,0)"
style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
id="path4362" />
</marker>
</defs>
<g
id="crosshair"
style="stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter">
<path
d="m16,3v9m0,8v9m-13-13h9m8,0h9"
id="path9" />
</g>
<path
style="fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 29.214914,34.439165 42.157865,29.821941 53.135692,38.188102 51.170566,51.171488 38.227617,55.788712 27.24979,47.422551 Z"
id="path3643" />
<path
style="fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 58.802646,33.137616 C 57.542789,26.170233 53.070885,21.623889 44.18064,22.732304 l 2.183951,-2.01555 0.761953,4.431188 -4.762987,-1.881068"
id="path3645"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 18.581684,44.491061 c -0.863982,7.027461 2.057747,12.695853 10.876564,14.274941 l -2.683602,1.276857 0.587018,-4.457737 3.990452,3.209479"
id="path3645-4"
sodipodi:nodetypes="ccccc" />
</svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@@ -0,0 +1,859 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
version="1.1"
id="svg2869"
height="64px"
width="64px"
sodipodi:docname="Sketcher_Rotate.svg"
inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<sodipodi:namedview
id="namedview107"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
objecttolerance="10.0"
gridtolerance="10.0"
guidetolerance="10.0"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="1.0399442"
inkscape:cx="224.53129"
inkscape:cy="29.809293"
inkscape:window-width="3840"
inkscape:window-height="1570"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg2869" />
<defs
id="defs2871">
<linearGradient
id="linearGradient3144">
<stop
id="stop3146"
offset="0"
style="stop-color:#ffffff;stop-opacity:1" />
<stop
id="stop3148"
offset="1"
style="stop-color:#ffffff;stop-opacity:0" />
</linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5114"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5118"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5130"
xlink:href="#linearGradient3144" />
<linearGradient
id="linearGradient3144-9-6">
<stop
id="stop3146-2-9"
offset="0"
style="stop-color:#ffffff;stop-opacity:1" />
<stop
id="stop3148-6-5"
offset="1"
style="stop-color:#ffffff;stop-opacity:0" />
</linearGradient>
<linearGradient
id="linearGradient3144-0">
<stop
id="stop3146-0"
offset="0"
style="stop-color:#ffffff;stop-opacity:1" />
<stop
id="stop3148-5"
offset="1"
style="stop-color:#ffffff;stop-opacity:0" />
</linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3150-8"
xlink:href="#linearGradient3144-0" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3166"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3209"
xlink:href="#linearGradient3144-9-6" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4003"
xlink:href="#linearGradient3144-9-6" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4017"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(0.75636158,0.04652811,-0.0510977,0.69887118,89.261365,192.11757)"
gradientUnits="userSpaceOnUse"
id="radialGradient4019"
xlink:href="#linearGradient3144-0" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4025"
xlink:href="#linearGradient3144" />
<linearGradient
id="linearGradient3836-9-7">
<stop
id="stop3838-8-0"
offset="0"
style="stop-color:#a40000;stop-opacity:1" />
<stop
id="stop3840-1-9"
offset="1"
style="stop-color:#ef2929;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient3836-9-3">
<stop
id="stop3838-8-5"
offset="0"
style="stop-color:#a40000;stop-opacity:1" />
<stop
id="stop3840-1-6"
offset="1"
style="stop-color:#ef2929;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient3836-9">
<stop
id="stop3838-8"
offset="0"
style="stop-color:#a40000;stop-opacity:1" />
<stop
id="stop3840-1"
offset="1"
style="stop-color:#ef2929;stop-opacity:1" />
</linearGradient>
<linearGradient
y2="13.649589"
x2="-12.869251"
y1="10.114055"
x1="-24.890066"
gradientUnits="userSpaceOnUse"
id="linearGradient3091"
xlink:href="#linearGradient3836-9" />
<linearGradient
gradientTransform="rotate(-135,22.739878,17.776008)"
y2="13.465822"
x2="-11.638764"
y1="8.5160742"
x1="-25.073793"
gradientUnits="userSpaceOnUse"
id="linearGradient3093"
xlink:href="#linearGradient3836-9-7" />
<linearGradient
id="linearGradient3836-9-7-6">
<stop
id="stop3838-8-0-7"
offset="0"
style="stop-color:#a40000;stop-opacity:1" />
<stop
id="stop3840-1-9-5"
offset="1"
style="stop-color:#ef2929;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient3836-9-5">
<stop
id="stop3838-8-6"
offset="0"
style="stop-color:#a40000;stop-opacity:1" />
<stop
id="stop3840-1-2"
offset="1"
style="stop-color:#ef2929;stop-opacity:1" />
</linearGradient>
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5114-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5118-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5130-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3150-8-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3166-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3209-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4003-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4017-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4019-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.75636158,0.04652811,-0.0510977,0.69887118,89.261365,192.11757)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4025-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5114-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5118-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5130-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3306"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3308"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
id="linearGradient3836-9-7-3">
<stop
style="stop-color:#4e9a06;stop-opacity:1"
offset="0"
id="stop3838-8-0-74" />
<stop
style="stop-color:#8ae234;stop-opacity:1"
offset="1"
id="stop3840-1-9-52" />
</linearGradient>
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5114-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5118-1"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5130-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5114-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5118-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient5130-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3150-8-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3166-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient3209-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4003-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4017-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4019-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.75636158,0.04652811,-0.0510977,0.69887118,89.261365,192.11757)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
xlink:href="#linearGradient3144"
id="radialGradient4025-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5114-6-9"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5118-2-2"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5130-9-2"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3150-8-9-8"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3166-3-9"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3209-6-7"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4003-0-3"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4017-6-6"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(0.75636158,0.04652811,-0.0510977,0.69887118,89.261365,192.11757)"
gradientUnits="userSpaceOnUse"
id="radialGradient4019-2-1"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4025-6-2"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5114-4-9"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5118-7-3"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5130-6-1"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3306-9"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3308-4"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5114-3-4"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5118-1-5"
xlink:href="#linearGradient3144" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient5130-4-0"
xlink:href="#linearGradient3144" />
<linearGradient
xlink:href="#linearGradient3836-9-7"
id="linearGradient923"
gradientUnits="userSpaceOnUse"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
xlink:href="#linearGradient3836-9-7"
id="linearGradient3801-1-3-7-3"
gradientUnits="userSpaceOnUse"
x1="-18"
y1="18"
x2="-22"
y2="5" />
</defs>
<metadata
id="metadata2874">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>[Abdullah Tahiri]</dc:title>
</cc:Agent>
</dc:creator>
<dc:date>2015-08-11</dc:date>
<dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
<dc:publisher>
<cc:Agent>
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier>FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Movy.svg</dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
</cc:Agent>
</dc:rights>
<cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
<dc:contributor>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson, vocx</dc:title>
</cc:Agent>
</dc:contributor>
<dc:description>A faded curve with two vertices, an arrow pointing right, to a colored curve with red vertices, indicating that the object was moved from one location to the other.</dc:description>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="g1942"
transform="matrix(0.77462165,0.11542363,-0.11542363,0.77462165,-54.160557,8.8403412)">
<g
id="g1639">
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 85.705652,39.254404 36.510728,0.03213 -0.0643,-36.0755714"
id="path3042" />
<g
id="g5444"
transform="matrix(0.12582856,0,0,0.13656888,-116.075,-78.506633)">
<rect
style="fill:none;fill-opacity:1;stroke:#2e3436;stroke-width:61.1235;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3579"
width="320.34793"
height="290.3475"
x="1581.9229"
y="577.53864"
ry="72.587051" />
<rect
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:15.2809;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3579-9-4"
width="334.35117"
height="306.85471"
x="1574.9211"
y="569.28497"
ry="76.713875" />
<rect
style="fill:none;fill-opacity:1;stroke:#d3d7cf;stroke-width:15.2809;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3579-9"
width="308.51923"
height="283.05432"
x="1587.837"
y="581.18518"
ry="70.763763" />
</g>
</g>
<g
id="g1893"
transform="matrix(0.92702216,0,0,0.92702216,60.747574,-46.780667)">
<path
style="fill:none;stroke:#2e3436;stroke-width:7.99999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.9;stroke-dasharray:none;stroke-opacity:1"
id="path3064"
d="m 87.99875,70.15496 -24,12.819254 L 40.058512,69.793468 40.118273,43.793467 64.118272,30.974213 88.058511,44.15496 Z" />
<path
style="fill:none;stroke:#d3d7cf;stroke-width:4.00001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.9;stroke-dasharray:none;stroke-opacity:1"
id="path3064-3"
d="m 87.99875,70.15496 -24,12.819254 L 40.058512,69.793468 40.118273,43.793467 64.118272,30.974213 88.058511,44.15496 Z" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.9;stroke-opacity:1"
d="m 39.058511,70.286516 0.06225,-27 25,-13.312301 24.93775,13.687698"
id="path3064-3-6" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.9;stroke-opacity:1"
d="m 87.058511,44.648008 -0.05727,25 -23,12.326206 -22.94273,-12.673794"
id="path3064-3-6-7" />
</g>
</g>
<g
transform="translate(-85.615168,-0.22217772)"
id="g1167">
<g
id="g4062-7"
transform="matrix(-1,0,0,1,111,-6.8353643)" />
</g>
<g
id="g885"
transform="matrix(-0.21873005,0.77810846,-0.77810846,-0.21873005,82.022689,23.278834)">
<path
style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
d="m 37,33 v 8 L 26,28 37,15 v 8 c 14,0 24,10 24,26 H 51 C 51,41 47,33 37,33 Z"
id="path3892-0" />
<path
style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 35,20.5 28.6,28 35,35.5 V 31 c 9,-1 17,5 18,16 h 6 C 59,36 51,24 35,25 Z"
id="path3918" />
</g>
<g
id="g885-7"
transform="matrix(0.25133292,-0.76819748,0.76819748,0.25133292,-19.085604,37.764938)">
<path
style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
d="m 37,33 v 8 L 26,28 37,15 v 8 c 14,0 24,10 24,26 H 51 C 51,41 47,33 37,33 Z"
id="path3892-0-4" />
<path
style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 35,20.5 28.6,28 35,35.5 V 31 c 9,-1 17,5 18,16 h 6 C 59,36 51,24 35,25 Z"
id="path3918-0" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 27 KiB

View File

@@ -534,6 +534,7 @@ inline void SketcherAddWorkbenchTools<Gui::MenuItem>(Gui::MenuItem& consaccel)
<< "Sketcher_SelectVerticalAxis"
<< "Separator"
<< "Sketcher_Offset"
<< "Sketcher_Rotate"
<< "Sketcher_Symmetry"
<< "Sketcher_Clone"
<< "Sketcher_Copy"
@@ -558,6 +559,7 @@ inline void SketcherAddWorkbenchTools<Gui::ToolBarItem>(Gui::ToolBarItem& consac
//<< "Sketcher_SelectConflictingConstraints"
<< "Sketcher_RestoreInternalAlignmentGeometry"
<< "Sketcher_Offset"
<< "Sketcher_Rotate"
<< "Sketcher_Symmetry"
<< "Sketcher_CompCopy"
<< "Sketcher_RectangularArray"