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

Merge branch 'uccnc_postprocessor' of https://github.com/papaathome/FreeCAD into uccnc_postprocessor

Browse Source
This commit is contained in:
andre
2021-03-26 09:37:28 +01:00
parent 5abd19f121 ce6c53a6a4
commit 8d186b5a59
45 changed files with 2409 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/fedora/freecad.spec
View File

@@ -339,3 +339,5 @@ fi
%files data
%{_datadir}/%{name}/
%{_docdir}/%{name}/%{name}.q*
%{_docdir}/%{name}/CONTRIBUTORS
%{_docdir}/%{name}/LICENSE.html

2
src/App/ExpressionParser.l
View File

@@ -274,6 +274,8 @@ EXPO [eE][-+]?[0-9]+
"kV" COUNTCHARS; yylval.quantity.scaler = Quantity::KiloVolt; yylval.quantity.unitStr = yytext; return UNIT; // kilo Volt
"mV" COUNTCHARS; yylval.quantity.scaler = Quantity::MilliVolt; yylval.quantity.unitStr = yytext; return UNIT; // milli Volt
"MS" COUNTCHARS; yylval.quantity.scaler = Quantity::MegaSiemens; yylval.quantity.unitStr = yytext; return UNIT; // mega Siemens
"kS" COUNTCHARS; yylval.quantity.scaler = Quantity::KiloSiemens; yylval.quantity.unitStr = yytext; return UNIT; // kilo Siemens
"S" COUNTCHARS; yylval.quantity.scaler = Quantity::Siemens; yylval.quantity.unitStr = yytext; return UNIT; // Siemens (A^2*s^3/kg/m^2)
"mS" COUNTCHARS; yylval.quantity.scaler = Quantity::MilliSiemens; yylval.quantity.unitStr = yytext; return UNIT; // milli Siemens
"uS" COUNTCHARS; yylval.quantity.scaler = Quantity::MicroSiemens; yylval.quantity.unitStr = yytext; return UNIT; // micro Siemens

3
src/App/FreeCADInit.py
View File

@@ -731,6 +731,8 @@ App.Units.Volt = App.Units.Quantity('V')
App.Units.MilliVolt = App.Units.Quantity('mV')
App.Units.KiloVolt = App.Units.Quantity('kV')
App.Units.MegaSiemens = App.Units.Quantity('MS')
App.Units.KiloSiemens = App.Units.Quantity('kS')
App.Units.Siemens = App.Units.Quantity('S')
App.Units.MilliSiemens = App.Units.Quantity('mS')
App.Units.MicroSiemens = App.Units.Quantity('uS')
@@ -807,6 +809,7 @@ App.Units.ElectricalCapacitance = App.Units.Unit(-2,-1,4,2)
App.Units.ElectricalInductance = App.Units.Unit(2,1,-2,-2)
App.Units.ElectricalConductance = App.Units.Unit(-2,-1,3,2)
App.Units.ElectricalResistance = App.Units.Unit(2,1,-3,-2)
App.Units.ElectricalConductivity = App.Units.Unit(-3,-1,3,2)
App.Units.AmountOfSubstance = App.Units.Unit(0,0,0,0,0,1)
App.Units.LuminousIntensity = App.Units.Unit(0,0,0,0,0,0,1)

2
src/Base/Quantity.cpp
View File

@@ -331,6 +331,8 @@ Quantity Quantity::Volt (1e+6 ,Unit(2,1,-3,-1)); // Volt (k
Quantity Quantity::MilliVolt (1e+3 ,Unit(2,1,-3,-1));
Quantity Quantity::KiloVolt (1e+9 ,Unit(2,1,-3,-1));
Quantity Quantity::MegaSiemens (1.0 ,Unit(-2,-1,3,2));
Quantity Quantity::KiloSiemens (1e-3 ,Unit(-2,-1,3,2));
Quantity Quantity::Siemens (1e-6 ,Unit(-2,-1,3,2)); // Siemens (A^2*s^3/kg/m^2)
Quantity Quantity::MilliSiemens (1e-9 ,Unit(-2,-1,3,2));
Quantity Quantity::MicroSiemens (1e-12 ,Unit(-2,-1,3,2));

2
src/Base/Quantity.h
View File

@@ -268,6 +268,8 @@ public:
static Quantity MilliVolt;
static Quantity KiloVolt;
static Quantity MegaSiemens;
static Quantity KiloSiemens;
static Quantity Siemens;
static Quantity MilliSiemens;
static Quantity MicroSiemens;

880
src/Base/QuantityLexer.c
View File

File diff suppressed because it is too large Load Diff

2
src/Base/QuantityParser.l
View File

@@ -164,6 +164,8 @@ CGRP '\,'[0-9][0-9][0-9]
"kV" yylval = Quantity::KiloVolt; return UNIT; // kilo Volt
"mV" yylval = Quantity::MilliVolt; return UNIT; // milli Volt
"MS" yylval = Quantity::MegaSiemens; return UNIT; // mega Siemens
"kS" yylval = Quantity::KiloSiemens; return UNIT; // kilo Siemens
"S" yylval = Quantity::Siemens; return UNIT; // Siemens (A^2*s^3/kg/m^2)
"mS" yylval = Quantity::MilliSiemens; return UNIT; // milli Siemens
"\xC2\xB5S" yylval = Quantity::MicroSiemens; return UNIT; // micro Siemens

2
src/Base/Unit.cpp
View File

@@ -447,6 +447,7 @@ QString Unit::getTypeString(void) const
if(*this == Unit::ElectricalInductance ) return QString::fromLatin1("ElectricalInductance");
if(*this == Unit::ElectricalConductance ) return QString::fromLatin1("ElectricalConductance");
if(*this == Unit::ElectricalResistance ) return QString::fromLatin1("ElectricalResistance");
if(*this == Unit::ElectricalConductivity ) return QString::fromLatin1("ElectricalConductivity");
if(*this == Unit::AmountOfSubstance ) return QString::fromLatin1("AmountOfSubstance");
if(*this == Unit::LuminousIntensity ) return QString::fromLatin1("LuminousIntensity");
if(*this == Unit::Pressure ) return QString::fromLatin1("Pressure");
@@ -495,6 +496,7 @@ Unit Unit::ElectricalCapacitance(-2,-1,4,2);
Unit Unit::ElectricalInductance(2,1,-2,-2);
Unit Unit::ElectricalConductance(-2,-1,3,2);
Unit Unit::ElectricalResistance(2,1,-3,-2);
Unit Unit::ElectricalConductivity(-3,-1,3,2);
Unit Unit::AmountOfSubstance(0,0,0,0,0,1);
Unit Unit::LuminousIntensity(0,0,0,0,0,0,1);

1
src/Base/Unit.h
View File

@@ -121,6 +121,7 @@ public:
static Unit ElectricalInductance;
static Unit ElectricalConductance;
static Unit ElectricalResistance;
static Unit ElectricalConductivity;
static Unit AmountOfSubstance;
static Unit LuminousIntensity;

18
src/Base/UnitsSchemaInternal.cpp
View File

@@ -360,6 +360,24 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact
factor = 1e12;
}
}
else if (unit == Unit::ElectricalConductivity) {
if (UnitValue < 1e-3) {
unitString = QString::fromLatin1("mS/m");
factor = 1e-12;
}
else if (UnitValue < 1.0) {
unitString = QString::fromLatin1("S/m");
factor = 1e-9;
}
else if (UnitValue < 1e3) {
unitString = QString::fromLatin1("kS/m");
factor = 1e-6;
}
else {
unitString = QString::fromLatin1("MS/m");
factor = 1e-3;
}
}
else if (unit == Unit::ElectricalCapacitance) {
if (UnitValue < 1e-15) {
unitString = QString::fromLatin1("pF");

18
src/Base/UnitsSchemaMKS.cpp
View File

@@ -307,6 +307,24 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity &quant, double &factor, Q
factor = 1e12;
}
}
else if (unit == Unit::ElectricalConductivity) {
if (UnitValue < 1e-3) {
unitString = QString::fromLatin1("mS/m");
factor = 1e-12;
}
else if (UnitValue < 1.0) {
unitString = QString::fromLatin1("S/m");
factor = 1e-9;
}
else if (UnitValue < 1e3) {
unitString = QString::fromLatin1("kS/m");
factor = 1e-6;
}
else {
unitString = QString::fromLatin1("MS/m");
factor = 1e-3;
}
}
else if (unit == Unit::ElectricalCapacitance) {
if (UnitValue < 1e-15) {
unitString = QString::fromLatin1("pF");

2
src/Ext/freecad/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
"from distutils.sysconfig import get_python_lib; print(get_python_lib())"
"from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix='', plat_specific=True))"
OUTPUT_VARIABLE python_libs OUTPUT_STRIP_TRAILING_WHITESPACE )
SET(PYTHON_MAIN_DIR ${python_libs})

1
src/Gui/DlgUnitsCalculatorImp.cpp
View File

@@ -81,6 +81,7 @@ DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl )
<< Base::Unit::ElectricalInductance
<< Base::Unit::ElectricalConductance
<< Base::Unit::ElectricalResistance
<< Base::Unit::ElectricalConductivity
<< Base::Unit::ElectricCharge
<< Base::Unit::ElectricCurrent
<< Base::Unit::ElectricPotential

3
src/Gui/PropertyView.cpp
View File

@@ -89,9 +89,6 @@ PropertyView::PropertyView(QWidget *parent)
tabs = new QTabWidget (this);
tabs->setObjectName(QString::fromUtf8("propertyTab"));
tabs->setTabPosition(QTabWidget::South);
#if defined(Q_OS_WIN32)
tabs->setTabShape(QTabWidget::Triangular);
#endif
pLayout->addWidget(tabs, 0, 0);
propertyEditorView = new Gui::PropertyEditor::PropertyEditor();

8
src/Mod/Fem/Gui/Resources/ui/MeshGmsh.ui
View File

@@ -34,7 +34,7 @@
<item row="1" column="0">
<widget class="QLabel" name="l_dimension">
<property name="text">
<string>Mesh element dimension:</string>
<string>Element dimension:</string>
</property>
</widget>
</item>
@@ -135,7 +135,7 @@
<item row="2" column="0">
<widget class="QLabel" name="I_order">
<property name="text">
<string>Mesh order</string>
<string>Element order:</string>
</property>
</widget>
</item>
@@ -195,7 +195,7 @@
</property>
</spacer>
</item>
<item row="7" column="0">
<item row="7" column="0">
<widget class="QPushButton" name="pb_get_gmsh_version">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -208,7 +208,7 @@
</property>
</widget>
</item>
</layout>
</layout>
</item>
</layout>
</item>

2
src/Mod/Fem/femguiutils/selection_widgets.py
View File

@@ -231,7 +231,7 @@ class SmallListView(QtGui.QListView):
class GeometryElementsSelection(QtGui.QWidget):
def __init__(self, ref, eltypes=[], multigeom, showHintEmptyList):
def __init__(self, ref, eltypes, multigeom, showHintEmptyList):
super(GeometryElementsSelection, self).__init__()
# init ui stuff
FreeCADGui.Selection.clearSelection()

3
src/Mod/Fem/femviewprovider/view_mesh_gmsh.py
View File

@@ -96,10 +96,9 @@ class VPMeshGmsh:
)
"""
# overwrite unsetEdit, hide mesh object on task panel exit
# overwrite unsetEdit
def unsetEdit(self, vobj, mode):
FreeCADGui.Control.closeDialog()
self.ViewObject.hide()
return True
def doubleClicked(self, vobj):

11
src/Mod/Material/StandardMaterial/TEMPLATE.FCMat
View File

@@ -94,7 +94,7 @@ YoungsModulus =
[Thermal]
; Description to be updated
; Specific capacity in [FreeCAD SpecificHeat unit]
; https://en.wikipedia.org/wiki/Heat_capacity
SpecificHeat =
@@ -106,6 +106,15 @@ ThermalConductivity =
; https://en.wikipedia.org/wiki/Volumetric_thermal_expansion_coefficient
ThermalExpansionCoefficient =
[Electrical]
; The ratio to the permittivity of the vacuum
; https://en.wikipedia.org/wiki/Relative_permittivity
RelativePermittivity =
; The electrical conductivity in [FreeCAD ElectricalConductivity unit]
; https://en.wikipedia.org/wiki/Electrical_resistivity_and_conductivity
ElectricalConductivity =
[Architectural]
; Description to be updated

10
src/Mod/Material/Templatematerial.yml
View File

@@ -142,11 +142,11 @@
SpecificHeat:
Type: 'Quantity'
URL: 'https://en.wikipedia.org/wiki/Heat_capacity'
Description: " "
Description: "Specific capacity in [FreeCAD SpecificHeat unit]"
ThermalConductivity:
Type: 'Quantity'
URL: 'https://en.wikipedia.org/wiki/Thermal_conductivity'
Description: "Thermal conductivity in [FreCAD ThermalConductivity unit]"
Description: "Thermal conductivity in [FreeCAD ThermalConductivity unit]"
ThermalExpansionCoefficient:
Type: 'Quantity'
URL: 'https://en.wikipedia.org/wiki/Volumetric_thermal_expansion_coefficient'
@@ -155,7 +155,11 @@
RelativePermittivity:
Type: 'Float'
URL: 'https://en.wikipedia.org/wiki/Relative_permittivity'
Description: "a material property, expressing the ratio to the permittivity of the Vacuum"
Description: "The ratio to the permittivity of the vacuum"
ElectricalConductivity:
Type: 'Quantity'
URL: 'https://en.wikipedia.org/wiki/Electrical_resistivity_and_conductivity'
Description: "The electrical conductivity in [FreeCAD ElectricalConductivity unit]"
- Architectural:
Color:
Type: 'String'

33
src/Mod/Mesh/Gui/RemeshGmsh.cpp
View File

@@ -92,16 +92,25 @@ GmshWidget::GmshWidget(QWidget* parent, Qt::WindowFlags fl)
d->syntax = new Gui::DockWnd::ReportHighlighter(d->ui.outputWindow);
d->ui.outputWindow->setReadOnly(true);
// Meshing algorithms
// 1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad
// 9=Packing of Parallelograms
d->ui.method->addItem(tr("Automatic"), static_cast<int>(2));
d->ui.method->addItem(tr("Adaptive"), static_cast<int>(1));
d->ui.method->addItem(QString::fromLatin1("Delaunay"), static_cast<int>(5));
d->ui.method->addItem(tr("Frontal"), static_cast<int>(6));
d->ui.method->addItem(QString::fromLatin1("BAMG"), static_cast<int>(5));
d->ui.method->addItem(tr("Frontal Quad"), static_cast<int>(6));
d->ui.method->addItem(tr("Parallelograms"), static_cast<int>(9));
// 2D Meshing algorithms
// https://gmsh.info/doc/texinfo/gmsh.html#index-Mesh_002eAlgorithm
enum {
MeshAdapt = 1,
Automatic = 2,
Delaunay = 5,
FrontalDelaunay = 6,
BAMG = 7,
FrontalDelaunayForQuads = 8,
PackingOfParallelograms = 9
};
d->ui.method->addItem(tr("Automatic"), static_cast<int>(Automatic));
d->ui.method->addItem(tr("Adaptive"), static_cast<int>(MeshAdapt));
d->ui.method->addItem(QString::fromLatin1("Delaunay"), static_cast<int>(Delaunay));
d->ui.method->addItem(tr("Frontal"), static_cast<int>(FrontalDelaunay));
d->ui.method->addItem(QString::fromLatin1("BAMG"), static_cast<int>(BAMG));
d->ui.method->addItem(tr("Frontal Quad"), static_cast<int>(FrontalDelaunayForQuads));
d->ui.method->addItem(tr("Parallelograms"), static_cast<int>(PackingOfParallelograms));
}
GmshWidget::~GmshWidget()
@@ -316,9 +325,9 @@ bool RemeshGmsh::writeProject(QString& inpFile, QString& outFile)
<< " Exit;\n"
<< "EndIf\n"
<< "Merge \"" << stl.filePath() << "\";\n\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad)\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad, 9=Packing of Parallelograms)\n"
<< "Mesh.Algorithm = " << algorithm << ";\n\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 5=Frontal Delaunay, 6=Frontal Hex, 7=MMG3D, 9=R-tree)\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 7=MMG3D, 9=R-tree, 10=HTX)\n"
<< "// Mesh.Algorithm3D = 1;\n\n"
<< "Mesh.CharacteristicLengthMax = " << maxSize << ";\n"
<< "Mesh.CharacteristicLengthMin = " << minSize << ";\n\n"

4
src/Mod/MeshPart/Gui/Tessellation.cpp
View File

@@ -484,9 +484,9 @@ bool Mesh2ShapeGmsh::writeProject(QString& inpFile, QString& outFile)
<< "// Second order nodes are created by linear interpolation instead by curvilinear\n"
<< "Mesh.SecondOrderLinear = 1;\n\n"
<< "// mesh algorithm, only a few algorithms are usable with 3D boundary layer generation\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=DelQuad)\n"
<< "// 2D mesh algorithm (1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=DelQuad, 9=Packing of Parallelograms)\n"
<< "Mesh.Algorithm = " << algorithm << ";\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 5=Frontal Delaunay, 6=Frontal Hex, 7=MMG3D, 9=R-tree)\n"
<< "// 3D mesh algorithm (1=Delaunay, 2=New Delaunay, 4=Frontal, 7=MMG3D, 9=R-tree, 10=HTX)\n"
<< "Mesh.Algorithm3D = 1;\n\n"
<< "// meshing\n"
<< "// set geometrical tolerance (also used for merging nodes)\n"

2
src/Mod/Part/Gui/CommandSimple.cpp
View File

@@ -181,7 +181,7 @@ CmdPartPointsFromMesh::CmdPartPointsFromMesh()
sToolTipText = QT_TR_NOOP("Create selectable points object from selected mesh object");
sWhatsThis = "Part_PointsFromMesh";
sStatusTip = sToolTipText;
sPixmap = "Part_Points_from_Mesh";
sPixmap = "Part_PointsFromMesh";
}
void CmdPartPointsFromMesh::activated(int iMsg)

2
src/Mod/Part/Gui/Resources/Part.qrc
View File

@@ -72,7 +72,7 @@
<file>icons/tools/Part_Mirror.svg</file>
<file>icons/tools/Part_Offset.svg</file>
<file>icons/tools/Part_Offset2D.svg</file>
<file>icons/tools/Part_Points_from_Mesh.svg</file>
<file>icons/tools/Part_PointsFromMesh.svg</file>
<file>icons/tools/Part_ProjectionOnSurface.svg</file>
<file>icons/tools/Part_Refine_Shape.svg</file>
<file>icons/tools/Part_Reverse_Shape.svg</file>

124
src/Mod/Part/Gui/Resources/icons/tools/Part_MakeFace.svg
View File

@@ -1,109 +1,35 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
width="64px"
height="64px"
id="svg2825"
version="1.1">
<title
id="title848">Part_MakeFace</title>
<defs
id="defs2827">
<linearGradient
id="linearGradient889">
<stop
style="stop-color:#204a87;stop-opacity:1;"
offset="0"
id="stop885" />
<stop
style="stop-color:#729fcf;stop-opacity:1"
offset="1"
id="stop887" />
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64px" height="64px" id="svg2825" version="1.1">
<title id="title848">Part_MakeFace</title>
<defs id="defs2827">
<linearGradient id="linearGradient889">
<stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop885" />
<stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop887" />
</linearGradient>
<linearGradient
id="linearGradient3836-0">
<stop
style="stop-color:#c4a000;stop-opacity:1;"
offset="0"
id="stop3838-2" />
<stop
style="stop-color:#fce94f;stop-opacity:1;"
offset="1"
id="stop3840-5" />
<linearGradient id="linearGradient3836-0">
<stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3838-2" />
<stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3840-5" />
</linearGradient>
<linearGradient
id="linearGradient3836-0-6">
<stop
style="stop-color:#c4a000;stop-opacity:1;"
offset="0"
id="stop3838-2-7" />
<stop
style="stop-color:#fce94f;stop-opacity:1;"
offset="1"
id="stop3840-5-5" />
<linearGradient id="linearGradient3836-0-6">
<stop style="stop-color:#c4a000;stop-opacity:1" offset="0" id="stop3838-2-7" />
<stop style="stop-color:#fce94f;stop-opacity:1" offset="1" id="stop3840-5-5" />
</linearGradient>
<linearGradient
xlink:href="#linearGradient889"
id="linearGradient891"
x1="38"
y1="51"
x2="17"
y2="19"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.82608697,0,0,0.82608697,10.434783,10.434782)" />
<linearGradient xlink:href="#linearGradient889" id="linearGradient891" x1="38" y1="51" x2="17" y2="19" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.82608697,0,0,0.82608697,10.434783,10.434782)" />
</defs>
<g
id="layer1">
<g
id="g3527"
transform="matrix(0.12582859,0,0,0.13656891,-119.21901,-53.81056)">
<path
id="rect2233"
d="M 971.31349,415.98457 V 752.81086 H 1336.8902 V 415.98457 Z m 43.86921,44.36492 274.0236,-0.43105 v 248.95857 l -274.0236,0.0646 z"
style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:15.2568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.913045,10.935149 H 9.1739164 v 43.063378"
id="path3040"
transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2.08668;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
id="path3042"
transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)" />
<g id="layer1">
<g id="g3527" transform="matrix(0.12582859,0,0,0.13656891,-119.21901,-53.81056)">
<path id="rect2233" d="M 977.50867,421.69252 V 753.79102 L 1336.8902,752.81086 L 1337.954,421.69252 Z M 1007.5458,449.36739 L 1307.9169,449.36739 L 1307.9169,726.11615 H 1007.5458 Z" style="fill:#ef2929;fill-opacity:1;stroke:#a40000;stroke-width:15.2568;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<rect
style="fill:url(#linearGradient891);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill"
id="rect881"
width="38"
height="36.347828"
x="22"
y="23.652174" />
<rect
style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill"
id="rect883"
width="36.347828"
height="34.695652"
x="22.826086"
y="24.47826"
ry="0" />
<rect style="fill:url(#linearGradient891);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" id="rect881" width="38" height="36.347828" x="22" y="23.652174" />
<rect style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" id="rect883" width="36.347828" height="34.695652" x="22.826086" y="24.47826" ry="0" />
</g>
<metadata
id="metadata5305">
<metadata id="metadata5305">
<rdf:RDF>
<cc:Work
rdf:about="">
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Part_MakeFace</dc:title>
<cc:license
rdf:resource="" />
<cc:license rdf:resource="" />
<dc:date>12-01-2021</dc:date>
<dc:creator>
<cc:Agent>
@@ -120,14 +46,14 @@
<dc:title>FreeCAD</dc:title>
</cc:Agent>
</dc:publisher>
<dc:identifier></dc:identifier>
<dc:identifier />
<dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
<dc:contributor>
<cc:Agent>
<dc:title></dc:title>
<dc:title />
</cc:Agent>
</dc:contributor>
<dc:description></dc:description>
<dc:description />
<dc:subject>
<rdf:Bag />
</dc:subject>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

281
src/Mod/Part/Gui/Resources/icons/tools/Part_PointsFromMesh.svg Normal file
View File

@@ -0,0 +1,281 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="1.1"
id="svg2985"
height="64px"
width="64px">
<title
id="title889">Part_PointsFromMesh</title>
<defs
id="defs2987">
<linearGradient
id="linearGradient4387">
<stop
id="stop4389"
offset="0"
style="stop-color:#71b2f8;stop-opacity:1;" />
<stop
id="stop4391"
offset="1"
style="stop-color:#002795;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient6321">
<stop
id="stop6323"
offset="0"
style="stop-color:#71b2f8;stop-opacity:1;" />
<stop
id="stop6325"
offset="1"
style="stop-color:#002795;stop-opacity:1;" />
</linearGradient>
<radialGradient
gradientTransform="translate(-0.23443224,0.23443198)"
gradientUnits="userSpaceOnUse"
r="19.467436"
fy="28.869568"
fx="45.883327"
cy="28.869568"
cx="45.883327"
id="radialGradient3692"
xlink:href="#linearGradient3377" />
<linearGradient
id="linearGradient3377">
<stop
style="stop-color:#faff2b;stop-opacity:1;"
offset="0"
id="stop3379" />
<stop
style="stop-color:#ffaa00;stop-opacity:1;"
offset="1"
id="stop3381" />
</linearGradient>
<linearGradient
id="linearGradient3377-3">
<stop
style="stop-color:#faff2b;stop-opacity:1;"
offset="0"
id="stop3379-8" />
<stop
style="stop-color:#ffaa00;stop-opacity:1;"
offset="1"
id="stop3381-3" />
</linearGradient>
<radialGradient
r="19.467436"
fy="28.869568"
fx="45.883327"
cy="28.869568"
cx="45.883327"
gradientTransform="matrix(0.67067175,0,0,0.64145918,-63.380792,0.83845403)"
gradientUnits="userSpaceOnUse"
id="radialGradient6412"
xlink:href="#linearGradient3377-3" />
<linearGradient
xlink:href="#linearGradient3036"
id="linearGradient3049"
gradientUnits="userSpaceOnUse"
gradientTransform="rotate(33.834399,20.280412,56.143946)"
x1="14.824193"
y1="50.468616"
x2="20.93985"
y2="56.000233" />
<linearGradient
id="linearGradient3036">
<stop
style="stop-color:#ef2929;stop-opacity:1"
offset="0"
id="stop3038" />
<stop
style="stop-color:#a40000;stop-opacity:1"
offset="1"
id="stop3040" />
</linearGradient>
</defs>
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>Part_PointsFromMesh</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>[bitacovir]</dc:title>
</cc:Agent>
</dc:creator>
<dc:title>Part_Shape_from_Mesh</dc:title>
<dc:date>2021-03-21</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 />
<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>Based on Alexander Gryson's work</dc:title>
</cc:Agent>
</dc:contributor>
</cc:Work>
</rdf:RDF>
</metadata>
<g
style="stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none"
id="g3042"
transform="matrix(0.67067175,0,0,0.55048347,-120.90697,-52.046252)">
<path
id="path3150-7-4"
d="m 226.49973,114.52887 v 36.3317 l -17.89251,14.53268 v -36.33171 z"
style="fill:#4e9a06;stroke:none" />
<path
id="path3930-0"
d="M 208.60722,161.76008 226.49973,147.2274"
style="fill:none;stroke:#73d216;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3932-9"
d="m 223.51764,154.49374 v -36.3317"
style="fill:none;stroke:#73d216;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3934-4"
d="m 226.49973,118.16204 -17.89251,14.53267"
style="fill:none;stroke:#73d216;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3936-8"
d="m 211.5893,125.42838 v 36.3317"
style="fill:none;stroke:#73d216;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3152-1-8"
d="m 208.60722,165.39325 -23.85668,-14.53268 v -36.3317 l 23.85668,14.53267 z"
style="fill:#73d216;stroke:none" />
<path
id="path3938-2"
d="m 205.62513,129.06154 v 32.69854"
style="fill:none;stroke:#8ae234;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3940-4"
d="m 184.75054,147.2274 23.85668,14.53268"
style="fill:none;stroke:#8ae234;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3942-5"
d="M 187.73263,150.86057 V 118.16204"
style="fill:none;stroke:#8ae234;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3150-5"
d="m 226.49973,114.52887 v 36.3317 l -17.89251,14.53268 v -36.33171 z"
style="fill:none;stroke:#172a04;stroke-width:3.29157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3944-1"
d="M 208.60722,132.69471 184.75054,118.16204"
style="fill:none;stroke:#8ae234;stroke-width:3.29157;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3152-7"
d="m 208.60722,165.39325 -23.85668,-14.53268 v -36.3317 l 23.85668,14.53267 z"
style="fill:none;stroke:#172a04;stroke-width:3.29157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3156-1"
d="m 226.49973,114.52887 -17.89251,14.53267 -23.85668,-14.53267 17.89251,-14.532675 23.85668,14.532675"
style="fill:#8ae234;stroke:#172a04;stroke-width:3.29157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3928-5"
d="m 184.75054,114.52887 h 41.74919"
style="fill:none;stroke:#172a04;stroke-width:3.29157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3928-5-3"
d="m 184.75054,150.86057 23.85668,-21.79902"
style="fill:none;stroke:#172a04;stroke-width:3.29157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path3928-5-6"
d="m 208.60722,165.39325 17.89251,-50.86438"
style="fill:none;stroke:#172a04;stroke-width:3.29157;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3049);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.2;marker:none;enable-background:accumulate"
d="m 14.577858,56.963669 14.422159,0.03633 -5.51345,-13.326736 -2.227176,3.322601 -9.967806,-6.681533 -4.4543552,6.645202 9.9678062,6.681534 z"
id="rect3165" />
<path
style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
d="m 18.466336,54.754657 1.113588,-1.6613 -9.9678041,-6.681534 3.3407661,-4.983901"
id="path4087" />
<path
style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 15.768199,54.861321 12.089968,0.0052"
id="path4089" />
<path
style="fill:none;stroke:#ef2929;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 17.918624,51.979768 0.547712,2.774889"
id="path4091" />
<path
style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 27.041007,56.356585 22.755847,45.99721"
id="path4042" />
<path
style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
d="m 15.058839,56.727355 14.422158,0.03633 -5.51345,-13.326735 -2.227175,3.322601 -9.967805,-6.681534 -4.4543552,6.645203 9.9678052,6.681533 z"
id="rect3165-1" />
<ellipse
id="path3896-0-1-8"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
cx="44.866348"
cy="26.883219"
rx="1.9999998"
ry="2.0000005" />
<ellipse
ry="2.0000005"
rx="1.9999998"
cy="37.621815"
cx="58.983444"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3896-0-1-8-6" />
<ellipse
ry="2.0000005"
rx="1.9999998"
cy="44.767174"
cx="48.710922"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3896-0-1-8-4" />
<ellipse
ry="2.0000005"
rx="1.9999998"
cy="51.824265"
cx="34.651279"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3896-0-1-8-9" />
<ellipse
ry="2.0000005"
rx="1.9999998"
cy="35.536747"
cx="34.120564"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3896-0-1-8-92" />
<ellipse
ry="2.0000005"
rx="1.9999998"
cy="58.979542"
cx="49.133045"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3896-0-1-8-41" />
<ellipse
ry="2.0000005"
rx="1.9999998"
cy="52.966244"
cx="58.995705"
style="display:inline;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3896-0-1-8-3" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

99
src/Mod/Part/Gui/Resources/icons/tools/Part_Points_from_Mesh.svg
View File

@@ -1,99 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg815"
width="64"
height="64"
viewBox="0 0 64 64"
sodipodi:docname="Part_Points_from_Mesh.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata821">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs819" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1001"
id="namedview817"
showgrid="false"
inkscape:zoom="12.625"
inkscape:cx="32"
inkscape:cy="32"
inkscape:window-x="1791"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:current-layer="svg815" />
<image
width="64"
height="64"
preserveAspectRatio="none"
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAB+5JREFU
eJztmltsFNcZx39nZry7Xu8Fg+1dY4NjGqdgLqIhanCCSNM2qFKlNm0fqlKkSihNpTxEvakXtfBQ
Hqq8REHhIVKjtJUgIb2kjdQkVZQ0D9ACLSQkQOLgADW+rNcXDLteey8zc/owu8t6d73em+td5J+0
Dz4zc+Y7/+87cz5/58AKK5RFW68m/b2aXG47KkWU+oC/V5PZoxbA2Id6yX3VAiUZ7Ut6XFEFO7/l
o3VDI6ePjRG8MpfurN6EKNrY1OBbuh186Ydd+Hoa09cG3wtz4oUAwYHZdK/BS/UhxKJG+jZrEgmK
ItjxjVZ2facdRcv/WD0KUdC4Ql4vRD0JkdeoUrxeiHoQIseYcr1eiFoWIm2EL2NNV20Kmq369pm6
RI9LpJl8lYTgR8srhJKv0dQlpl79HEfRxPypVAMxoGU3qA0CIyFJRCUt3Q769vrp2bUKUaGxk9ei
/P3pQYIDc5V1VGVypsDjR3v56J2bnDoaQI9ZUVCJEKYhOffKBCd/H8DUJaoGhn77enCZE6e8Arhb
bACcfjnAmRfHyxYi0+sCaN6g0rRaZehsPH1PzQqgG3E0tTwhsr2uNEDfd5to69V49clbmCbI5Mtr
VoDJ0CiqouFq9NKg2oHihMjn9T0HPah2wennw1x5O8GqTpWbwwZQ4wIYpjVZbZojLYSU8K9jI5z9
42RaCN+nGtn5bT8TV+c481IQw5CoDbDzey66d9mIzxqM9s9y+lkdfU6yY5+Tc0etnGC5BchZBfIR
16PcCEfTQjy4r4O+vR2c+N0w5/86RfDKHK/+6hpgKerr1Xj4Zx7UBrgxGuPGUJTgBYk+J7G7FTrv
a+Dc0aUcVvEUJUCKbCEe2t9J611NvPn0dYxk3rB9r5PNX3EQnzMY/XiWWCQZ6udNAHq+YENdgiSr
XEoSIEVcjzI5Ncf7L+tcei0875p/i9XlSP9MeoqEh2F2EoQC9zxir9Dk6pI3E1yMUMDkjQMhLr0W
pqFRYdf+9tybMhLJsfPWH6t7BM41almGLhUlR8D1f8c5/VyE+KzE26nytQM9JGIGJxe4Px6WTF+x
BGjfUTuhn6JoAYy45L2XZul/IwbAht12+h73sKbFwdjlyILPjb0PUkJTK3g761SAUMDkxDNhpgcN
NIfg/secdO+yoyqFB2TqMHExuVRuL2u25dDU2i0BIhPXqqLmogJkh/zu77vwdhY3jyf7QY+C1ghr
Pl2xrUvCggIYccnZY5F5If/Zx5wl1QlSS1/bFoFS1nqTS7U8nyKvWTeGY7x+aJobg/q8kC+F0HVp
LX0CfNuqYuuSkCPA1f+EOPF8gFjEKDnkMwm8a8395rsFNnftffxS5Ajw1uFhAHo+18R9+8vL2iKT
BlOfpD5+tVUByiZHAM2msOcH69j0cDO6kSASvUUsMUspBbLLb8aQprX0eTqsNptTpf1uJwAzQbMa
tleF2wIk/0HX4yZn/jCKYjO454EWvE0tJQlhJiSfvGMVPHzbFYSA5nY7q9c5kKbggz/NcfEvtVMW
SwuQqs76Nmly6lqCvx0aprlrjL69Pjbubi1aiJHzOrGwieYUtG9XWbvRib1JZXrQ4OSRMLeGTBQF
HG7B4JmEcLV2S0n1v+4L0dTaLQWCmYmrAvJMgUwhpgd1Xv/1CKdeDOYVQjfi2Y9z/ZS1bHb1adx1
rwspBR/8eZYLr0SRBiAgcPF2DWA59tdlxlsX3xvcpMnUXc1dWloIIcAwdFRVY+xyhGNPDqSfURR4
9FkvsRk4cSRMaMhMvXnZ9wGyKX53uIAQ2QKsv9/GqvXKPK/Xyk5QNiUblSnE6q4GHtzXgcfXME8A
91qF8Gjtej2Tsg3LPCni8amEgkbOPctd7yuGig3MOTIjrfS33k6KFMVGkBsX+HD7ejXZVoeHpor2
Ui/IzPytv0YS20rrA0VXKUzAo6psa7TOCxSKhjuOzcnBHl+7Vk5t2iSf8/nkViHknSDComGTCv3d
bjdPdXam26/H4xwcGeHjaDTdlj0tUuLUynTJx6JTwAS8qspP/f557ettNn7b3c1P/H605MZgZjT0
ClEXkVHQMynvH+ro4Isez4L3DcbjHBwe5nIsNq+9TdMY1639xVqNggUjYEty8Ks1jXudzoKddNls
vLBhA0+0tqajwS4Ez6xfj0+rUjFwiSjolW1CyLiUeFWVH/n9PFIgClL8NxbjN5OTPOR2s8fj4fjU
FIfHx4HajIJFDdqhqjJiWGnuAy4XP29vp2UBr5pSYkqJYVoZg13TCBkGXx4YQJeyPgVIsVUImZAS
t6ryRFsbj65aBYBhmuimmR58pgjexkZUIfjl0BBvz8wAtRcFRSdCF6QUTiEIGwZPBQL8eGiIKV1H
VawuookEc5k/XSecXCK/2dwM1GbCUNJ+1btSin4QmhD8c2aGfVev8o9QCLum4XY4MEwzLUA0kWAq
EsEEtrpcdKpqbbk+SVkbdhelFA4huGkY/GJkhAMjI5hC0OZyoSpKWoRIIsGtWesozNe9XmB+rgBW
Lp/K5/8fZL+v7B3L81IKRzL83wqFGIhGEULQoCiYpmn9pGQiYu0cf7WlBXulpy2XgIos2q1pclzX
+YzTyZGurkXVPDw2xvHpaaB2PoYVZSnjuo4APu9ycSoUmndNZpRJVEVBUxTW2WyVvG5JKNsL2fWB
UqmVCCj7G/BhBQOoiZGvsMKdQaV5RHVOLq2wQt3yP4oWwz3+iIk4AAAAAElFTkSuQmCC
"
id="image823"
x="0"
y="0" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

13
src/Mod/Part/Gui/Workbench.cpp
View File

@@ -127,17 +127,17 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Separator"
<< bop << join << split << compound
<< "Separator"
<< "Part_Section"
<< "Part_CrossSections"
<< "Part_MakeFace"
<< "Part_Extrude"
<< "Part_Revolve"
<< "Part_Mirror"
<< "Part_Fillet"
<< "Part_Chamfer"
<< "Part_MakeFace"
<< "Part_RuledSurface"
<< "Part_Loft"
<< "Part_Sweep"
<< "Part_Section"
<< "Part_CrossSections"
<< "Part_Offset"
<< "Part_Offset2D"
<< "Part_Thickness"
@@ -191,9 +191,12 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "Part_Mirror"
<< "Part_Fillet"
<< "Part_Chamfer"
<< "Part_MakeFace"
<< "Part_RuledSurface"
<< "Part_Loft"
<< "Part_Sweep"
<< "Part_Section"
<< "Part_CrossSections"
<< "Part_CompOffset"
<< "Part_Thickness"
<< "Part_ProjectionOnSurface"
@@ -209,9 +212,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "Part_CompJoinFeatures"
<< "Part_CompSplitFeatures"
<< "Part_CheckGeometry"
<< "Part_Defeaturing"
<< "Part_Section"
<< "Part_CrossSections";
<< "Part_Defeaturing";
Gui::ToolBarItem* measure = new Gui::ToolBarItem(root);
measure->setCommand("Measure");

16
src/Mod/PartDesign/App/FeaturePad.cpp
View File

@@ -68,9 +68,9 @@ Pad::Pad()
Type.setEnums(TypeEnums);
ADD_PROPERTY_TYPE(Length, (100.0), "Pad", App::Prop_None,"Pad length");
ADD_PROPERTY_TYPE(Length2, (100.0), "Pad", App::Prop_None,"Second Pad length");
ADD_PROPERTY_TYPE(UseCustomVector, (0), "Pad", App::Prop_None, "Use custom vector for pad direction");
ADD_PROPERTY_TYPE(UseCustomVector, (false), "Pad", App::Prop_None, "Use custom vector for pad direction");
ADD_PROPERTY_TYPE(Direction, (Base::Vector3d(1.0, 1.0, 1.0)), "Pad", App::Prop_None, "Pad direction vector");
ADD_PROPERTY_TYPE(AlongCustomVector, (true), "Pad", App::Prop_None, "Measure length along custom direction vector");
ADD_PROPERTY_TYPE(AlongSketchNormal, (true), "Pad", App::Prop_None, "Measure pad length along the sketch normal direction");
ADD_PROPERTY_TYPE(UpToFace, (0), "Pad", App::Prop_None, "Face where pad will end");
ADD_PROPERTY_TYPE(Offset, (0.0), "Pad", App::Prop_None, "Offset from face in which pad will end");
static const App::PropertyQuantityConstraint::Constraints signedLengthConstraint = {-DBL_MAX, DBL_MAX, 1.0};
@@ -79,6 +79,10 @@ Pad::Pad()
// Remove the constraints and keep the type to allow to accept negative values
// https://forum.freecadweb.org/viewtopic.php?f=3&t=52075&p=448410#p447636
Length2.setConstraints(nullptr);
// for new pads UseCustomVector is false, thus disable Direction and AlongSketchNormal
AlongSketchNormal.setReadOnly(true);
Direction.setReadOnly(true);
}
short Pad::mustExecute() const
@@ -89,7 +93,7 @@ short Pad::mustExecute() const
Length2.isTouched() ||
UseCustomVector.isTouched() ||
Direction.isTouched() ||
AlongCustomVector.isTouched() ||
AlongSketchNormal.isTouched() ||
Offset.isTouched() ||
UpToFace.isTouched())
return 1;
@@ -159,6 +163,10 @@ App::DocumentObjectExecReturn *Pad::execute(void)
paddingDirection = Direction.getValue();
}
// disable options of UseCustomVector
AlongSketchNormal.setReadOnly(!UseCustomVector.getValue());
Direction.setReadOnly(!UseCustomVector.getValue());
// create vector in padding direction with length 1
gp_Dir dir(paddingDirection.x, paddingDirection.y, paddingDirection.z);
@@ -178,7 +186,7 @@ App::DocumentObjectExecReturn *Pad::execute(void)
return new App::DocumentObjectExecReturn("Pad: Creation failed because direction is orthogonal to sketch's normal vector");
// perform the length correction if not along custom vector
if (AlongCustomVector.getValue()) {
if (AlongSketchNormal.getValue()) {
L = L / factor;
L2 = L2 / factor;
}

2
src/Mod/PartDesign/App/FeaturePad.h
View File

@@ -45,7 +45,7 @@ public:
App::PropertyLength Length2;
App::PropertyBool UseCustomVector;
App::PropertyVector Direction;
App::PropertyBool AlongCustomVector;
App::PropertyBool AlongSketchNormal;
App::PropertyLength Offset;
/** @name methods override feature */

12
src/Mod/PartDesign/Gui/TaskPadParameters.cpp
View File

@@ -75,7 +75,7 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView, QWidget *parent,
PartDesign::Pad* pcPad = static_cast<PartDesign::Pad*>(vp->getObject());
Base::Quantity l = pcPad->Length.getQuantityValue();
Base::Quantity l2 = pcPad->Length2.getQuantityValue();
bool alongCustom = pcPad->AlongCustomVector.getValue();
bool alongCustom = pcPad->AlongSketchNormal.getValue();
bool useCustom = pcPad->UseCustomVector.getValue();
double xs = pcPad->Direction.getValue().x;
double ys = pcPad->Direction.getValue().y;
@@ -157,7 +157,7 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView, QWidget *parent,
connect(ui->lengthEdit2, SIGNAL(valueChanged(double)),
this, SLOT(onLength2Changed(double)));
connect(ui->checkBoxAlongDirection, SIGNAL(toggled(bool)),
this, SLOT(onAlongDirectionChanged(bool)));
this, SLOT(onAlongSketchNormalChanged(bool)));
connect(ui->groupBoxDirection, SIGNAL(toggled(bool)),
this, SLOT(onDirectionToggled(bool)));
connect(ui->XDirectionEdit, SIGNAL(valueChanged(double)),
@@ -310,10 +310,10 @@ void TaskPadParameters::onLength2Changed(double len)
recomputeFeature();
}
void TaskPadParameters::onAlongDirectionChanged(bool on)
void TaskPadParameters::onAlongSketchNormalChanged(bool on)
{
PartDesign::Pad* pcPad = static_cast<PartDesign::Pad*>(vp->getObject());
pcPad->AlongCustomVector.setValue(on);
pcPad->AlongSketchNormal.setValue(on);
recomputeFeature();
}
@@ -466,7 +466,7 @@ double TaskPadParameters::getLength2(void) const
return ui->lengthEdit2->value().getValue();
}
bool TaskPadParameters::getAlongCustom(void) const
bool TaskPadParameters::getAlongSketchNormal(void) const
{
return ui->checkBoxAlongDirection->isChecked();
}
@@ -602,7 +602,7 @@ void TaskPadParameters::apply()
FCMD_OBJ_CMD(obj, "UseCustomVector = " << (getCustom() ? 1 : 0));
FCMD_OBJ_CMD(obj, "Direction = ("
<< getXDirection() << ", " << getYDirection() << ", " << getZDirection() << ")");
FCMD_OBJ_CMD(obj, "AlongCustomVector = " << (getAlongCustom() ? 1 : 0));
FCMD_OBJ_CMD(obj, "AlongSketchNormal = " << (getAlongSketchNormal() ? 1 : 0));
FCMD_OBJ_CMD(obj,"Type = " << getMode());
QString facename = getFaceName();
FCMD_OBJ_CMD(obj,"UpToFace = " << facename.toLatin1().data());

4
src/Mod/PartDesign/Gui/TaskPadParameters.h
View File

@@ -58,7 +58,7 @@ public:
private Q_SLOTS:
void onLengthChanged(double);
void onLength2Changed(double);
void onAlongDirectionChanged(bool);
void onAlongSketchNormalChanged(bool);
void onDirectionToggled(bool);
void onXDirectionEditChanged(double);
void onYDirectionEditChanged(double);
@@ -76,7 +76,7 @@ protected:
private:
double getLength(void) const;
double getLength2(void) const;
bool getAlongCustom(void) const;
bool getAlongSketchNormal(void) const;
bool getCustom(void) const;
double getXDirection(void) const;
double getYDirection(void) const;

620
src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineDecreaseDegree.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 17 KiB

387
src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineDecreaseKnotMultiplicity.svg
View File

@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -8,23 +6,15 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg2918"
sodipodi:version="0.32"
inkscape:version="0.92.1 unknown"
sodipodi:docname="Sketcher_BSplineDecreaseKnotMultiplicity.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
version="1.1">
<title
id="title934">Sketcher_BSplineDecreaseKnotMultiplicity</title>
<defs
id="defs2920">
<linearGradient
inkscape:collect="always"
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -35,15 +25,7 @@
offset="1"
id="stop3148" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2926" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-3">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -55,7 +37,6 @@
id="stop3148-5" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3958"
gradientUnits="userSpaceOnUse"
@@ -66,7 +47,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-3"
id="radialGradient3960"
gradientUnits="userSpaceOnUse"
@@ -77,7 +57,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3042"
gradientUnits="userSpaceOnUse"
@@ -88,7 +67,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3068"
gradientUnits="userSpaceOnUse"
@@ -99,7 +77,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3880"
gradientUnits="userSpaceOnUse"
@@ -110,7 +87,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4654"
gradientUnits="userSpaceOnUse"
@@ -121,7 +97,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4693"
gradientUnits="userSpaceOnUse"
@@ -138,8 +113,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3131-2"
xlink:href="#linearGradient3836-9-3-9"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-9" />
<linearGradient
id="linearGradient3836-9-3-9">
<stop
@@ -158,8 +132,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3171-7"
xlink:href="#linearGradient3836-9-3-6-0"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-6-0" />
<linearGradient
id="linearGradient3836-9-3-6-0">
<stop
@@ -172,7 +145,6 @@
id="stop3840-1-6-5-3" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3"
id="linearGradient3262"
gradientUnits="userSpaceOnUse"
@@ -203,7 +175,6 @@
id="stop3840-1-6-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-7"
id="linearGradient3264-1"
gradientUnits="userSpaceOnUse"
@@ -224,7 +195,6 @@
id="stop3840-1-6-5-0" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-4"
id="linearGradient3264-9"
gradientUnits="userSpaceOnUse"
@@ -245,7 +215,6 @@
id="stop3840-1-6-5-8" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-1"
id="linearGradient3264-17"
gradientUnits="userSpaceOnUse"
@@ -266,7 +235,6 @@
id="stop3840-1-6-5-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-2"
id="linearGradient3264-3"
gradientUnits="userSpaceOnUse"
@@ -287,7 +255,6 @@
id="stop3840-1-6-5-1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-3"
id="linearGradient3262-5"
gradientUnits="userSpaceOnUse"
@@ -307,7 +274,6 @@
id="stop3840-1-6-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3264"
gradientUnits="userSpaceOnUse"
@@ -333,8 +299,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3131-2-0"
xlink:href="#linearGradient3836-9-3-9-9"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-9-9" />
<linearGradient
id="linearGradient3836-9-3-9-9">
<stop
@@ -353,8 +318,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3171-7-0"
xlink:href="#linearGradient3836-9-3-6-0-6"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-6-0-6" />
<linearGradient
id="linearGradient3836-9-3-6-0-6">
<stop
@@ -367,27 +331,6 @@
id="stop3840-1-6-5-3-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3931"
gradientUnits="userSpaceOnUse"
x1="-18"
y1="18"
x2="-22"
y2="5"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3937"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-8"
id="linearGradient3937-1"
gradientUnits="userSpaceOnUse"
@@ -407,26 +350,6 @@
offset="1"
id="stop3840-1-6-5-7-9" />
</linearGradient>
<linearGradient
y2="5"
x2="-22"
y1="18"
x1="-18"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
gradientUnits="userSpaceOnUse"
id="linearGradient3956"
xlink:href="#linearGradient3836-9-3-6-29-8"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-7"
id="linearGradient3937-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
id="linearGradient3836-9-3-6-29-7">
<stop
@@ -438,16 +361,6 @@
offset="1"
id="stop3840-1-6-5-7-92" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-1"
id="linearGradient3937-36"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
id="linearGradient3836-9-3-6-29-1">
<stop
@@ -460,7 +373,6 @@
id="stop3840-1-6-5-7-93" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836"
id="linearGradient3850"
x1="164.4444"
@@ -487,10 +399,8 @@
x1="164.4444"
gradientUnits="userSpaceOnUse"
id="linearGradient3167"
xlink:href="#linearGradient3836"
inkscape:collect="always" />
xlink:href="#linearGradient3836" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836"
id="linearGradient3112"
gradientUnits="userSpaceOnUse"
@@ -500,7 +410,6 @@
x2="154.4444"
y2="131.22015" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-6"
id="linearGradient3850-3"
x1="160.4444"
@@ -520,68 +429,15 @@
id="stop3840-5" />
</linearGradient>
<linearGradient
gradientTransform="translate(-141.44439,-128.22016)"
gradientTransform="translate(-141.44439,-136.22016)"
y2="143.22015"
x2="158.4444"
y1="149.22015"
x1="160.4444"
gradientUnits="userSpaceOnUse"
id="linearGradient3185"
xlink:href="#linearGradient3836-6"
inkscape:collect="always" />
xlink:href="#linearGradient3836-6" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.3108168"
inkscape:cx="41.931335"
inkscape:cy="35.208556"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="993"
inkscape:window-x="0"
inkscape:window-y="28"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true"
showguides="true"
inkscape:guide-bbox="true">
<inkscape:grid
type="xygrid"
id="grid3058"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
<sodipodi:guide
orientation="1,0"
position="28,22"
id="guide3917"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="12,32"
id="guide3919"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="60,16"
id="guide3921"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="52,8"
id="guide3923"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata2923">
<rdf:RDF>
@@ -590,21 +446,21 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Sketcher_BSplineDecreaseKnotMultiplicity</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson</dc:title>
<dc:title>[bitacovir]</dc:title>
</cc:Agent>
</dc:creator>
<dc:title>Sketcher_Create_Periodic_BSpline</dc:title>
<dc:date>2017-02-15</dc:date>
<dc:date>22-03-2021</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_Toggle_BSpline_Information.svg</dc:identifier>
<dc:identifier></dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
@@ -613,175 +469,80 @@
<cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
<dc:contributor>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson</dc:title>
<dc:title></dc:title>
</cc:Agent>
</dc:contributor>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.999976,26.000003 C 58,48 32,32 29.999975,52.000002"
id="path3266"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.999976,26.000003 C 56,48 32,32 29.999975,52.000002"
id="path3266-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 54.999975,26.000003 C 56,47 32,31 28.999974,52.000002"
id="path3266-9-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
id="layer1">
<g
inkscape:export-ydpi="7.2934141"
inkscape:export-xdpi="7.2934141"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
transform="matrix(-0.14137236,0.07774155,-0.01888492,-0.10633123,99.823869,75.569613)"
id="g3177" />
<g
inkscape:export-ydpi="7.2934141"
inkscape:export-xdpi="7.2934141"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
transform="matrix(-0.14109247,0.07923086,-0.02087339,-0.10522619,77.138226,86.686164)"
id="g3185" />
<g
transform="matrix(0.59988397,0,0,0.60016354,23.595637,49.138672)"
id="g3797-7-2-3">
<g
id="g3933"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6"
style="fill:url(#linearGradient3937);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
<g
id="g3933-2"
transform="matrix(0.59988397,0,0,0.60016354,67.595636,19.138672)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-0"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-2"
style="fill:url(#linearGradient3956);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(0.59988397,0,0,0.60016354,25.595637,25.138672)"
id="g3797-7-2-3-2">
<g
id="g3933-8"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-9"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-7"
style="fill:url(#linearGradient3937-3);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
<g
transform="matrix(0.59988397,0,0,0.60016354,49.595637,41.138672)"
id="g3797-7-2-3-1">
<g
id="g3933-9"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-4"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-78"
style="fill:url(#linearGradient3937-36);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
<path
style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 31,44 35,6 M 6,33 44,33"
id="path3047-3-6-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 17,6 13,44 M 44,17 6,17"
id="path3047-3-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#4e9a06;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 17,6 13,44 M 44,17 6,17"
id="path3047"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<g
id="g958"
transform="translate(32.279658,-18.049864)">
<path
inkscape:connector-curvature="0"
style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-6-9-5-3"
d="m 8.203393,54.749201 a 4.9983118,4.9980285 0 1 1 7.592881,6.501986 4.9983118,4.9980285 0 1 1 -7.592881,-6.501986 z" />
<path
inkscape:connector-curvature="0"
style="fill:#99cc33;fill-opacity:1;stroke:#669900;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-7-0-1-6-5"
d="M 9.7203418,56.049864 A 2.9999798,2.9999764 0 1 1 14.277564,59.952581 2.9999798,2.9999764 0 0 1 9.7203418,56.049864 Z" />
</g>
<path
style="fill:none;stroke:#4e9a06;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 31,44 35,6 M 6,33 44,33"
id="path3047-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 30,44 34,6 M 6,32 44,32"
id="path3047-3-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 16,6 12,44 M 44,16 6,16"
id="path3047-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="color:#000000;fill:url(#linearGradient3185);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 13,13 0,0 -10,0 0,10 10,0 0,0 10,0 0,0 10,0 0,-10 -10,0 0,0 z"
id="rect3558-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccc" />
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3185);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
d="M 13,5 V 5 H 3 v 10 h 10 v 0 h 10 v 0 H 33 V 5 H 23 v 0 z"
id="rect3558-3" />
<path
style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 5,15 10,0 0,0 6,0 0,0 10,0 0,6 -10,0 0,0 -6,0 0,0 -10,0 z"
id="path3826-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccc" />
d="m 5,7 h 10 v 0 h 6 v 0 h 10 v 6 H 21 v 0 h -6 v 0 H 5 Z"
id="path3826-5" />
<path
id="path3266"
d="M 55.708085,12.979883 C 54.199158,48.108567 17.100307,30.198606 8.319289,55.598385"
style="fill:none;stroke:#2e3436;stroke-width:12.5366;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="path3266-9"
d="M 55.705902,8.2850995 C 58.063432,48.420232 17.264642,29.603721 8.319289,55.598385"
style="fill:none;stroke:#d3d7cf;stroke-width:6.2683;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
id="path3266-9-2"
d="M 54.080712,8.2850995 C 57.670672,46.81183 15.236647,27.733422 6.694105,55.749322"
style="fill:none;stroke:#ffffff;stroke-width:3.13415;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<g
id="g985">
<path
style="fill:none;stroke:#172a04;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 50.429651,58.951026 2.631579,-25 M 33.982283,51.714184 h 25"
id="path3047-3-6-3-2" />
<path
style="fill:none;stroke:#172a04;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 41.219125,33.951026 -2.631579,25 M 58.982283,41.187868 h -25"
id="path3047-3-6-2" />
<path
style="fill:none;stroke:#4e9a06;stroke-width:2.63158;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 41.219125,33.951026 -2.631579,25 M 58.982283,41.187868 h -25"
id="path3047-4" />
<path
style="fill:none;stroke:#4e9a06;stroke-width:2.63158;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 50.429651,58.951026 2.631579,-25 M 33.982283,51.714184 h 25"
id="path3047-6-7" />
<path
style="fill:none;stroke:#8ae234;stroke-width:1.31579;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 49.771757,58.951026 2.631579,-25 M 33.982283,51.056289 h 25"
id="path3047-3-7-6" />
<path
style="fill:none;stroke:#8ae234;stroke-width:1.31579;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 40.56123,33.951026 -2.631579,25 M 58.982283,40.529973 h -25"
id="path3047-3-4" />
</g>
<circle
r="13.203125"
cy="15.203125"
cx="49.796875"
id="path945"
style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1.3629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" />
<path
style="fill:#ef2929;stroke:#4e9a06;stroke-width:3.89444;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-6-9-5-3-3"
d="M 42.449361,8.9063962 A 9.7328242,9.7322726 0 1 1 57.234388,21.567208 9.7328242,9.7322726 0 1 1 42.449361,8.9063962 Z" />
<path
style="fill:#172a04;fill-opacity:1;stroke:#73d216;stroke-width:3.89444;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-7-0-1-6-5-4"
d="m 45.403197,11.439076 a 5.8416276,5.8416209 0 1 1 8.873925,7.599458 5.8416276,5.8416209 0 0 1 -8.873925,-7.599458 z" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 18 KiB

539
src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineDegree.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 14 KiB

597
src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineIncreaseDegree.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 16 KiB

359
src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineIncreaseKnotMultiplicity.svg
View File

@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -8,23 +6,15 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg2918"
sodipodi:version="0.32"
inkscape:version="0.92.1 unknown"
sodipodi:docname="Sketcher_BSplineIncreaseKnotMultiplicity.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
version="1.1">
<title
id="title928">Sketcher_BSplineIncreaseKnotMultiplicity</title>
<defs
id="defs2920">
<linearGradient
inkscape:collect="always"
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -35,15 +25,7 @@
offset="1"
id="stop3148" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2926" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-3">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -55,7 +37,6 @@
id="stop3148-5" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3958"
gradientUnits="userSpaceOnUse"
@@ -66,7 +47,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-3"
id="radialGradient3960"
gradientUnits="userSpaceOnUse"
@@ -77,7 +57,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3042"
gradientUnits="userSpaceOnUse"
@@ -88,7 +67,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3068"
gradientUnits="userSpaceOnUse"
@@ -99,7 +77,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3880"
gradientUnits="userSpaceOnUse"
@@ -110,7 +87,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4654"
gradientUnits="userSpaceOnUse"
@@ -121,7 +97,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4693"
gradientUnits="userSpaceOnUse"
@@ -138,8 +113,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3131-2"
xlink:href="#linearGradient3836-9-3-9"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-9" />
<linearGradient
id="linearGradient3836-9-3-9">
<stop
@@ -158,8 +132,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3171-7"
xlink:href="#linearGradient3836-9-3-6-0"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-6-0" />
<linearGradient
id="linearGradient3836-9-3-6-0">
<stop
@@ -172,7 +145,6 @@
id="stop3840-1-6-5-3" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3"
id="linearGradient3262"
gradientUnits="userSpaceOnUse"
@@ -203,7 +175,6 @@
id="stop3840-1-6-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-7"
id="linearGradient3264-1"
gradientUnits="userSpaceOnUse"
@@ -224,7 +195,6 @@
id="stop3840-1-6-5-0" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-4"
id="linearGradient3264-9"
gradientUnits="userSpaceOnUse"
@@ -245,7 +215,6 @@
id="stop3840-1-6-5-8" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-1"
id="linearGradient3264-17"
gradientUnits="userSpaceOnUse"
@@ -266,7 +235,6 @@
id="stop3840-1-6-5-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-2"
id="linearGradient3264-3"
gradientUnits="userSpaceOnUse"
@@ -287,7 +255,6 @@
id="stop3840-1-6-5-1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-3"
id="linearGradient3262-5"
gradientUnits="userSpaceOnUse"
@@ -307,7 +274,6 @@
id="stop3840-1-6-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3264"
gradientUnits="userSpaceOnUse"
@@ -333,8 +299,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3131-2-0"
xlink:href="#linearGradient3836-9-3-9-9"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-9-9" />
<linearGradient
id="linearGradient3836-9-3-9-9">
<stop
@@ -353,8 +318,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3171-7-0"
xlink:href="#linearGradient3836-9-3-6-0-6"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-6-0-6" />
<linearGradient
id="linearGradient3836-9-3-6-0-6">
<stop
@@ -367,27 +331,6 @@
id="stop3840-1-6-5-3-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3931"
gradientUnits="userSpaceOnUse"
x1="-18"
y1="18"
x2="-22"
y2="5"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3937"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-8"
id="linearGradient3937-1"
gradientUnits="userSpaceOnUse"
@@ -407,26 +350,6 @@
offset="1"
id="stop3840-1-6-5-7-9" />
</linearGradient>
<linearGradient
y2="5"
x2="-22"
y1="18"
x1="-18"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
gradientUnits="userSpaceOnUse"
id="linearGradient3956"
xlink:href="#linearGradient3836-9-3-6-29-8"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-7"
id="linearGradient3937-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
id="linearGradient3836-9-3-6-29-7">
<stop
@@ -438,16 +361,6 @@
offset="1"
id="stop3840-1-6-5-7-92" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-1"
id="linearGradient3937-36"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
<linearGradient
id="linearGradient3836-9-3-6-29-1">
<stop
@@ -460,7 +373,6 @@
id="stop3840-1-6-5-7-93" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836"
id="linearGradient3850"
x1="164.4444"
@@ -480,17 +392,6 @@
id="stop3840" />
</linearGradient>
<linearGradient
gradientTransform="translate(-188.44439,-101.22016)"
y2="131.22015"
x2="154.4444"
y1="161.22015"
x1="164.4444"
gradientUnits="userSpaceOnUse"
id="linearGradient3167"
xlink:href="#linearGradient3836"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836"
id="linearGradient3112"
gradientUnits="userSpaceOnUse"
@@ -500,58 +401,6 @@
x2="154.4444"
y2="131.22015" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.3108168"
inkscape:cx="34.159114"
inkscape:cy="47.567447"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="993"
inkscape:window-x="0"
inkscape:window-y="28"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true"
showguides="true"
inkscape:guide-bbox="true">
<inkscape:grid
type="xygrid"
id="grid3058"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
<sodipodi:guide
orientation="1,0"
position="28,22"
id="guide3917"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="12,32"
id="guide3919"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="60,16"
id="guide3921"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="52,8"
id="guide3923"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata2923">
<rdf:RDF>
@@ -560,21 +409,21 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Sketcher_BSplineIncreaseKnotMultiplicity</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson</dc:title>
<dc:title>[bitacovir]</dc:title>
</cc:Agent>
</dc:creator>
<dc:title>Sketcher_Create_Periodic_BSpline</dc:title>
<dc:date>2017-02-16</dc:date>
<dc:date>22-03-2021</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_Toggle_BSpline_Information.svg</dc:identifier>
<dc:identifier></dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
@@ -583,178 +432,84 @@
<cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
<dc:contributor>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson</dc:title>
<dc:title></dc:title>
</cc:Agent>
</dc:contributor>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
id="layer1">
<path
style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.999976,26.000003 C 58,48 32,32 29.999975,52.000002"
id="path3266"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
d="M 55.618776,14.550317 C 53.081884,47.579198 16.970778,30.589727 8.323225,55.603448"
style="fill:none;stroke:#2e3436;stroke-width:12.5366;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.999976,26.000003 C 56,48 32,32 29.999975,52.000002"
id="path3266-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
d="M 55.709838,8.2901619 C 58.067368,48.425294 17.268578,29.608783 8.323225,55.603448"
style="fill:none;stroke:#d3d7cf;stroke-width:6.2683;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 54.999975,26.000003 C 56,47 32,31 28.999974,52.000002"
id="path3266-9-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
d="M 54.084648,8.2901619 C 57.674608,46.816893 15.240583,27.738484 6.698041,55.754384"
style="fill:none;stroke:#ffffff;stroke-width:3.13415;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
<g
inkscape:export-ydpi="7.2934141"
inkscape:export-xdpi="7.2934141"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
transform="matrix(-0.14137236,0.07774155,-0.01888492,-0.10633123,99.823869,75.569613)"
id="g3177" />
<g
inkscape:export-ydpi="7.2934141"
inkscape:export-xdpi="7.2934141"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
transform="matrix(-0.14109247,0.07923086,-0.02087339,-0.10522619,77.138226,86.686164)"
id="g3185" />
<g
transform="matrix(0.59988397,0,0,0.60016354,23.595637,49.138672)"
id="g3797-7-2-3">
<g
id="g3933"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6"
style="fill:url(#linearGradient3937);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
<g
id="g3933-2"
transform="matrix(0.59988397,0,0,0.60016354,67.595636,19.138672)">
id="g985">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-0"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
id="path3047-3-6-3-2"
d="m 50.429651,58.951026 2.631579,-25 M 33.982283,51.714184 h 25"
style="fill:none;stroke:#172a04;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-2"
style="fill:url(#linearGradient3956);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(0.59988397,0,0,0.60016354,25.595637,25.138672)"
id="g3797-7-2-3-2">
<g
id="g3933-8"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-9"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-7"
style="fill:url(#linearGradient3937-3);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
<g
transform="matrix(0.59988397,0,0,0.60016354,49.595637,41.138672)"
id="g3797-7-2-3-1">
<g
id="g3933-9"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-4"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-78"
style="fill:url(#linearGradient3937-36);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
<path
style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 31,44 35,6 M 6,33 44,33"
id="path3047-3-6-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 17,6 13,44 M 44,17 6,17"
id="path3047-3-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#4e9a06;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 17,6 13,44 M 44,17 6,17"
id="path3047"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<g
id="g958"
transform="translate(32.279658,-18.049864)">
id="path3047-3-6-2"
d="m 41.219125,33.951026 -2.631579,25 M 58.982283,41.187868 h -25"
style="fill:none;stroke:#172a04;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-6-9-5-3"
d="m 8.203393,54.749201 a 4.9983118,4.9980285 0 1 1 7.592881,6.501986 4.9983118,4.9980285 0 1 1 -7.592881,-6.501986 z" />
id="path3047-4-7"
d="m 41.219125,33.951026 -2.631579,25 M 58.982283,41.187868 h -25"
style="fill:none;stroke:#4e9a06;stroke-width:2.63158;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
style="fill:#99cc33;fill-opacity:1;stroke:#669900;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-7-0-1-6-5"
d="M 9.7203418,56.049864 A 2.9999798,2.9999764 0 1 1 14.277564,59.952581 2.9999798,2.9999764 0 0 1 9.7203418,56.049864 Z" />
id="path3047-6-7"
d="m 50.429651,58.951026 2.631579,-25 M 33.982283,51.714184 h 25"
style="fill:none;stroke:#4e9a06;stroke-width:2.63158;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
id="path3047-3-7-6"
d="m 49.771757,58.951026 2.631579,-25 M 33.982283,51.056289 h 25"
style="fill:none;stroke:#8ae234;stroke-width:1.31579;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
id="path3047-3-4"
d="m 40.56123,33.951026 -2.631579,25 M 58.982283,40.529973 h -25"
style="fill:none;stroke:#8ae234;stroke-width:1.31579;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
</g>
<path
style="fill:none;stroke:#4e9a06;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 31,44 35,6 M 6,33 44,33"
id="path3047-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 30,44 34,6 M 6,32 44,32"
id="path3047-3-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 16,6 12,44 M 44,16 6,16"
id="path3047-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<g
id="g3108"
transform="translate(47,-27)">
<path
sodipodi:nodetypes="ccccccccccccc"
inkscape:connector-curvature="0"
id="rect3558"
d="m -34,30 0,10 -10,0 0,10 10,0 0,10 10,0 0,-10 10,0 0,-10 -10,0 0,-10 z"
style="color:#000000;fill:url(#linearGradient3112);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
d="m -34,30 v 10 h -10 v 10 h 10 v 10 h 10 V 50 h 10 V 40 H -24 V 30 Z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3112);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
id="path3826"
d="m -42,42 10,0 0,-10 6,0 0,10 10,0 0,6 -10,0 0,10 -6,0 0,-10 -10,0 z"
d="m -42,42 h 10 V 32 h 6 v 10 h 10 v 6 h -10 v 10 h -6 V 48 h -10 z"
style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<circle
r="13.203125"
cy="15.206594"
cx="49.803802"
id="path945"
style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1.3629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers stroke fill" />
<path
style="fill:#ef2929;stroke:#4e9a06;stroke-width:3.89444;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-6-9-5-3-3"
d="M 42.456289,8.909865 A 9.7328242,9.7322726 0 1 1 57.241316,21.570677 9.7328242,9.7322726 0 1 1 42.456289,8.909865 Z" />
<path
style="fill:#172a04;fill-opacity:1;stroke:#73d216;stroke-width:3.89444;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-7-0-1-6-5-4"
d="m 45.410125,11.442545 a 5.8416276,5.8416209 0 1 1 8.873925,7.599458 5.8416276,5.8416209 0 0 1 -8.873925,-7.599458 z" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 17 KiB

246
src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineKnotMultiplicity.svg
View File

@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -8,23 +6,15 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg2918"
sodipodi:version="0.32"
inkscape:version="0.92.1 unknown"
sodipodi:docname="Sketcher_BSplineKnotMultiplicity.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
inkscape:export-xdpi="22.5"
inkscape:export-ydpi="22.5">
version="1.1">
<title
id="title928">Sketcher_BSplineKnotMultiplicity</title>
<defs
id="defs2920">
<linearGradient
inkscape:collect="always"
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -35,15 +25,7 @@
offset="1"
id="stop3148" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2926" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-3">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
@@ -55,7 +37,6 @@
id="stop3148-5" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3958"
gradientUnits="userSpaceOnUse"
@@ -66,7 +47,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-3"
id="radialGradient3960"
gradientUnits="userSpaceOnUse"
@@ -77,7 +57,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3042"
gradientUnits="userSpaceOnUse"
@@ -88,7 +67,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3068"
gradientUnits="userSpaceOnUse"
@@ -99,7 +77,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3880"
gradientUnits="userSpaceOnUse"
@@ -110,7 +87,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4654"
gradientUnits="userSpaceOnUse"
@@ -121,7 +97,6 @@
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4693"
gradientUnits="userSpaceOnUse"
@@ -138,8 +113,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3131-2"
xlink:href="#linearGradient3836-9-3-9"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-9" />
<linearGradient
id="linearGradient3836-9-3-9">
<stop
@@ -158,8 +132,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3171-7"
xlink:href="#linearGradient3836-9-3-6-0"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-6-0" />
<linearGradient
id="linearGradient3836-9-3-6-0">
<stop
@@ -172,7 +145,6 @@
id="stop3840-1-6-5-3" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3"
id="linearGradient3262"
gradientUnits="userSpaceOnUse"
@@ -203,7 +175,6 @@
id="stop3840-1-6-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-7"
id="linearGradient3264-1"
gradientUnits="userSpaceOnUse"
@@ -224,7 +195,6 @@
id="stop3840-1-6-5-0" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-4"
id="linearGradient3264-9"
gradientUnits="userSpaceOnUse"
@@ -245,7 +215,6 @@
id="stop3840-1-6-5-8" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-1"
id="linearGradient3264-17"
gradientUnits="userSpaceOnUse"
@@ -266,7 +235,6 @@
id="stop3840-1-6-5-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-2"
id="linearGradient3264-3"
gradientUnits="userSpaceOnUse"
@@ -287,7 +255,6 @@
id="stop3840-1-6-5-1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-3"
id="linearGradient3262-5"
gradientUnits="userSpaceOnUse"
@@ -307,7 +274,6 @@
id="stop3840-1-6-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3264"
gradientUnits="userSpaceOnUse"
@@ -333,8 +299,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3131-2-0"
xlink:href="#linearGradient3836-9-3-9-9"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-9-9" />
<linearGradient
id="linearGradient3836-9-3-9-9">
<stop
@@ -353,8 +318,7 @@
x1="-18"
gradientUnits="userSpaceOnUse"
id="linearGradient3171-7-0"
xlink:href="#linearGradient3836-9-3-6-0-6"
inkscape:collect="always" />
xlink:href="#linearGradient3836-9-3-6-0-6" />
<linearGradient
id="linearGradient3836-9-3-6-0-6">
<stop
@@ -367,7 +331,6 @@
id="stop3840-1-6-5-3-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29"
id="linearGradient3937"
gradientUnits="userSpaceOnUse"
@@ -377,7 +340,6 @@
x2="-22"
y2="5" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-8"
id="linearGradient3937-1"
gradientUnits="userSpaceOnUse"
@@ -405,18 +367,7 @@
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
gradientUnits="userSpaceOnUse"
id="linearGradient3956"
xlink:href="#linearGradient3836-9-3-6-29-8"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-7"
id="linearGradient3937-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.71441909,0,0,0.71408544,-5.531259,3.2604792)"
x1="-18"
y1="18"
x2="-22"
y2="5" />
xlink:href="#linearGradient3836-9-3-6-29-8" />
<linearGradient
id="linearGradient3836-9-3-6-29-7">
<stop
@@ -429,7 +380,6 @@
id="stop3840-1-6-5-7-92" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3836-9-3-6-29-1"
id="linearGradient3937-36"
gradientUnits="userSpaceOnUse"
@@ -450,58 +400,6 @@
id="stop3840-1-6-5-7-93" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.3108168"
inkscape:cx="-1.5801036"
inkscape:cy="16.822168"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="993"
inkscape:window-x="0"
inkscape:window-y="28"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true"
showguides="true"
inkscape:guide-bbox="true">
<inkscape:grid
type="xygrid"
id="grid3058"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
<sodipodi:guide
orientation="1,0"
position="28,22"
id="guide3917"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="12,32"
id="guide3919"
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
position="60,16"
id="guide3921"
inkscape:locked="false" />
<sodipodi:guide
orientation="1,0"
position="52,8"
id="guide3923"
inkscape:locked="false" />
</sodipodi:namedview>
<metadata
id="metadata2923">
<rdf:RDF>
@@ -510,21 +408,21 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title>Sketcher_BSplineKnotMultiplicity</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson</dc:title>
<dc:title>[bitacovir]</dc:title>
</cc:Agent>
</dc:creator>
<dc:title>Sketcher_Create_Periodic_BSpline</dc:title>
<dc:date>2017-02-15</dc:date>
<dc:date>22-03-2021</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_Toggle_BSpline_Information.svg</dc:identifier>
<dc:identifier></dc:identifier>
<dc:rights>
<cc:Agent>
<dc:title>FreeCAD LGPL2+</dc:title>
@@ -533,44 +431,18 @@
<cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
<dc:contributor>
<cc:Agent>
<dc:title>[agryson] Alexander Gryson</dc:title>
<dc:title></dc:title>
</cc:Agent>
</dc:contributor>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.999976,26.000003 C 58,48 32,32 29.999975,52.000002"
id="path3266"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 55.999976,26.000003 C 56,48 32,32 29.999975,52.000002"
id="path3266-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 54.999975,26.000003 C 56,47 32,31 28.999974,52.000002"
id="path3266-9-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
id="layer1">
<g
inkscape:export-ydpi="7.2934141"
inkscape:export-xdpi="7.2934141"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
transform="matrix(-0.14137236,0.07774155,-0.01888492,-0.10633123,99.823869,75.569613)"
id="g3177" />
<g
inkscape:export-ydpi="7.2934141"
inkscape:export-xdpi="7.2934141"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
transform="matrix(-0.14109247,0.07923086,-0.02087339,-0.10522619,77.138226,86.686164)"
id="g3185" />
<g
@@ -578,17 +450,15 @@
id="g3797-7-2-3">
<g
id="g3933"
transform="translate(30.005802,0)">
transform="translate(30.005802)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
style="fill:#ef2929;stroke:#280000;stroke-width:3.3332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6"
style="fill:url(#linearGradient3937);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
style="fill:url(#linearGradient3937);fill-opacity:1;stroke:#ef2929;stroke-width:3.3332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
<g
@@ -597,99 +467,51 @@
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-0"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
style="fill:#ef2929;stroke:#280000;stroke-width:3.3332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-2"
style="fill:url(#linearGradient3956);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<g
transform="matrix(0.59988397,0,0,0.60016354,25.595637,25.138672)"
id="g3797-7-2-3-2">
<g
id="g3933-8"
transform="translate(30.005802,0)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-9"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-7"
style="fill:url(#linearGradient3937-3);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
style="fill:url(#linearGradient3956);fill-opacity:1;stroke:#ef2929;stroke-width:3.3332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
transform="matrix(0.59988397,0,0,0.60016354,49.595637,41.138672)"
id="g3797-7-2-3-1">
<g
id="g3933-9"
transform="translate(30.005802,0)">
transform="translate(30.005802)">
<path
d="m -25.658702,6.015909 a 8.3321309,8.3277776 0 1 1 12.65725,10.83369 8.3321309,8.3277776 0 1 1 -12.65725,-10.83369 z"
id="path4250-6-9-5-4"
style="fill:#ef2929;stroke:#280000;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
style="fill:#ef2929;stroke:#280000;stroke-width:3.3332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
d="m -23.129965,8.18309 a 5.0009335,4.9985982 0 1 1 7.596839,6.502756 5.0009335,4.9985982 0 0 1 -7.596839,-6.502756 z"
id="path4250-7-0-1-6-78"
style="fill:url(#linearGradient3937-36);fill-opacity:1;stroke:#ef2929;stroke-width:3.33320141;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
style="fill:url(#linearGradient3937-36);fill-opacity:1;stroke:#ef2929;stroke-width:3.3332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
<path
style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 31,44 35,6 M 6,33 44,33"
id="path3047-3-6-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
d="M 31,44 35,6 M 6,33 h 38"
id="path3047-3-6-3" />
<path
style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 17,6 13,44 M 44,17 6,17"
id="path3047-3-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
d="M 17,6 13,44 M 44,17 H 6"
id="path3047-3-6" />
<path
style="fill:none;stroke:#4e9a06;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 17,6 13,44 M 44,17 6,17"
id="path3047"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<g
id="g958"
transform="translate(30.279658,-18.049864)">
<path
inkscape:connector-curvature="0"
style="fill:#ef2929;stroke:#280000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-6-9-5-3"
d="m 8.203393,54.749201 a 4.9983118,4.9980285 0 1 1 7.592881,6.501986 4.9983118,4.9980285 0 1 1 -7.592881,-6.501986 z" />
<path
inkscape:connector-curvature="0"
style="fill:#99cc33;fill-opacity:1;stroke:#669900;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4250-7-0-1-6-5"
d="M 9.7203418,56.049864 A 2.9999798,2.9999764 0 1 1 14.277564,59.952581 2.9999798,2.9999764 0 0 1 9.7203418,56.049864 Z" />
</g>
d="M 17,6 13,44 M 44,17 H 6"
id="path3047" />
<path
style="fill:none;stroke:#4e9a06;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 31,44 35,6 M 6,33 44,33"
id="path3047-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
d="M 31,44 35,6 M 6,33 h 38"
id="path3047-6" />
<path
style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 30,44 34,6 M 6,32 44,32"
id="path3047-3-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
d="M 30,44 34,6 M 6,32 h 38"
id="path3047-3-7" />
<path
style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="M 16,6 12,44 M 44,16 6,16"
id="path3047-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
d="M 16,6 12,44 M 44,16 H 6"
id="path3047-3" />
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 16 KiB

4
src/Mod/TechDraw/App/DrawViewDimension.cpp
View File

@@ -792,7 +792,7 @@ std::string DrawViewDimension::formatValue(qreal value, QString qFormatSpec, int
}
// qUserString is the value + unit with default decimals, so extract the unit
// we cannot just use unit.getString() because this would convert '°' to 'deg'
// we cannot just use unit.getString() because this would convert '°' to 'deg'
QRegExp rxUnits(QString::fromUtf8(" \\D*$")); // space + any non digits at end of string
int pos = 0;
if ((pos = rxUnits.indexIn(qUserString, 0)) != -1) {
@@ -948,7 +948,7 @@ std::string DrawViewDimension::getFormattedDimensionValue(int partial)
if ((Type.isValue("Angle")) || (Type.isValue("Angle3Pt"))) {
result = labelText + unitText + QString::fromUtf8(" \xC2\xB1 ") + tolerance;
} else {
// add the tolerance to the dimension using the ± sign
// add the tolerance to the dimension using the ± sign
result = labelText + QString::fromUtf8(" \xC2\xB1 ") + tolerance;
}
if (partial == 2) {

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp
View File

@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (c) 2020 FreeCAD Developers *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Based on src/Mod/FEM/Gui/DlgSettingsFEMImp.cpp *
* *
* This file is part of the FreeCAD CAx development system. *

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************
* Copyright (c) 2020 FreeCAD Developers *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp
View File

@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (c) 2020 FreeCAD Developers *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Based on src/Mod/FEM/Gui/DlgSettingsFEMImp.cpp *
* *
* This file is part of the FreeCAD CAx development system. *

2
src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************
* Copyright (c) 2020 FreeCAD Developers *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

2
src/Mod/TechDraw/Gui/TaskDimension.cpp
View File

@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) 2021 Uwe Stöhr <uwestoehr@lyx.org> *
* Copyright (c) 2021 Uwe Stöhr <uwestoehr@lyx.org> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

2
src/Mod/TechDraw/Gui/TaskHatch.cpp
View File

@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (c) 2020 FreeCAD Developers *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* *
* This file is part of the FreeCAD CAx development system. *
* *

2
src/Mod/TechDraw/Gui/TaskHatch.h
View File

@@ -1,6 +1,6 @@
/***************************************************************************
* Copyright (c) 2020 FreeCAD Developers *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* Author: Uwe Stöhr <uwestoehr@lyx.org> *
* *
* This file is part of the FreeCAD CAx development system. *
* *