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

Improve ProjectionGroup dialog

Browse Source 
Text to icons in dialog
Fix rotation directions
This commit is contained in:
WandererFan
2016-11-24 07:22:34 -05:00
committed by wmayer
parent 9befc3b238
commit a2cd878708
10 changed files with 1513 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/TechDraw/Gui/TaskProjGroup.cpp
View File

@@ -102,6 +102,8 @@ TaskProjGroup::TaskProjGroup(TechDraw::DrawProjGroup* featView, bool mode) :
Gui::ViewProvider* vp = activeGui->getViewProvider(m_page);
ViewProviderPage* dvp = dynamic_cast<ViewProviderPage*>(vp);
m_mdi = dvp->getMDIViewPage();
setPrimaryDirection();
}
TaskProjGroup::~TaskProjGroup()
@@ -152,21 +154,22 @@ void TaskProjGroup::rotateButtonClicked(void)
//TODO: Consider changing the vectors around depending on whether we're in First or Third angle mode - might be more intuitive? IR
if ( clicked == ui->butTopRotate ) {
t.rotX(M_PI / 2);
} else if ( clicked == ui->butDownRotate) {
t.rotX(M_PI / -2);
} else if ( clicked == ui->butRightRotate) {
t.rotZ(M_PI / -2);
} else if ( clicked == ui->butLeftRotate) {
t.rotZ(M_PI / 2);
} else if ( clicked == ui->butCWRotate ) {
t.rotY(M_PI / -2);
} else if ( clicked == ui->butRightRotate) {
t.rotZ(M_PI / 2);
} else if ( clicked == ui->butDownRotate) {
t.rotX(M_PI / 2);
} else if ( clicked == ui->butLeftRotate) {
t.rotZ(M_PI / -2);
} else if ( clicked == ui->butCCWRotate) {
t.rotY(M_PI / 2);
}
m *= t;
multiView->setFrontViewOrientation(m);
setPrimaryDirection();
Gui::Command::updateActive();
}
}
@@ -375,6 +378,25 @@ void TaskProjGroup::setupViewCheckboxes(bool addConnections)
}
}
void TaskProjGroup::setPrimaryDirection()
{
App::DocumentObject* docObj = multiView->getProjObj("Front");
TechDraw::DrawViewPart* dvp = dynamic_cast<TechDraw::DrawViewPart*>(docObj);
if (dvp != nullptr) {
Base::Vector3d frontDir = dvp->Direction.getValue();
ui->lePrimary->setText(formatVector(frontDir));
}
}
QString TaskProjGroup::formatVector(Base::Vector3d v)
{
QString data = QString::fromLatin1("[%1 %2 %3]")
.arg(QLocale::system().toString(v.x, 'f', 2))
.arg(QLocale::system().toString(v.y, 'f', 2))
.arg(QLocale::system().toString(v.z, 'f', 2));
return data;
}
bool TaskProjGroup::accept()
{
Gui::Command::commitCommand();