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

[TD] fix context menu

Browse Source
This commit is contained in:
wandererfan
2019-07-10 16:37:37 -04:00
committed by WandererFan
parent 9828655f48
commit 6709fd849b
2 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Mod/TechDraw/Gui/TaskCosVertex.cpp
View File

@@ -65,14 +65,12 @@ using namespace Gui;
using namespace TechDraw;
using namespace TechDrawGui;
//ctor for creation
TaskCosVertex::TaskCosVertex(TechDraw::DrawViewPart* baseFeat,
TechDraw::DrawPage* page) :
ui(new Ui_TaskCosVertex),
m_tracker(nullptr),
m_baseFeat(baseFeat),
m_basePage(page),
m_createMode(true),
m_inProgressLock(false),
m_pbTrackerState(TRACKERPICK),
m_savePoint(QPointF(0.0,0.0)),
@@ -139,10 +137,6 @@ void TaskCosVertex::setUiPrimary()
void TaskCosVertex::updateUi(void)
{
//need to unscale & unRez m_savePoint for display
// double scale = m_baseFeat->getScale();
// double x = Rez::appX(m_savePoint.x() / scale);
// double y = Rez::appX(- m_savePoint.y() / scale) ;
double x = m_savePoint.x();
double y = - m_savePoint.y();
double z = 0.0;
@@ -154,7 +148,7 @@ void TaskCosVertex::updateUi(void)
void TaskCosVertex::addCosVertex(QPointF qPos)
{
// Base::Console().Message("TCV::addCosVertex(%s)\n", TechDraw::DrawUtil::formatVector(qPos).c_str());
Base::Vector3d pos(qPos.x(), qPos.y());
Base::Vector3d pos(qPos.x(), -qPos.y());
// int idx =
(void) m_baseFeat->addCosmeticVertex(pos);
m_baseFeat->requestPaint();
@@ -178,22 +172,20 @@ void TaskCosVertex::onTrackerClicked(bool b)
return;
}
if (getCreateMode()) {
m_inProgressLock = true;
m_saveContextPolicy = m_mdi->contextMenuPolicy();
m_mdi->setContextMenuPolicy(Qt::PreventContextMenu);
m_trackerMode = QGTracker::TrackerMode::Point;
setEditCursor(Qt::CrossCursor);
startTracker();
m_inProgressLock = true;
m_saveContextPolicy = m_mdi->contextMenuPolicy();
m_mdi->setContextMenuPolicy(Qt::PreventContextMenu);
m_trackerMode = QGTracker::TrackerMode::Point;
setEditCursor(Qt::CrossCursor);
startTracker();
QString msg = tr("Pick a point for cosmetic vertex");
getMainWindow()->statusBar()->show();
Gui::getMainWindow()->showMessage(msg,3000);
ui->pbTracker->setText(QString::fromUtf8("Escape picking"));
ui->pbTracker->setEnabled(true);
m_pbTrackerState = TRACKERCANCEL;
enableTaskButtons(false);
}
QString msg = tr("Pick a point for cosmetic vertex");
getMainWindow()->statusBar()->show();
Gui::getMainWindow()->showMessage(msg,3000);
ui->pbTracker->setText(QString::fromUtf8("Escape picking"));
ui->pbTracker->setEnabled(true);
m_pbTrackerState = TRACKERCANCEL;
enableTaskButtons(false);
}
void TaskCosVertex::startTracker(void)
@@ -249,6 +241,8 @@ void TaskCosVertex::onTrackerFinished(std::vector<QPointF> pts, QGIView* qgParen
ui->pbTracker->setEnabled(false);
enableTaskButtons(true);
setEditCursor(Qt::ArrowCursor);
m_mdi->setContextMenuPolicy(m_saveContextPolicy);
}
void TaskCosVertex::removeTracker(void)

12
src/Mod/TechDraw/Gui/TaskCosVertex.h
View File

@@ -70,7 +70,6 @@ class TaskCosVertex : public QWidget
public:
TaskCosVertex(TechDraw::DrawViewPart* baseFeat,
TechDraw::DrawPage* page);
/* TaskCosVertex(TechDrawGui::ViewProviderLeader* leadVP);*/
~TaskCosVertex();
public Q_SLOTS:
@@ -80,16 +79,11 @@ public Q_SLOTS:
public:
virtual bool accept();
virtual bool reject();
virtual void setCreateMode(bool b) { m_createMode = b; }
virtual bool getCreateMode(void) { return m_createMode; }
void updateTask();
void saveButtons(QPushButton* btnOK,
QPushButton* btnCancel);
void enableTaskButtons(bool b);
/*protected Q_SLOTS:*/
/* void onPointPicked(QPointF pt);*/
protected:
void changeEvent(QEvent *e);
void startTracker(void);
@@ -114,17 +108,11 @@ private:
MDIViewPage* m_mdi;
QGraphicsScene* m_scene;
QGVPage* m_view;
/* ViewProviderLeader* m_lineVP;*/
TechDraw::DrawViewPart* m_baseFeat;
TechDraw::DrawPage* m_basePage;
/* TechDraw::DrawCosVertex* m_lineFeat;*/
/* std::string m_leaderName;*/
/* std::string m_leaderType;*/
QGIView* m_qgParent;
std::string m_qgParentName;
bool m_createMode;
QGTracker::TrackerMode m_trackerMode;
Qt::ContextMenuPolicy m_saveContextPolicy;
bool m_inProgressLock;