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

TechDraw: Refractor tracker action with proper enum

Browse Source
This commit is contained in:
Farley Runkel
2024-04-22 18:21:49 +08:00
parent 58be610253
commit 9430ea9ee5
4 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/TechDraw/Gui/QGTracker.h
View File

@@ -44,13 +44,15 @@ namespace TechDrawGui
class QGSPage;
class QGIView;
//TODO: make this a proper enum
static constexpr int TRACKERPICK(0);
static constexpr int TRACKEREDIT(1);
static constexpr int TRACKERCANCEL(2);
static constexpr int TRACKERCANCELEDIT(3);
static constexpr int TRACKERFINISHED(4);
static constexpr int TRACKERSAVE(5);
enum TrackerAction
{
PICK = 0,
EDIT = 1,
CANCEL = 2,
CANCELEDIT = 3,
FINISHED = 4,
SAVE = 5
};
class TechDrawGuiExport QGTracker : public QObject, public QGIPrimPath
{

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

@@ -70,7 +70,7 @@ TaskCosVertex::TaskCosVertex(TechDraw::DrawViewPart* baseFeat,
m_inProgressLock(false),
m_btnOK(nullptr),
m_btnCancel(nullptr),
m_pbTrackerState(TRACKERPICK),
m_pbTrackerState(TrackerAction::PICK),
m_savePoint(QPointF(0.0, 0.0))
{
//baseFeat and page existence checked in cosmetic vertex command (CommandAnnotate.cpp)
@@ -155,8 +155,8 @@ void TaskCosVertex::onTrackerClicked(bool clicked)
removeTracker();
if (m_pbTrackerState == TRACKERCANCEL) {
m_pbTrackerState = TRACKERPICK;
if (m_pbTrackerState == TrackerAction::CANCEL) {
m_pbTrackerState = TrackerAction::PICK;
ui->pbTracker->setText(tr("Pick Points"));
enableTaskButtons(true);
@@ -176,7 +176,7 @@ void TaskCosVertex::onTrackerClicked(bool clicked)
Gui::getMainWindow()->showMessage(msg, 3000);
ui->pbTracker->setText(tr("Escape picking"));
ui->pbTracker->setEnabled(true);
m_pbTrackerState = TRACKERCANCEL;
m_pbTrackerState = TrackerAction::CANCEL;
enableTaskButtons(false);
}
@@ -250,7 +250,7 @@ void TaskCosVertex::onTrackerFinished(std::vector<QPointF> pts, QGIView* qgParen
m_tracker->sleep(true);
m_inProgressLock = false;
m_pbTrackerState = TRACKERPICK;
m_pbTrackerState = TrackerAction::PICK;
ui->pbTracker->setText(tr("Pick Points"));
ui->pbTracker->setEnabled(true);
enableTaskButtons(true);

7
src/Mod/TechDraw/Gui/TaskDetail.h
View File

@@ -29,13 +29,6 @@
#include <Mod/TechDraw/TechDrawGlobal.h>
//TODO: make this a proper enum
static constexpr int TRACKERPICK(0);
static constexpr int TRACKEREDIT(1);
static constexpr int TRACKERCANCEL(2);
static constexpr int TRACKERCANCELEDIT(3);
namespace TechDraw
{
class DrawPage;

26
src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
View File

@@ -75,7 +75,7 @@ TaskLeaderLine::TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) :
m_qgLine(nullptr),
m_btnOK(nullptr),
m_btnCancel(nullptr),
m_pbTrackerState(TRACKEREDIT),
m_pbTrackerState(TrackerAction::EDIT),
m_saveX(0.0),
m_saveY(0.0)
{
@@ -148,7 +148,7 @@ TaskLeaderLine::TaskLeaderLine(TechDraw::DrawView* baseFeat,
m_qgLine(nullptr),
m_btnOK(nullptr),
m_btnCancel(nullptr),
m_pbTrackerState(TRACKERPICK),
m_pbTrackerState(TrackerAction::PICK),
m_saveX(0.0),
m_saveY(0.0)
{
@@ -462,24 +462,24 @@ void TaskLeaderLine::onTrackerClicked(bool clicked)
return;
}
if ( (m_pbTrackerState == TRACKERSAVE) &&
if ( (m_pbTrackerState == TrackerAction::SAVE) &&
(getCreateMode()) ){
if (m_tracker) {
m_tracker->terminateDrawing();
}
m_pbTrackerState = TRACKERPICK;
m_pbTrackerState = TrackerAction::PICK;
ui->pbTracker->setText(tr("Pick Points"));
ui->pbCancelEdit->setEnabled(false);
enableTaskButtons(true);
setEditCursor(Qt::ArrowCursor);
return;
} else if ( (m_pbTrackerState == TRACKERSAVE) &&
} else if ( (m_pbTrackerState == TrackerAction::SAVE) &&
(!getCreateMode()) ) { //edit mode
if (m_qgLine) {
m_qgLine->closeEdit();
}
m_pbTrackerState = TRACKERPICK;
m_pbTrackerState = TrackerAction::PICK;
ui->pbTracker->setText(tr("Edit Points"));
ui->pbCancelEdit->setEnabled(false);
enableTaskButtons(true);
@@ -488,7 +488,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked)
return;
}
//TRACKERPICK or TRACKEREDIT
//TrackerAction::PICK or TrackerAction::EDIT
if (getCreateMode()) {
m_inProgressLock = true;
m_saveContextPolicy = m_vpp->getMDIViewPage()->contextMenuPolicy();
@@ -503,7 +503,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked)
ui->pbTracker->setText(tr("Save Points"));
ui->pbTracker->setEnabled(true);
ui->pbCancelEdit->setEnabled(true);
m_pbTrackerState = TRACKERSAVE;
m_pbTrackerState = TrackerAction::SAVE;
enableTaskButtons(false);
} else { //edit mode
m_trackerPoints = m_lineFeat->WayPoints.getValues();
@@ -529,7 +529,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked)
ui->pbTracker->setText(tr("Save changes"));
ui->pbTracker->setEnabled(true);
ui->pbCancelEdit->setEnabled(true);
m_pbTrackerState = TRACKERSAVE;
m_pbTrackerState = TrackerAction::SAVE;
enableTaskButtons(false);
}
} else { // need to recreate leaderline
@@ -546,7 +546,7 @@ void TaskLeaderLine::onTrackerClicked(bool clicked)
ui->pbTracker->setText(tr("Save changes"));
ui->pbTracker->setEnabled(true);
ui->pbCancelEdit->setEnabled(true);
m_pbTrackerState = TRACKERSAVE;
m_pbTrackerState = TrackerAction::SAVE;
enableTaskButtons(false);
}
}
@@ -632,7 +632,7 @@ void TaskLeaderLine::onCancelEditClicked(bool clicked)
m_lineFeat->requestPaint();
}
m_pbTrackerState = TRACKEREDIT;
m_pbTrackerState = TrackerAction::EDIT;
ui->pbTracker->setText(tr("Edit points"));
ui->pbCancelEdit->setEnabled(false);
enableTaskButtons(true);
@@ -684,7 +684,7 @@ void TaskLeaderLine::onPointEditComplete()
// Base::Console().Message("TTL::onPointEditComplete()\n");
m_inProgressLock = false;
m_pbTrackerState = TRACKEREDIT;
m_pbTrackerState = TrackerAction::EDIT;
ui->pbTracker->setText(tr("Edit points"));
ui->pbTracker->setEnabled(true);
ui->pbCancelEdit->setEnabled(true);
@@ -701,7 +701,7 @@ void TaskLeaderLine::abandonEditSession()
getMainWindow()->statusBar()->show();
Gui::getMainWindow()->showMessage(msg, 4000);
m_pbTrackerState = TRACKEREDIT;
m_pbTrackerState = TrackerAction::EDIT;
ui->pbTracker->setText(tr("Edit points"));
enableTaskButtons(true);
ui->pbTracker->setEnabled(true);