summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-fillet-chamfer.cpp48
-rw-r--r--src/live_effects/lpe-fillet-chamfer.h4
-rw-r--r--src/live_effects/parameter/satellitesarray.cpp28
-rw-r--r--src/live_effects/parameter/satellitesarray.h8
4 files changed, 44 insertions, 44 deletions
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 6ec711de7..56f7557ba 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -104,9 +104,9 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
satellite.setSteps(chamfer_steps);
subpath_satellites.push_back(satellite);
}
- //we add the last satellite on open path because pointwise is related to nodes, not curves
+ //we add the last satellite on open path because pathVectorSatellites is related to nodes, not curves
//so maybe in the future we can need this last satellite in other effects
- //dont remove for this effect because pointwise class has methods when the path is modiffied
+ //dont remove for this effect because pathVectorSatellites class has methods when the path is modiffied
//and we want one method for all uses
if (!path_it->closed()) {
Satellite satellite(FILLET);
@@ -115,9 +115,9 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
}
satellites.push_back(subpath_satellites);
}
- pointwise.setPathVector(pathv);
- pointwise.setSatellites(satellites);
- satellites_param.setPointwise(pointwise);
+ pathVectorSatellites.setPathVector(pathv);
+ pathVectorSatellites.setSatellites(satellites);
+ satellites_param.setPathVectorSatellites(pathVectorSatellites);
} else {
g_warning("LPE Fillet/Chamfer can only be applied to shapes (not groups).");
SPLPEItem *item = const_cast<SPLPEItem *>(lpeItem);
@@ -256,8 +256,8 @@ void LPEFilletChamfer::updateAmount()
} else {
power = radius / 100;
}
- Satellites satellites = pointwise.getSatellites();
- Geom::PathVector pathv = pointwise.getPathVector();
+ Satellites satellites = pathVectorSatellites.getSatellites();
+ Geom::PathVector pathv = pathVectorSatellites.getPathVector();
for (size_t i = 0; i < satellites.size(); ++i) {
for (size_t j = 0; j < satellites[i].size(); ++j) {
boost::optional<size_t> previous_index = boost::none;
@@ -293,14 +293,14 @@ void LPEFilletChamfer::updateAmount()
}
}
}
- pointwise.setSatellites(satellites);
- satellites_param.setPointwise(pointwise);
+ pathVectorSatellites.setSatellites(satellites);
+ satellites_param.setPathVectorSatellites(pathVectorSatellites);
}
void LPEFilletChamfer::updateChamferSteps()
{
- Satellites satellites = pointwise.getSatellites();
- Geom::PathVector pathv = pointwise.getPathVector();
+ Satellites satellites = pathVectorSatellites.getSatellites();
+ Geom::PathVector pathv = pathVectorSatellites.getPathVector();
for (size_t i = 0; i < satellites.size(); ++i) {
for (size_t j = 0; j < satellites[i].size(); ++j) {
if ((!apply_no_radius && satellites[i][j].amount == 0) ||
@@ -318,14 +318,14 @@ void LPEFilletChamfer::updateChamferSteps()
}
}
}
- pointwise.setSatellites(satellites);
- satellites_param.setPointwise(pointwise);
+ pathVectorSatellites.setSatellites(satellites);
+ satellites_param.setPathVectorSatellites(pathVectorSatellites);
}
void LPEFilletChamfer::updateSatelliteType(SatelliteType satellitetype)
{
- Satellites satellites = pointwise.getSatellites();
- Geom::PathVector pathv = pointwise.getPathVector();
+ Satellites satellites = pathVectorSatellites.getSatellites();
+ Geom::PathVector pathv = pathVectorSatellites.getPathVector();
for (size_t i = 0; i < satellites.size(); ++i) {
for (size_t j = 0; j < satellites[i].size(); ++j) {
if ((!apply_no_radius && satellites[i][j].amount == 0) ||
@@ -349,8 +349,8 @@ void LPEFilletChamfer::updateSatelliteType(SatelliteType satellitetype)
}
}
}
- pointwise.setSatellites(satellites);
- satellites_param.setPointwise(pointwise);
+ pathVectorSatellites.setSatellites(satellites);
+ satellites_param.setPathVectorSatellites(pathVectorSatellites);
}
void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
@@ -371,14 +371,14 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
//if are diferent sizes call to poinwise recalculate
//TODO: Update the satellite data in paths modified, Goal 0.93
size_t number_nodes = pathv.nodes().size();
- size_t satellites_counter = pointwise.getTotalSatellites();
+ size_t satellites_counter = pathVectorSatellites.getTotalSatellites();
if (satellites_counter != 0 && number_nodes != satellites_counter) {
Satellite satellite(FILLET);
satellite.setIsTime(flexible);
satellite.setHasMirror(mirror_knots);
satellite.setHidden(hide_knots);
- pointwise.recalculateForNewPathVector(pathv, satellite);
- satellites_param.setPointwise(pointwise);
+ pathVectorSatellites.recalculateForNewPathVector(pathv, satellite);
+ satellites_param.setPathVectorSatellites(pathVectorSatellites);
refreshKnots();
return;
}
@@ -416,9 +416,9 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
}
}
- pointwise.setPathVector(pathv);
- pointwise.setSatellites(satellites);
- satellites_param.setPointwise(pointwise);
+ pathVectorSatellites.setPathVector(pathv);
+ pathVectorSatellites.setSatellites(satellites);
+ satellites_param.setPathVectorSatellites(pathVectorSatellites);
refreshKnots();
} else {
g_warning("LPE Fillet can only be applied to shapes (not groups).");
@@ -454,7 +454,7 @@ LPEFilletChamfer::doEffect_path(Geom::PathVector const &path_in)
}
double time0 = 0;
size_t curve = 0;
- Satellites satellites = pointwise.getSatellites();
+ Satellites satellites = pathVectorSatellites.getSatellites();
for (Geom::Path::const_iterator curve_it1 = path_it->begin(); curve_it1 != path_it->end(); ++curve_it1) {
size_t next_index = curve + 1;
if (curve == pathv[path].size() - 1 && pathv[path].closed()) {
diff --git a/src/live_effects/lpe-fillet-chamfer.h b/src/live_effects/lpe-fillet-chamfer.h
index 7603c7de4..62b894660 100644
--- a/src/live_effects/lpe-fillet-chamfer.h
+++ b/src/live_effects/lpe-fillet-chamfer.h
@@ -15,7 +15,7 @@
#include "live_effects/parameter/enum.h"
#include "live_effects/parameter/satellitesarray.h"
#include "live_effects/effect.h"
-#include "helper/geom-pointwise.h"
+#include "helper/geom-pathvectorsatellites.h"
namespace Inkscape {
namespace LivePathEffect {
@@ -60,7 +60,7 @@ private:
BoolParam apply_with_radius;
ScalarParam helper_size;
- Pointwise pointwise;
+ PathVectorSatellites pathVectorSatellites;
Geom::PathVector _hp;
LPEFilletChamfer(const LPEFilletChamfer &);
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index 78f1a945f..45a6282e0 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -44,10 +44,10 @@ void SatellitesArrayParam::set_oncanvas_looks(SPKnotShapeType shape,
_knot_color = color;
}
-void SatellitesArrayParam::setPointwise(Pointwise pointwise)
+void SatellitesArrayParam::setPathVectorSatellites(PathVectorSatellites pathVectorSatellites)
{
- _last_pointwise = pointwise;
- param_set_and_write_new_value(_last_pointwise.getSatellites());
+ _last_pathVectorSatellites = pathVectorSatellites;
+ param_set_and_write_new_value(_last_pathVectorSatellites.getSatellites());
}
@@ -68,13 +68,13 @@ void SatellitesArrayParam::setHelperSize(int hs)
}
bool SatellitesArrayParam::validData(size_t index,size_t subindex)
{
- if(!_last_pointwise.getPathVector().size() > index){
+ if(!_last_pathVectorSatellites.getPathVector().size() > index){
return false;
}
- if(!_last_pointwise.getPathVector()[index].size_closed() > subindex){
+ if(!_last_pathVectorSatellites.getPathVector()[index].size_closed() > subindex){
return false;
}
- return true; //_last_pointwise.getPathVector().nodes().size() == _last_pointwise.getTotalSatellites();
+ return true; //_last_pathVectorSatellites.getPathVector().nodes().size() == _last_pathVectorSatellites.getTotalSatellites();
}
void SatellitesArrayParam::updateCanvasIndicators(bool mirror)
@@ -83,7 +83,7 @@ void SatellitesArrayParam::updateCanvasIndicators(bool mirror)
if(!_hp.empty()) {
_hp.clear();
}
- Geom::PathVector pathv = _last_pointwise.getPathVector();
+ Geom::PathVector pathv = _last_pathVectorSatellites.getPathVector();
if (pathv.empty()) {
return;
}
@@ -218,7 +218,7 @@ void SatellitesArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
SPDesktop *desktop,
SPItem *item, bool mirror)
{
- Geom::PathVector pathv = _last_pointwise.getPathVector();
+ Geom::PathVector pathv = _last_pathVectorSatellites.getPathVector();
for (size_t i = 0; i < _vector.size(); ++i) {
for (size_t j = 0; j < _vector[i].size(); ++j) {
if (!validData(i, j)) {
@@ -293,7 +293,7 @@ void FilletChamferKnotHolderEntity::knot_set(Geom::Point const &p,
return;
}
Satellite satellite = _pparam->_vector[_index][subindex];
- Geom::PathVector pathv = _pparam->_last_pointwise.getPathVector();
+ Geom::PathVector pathv = _pparam->_last_pathVectorSatellites.getPathVector();
if (satellite.hidden ||
!pathv[_index].closed() && subindex == 0 ||//ignore first satellites on open paths
pathv[_index].size() == subindex) //ignore last satellite in open paths with fillet chamfer effect
@@ -308,7 +308,7 @@ void FilletChamferKnotHolderEntity::knot_set(Geom::Point const &p,
Geom::Curve const &curve_in = pathv[_index][previous_index];
double mirror_time = Geom::nearest_time(s, curve_in);
double time_start = 0;
- Satellites satellites = _pparam->_last_pointwise.getSatellites();
+ Satellites satellites = _pparam->_last_pathVectorSatellites.getSatellites();
time_start = satellites[_index][previous_index].time(curve_in);
if (time_start > mirror_time) {
mirror_time = time_start;
@@ -341,7 +341,7 @@ Geom::Point FilletChamferKnotHolderEntity::knot_get() const
return Geom::Point(Geom::infinity(), Geom::infinity());
}
Satellite satellite = _pparam->_vector[_index][subindex];
- Geom::PathVector pathv = _pparam->_last_pointwise.getPathVector();
+ Geom::PathVector pathv = _pparam->_last_pathVectorSatellites.getPathVector();
if (satellite.hidden ||
!pathv[_index].closed() && subindex == 0 ||//ignore first satellites on open paths
pathv[_index].size() == subindex) //ignore last satellite in open paths with fillet chamfer effect
@@ -368,7 +368,7 @@ Geom::Point FilletChamferKnotHolderEntity::knot_get() const
t = 0;
}
double time_start = 0;
- time_start = _pparam->_last_pointwise.getSatellites()[_index][previous_index].time(curve_in);
+ time_start = _pparam->_last_pathVectorSatellites.getSatellites()[_index][previous_index].time(curve_in);
if (time_start > t) {
t = time_start;
}
@@ -389,7 +389,7 @@ void FilletChamferKnotHolderEntity::knot_click(guint state)
if (!_pparam->validData(_index, subindex)) {
return;
}
- Geom::PathVector pathv = _pparam->_last_pointwise.getPathVector();
+ Geom::PathVector pathv = _pparam->_last_pathVectorSatellites.getPathVector();
if (!pathv[_index].closed() && subindex == 0 ||//ignore first satellites on open paths
pathv[_index].size() == subindex) //ignore last satellite in open paths with fillet chamfer effect
{
@@ -480,7 +480,7 @@ void FilletChamferKnotHolderEntity::knot_set_offset(Satellite satellite)
if (!_pparam->validData(_index, subindex)) {
return;
}
- Geom::PathVector pathv = _pparam->_last_pointwise.getPathVector();
+ Geom::PathVector pathv = _pparam->_last_pathVectorSatellites.getPathVector();
if (satellite.hidden ||
!pathv[_index].closed() && subindex == 0 ||//ignore first satellites on open paths
pathv[_index].size() == subindex) //ignore last satellite in open paths with fillet chamfer effect
diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h
index c6893f595..27e9dea6f 100644
--- a/src/live_effects/parameter/satellitesarray.h
+++ b/src/live_effects/parameter/satellitesarray.h
@@ -12,7 +12,7 @@
* hours
*
*
- * This parameter act as bridge from pointwise class to serialize it as a LPE
+ * This parameter act as bridge from pathVectorSatellites class to serialize it as a LPE
* parameter
*
* Released under GNU GPL, read the file 'COPYING' for more information
@@ -20,7 +20,7 @@
#include "live_effects/parameter/array.h"
#include "live_effects/effect-enum.h"
-#include "helper/geom-pointwise.h"
+#include "helper/geom-pathvectorsatellites.h"
#include "knot-holder-entity.h"
#include <glib.h>
@@ -56,7 +56,7 @@ public:
void param_transform_multiply(Geom::Affine const &postmul, bool /*set*/);
void setUseDistance(bool use_knot_distance);
void setEffectType(EffectType et);
- void setPointwise(Pointwise pointwise);
+ void setPathVectorSatellites(PathVectorSatellites pathVectorSatellites);
bool validData(size_t index, size_t subindex);
void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode, guint32 color);
@@ -77,7 +77,7 @@ private:
int _helper_size;
bool _use_distance;
EffectType _effectType;
- Pointwise _last_pointwise;
+ PathVectorSatellites _last_pathVectorSatellites;
};
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 17:39:59 +0000