summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/satellitepairarray.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/live_effects/parameter/satellitepairarray.cpp')
-rw-r--r--src/live_effects/parameter/satellitepairarray.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/live_effects/parameter/satellitepairarray.cpp b/src/live_effects/parameter/satellitepairarray.cpp
index dd67be6a1..0748269f4 100644
--- a/src/live_effects/parameter/satellitepairarray.cpp
+++ b/src/live_effects/parameter/satellitepairarray.cpp
@@ -195,7 +195,7 @@ void SatellitePairArrayParam::addCanvasIndicators(
void SatellitePairArrayParam::recalculate_knots()
{
if(last_pointwise){
- //_vector = last_pointwise->getSatellites();
+ _vector = last_pointwise->getSatellites();
}
}
@@ -222,13 +222,13 @@ void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
SPItem *item,
bool mirror)
{
- recalculate_knots();
+ //recalculate_knots();
for (size_t i = 0; i < _vector.size(); ++i) {
size_t iPlus = i;
if( mirror == true){
iPlus = i + _vector.size();
}
- if(!_vector[i].second.getActive() || _vector[i].second.getHidden()){
+ if(!_vector[i].second.getActive()){
continue;
}
if(!_vector[i].second.getHasMirror() && mirror == true){
@@ -282,8 +282,6 @@ FilletChamferKnotHolderEntity::FilletChamferKnotHolderEntity(SatellitePairArrayP
{
}
-
-
void FilletChamferKnotHolderEntity::knot_set(Point const &p,
Point const &/*origin*/,
guint state)
@@ -353,6 +351,7 @@ FilletChamferKnotHolderEntity::knot_get() const
if(!_pparam->last_pointwise){
return Point(infinity(), infinity());
}
+ std::cout << satellite.second.getHidden() << "hiddden\n";
if(!satellite.second.getActive() || satellite.second.getHidden()){
return Point(infinity(), infinity());
}
@@ -361,6 +360,8 @@ FilletChamferKnotHolderEntity::knot_get() const
if(pwd2.size() <= (unsigned)satellite.first){
return Point(infinity(), infinity());
}
+ this->knot->show();
+ std::cout << satellite.second.getHidden() << "show\n";
if( _index >= _pparam->_vector.size()){
tmpPoint = satellite.second.getPosition(pwd2[satellite.first]);
boost::optional<size_t> d2_prev_index = pointwise->getPrevious(satellite.first);