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

[TD]Add CenterLine edit function

Browse Source
This commit is contained in:
wandererfan
2019-06-23 13:44:29 -04:00
committed by WandererFan
parent 39e556fb3f
commit 11d8aaed61
20 changed files with 977 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

356
src/Mod/TechDraw/Gui/TaskCenterLine.cpp
View File

@@ -71,60 +71,41 @@ using namespace TechDraw;
using namespace TechDrawGui;
//ctor for edit
//TaskCenterLine::TaskCenterLine(TechDrawGui::ViewProviderViewPart* partVP) :
// ui(new Ui_TaskCenterLine),
// m_partVP(partVp),
// m_partFeat(nullptr),
// m_basePage(nullptr),
// m_createMode(false),
// m_inProgressLock(false)
//{
// if (m_partVP == nullptr) {
// //should be caught in CMD caller
// Base::Console().Error("TaskCenterLine - bad parameters. Can not proceed.\n");
// return;
// }
// ui->setupUi(this);
//
// m_partFeat = m_partVP->getFeature();
// m_basePage = m_partFeat->findParentPage();
TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat,
TechDraw::DrawPage* page,
std::string edgeName) :
ui(new Ui_TaskCenterLine),
m_partFeat(partFeat),
m_basePage(page),
m_createMode(false),
m_edgeName(edgeName)
{
// Base::Console().Message("TCL::TCL() - edit mode\n");
ui->setupUi(this);
// //TODO: when/if leaders are allowed to be parented to Page, check for m_partFeat will be removed
// if ( (m_partFeat == nullptr) ||
// (m_basePage == nullptr) ) {
// Base::Console().Error("TaskCenterLine - bad parameters (2). Can not proceed.\n");
// return;
// }
m_geomIndex = DrawUtil::getIndexFromName(m_edgeName);
const std::vector<TechDraw::BaseGeom *> &geoms = partFeat->getEdgeGeometry();
BaseGeom* bg = geoms.at(m_geomIndex);
m_clIdx = bg->sourceIndex();
m_cl = partFeat->getCenterLineByIndex(m_clIdx);
if (m_cl == nullptr) { //checked by CommandAnnotate. Should never happen.
Base::Console().Message("TCL::TCL() - no centerline found\n");
}
// //m_subNames = m_partFeat->get?????();
// setUiEdit();
//// m_mdi = m_partVP->getMDIViewPage();
//// m_scene = m_mdi->m_scene;
//// m_view = m_mdi->getQGVPage();
//// connect(ui->pbTracker, SIGNAL(clicked(bool)),
//// this, SLOT(onTrackerClicked(bool)));
//// connect(ui->pbCancelEdit, SIGNAL(clicked(bool)),
//// this, SLOT(onCancelEditClicked(bool)));
//// ui->pbCancelEdit->setEnabled(false);
// saveState();
//}
setUiEdit();
}
//ctor for creation
TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat,
TechDraw::DrawPage* page,
std::vector<std::string> subNames) :
ui(new Ui_TaskCenterLine),
m_partVP(nullptr),
m_partFeat(partFeat),
m_basePage(page),
m_createMode(true),
m_subNames(subNames)
{
// Base::Console().Message("TCL::TCL() - create mode\n");
if ( (m_basePage == nullptr) ||
(m_partFeat == nullptr) ) {
//should be caught in CMD caller
@@ -134,19 +115,7 @@ TaskCenterLine::TaskCenterLine(TechDraw::DrawViewPart* partFeat,
ui->setupUi(this);
Gui::Document* activeGui = Gui::Application::Instance->getDocument(m_basePage->getDocument());
Gui::ViewProvider* vp = activeGui->getViewProvider(m_basePage);
ViewProviderPage* vpp = static_cast<ViewProviderPage*>(vp);
m_mdi = vpp->getMDIViewPage();
m_scene = m_mdi->m_scene;
m_view = m_mdi->getQGVPage();
setUiPrimary();
// connect(ui->pbTracker, SIGNAL(clicked(bool)),
// this, SLOT(onTrackerClicked(bool)));
// connect(ui->pbCancelEdit, SIGNAL(clicked(bool)),
// this, SLOT(onCancelEditClicked(bool)));
}
TaskCenterLine::~TaskCenterLine()
@@ -154,18 +123,6 @@ TaskCenterLine::~TaskCenterLine()
delete ui;
}
void TaskCenterLine::saveState()
{
if (m_partFeat != nullptr) {
}
}
void TaskCenterLine::restoreState()
{
if (m_partFeat != nullptr) {
}
}
void TaskCenterLine::updateTask()
{
// blockUpdate = true;
@@ -183,8 +140,7 @@ void TaskCenterLine::changeEvent(QEvent *e)
void TaskCenterLine::setUiPrimary()
{
// Base::Console().Message("TCL::setUiPrimary()\n");
// enableVPUi(false);
setWindowTitle(QObject::tr("New Center Line"));
setWindowTitle(QObject::tr("Create Center Line"));
if (m_partFeat != nullptr) {
std::string baseName = m_partFeat->getNameInDocument();
@@ -194,37 +150,61 @@ void TaskCenterLine::setUiPrimary()
ui->lstSubList->addItem(listItem);
}
}
ui->cpLineColor->setColor(getCenterColor());
ui->dsbWeight->setValue(getCenterWidth());
ui->cboxStyle->setCurrentIndex(getCenterStyle());
ui->qsbExtend->setValue(getExtendBy());
Base::Quantity qVal;
qVal.setUnit(Base::Unit::Length);
qVal.setValue(getExtendBy());
ui->qsbExtend->setValue(qVal);
int precision = Base::UnitsApi::getDecimals();
ui->dsbRotate->setDecimals(precision);
}
//void TaskCenterLine::enableVPUi(bool b)
//{
//}
//void TaskCenterLine::setUiEdit()
//{
//// Base::Console().Message("TCL::setUiEdit()\n");
// enableVPUi(true);
// setWindowTitle(QObject::tr("Edit Center Line"));
//}
void TaskCenterLine::addCenterLine(void)
void TaskCenterLine::setUiEdit()
{
// TechDraw::CosmeticEdge* ce = new TechDrawCosmeticEdge();
}
// Base::Console().Message("TCL::setUiEdit()\n");
setWindowTitle(QObject::tr("Edit Center Line"));
if (m_partFeat != nullptr) {
std::string baseName = m_partFeat->getNameInDocument();
ui->leBaseView->setText(Base::Tools::fromStdString(baseName));
QString listItem = Base::Tools::fromStdString(m_edgeName);
ui->lstSubList->addItem(listItem);
}
ui->cpLineColor->setColor(m_cl->fmt.m_color.asValue<QColor>());
ui->dsbWeight->setValue(m_cl->fmt.m_weight);
ui->cboxStyle->setCurrentIndex(m_cl->fmt.m_style);
int precision = Base::UnitsApi::getDecimals();
ui->dsbRotate->setDecimals(precision);
ui->rbVertical->setChecked(false);
ui->rbHorizontal->setChecked(false);
ui->rbAligned->setChecked(false);
if (m_cl->mode == 0) {
ui->rbVertical->setChecked(true);
} else if (m_cl->mode == 1) {
ui->rbHorizontal->setChecked(true);
} else if (m_cl->mode ==2) {
ui->rbAligned->setChecked(true);
}
ui->dsbRotate->setValue(m_cl->rotate);
Base::Quantity qVal;
qVal.setUnit(Base::Unit::Length);
qVal.setValue(m_cl->vShift);
ui->qsbVertShift->setValue(qVal);
qVal.setValue(m_cl->hShift);
ui->qsbHorizShift->setValue(qVal);
qVal.setValue(m_cl->extendBy);
ui->qsbExtend->setValue(qVal);
}
//******************************************************************************
void TaskCenterLine::createCenterLine(void)
{
// Base::Console().Message("TCL::createCenterLine()\n");
Gui::Command::openCommand("Create CenterLine");
bool vertical = false;
if (ui->rbVertical->isChecked()) {
@@ -233,12 +213,41 @@ void TaskCenterLine::createCenterLine(void)
double hShift = ui->qsbHorizShift->rawValue();
double vShift = ui->qsbVertShift->rawValue();
double rotate = ui->dsbRotate->value();
m_extendBy = ui->qsbExtend->rawValue();
TechDraw::CosmeticEdge* ce = calcEndPoints(m_subNames,vertical,
m_extendBy,
hShift, vShift, rotate);
m_partFeat->addCosmeticEdge(ce);
m_partFeat->requestPaint();
double extendBy = ui->qsbExtend->rawValue();
std::pair<Base::Vector3d, Base::Vector3d> ends;
ends = TechDraw::CenterLine::calcEndPoints(m_partFeat,
m_subNames,
vertical,
extendBy,
hShift, vShift, rotate);
TechDraw::CenterLine* cl = new TechDraw::CenterLine(ends.first, ends.second);
cl->start = ends.first;
cl->end = ends.second;
App::Color ac;
ac.setValue<QColor>(ui->cpLineColor->color());
cl->fmt.m_color = ac;
cl->fmt.m_weight = ui->dsbWeight->value();
cl->fmt.m_style = ui->cboxStyle->currentIndex();
cl->fmt.m_visible = true;
if (ui->rbVertical->isChecked()) {
cl->mode = 0;
} else if (ui->rbHorizontal->isChecked()) {
cl->mode = 1;
} else if (ui->rbAligned->isChecked()) {
cl->mode = 2;
}
cl->m_faces = m_subNames;
cl->rotate = rotate;
cl->vShift = vShift;
cl->hShift = hShift;
cl->extendBy = extendBy;
m_partFeat->addCenterLine(cl);
// m_partFeat->requestPaint(); //if execute has not run, then CL will not be in Geoms.
m_partFeat->recomputeFeature();
Gui::Command::updateActive();
Gui::Command::commitCommand();
}
@@ -247,41 +256,30 @@ void TaskCenterLine::updateCenterLine(void)
{
// Base::Console().Message("TCL::updateCenterLine()\n");
Gui::Command::openCommand("Edit CenterLine");
m_cl->fmt.m_color.setValue<QColor>(ui->cpLineColor->color() );
m_cl->fmt.m_weight = ui->dsbWeight->value();
m_cl->fmt.m_style = ui->cboxStyle->currentIndex();
m_cl->fmt.m_visible = true;
if (ui->rbVertical->isChecked()) {
m_cl->mode = 0;
} else if (ui->rbHorizontal->isChecked()) {
m_cl->mode = 1;
} else if (ui->rbAligned->isChecked()) {
m_cl->mode = 2;
}
m_cl->rotate = ui->dsbRotate->value();
m_cl->vShift = ui->qsbVertShift->rawValue();
m_cl->hShift = ui->qsbHorizShift->rawValue();
m_cl->extendBy = ui->qsbExtend->rawValue();
m_partFeat->replaceCenterLine(m_clIdx, m_cl);
m_partFeat->requestPaint(); //is requestPaint enough here?
// m_partFeat->recomputeFeature();
Gui::Command::updateActive();
Gui::Command::commitCommand();
}
void TaskCenterLine::removeCenterLine(void)
{
// Base::Console().Message("TCL::removeCenterLine()\n");
if (m_partFeat != nullptr) {
if (m_createMode) {
//don't know!
} else {
if (Gui::Command::hasPendingCommand()) {
std::vector<std::string> undos = Gui::Application::Instance->activeDocument()->getUndoVector();
Gui::Application::Instance->activeDocument()->undo(1);
} else {
Base::Console().Log("TaskCenterLine: Edit mode - NO command is active\n");
}
}
}
}
QGIView* TaskCenterLine::findParentQGIV()
{
QGIView* result = nullptr;
if (m_partFeat != nullptr) {
Gui::ViewProvider* gvp = QGIView::getViewProvider(m_partFeat);
ViewProviderDrawingView* vpdv = dynamic_cast<ViewProviderDrawingView*>(gvp);
if (vpdv != nullptr) {
result = vpdv->getQView();
}
}
return result;
}
void TaskCenterLine::saveButtons(QPushButton* btnOK,
QPushButton* btnCancel)
{
@@ -295,86 +293,6 @@ void TaskCenterLine::enableTaskButtons(bool b)
m_btnCancel->setEnabled(b);
}
TechDraw::CosmeticEdge* TaskCenterLine::calcEndPoints(std::vector<std::string> faceNames,
bool vert, double ext,
double hShift, double vShift,
double rotate)
{
// Base::Console().Message("TCL::calcEndPoints(%d, %d) \n",faceNames.size(), vert);
TechDraw::CosmeticEdge* result = nullptr;
Bnd_Box faceBox;
faceBox.SetGap(0.0);
double scale = m_partFeat->getScale();
double hss = hShift * scale;
double vss = vShift * scale;
for (auto& fn: faceNames) {
if (TechDraw::DrawUtil::getGeomTypeFromName(fn) != "Face") {
continue;
}
int idx = TechDraw::DrawUtil::getIndexFromName(fn);
std::vector<TechDraw::BaseGeom*> faceEdges =
m_partFeat->getFaceEdgesByIndex(idx);
for (auto& fe: faceEdges) {
if (!fe->cosmetic) {
BRepBndLib::Add(fe->occEdge, faceBox);
}
}
}
double Xmin,Ymin,Zmin,Xmax,Ymax,Zmax;
faceBox.Get(Xmin,Ymin,Zmin,Xmax,Ymax,Zmax);
double Xspan = fabs(Xmax - Xmin);
// Xspan = (Xspan / 2.0) + (ext * scale); //this should be right? edges in GO are scaled!
Xspan = (Xspan / 2.0) + ext;
double Xmid = Xmin + fabs(Xmax - Xmin) / 2.0;
double Yspan = fabs(Ymax - Ymin);
// Yspan = (Yspan / 2.0) + (ext * scale);
Yspan = (Yspan / 2.0) + ext;
double Ymid = Ymin + fabs(Ymax - Ymin) / 2.0;
Base::Vector3d p1, p2;
if (vert) {
Base::Vector3d top(Xmid + hss, (Ymid - Yspan) + vss, 0.0);
Base::Vector3d bottom(Xmid + hss, (Ymid + Yspan) + vss, 0.0);
p1 = top;
p2 = bottom;
} else {
Base::Vector3d left((Xmid - Xspan) + hss, Ymid + vss, 0.0);
Base::Vector3d right((Xmid + Xspan) + hss, Ymid + vss, 0.0);
p1 = left;
p2 = right;
}
Base::Vector3d bbxCenter(Xmid, Ymid, 0.0);
if (!DrawUtil::fpCompare(rotate, 0.0)) {
double cosTheta = cos(rotate * M_PI / 180.0);
double sinTheta = sin(rotate * M_PI / 180.0);
Base::Vector3d toOrg = p1 - bbxCenter;
double xRot = toOrg.x * cosTheta - toOrg.y * sinTheta;
double yRot = toOrg.y * cosTheta + toOrg.x * sinTheta;
p1 = Base::Vector3d(xRot, yRot, 0.0) + bbxCenter;
toOrg = p2 - bbxCenter;
xRot = toOrg.x * cosTheta - toOrg.y * sinTheta;
yRot = toOrg.y * cosTheta + toOrg.x * sinTheta;
p2 = Base::Vector3d(xRot, yRot, 0.0) + bbxCenter;
}
result = new TechDraw::CosmeticEdge(p1 / scale, p2 / scale); //p1 & p2 are as found in GO.
App::Color ac;
ac.setValue<QColor>(ui->cpLineColor->color());
result->m_format.m_color = ac;
result->m_format.m_weight = ui->dsbWeight->value();
result->m_format.m_style = ui->cboxStyle->currentIndex();
result->m_format.m_visible = true;
return result;
}
double TaskCenterLine::getCenterWidth()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->
@@ -416,16 +334,14 @@ double TaskCenterLine::getExtendBy(void)
bool TaskCenterLine::accept()
{
// Base::Console().Message("TCL::accept()\n");
Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument());
if (!doc) return false;
if (!getCreateMode()) {
//
updateCenterLine();
} else {
createCenterLine();
}
// m_mdi->setContextMenuPolicy(m_saveContextPolicy);
Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
return true;
@@ -433,25 +349,19 @@ bool TaskCenterLine::accept()
bool TaskCenterLine::reject()
{
if (m_inProgressLock) {
// Base::Console().Message("TCL::reject - edit in progress!!\n");
return false;
}
Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument());
if (!doc) return false;
if (m_mdi != nullptr) {
// m_mdi->setContextMenuPolicy(m_saveContextPolicy);
}
if (getCreateMode() &&
(m_partFeat != nullptr) ) {
//
// Base::Console().Message("TCL::reject - credit Mode!!\n");
//nothing to remove.
}
if (!getCreateMode() &&
(m_partFeat != nullptr) ) {
//
// Base::Console().Message("TCL::reject - edit Mode!!\n");
//nothing to un-update
}
//make sure any dangling objects are cleaned up
@@ -475,15 +385,17 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat,
Content.push_back(taskbox);
}
//TaskDlgCenterLine::TaskDlgCenterLine(TechDrawGui::ViewProviderViewPart* partVP)
// : TaskDialog()
//{
// widget = new TaskCenterLine(partVP);
// taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-facecenterline"),
// widget->windowTitle(), true, 0);
// taskbox->groupLayout()->addWidget(widget);
// Content.push_back(taskbox);
//}
TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat,
TechDraw::DrawPage* page,
std::string edgeName)
: TaskDialog()
{
widget = new TaskCenterLine(partFeat,page, edgeName);
taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-facecenterline"),
widget->windowTitle(), true, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
}
TaskDlgCenterLine::~TaskDlgCenterLine()
{