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

CAM: apply precommit

Browse Source
This commit is contained in:
Adrian Insaurralde Avalos
2024-09-03 14:54:36 -04:00
parent 261ef09348
commit a17a3cf6d7
337 changed files with 26842 additions and 25585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

567
src/Mod/CAM/Gui/ViewProviderPath.cpp
View File

@@ -23,19 +23,19 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/replace.hpp>
# include <Inventor/SbVec3f.h>
# include <Inventor/details/SoLineDetail.h>
# include <Inventor/nodes/SoBaseColor.h>
# include <Inventor/nodes/SoCoordinate3.h>
# include <Inventor/nodes/SoDrawStyle.h>
# include <Inventor/nodes/SoMaterial.h>
# include <Inventor/nodes/SoMaterialBinding.h>
# include <Inventor/nodes/SoPointSet.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoSwitch.h>
# include <Inventor/nodes/SoTransform.h>
#include <Inventor/SbVec3f.h>
#include <Inventor/details/SoLineDetail.h>
#include <Inventor/nodes/SoBaseColor.h>
#include <Inventor/nodes/SoCoordinate3.h>
#include <Inventor/nodes/SoDrawStyle.h>
#include <Inventor/nodes/SoMaterial.h>
#include <Inventor/nodes/SoMaterialBinding.h>
#include <Inventor/nodes/SoPointSet.h>
#include <Inventor/nodes/SoSeparator.h>
#include <Inventor/nodes/SoSwitch.h>
#include <Inventor/nodes/SoTransform.h>
#endif
#include <App/Application.h>
@@ -58,64 +58,74 @@ using namespace PathGui;
using namespace Path;
using namespace PartGui;
namespace PathGui {
namespace PathGui
{
class PathSelectionObserver: public Gui::SelectionObserver {
class PathSelectionObserver: public Gui::SelectionObserver
{
public:
static void init() {
static PathSelectionObserver *instance;
if(!instance)
static void init()
{
static PathSelectionObserver* instance;
if (!instance) {
instance = new PathSelectionObserver();
}
}
void setArrow(SoSwitch *pcSwitch=nullptr) {
if(pcSwitch==pcLastArrowSwitch)
void setArrow(SoSwitch* pcSwitch = nullptr)
{
if (pcSwitch == pcLastArrowSwitch) {
return;
if(pcLastArrowSwitch) {
}
if (pcLastArrowSwitch) {
pcLastArrowSwitch->whichChild = -1;
pcLastArrowSwitch->unref();
pcLastArrowSwitch = nullptr;
}
if(pcSwitch) {
if (pcSwitch) {
pcSwitch->ref();
pcSwitch->whichChild = 0;
pcLastArrowSwitch = pcSwitch;
}
}
void onSelectionChanged(const Gui::SelectionChanges& msg) override {
if(msg.Type == Gui::SelectionChanges::RmvPreselect) {
void onSelectionChanged(const Gui::SelectionChanges& msg) override
{
if (msg.Type == Gui::SelectionChanges::RmvPreselect) {
setArrow();
return;
}
if(msg.Type!=Gui::SelectionChanges::SetPreselect
&& msg.Type!=Gui::SelectionChanges::MovePreselect)
if (msg.Type != Gui::SelectionChanges::SetPreselect
&& msg.Type != Gui::SelectionChanges::MovePreselect) {
return;
}
auto obj = msg.Object.getObject();
if(!obj)
if (!obj) {
return;
}
Base::Matrix4D mat;
auto sobj = obj->getSubObject(msg.pSubName,nullptr,&mat);
if(!sobj)
auto sobj = obj->getSubObject(msg.pSubName, nullptr, &mat);
if (!sobj) {
return;
}
Base::Matrix4D linkMat;
auto linked = sobj->getLinkedObject(true,&linkMat,false);
auto linked = sobj->getLinkedObject(true, &linkMat, false);
auto vp = Base::freecad_dynamic_cast<ViewProviderPath>(
Application::Instance->getViewProvider(linked));
if(!vp) {
Application::Instance->getViewProvider(linked));
if (!vp) {
setArrow();
return;
}
if(vp->pt0Index >= 0) {
if (vp->pt0Index >= 0) {
mat *= linkMat;
mat.inverse();
Base::Vector3d pt = mat*Base::Vector3d(msg.x,msg.y,msg.z);
if(vp->pcLineCoords->point.getNum() > 0){
Base::Vector3d pt = mat * Base::Vector3d(msg.x, msg.y, msg.z);
if (vp->pcLineCoords->point.getNum() > 0) {
auto ptTo = vp->pcLineCoords->point.getValues(vp->pt0Index);
SbVec3f ptFrom(pt.x,pt.y,pt.z);
if(ptTo && ptFrom != *ptTo) {
vp->pcArrowTransform->pointAt(ptFrom,*ptTo);
SbVec3f ptFrom(pt.x, pt.y, pt.z);
if (ptTo && ptFrom != *ptTo) {
vp->pcArrowTransform->pointAt(ptFrom, *ptTo);
setArrow(vp->pcArrowSwitch);
return;
}
@@ -124,42 +134,73 @@ public:
setArrow();
}
SoSwitch *pcLastArrowSwitch = nullptr;
SoSwitch* pcLastArrowSwitch = nullptr;
};
}
} // namespace PathGui
//////////////////////////////////////////////////////////////////////////////
PROPERTY_SOURCE(PathGui::ViewProviderPath, Gui::ViewProviderGeometryObject)
ViewProviderPath::ViewProviderPath()
:pt0Index(-1),blockPropertyChange(false),edgeStart(-1),coordStart(-1),coordEnd(-1)
: pt0Index(-1)
, blockPropertyChange(false)
, edgeStart(-1)
, coordStart(-1)
, coordEnd(-1)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM");
unsigned long lcol = hGrp->GetUnsigned("DefaultNormalPathColor",11141375UL); // dark green (0,170,0)
float lr,lg,lb;
lr = ((lcol >> 24) & 0xff) / 255.0; lg = ((lcol >> 16) & 0xff) / 255.0; lb = ((lcol >> 8) & 0xff) / 255.0;
unsigned long mcol = hGrp->GetUnsigned("DefaultPathMarkerColor",1442775295UL); // lime green (85,255,0)
float mr,mg,mb;
mr = ((mcol >> 24) & 0xff) / 255.0; mg = ((mcol >> 16) & 0xff) / 255.0; mb = ((mcol >> 8) & 0xff) / 255.0;
int lwidth = hGrp->GetInt("DefaultPathLineWidth",1);
ADD_PROPERTY_TYPE(NormalColor,(lr,lg,lb),"Path",App::Prop_None,"The color of the feed rate moves");
ADD_PROPERTY_TYPE(MarkerColor,(mr,mg,mb),"Path",App::Prop_None,"The color of the markers");
ADD_PROPERTY_TYPE(LineWidth,(lwidth),"Path",App::Prop_None,"The line width of this path");
ADD_PROPERTY_TYPE(ShowNodes,(false),"Path",App::Prop_None,"Turns the display of nodes on/off");
ParameterGrp::handle hGrp =
App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM");
unsigned long lcol =
hGrp->GetUnsigned("DefaultNormalPathColor", 11141375UL); // dark green (0,170,0)
float lr, lg, lb;
lr = ((lcol >> 24) & 0xff) / 255.0;
lg = ((lcol >> 16) & 0xff) / 255.0;
lb = ((lcol >> 8) & 0xff) / 255.0;
unsigned long mcol =
hGrp->GetUnsigned("DefaultPathMarkerColor", 1442775295UL); // lime green (85,255,0)
float mr, mg, mb;
mr = ((mcol >> 24) & 0xff) / 255.0;
mg = ((mcol >> 16) & 0xff) / 255.0;
mb = ((mcol >> 8) & 0xff) / 255.0;
int lwidth = hGrp->GetInt("DefaultPathLineWidth", 1);
ADD_PROPERTY_TYPE(NormalColor,
(lr, lg, lb),
"Path",
App::Prop_None,
"The color of the feed rate moves");
ADD_PROPERTY_TYPE(MarkerColor,
(mr, mg, mb),
"Path",
App::Prop_None,
"The color of the markers");
ADD_PROPERTY_TYPE(LineWidth, (lwidth), "Path", App::Prop_None, "The line width of this path");
ADD_PROPERTY_TYPE(ShowNodes,
(false),
"Path",
App::Prop_None,
"Turns the display of nodes on/off");
ShowCountConstraints.LowerBound=0;
ShowCountConstraints.UpperBound=INT_MAX;
ShowCountConstraints.StepSize=1;
ShowCountConstraints.LowerBound = 0;
ShowCountConstraints.UpperBound = INT_MAX;
ShowCountConstraints.StepSize = 1;
ShowCount.setConstraints(&ShowCountConstraints);
StartIndexConstraints.LowerBound=0;
StartIndexConstraints.UpperBound=INT_MAX;
StartIndexConstraints.StepSize=1;
StartIndexConstraints.LowerBound = 0;
StartIndexConstraints.UpperBound = INT_MAX;
StartIndexConstraints.StepSize = 1;
StartIndex.setConstraints(&StartIndexConstraints);
ADD_PROPERTY_TYPE(StartPosition,(Base::Vector3d()),"Show",App::Prop_None,"Tool initial position");
ADD_PROPERTY_TYPE(StartIndex,(0),"Show",App::Prop_None,"The index of first GCode to show");
ADD_PROPERTY_TYPE(ShowCount,(0),"Show",App::Prop_None,"Number of movement GCode to show, 0 means all");
ADD_PROPERTY_TYPE(StartPosition,
(Base::Vector3d()),
"Show",
App::Prop_None,
"Tool initial position");
ADD_PROPERTY_TYPE(StartIndex, (0), "Show", App::Prop_None, "The index of first GCode to show");
ADD_PROPERTY_TYPE(ShowCount,
(0),
"Show",
App::Prop_None,
"Number of movement GCode to show, 0 means all");
pcLineCoords = new SoCoordinate3();
pcLineCoords->ref();
@@ -174,7 +215,10 @@ ViewProviderPath::ViewProviderPath()
pcMarkerStyle = new SoDrawStyle();
pcMarkerStyle->ref();
pcMarkerStyle->style = SoDrawStyle::POINTS;
pcMarkerStyle->pointSize = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View")->GetInt("MarkerSize", 4);
pcMarkerStyle->pointSize =
App::GetApplication()
.GetParameterGroupByPath("User parameter:BaseApp/Preferences/View")
->GetInt("MarkerSize", 4);
pcDrawStyle = new SoDrawStyle();
pcDrawStyle->ref();
@@ -222,9 +266,9 @@ ViewProviderPath::ViewProviderPath()
DisplayMode.setStatus(App::Property::Status::Hidden, true);
static const char *SelectionStyleEnum[] = {"Shape","BoundBox","None",nullptr};
static const char* SelectionStyleEnum[] = {"Shape", "BoundBox", "None", nullptr};
SelectionStyle.setEnums(SelectionStyleEnum);
unsigned long sstyle = hGrp->GetInt("DefaultSelectionStyle",0);
unsigned long sstyle = hGrp->GetInt("DefaultSelectionStyle", 0);
SelectionStyle.setValue(sstyle);
PathSelectionObserver::init();
@@ -244,7 +288,7 @@ ViewProviderPath::~ViewProviderPath()
pcArrowSwitch->unref();
}
void ViewProviderPath::attach(App::DocumentObject *pcObj)
void ViewProviderPath::attach(App::DocumentObject* pcObj)
{
inherited::attach(pcObj);
@@ -273,15 +317,17 @@ void ViewProviderPath::attach(App::DocumentObject *pcObj)
addDisplayMaskMode(pcPathRoot, "Waypoints");
}
bool ViewProviderPath::useNewSelectionModel() const {
return SelectionStyle.getValue()!=2;
bool ViewProviderPath::useNewSelectionModel() const
{
return SelectionStyle.getValue() != 2;
}
void ViewProviderPath::setDisplayMode(const char* ModeName)
{
if ( strcmp("Waypoints",ModeName)==0 )
if (strcmp("Waypoints", ModeName) == 0) {
setDisplayMaskMode("Waypoints");
inherited::setDisplayMode( ModeName );
}
inherited::setDisplayMode(ModeName);
}
std::vector<std::string> ViewProviderPath::getDisplayModes() const
@@ -293,20 +339,21 @@ std::vector<std::string> ViewProviderPath::getDisplayModes() const
std::string ViewProviderPath::getElement(const SoDetail* detail) const
{
if(edgeStart>=0 && detail && detail->getTypeId() == SoLineDetail::getClassTypeId()) {
if (edgeStart >= 0 && detail && detail->getTypeId() == SoLineDetail::getClassTypeId()) {
const SoLineDetail* line_detail = static_cast<const SoLineDetail*>(detail);
int index = line_detail->getLineIndex()+edgeStart;
if(index>=0 && index<(int)edge2Command.size()) {
int index = line_detail->getLineIndex() + edgeStart;
if (index >= 0 && index < (int)edge2Command.size()) {
index = edge2Command[index];
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
const Toolpath &tp = pcPathObj->Path.getValue();
if(index<(int)tp.getSize()) {
const Toolpath& tp = pcPathObj->Path.getValue();
if (index < (int)tp.getSize()) {
std::stringstream str;
str << index+1 << " " << tp.getCommand(index).toGCode(6,false);
str << index + 1 << " " << tp.getCommand(index).toGCode(6, false);
pt0Index = line_detail->getPoint0()->getCoordinateIndex();
if(pt0Index<0 || pt0Index>=pcLineCoords->point.getNum())
if (pt0Index < 0 || pt0Index >= pcLineCoords->point.getNum()) {
pt0Index = -1;
return boost::replace_all_copy(str.str(),".",",");
}
return boost::replace_all_copy(str.str(), ".", ",");
}
}
}
@@ -319,11 +366,11 @@ SoDetail* ViewProviderPath::getDetail(const char* subelement) const
{
int index = std::atoi(subelement);
SoDetail* detail = nullptr;
if (index>0 && index<=(int)command2Edge.size()) {
index = command2Edge[index-1];
if(index>=0 && edgeStart>=0 && edgeStart<=index) {
if (index > 0 && index <= (int)command2Edge.size()) {
index = command2Edge[index - 1];
if (index >= 0 && edgeStart >= 0 && edgeStart <= index) {
detail = new SoLineDetail();
static_cast<SoLineDetail*>(detail)->setLineIndex(index-edgeStart);
static_cast<SoLineDetail*>(detail)->setLineIndex(index - edgeStart);
}
}
return detail;
@@ -331,113 +378,145 @@ SoDetail* ViewProviderPath::getDetail(const char* subelement) const
void ViewProviderPath::onChanged(const App::Property* prop)
{
if(blockPropertyChange)
if (blockPropertyChange) {
return;
}
if (prop == &LineWidth) {
pcDrawStyle->lineWidth = LineWidth.getValue();
} else if (prop == &NormalColor) {
if (!colorindex.empty() && coordStart>=0 && coordStart<(int)colorindex.size()) {
}
else if (prop == &NormalColor) {
if (!colorindex.empty() && coordStart >= 0 && coordStart < (int)colorindex.size()) {
const App::Color& c = NormalColor.getValue();
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM");
unsigned long rcol = hGrp->GetUnsigned("DefaultRapidPathColor",2852126975UL); // dark red (170,0,0)
float rr,rg,rb;
rr = ((rcol >> 24) & 0xff) / 255.0; rg = ((rcol >> 16) & 0xff) / 255.0; rb = ((rcol >> 8) & 0xff) / 255.0;
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/CAM");
unsigned long rcol =
hGrp->GetUnsigned("DefaultRapidPathColor", 2852126975UL); // dark red (170,0,0)
float rr, rg, rb;
rr = ((rcol >> 24) & 0xff) / 255.0;
rg = ((rcol >> 16) & 0xff) / 255.0;
rb = ((rcol >> 8) & 0xff) / 255.0;
unsigned long pcol = hGrp->GetUnsigned("DefaultProbePathColor",4293591295UL); // yellow (255,255,5)
float pr,pg,pb;
pr = ((pcol >> 24) & 0xff) / 255.0; pg = ((pcol >> 16) & 0xff) / 255.0; pb = ((pcol >> 8) & 0xff) / 255.0;
unsigned long pcol =
hGrp->GetUnsigned("DefaultProbePathColor", 4293591295UL); // yellow (255,255,5)
float pr, pg, pb;
pr = ((pcol >> 24) & 0xff) / 255.0;
pg = ((pcol >> 16) & 0xff) / 255.0;
pb = ((pcol >> 8) & 0xff) / 255.0;
pcMatBind->value = SoMaterialBinding::PER_PART;
// resizing and writing the color vector:
int count = coordEnd-coordStart;
if(count > (int)colorindex.size()-coordStart) count = colorindex.size()-coordStart;
int count = coordEnd - coordStart;
if (count > (int)colorindex.size() - coordStart) {
count = colorindex.size() - coordStart;
}
pcLineColor->diffuseColor.setNum(count);
SbColor* colors = pcLineColor->diffuseColor.startEditing();
for(int i=0;i<count;i++) {
switch(colorindex[i+coordStart]){
case 0:
colors[i] = SbColor(rr,rg,rb);
break;
case 1:
colors[i] = SbColor(c.r,c.g,c.b);
break;
default:
colors[i] = SbColor(pr,pg,pb);
for (int i = 0; i < count; i++) {
switch (colorindex[i + coordStart]) {
case 0:
colors[i] = SbColor(rr, rg, rb);
break;
case 1:
colors[i] = SbColor(c.r, c.g, c.b);
break;
default:
colors[i] = SbColor(pr, pg, pb);
}
}
pcLineColor->diffuseColor.finishEditing();
}
} else if (prop == &MarkerColor) {
}
else if (prop == &MarkerColor) {
const App::Color& c = MarkerColor.getValue();
pcMarkerColor->rgb.setValue(c.r,c.g,c.b);
} else if(prop == &ShowNodes) {
pcMarkerSwitch->whichChild = ShowNodes.getValue()?0:-1;
} else if (prop == &ShowCount || prop==&StartIndex) {
pcMarkerColor->rgb.setValue(c.r, c.g, c.b);
}
else if (prop == &ShowNodes) {
pcMarkerSwitch->whichChild = ShowNodes.getValue() ? 0 : -1;
}
else if (prop == &ShowCount || prop == &StartIndex) {
bool vis = isShow();
if (vis) hide();
updateVisual();
if (vis) show();
} else if (prop == &StartPosition) {
if(pcLineCoords->point.getNum()){
const Base::Vector3d &pt = StartPosition.getValue();
pcLineCoords->point.set1Value(0,pt.x,pt.y,pt.z);
pcMarkerCoords->point.set1Value(0,pt.x,pt.y,pt.z);
if (vis) {
hide();
}
} else {
updateVisual();
if (vis) {
show();
}
}
else if (prop == &StartPosition) {
if (pcLineCoords->point.getNum()) {
const Base::Vector3d& pt = StartPosition.getValue();
pcLineCoords->point.set1Value(0, pt.x, pt.y, pt.z);
pcMarkerCoords->point.set1Value(0, pt.x, pt.y, pt.z);
}
}
else {
inherited::onChanged(prop);
if(prop == &SelectionStyle && SelectionStyle.getValue()==2)
if (prop == &SelectionStyle && SelectionStyle.getValue() == 2) {
hideSelection();
}
}
}
void ViewProviderPath::showBoundingBox(bool show) {
if(show) {
if(!pcLineCoords->point.getNum())
void ViewProviderPath::showBoundingBox(bool show)
{
if (show) {
if (!pcLineCoords->point.getNum()) {
return;
}
}
inherited::showBoundingBox(show);
}
unsigned long ViewProviderPath::getBoundColor() const {
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM");
if(SelectionStyle.getValue() == 0 || !Selectable.getValue())
return hGrp->GetUnsigned("DefaultBBoxNormalColor",4294967295UL); // white (255,255,255)
else
return hGrp->GetUnsigned("DefaultBBoxSelectionColor",0xc8ffff00UL); // rgb(0,85,255)
unsigned long ViewProviderPath::getBoundColor() const
{
ParameterGrp::handle hGrp =
App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM");
if (SelectionStyle.getValue() == 0 || !Selectable.getValue()) {
return hGrp->GetUnsigned("DefaultBBoxNormalColor", 4294967295UL); // white (255,255,255)
}
else {
return hGrp->GetUnsigned("DefaultBBoxSelectionColor", 0xc8ffff00UL); // rgb(0,85,255)
}
}
void ViewProviderPath::updateShowConstraints() {
void ViewProviderPath::updateShowConstraints()
{
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
const Toolpath &tp = pcPathObj->Path.getValue();
const Toolpath& tp = pcPathObj->Path.getValue();
StartIndexConstraints.UpperBound = tp.getSize();
if (StartIndex.getValue() >= (long)tp.getSize()) {
int start = ((int)tp.getSize())-ShowCount.getValue();
if(start>=(int)tp.getSize())
start=tp.getSize()-1;
if(start<0) start = 0;
int start = ((int)tp.getSize()) - ShowCount.getValue();
if (start >= (int)tp.getSize()) {
start = tp.getSize() - 1;
}
if (start < 0) {
start = 0;
}
blockPropertyChange = true;
StartIndex.setValue(start);
blockPropertyChange = false;
StartIndex.purgeTouched();
}
StartIndexConstraints.StepSize = ShowCount.getValue()>2?ShowCount.getValue()-2:1;
StartIndexConstraints.StepSize = ShowCount.getValue() > 2 ? ShowCount.getValue() - 2 : 1;
}
void ViewProviderPath::updateData(const App::Property* prop)
{
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
if(prop == &pcPathObj->Path) {
if (prop == &pcPathObj->Path) {
updateVisual(true);
return;
}
inherited::updateData(prop);
}
void ViewProviderPath::hideSelection() {
void ViewProviderPath::hideSelection()
{
// Clear selection
SoSelectionElementAction saction(Gui::SoSelectionElementAction::None);
saction.apply(pcLines);
@@ -450,28 +529,26 @@ void ViewProviderPath::hideSelection() {
pcArrowSwitch->whichChild = -1;
}
class VisualPathSegmentVisitor
: public PathSegmentVisitor
class VisualPathSegmentVisitor: public PathSegmentVisitor
{
public:
VisualPathSegmentVisitor(
const Toolpath &tp,
SoCoordinate3 *pcLineCoords_,
SoCoordinate3 *pcMarkerCoords_,
std::vector<int> &command2Edge_,
std::deque<int> &edge2Command_,
std::deque<int> &edgeIndices_,
std::vector<int> &colorindex_,
std::deque<Base::Vector3d> &points_,
std::deque<Base::Vector3d> &markers_)
: pcLineCoords(pcLineCoords_)
, pcMarkerCoords(pcMarkerCoords_)
, command2Edge(command2Edge_)
, edge2Command(edge2Command_)
, edgeIndices(edgeIndices_)
, colorindex(colorindex_)
, points(points_)
, markers(markers_)
VisualPathSegmentVisitor(const Toolpath& tp,
SoCoordinate3* pcLineCoords_,
SoCoordinate3* pcMarkerCoords_,
std::vector<int>& command2Edge_,
std::deque<int>& edge2Command_,
std::deque<int>& edgeIndices_,
std::vector<int>& colorindex_,
std::deque<Base::Vector3d>& points_,
std::deque<Base::Vector3d>& markers_)
: pcLineCoords(pcLineCoords_)
, pcMarkerCoords(pcMarkerCoords_)
, command2Edge(command2Edge_)
, edge2Command(edge2Command_)
, edgeIndices(edgeIndices_)
, colorindex(colorindex_)
, points(points_)
, markers(markers_)
{
pcLineCoords->point.deleteValues(0);
pcMarkerCoords->point.deleteValues(0);
@@ -482,36 +559,50 @@ public:
colorindex.clear();
command2Edge.resize(tp.getSize(),-1);
command2Edge.resize(tp.getSize(), -1);
}
void setup(const Base::Vector3d &last) override
void setup(const Base::Vector3d& last) override
{
points.push_back(last);
markers.push_back(last);
}
void g0(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts) override
void g0(int id,
const Base::Vector3d& last,
const Base::Vector3d& next,
const std::deque<Base::Vector3d>& pts) override
{
(void)last;
gx(id, &next, pts, 0);
}
void g1(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts) override
void g1(int id,
const Base::Vector3d& last,
const Base::Vector3d& next,
const std::deque<Base::Vector3d>& pts) override
{
(void)last;
gx(id, &next, pts, 1);
}
void g23(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts, const Base::Vector3d &center) override
void g23(int id,
const Base::Vector3d& last,
const Base::Vector3d& next,
const std::deque<Base::Vector3d>& pts,
const Base::Vector3d& center) override
{
(void)last;
gx(id, &next, pts, 1);
markers.push_back(center);
}
void g8x(int id, const Base::Vector3d &last, const Base::Vector3d &next, const std::deque<Base::Vector3d> &pts,
const std::deque<Base::Vector3d> &p, const std::deque<Base::Vector3d> &q) override
void g8x(int id,
const Base::Vector3d& last,
const Base::Vector3d& next,
const std::deque<Base::Vector3d>& pts,
const std::deque<Base::Vector3d>& p,
const std::deque<Base::Vector3d>& q) override
{
(void)last;
@@ -529,7 +620,7 @@ public:
markers.push_back(next);
colorindex.push_back(1);
for (std::deque<Base::Vector3d>::const_iterator it=q.begin(); q.end() != it; ++it) {
for (std::deque<Base::Vector3d>::const_iterator it = q.begin(); q.end() != it; ++it) {
markers.push_back(*it);
}
@@ -540,7 +631,7 @@ public:
pushCommand(id);
}
void g38(int id, const Base::Vector3d &last, const Base::Vector3d &next) override
void g38(int id, const Base::Vector3d& last, const Base::Vector3d& next) override
{
#if 0
Base::Vector3d p1(next.x,next.y,last.z);
@@ -556,29 +647,30 @@ public:
pushCommand(id);
#else
(void)last;
const std::deque<Base::Vector3d> pts{};
gx(id, &next, pts, 2);
(void)last;
const std::deque<Base::Vector3d> pts {};
gx(id, &next, pts, 2);
#endif
}
private:
SoCoordinate3 *pcLineCoords;
SoCoordinate3 *pcMarkerCoords;
SoCoordinate3* pcLineCoords;
SoCoordinate3* pcMarkerCoords;
std::vector<int> &command2Edge;
std::deque<int> &edge2Command;
std::deque<int> &edgeIndices;
std::vector<int>& command2Edge;
std::deque<int>& edge2Command;
std::deque<int>& edgeIndices;
std::vector<int> &colorindex;
std::deque<Base::Vector3d> &points;
std::deque<Base::Vector3d> &markers;
std::vector<int>& colorindex;
std::deque<Base::Vector3d>& points;
std::deque<Base::Vector3d>& markers;
virtual void gx(int id, const Base::Vector3d *next, const std::deque<Base::Vector3d> &pts, int color)
virtual void
gx(int id, const Base::Vector3d* next, const std::deque<Base::Vector3d>& pts, int color)
{
for (std::deque<Base::Vector3d>::const_iterator it=pts.begin(); pts.end() != it; ++it) {
points.push_back(*it);
colorindex.push_back(color);
for (std::deque<Base::Vector3d>::const_iterator it = pts.begin(); pts.end() != it; ++it) {
points.push_back(*it);
colorindex.push_back(color);
}
if (next) {
@@ -590,14 +682,16 @@ private:
}
}
void pushCommand(int id) {
command2Edge[id] = edgeIndices.size();
edgeIndices.push_back(points.size());
edge2Command.push_back(id);
void pushCommand(int id)
{
command2Edge[id] = edgeIndices.size();
edgeIndices.push_back(points.size());
edge2Command.push_back(id);
}
};
void ViewProviderPath::updateVisual(bool rebuild) {
void ViewProviderPath::updateVisual(bool rebuild)
{
hideSelection();
@@ -605,22 +699,22 @@ void ViewProviderPath::updateVisual(bool rebuild) {
pcLines->coordIndex.deleteValues(0);
if(rebuild) {
if (rebuild) {
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
const Toolpath &tp = pcPathObj->Path.getValue();
const Toolpath& tp = pcPathObj->Path.getValue();
std::deque<Base::Vector3d> points;
std::deque<Base::Vector3d> markers;
VisualPathSegmentVisitor collect(tp,
pcLineCoords,
pcMarkerCoords,
command2Edge,
edge2Command,
edgeIndices,
colorindex,
points,
markers);
pcLineCoords,
pcMarkerCoords,
command2Edge,
edge2Command,
edgeIndices,
colorindex,
points,
markers);
PathSegmentWalker segments(tp);
segments.walk(collect, StartPosition.getValue());
@@ -629,14 +723,16 @@ void ViewProviderPath::updateVisual(bool rebuild) {
if (!edgeIndices.empty()) {
pcLineCoords->point.setNum(points.size());
SbVec3f* verts = pcLineCoords->point.startEditing();
int i=0;
for(const auto &pt : points)
verts[i++].setValue(pt.x,pt.y,pt.z);
int i = 0;
for (const auto& pt : points) {
verts[i++].setValue(pt.x, pt.y, pt.z);
}
pcLineCoords->point.finishEditing();
pcMarkerCoords->point.setNum(markers.size());
for(unsigned int i=0;i<markers.size();i++)
pcMarkerCoords->point.set1Value(i,markers[i].x,markers[i].y,markers[i].z);
for (unsigned int i = 0; i < markers.size(); i++) {
pcMarkerCoords->point.set1Value(i, markers[i].x, markers[i].y, markers[i].z);
}
recomputeBoundingBox();
}
@@ -645,42 +741,48 @@ void ViewProviderPath::updateVisual(bool rebuild) {
// count = index + separators
edgeStart = -1;
int i;
for(i=StartIndex.getValue();i<(int)command2Edge.size();++i)
if((edgeStart=command2Edge[i])>=0) break;
for (i = StartIndex.getValue(); i < (int)command2Edge.size(); ++i) {
if ((edgeStart = command2Edge[i]) >= 0) {
break;
}
}
if(edgeStart<0)
if (edgeStart < 0) {
return;
}
if(i!=StartIndex.getValue() && StartIndex.getValue()!=0) {
if (i != StartIndex.getValue() && StartIndex.getValue() != 0) {
blockPropertyChange = true;
StartIndex.setValue(i);
blockPropertyChange = false;
StartIndex.purgeTouched();
}
int edgeEnd = edgeStart+ShowCount.getValue();
if(edgeEnd==edgeStart || edgeEnd>(int)edgeIndices.size())
int edgeEnd = edgeStart + ShowCount.getValue();
if (edgeEnd == edgeStart || edgeEnd > (int)edgeIndices.size()) {
edgeEnd = edgeIndices.size();
}
// coord index start
coordStart = edgeStart==0?0:(edgeIndices[edgeStart-1]-1);
coordEnd = edgeIndices[edgeEnd-1];
coordStart = edgeStart == 0 ? 0 : (edgeIndices[edgeStart - 1] - 1);
coordEnd = edgeIndices[edgeEnd - 1];
// count = coord indices + index separators
int count = coordEnd-coordStart+2*(edgeEnd-edgeStart-1)+1;
int count = coordEnd - coordStart + 2 * (edgeEnd - edgeStart - 1) + 1;
pcLines->coordIndex.setNum(count);
int32_t *idx = pcLines->coordIndex.startEditing();
i=0;
int32_t* idx = pcLines->coordIndex.startEditing();
i = 0;
int start = coordStart;
for(int e=edgeStart;e!=edgeEnd;++e) {
for(int end=edgeIndices[e];start<end;++start)
for (int e = edgeStart; e != edgeEnd; ++e) {
for (int end = edgeIndices[e]; start < end; ++start) {
idx[i++] = start;
idx[i++]=-1;
}
idx[i++] = -1;
--start;
}
pcLines->coordIndex.finishEditing();
assert(i==count);
assert(i == count);
NormalColor.touch();
}
@@ -688,7 +790,7 @@ void ViewProviderPath::updateVisual(bool rebuild) {
void ViewProviderPath::recomputeBoundingBox()
{
// update the boundbox
double MinX,MinY,MinZ,MaxX,MaxY,MaxZ;
double MinX, MinY, MinZ, MaxX, MaxY, MaxZ;
MinX = 999999999.0;
MinY = 999999999.0;
MinZ = 999999999.0;
@@ -698,17 +800,29 @@ void ViewProviderPath::recomputeBoundingBox()
Path::Feature* pcPathObj = static_cast<Path::Feature*>(pcObject);
Base::Placement pl = *(&pcPathObj->Placement.getValue());
Base::Vector3d pt;
for (int i=1;i<pcLineCoords->point.getNum();i++) {
for (int i = 1; i < pcLineCoords->point.getNum(); i++) {
pt.x = pcLineCoords->point[i].getValue()[0];
pt.y = pcLineCoords->point[i].getValue()[1];
pt.z = pcLineCoords->point[i].getValue()[2];
pl.multVec(pt,pt);
if (pt.x < MinX) MinX = pt.x;
if (pt.y < MinY) MinY = pt.y;
if (pt.z < MinZ) MinZ = pt.z;
if (pt.x > MaxX) MaxX = pt.x;
if (pt.y > MaxY) MaxY = pt.y;
if (pt.z > MaxZ) MaxZ = pt.z;
pl.multVec(pt, pt);
if (pt.x < MinX) {
MinX = pt.x;
}
if (pt.y < MinY) {
MinY = pt.y;
}
if (pt.z < MinZ) {
MinZ = pt.z;
}
if (pt.x > MaxX) {
MaxX = pt.x;
}
if (pt.y > MaxY) {
MaxY = pt.y;
}
if (pt.z > MaxZ) {
MaxZ = pt.z;
}
}
pcBoundingBox->minBounds.setValue(MinX, MinY, MinZ);
pcBoundingBox->maxBounds.setValue(MaxX, MaxY, MaxZ);
@@ -721,11 +835,12 @@ QIcon ViewProviderPath::getIcon() const
// Python object -----------------------------------------------------------------------
namespace Gui {
namespace Gui
{
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderPathPython, PathGui::ViewProviderPath)
/// @endcond
// explicit template instantiation
template class PathGuiExport ViewProviderFeaturePythonT<PathGui::ViewProviderPath>;
}
} // namespace Gui