source typo fixes pt2 (only on py3 merged code)

This commit is contained in:
Kunda
2017-02-27 19:18:00 -05:00
committed by wmayer
parent 06b10a4061
commit 0485edd560
33 changed files with 169 additions and 169 deletions

View File

@@ -23,13 +23,13 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QPushButton>
#ifndef _PreComp_
# include <QPushButton>
#endif
#include "RemoveComponents.h"
#include "ui_RemoveComponents.h"
#include <Gui/Application.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
using namespace MeshGui;
@@ -44,9 +44,9 @@ RemoveComponents::RemoveComponents(QWidget* parent, Qt::WindowFlags fl)
ui->spSelectComp->setValue(10);
ui->spDeselectComp->setRange(1, INT_MAX);
ui->spDeselectComp->setValue(10);
meshSel.setCheckOnlyVisibleTriangles(ui->visibleTriangles->isChecked());
meshSel.setCheckOnlyPointToUserTriangles(ui->screenTriangles->isChecked());
meshSel.setCheckOnlyVisibleTriangles(ui->visibleTriangles->isChecked());
meshSel.setCheckOnlyPointToUserTriangles(ui->screenTriangles->isChecked());
}
RemoveComponents::~RemoveComponents()
@@ -54,108 +54,108 @@ RemoveComponents::~RemoveComponents()
// no need to delete child widgets, Qt does it all for us
delete ui;
}
void RemoveComponents::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
ui->retranslateUi(this);
}
QWidget::changeEvent(e);
}
void RemoveComponents::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
ui->retranslateUi(this);
}
QWidget::changeEvent(e);
}
void RemoveComponents::on_selectRegion_clicked()
{
meshSel.startSelection();
meshSel.startSelection();
}
void RemoveComponents::on_deselectRegion_clicked()
{
meshSel.startDeselection();
meshSel.startDeselection();
}
void RemoveComponents::on_selectAll_clicked()
{
// select the complete meshes
meshSel.fullSelection();
meshSel.fullSelection();
}
void RemoveComponents::on_deselectAll_clicked()
{
// deselect all meshes
meshSel.clearSelection();
meshSel.clearSelection();
}
void RemoveComponents::on_selectComponents_clicked()
{
// select components upto a certain size
// select components up to a certain size
int size = ui->spSelectComp->value();
meshSel.selectComponent(size);
meshSel.selectComponent(size);
}
void RemoveComponents::on_deselectComponents_clicked()
{
// deselect components from a certain size on
int size = ui->spDeselectComp->value();
meshSel.deselectComponent(size);
}
meshSel.deselectComponent(size);
}
void RemoveComponents::on_visibleTriangles_toggled(bool on)
{
meshSel.setCheckOnlyVisibleTriangles(on);
}
void RemoveComponents::on_screenTriangles_toggled(bool on)
{
meshSel.setCheckOnlyPointToUserTriangles(on);
}
void RemoveComponents::on_cbSelectComp_toggled(bool on)
{
meshSel.setAddComponentOnClick(on);
}
void RemoveComponents::on_cbDeselectComp_toggled(bool on)
{
meshSel.setRemoveComponentOnClick(on);
void RemoveComponents::on_visibleTriangles_toggled(bool on)
{
meshSel.setCheckOnlyVisibleTriangles(on);
}
void RemoveComponents::on_screenTriangles_toggled(bool on)
{
meshSel.setCheckOnlyPointToUserTriangles(on);
}
void RemoveComponents::on_cbSelectComp_toggled(bool on)
{
meshSel.setAddComponentOnClick(on);
}
void RemoveComponents::on_cbDeselectComp_toggled(bool on)
{
meshSel.setRemoveComponentOnClick(on);
}
void RemoveComponents::deleteSelection()
{
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if (!doc) return;
// delete all selected faces
// delete all selected faces
doc->openCommand("Delete selection");
bool ok = meshSel.deleteSelection();
if (!ok)
doc->abortCommand();
else
doc->commitCommand();
bool ok = meshSel.deleteSelection();
if (!ok)
doc->abortCommand();
else
doc->commitCommand();
}
void RemoveComponents::invertSelection()
{
meshSel.invertSelection();
meshSel.invertSelection();
}
void RemoveComponents::on_selectTriangle_clicked()
{
meshSel.selectTriangle();
meshSel.setAddComponentOnClick(ui->cbSelectComp->isChecked());
meshSel.selectTriangle();
meshSel.setAddComponentOnClick(ui->cbSelectComp->isChecked());
}
void RemoveComponents::on_deselectTriangle_clicked()
{
meshSel.deselectTriangle();
meshSel.setRemoveComponentOnClick(ui->cbDeselectComp->isChecked());
meshSel.deselectTriangle();
meshSel.setRemoveComponentOnClick(ui->cbDeselectComp->isChecked());
}
void RemoveComponents::reject()
{
// deselect all meshes
meshSel.clearSelection();
// deselect all meshes
meshSel.clearSelection();
}
// -------------------------------------------------
// -------------------------------------------------
RemoveComponentsDialog::RemoveComponentsDialog(QWidget* parent, Qt::WindowFlags fl)
: QDialog(parent, fl)
@@ -204,8 +204,8 @@ void RemoveComponentsDialog::clicked(QAbstractButton* btn)
}
// ---------------------------------------
/* TRANSLATOR MeshGui::TaskRemoveComponents */
/* TRANSLATOR MeshGui::TaskRemoveComponents */
TaskRemoveComponents::TaskRemoveComponents()
{