db57b42e5a
====================================================================================== There is a checkbox, default disabled, that makes the commands NOT to generate a recompute after each. This means that if you are editing a sketch that is used to generate a pad or pocket, if the checkbox is disabled, the dependent objects do not get recomputed. There is a button next to it to force a manual recompute, in case it is needed. If the user wants the previous behavior, he only needs to activate the checkbox. The previous status of the box is restored upon entering a sketch in edit mode. It is remarkable the case of the Fillet and Trim On changing ActSketch (solvedSketch) to SketchObject and making movePoint not systematically update the geometry, the solving in MovePoint was confronted with solving for "the last solved geometry", which is the default behaviour, in some situations (Fillet and Trim) where geometry had changed at SketchObject level, and was the subject of the moving actions. MovePoint has been updated to take an extra optional parameter, to force the change in solved geometry in those situations. Some other minor bug also fixed in Fillet creation in CommandCreateGeo.cpp This commit also introduces conditional recompute on some operations of: - constraints - geometry creation (reubication of update active to comprise the autoconstraints within a single UpdateActive)
130 lines
4.9 KiB
C++
130 lines
4.9 KiB
C++
/***************************************************************************
|
|
* Copyright (c) 2011 Jürgen Riegel <juergen.riegel@web.de> *
|
|
* *
|
|
* This file is part of the FreeCAD CAx development system. *
|
|
* *
|
|
* This library is free software; you can redistribute it and/or *
|
|
* modify it under the terms of the GNU Library General Public *
|
|
* License as published by the Free Software Foundation; either *
|
|
* version 2 of the License, or (at your option) any later version. *
|
|
* *
|
|
* This library is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* GNU Library General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU Library General Public *
|
|
* License along with this library; see the file COPYING.LIB. If not, *
|
|
* write to the Free Software Foundation, Inc., 59 Temple Place, *
|
|
* Suite 330, Boston, MA 02111-1307, USA *
|
|
* *
|
|
***************************************************************************/
|
|
|
|
|
|
#include "PreCompiled.h"
|
|
|
|
#ifndef _PreComp_
|
|
#endif
|
|
|
|
#include "ui_TaskSketcherMessages.h"
|
|
#include "TaskSketcherMessages.h"
|
|
#include <Gui/Application.h>
|
|
#include <Gui/Document.h>
|
|
#include <Gui/BitmapFactory.h>
|
|
#include <Gui/ViewProvider.h>
|
|
#include <Gui/WaitCursor.h>
|
|
#include <Gui/Selection.h>
|
|
#include <Gui/Command.h>
|
|
|
|
#include <boost/bind.hpp>
|
|
|
|
#include <Mod/Sketcher/App/SketchObject.h>
|
|
|
|
#include "ViewProviderSketch.h"
|
|
|
|
using namespace SketcherGui;
|
|
using namespace Gui::TaskView;
|
|
|
|
TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView)
|
|
: TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Solver messages"),true, 0)
|
|
, sketchView(sketchView)
|
|
{
|
|
// we need a separate container widget to add all controls to
|
|
proxy = new QWidget(this);
|
|
ui = new Ui_TaskSketcherMessages();
|
|
ui->setupUi(proxy);
|
|
QMetaObject::connectSlotsByName(this);
|
|
|
|
this->groupLayout()->addWidget(proxy);
|
|
|
|
connectionSetUp = sketchView->signalSetUp.connect(boost::bind(&SketcherGui::TaskSketcherMessages::slotSetUp, this,_1));
|
|
connectionSolved = sketchView->signalSolved.connect(boost::bind(&SketcherGui::TaskSketcherMessages::slotSolved, this,_1));
|
|
|
|
ui->labelConstrainStatus->setOpenExternalLinks(false);
|
|
|
|
ui->autoUpdate->onRestore();
|
|
|
|
if(ui->autoUpdate->isChecked())
|
|
sketchView->getSketchObject()->noRecomputes=false;
|
|
else
|
|
sketchView->getSketchObject()->noRecomputes=true;
|
|
|
|
/*QObject::connect(
|
|
ui->labelConstrainStatus, SIGNAL(linkActivated(const QString &)),
|
|
this , SLOT (on_labelConstrainStatus_linkActivated(const QString &))
|
|
);
|
|
QObject::connect(
|
|
ui->autoUpdate, SIGNAL(stateChanged(int)),
|
|
this , SLOT (on_autoUpdate_stateChanged(int))
|
|
);
|
|
QObject::connect(
|
|
ui->manualUpdate, SIGNAL(clicked(bool)),
|
|
this , SLOT (on_manualUpdate_clicked(bool))
|
|
);*/
|
|
}
|
|
|
|
TaskSketcherMessages::~TaskSketcherMessages()
|
|
{
|
|
connectionSetUp.disconnect();
|
|
connectionSolved.disconnect();
|
|
delete ui;
|
|
}
|
|
|
|
void TaskSketcherMessages::slotSetUp(QString msg)
|
|
{
|
|
ui->labelConstrainStatus->setText(msg);
|
|
}
|
|
|
|
void TaskSketcherMessages::slotSolved(QString msg)
|
|
{
|
|
ui->labelSolverStatus->setText(msg);
|
|
}
|
|
|
|
void TaskSketcherMessages::on_labelConstrainStatus_linkActivated(const QString &str)
|
|
{
|
|
if( str == QString::fromLatin1("#conflicting"))
|
|
Gui::Application::Instance->commandManager().runCommandByName("Sketcher_SelectConflictingConstraints");
|
|
|
|
if( str == QString::fromLatin1("#redundant"))
|
|
Gui::Application::Instance->commandManager().runCommandByName("Sketcher_SelectRedundantConstraints");
|
|
}
|
|
|
|
void TaskSketcherMessages::on_autoUpdate_stateChanged(int state)
|
|
{
|
|
if(state==Qt::Checked) {
|
|
sketchView->getSketchObject()->noRecomputes=false;
|
|
ui->autoUpdate->onSave();
|
|
}
|
|
else if (state==Qt::Unchecked) {
|
|
sketchView->getSketchObject()->noRecomputes=true;
|
|
ui->autoUpdate->onSave();
|
|
}
|
|
}
|
|
|
|
void TaskSketcherMessages::on_manualUpdate_clicked(bool checked)
|
|
{
|
|
Gui::Command::updateActive();
|
|
}
|
|
|
|
#include "moc_TaskSketcherMessages.cpp"
|