2d447d2560
- as discussed here: https://forum.freecadweb.org/viewtopic.php?f=17&t=50466&start=10#p433327 this PR is the first step for new Pad features. It implements 3 features requested by users: 1. an option to measure the pad length along its direction if there is a custom direction 2. when there are two lengths, the reverse feature should be active 3. the pad dialog shows now always the used pad direction, no matter if it is a custom one or the sketch's normal - Furthermore there are some code improvements (avoid rounding and blocking signals) - Also adapt TestPad.py because its test used the case two lengths + reversed but this was not possible before this PR - the reverse option was not take into account for two lengths in FeatureSketchBased.cpp) Now it is and therefore the test must be updated: In the test the second sketch has the normal vector 0, -1, 0. As the reverse option is set the pad direction is 0, 1, 0. So in y direction is the length (1mm) and in -y direction is length2 (2mm). This gives together with the other pad of volume 1, a total volume of 4. - fix UI issue: either reversed or midplane As noticed by @chennes, when the pad uses symmetric, reversed is not sensible and vice versa. This commit fixes the missing Gui side for the case midplane is checked and the App side. - the PR also fix two typos
113 lines
3.9 KiB
C++
113 lines
3.9 KiB
C++
/***************************************************************************
|
|
* Copyright (c) 2011 Juergen Riegel <FreeCAD@juergen-riegel.net> *
|
|
* *
|
|
* 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 *
|
|
* *
|
|
***************************************************************************/
|
|
|
|
|
|
#ifndef GUI_TASKVIEW_TaskPadParameters_H
|
|
#define GUI_TASKVIEW_TaskPadParameters_H
|
|
|
|
#include <Gui/TaskView/TaskView.h>
|
|
#include <Gui/Selection.h>
|
|
#include <Gui/TaskView/TaskDialog.h>
|
|
|
|
#include "TaskSketchBasedParameters.h"
|
|
#include "ViewProviderPad.h"
|
|
|
|
class Ui_TaskPadParameters;
|
|
|
|
namespace App {
|
|
class Property;
|
|
}
|
|
|
|
namespace Gui {
|
|
class ViewProvider;
|
|
}
|
|
|
|
namespace PartDesignGui {
|
|
|
|
|
|
class TaskPadParameters : public TaskSketchBasedParameters
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
TaskPadParameters(ViewProviderPad *PadView, QWidget *parent = 0, bool newObj=false);
|
|
~TaskPadParameters();
|
|
|
|
virtual void saveHistory() override;
|
|
virtual void apply() override;
|
|
|
|
private Q_SLOTS:
|
|
void onLengthChanged(double);
|
|
void onLength2Changed(double);
|
|
void onCBAlongDirectionChanged(bool);
|
|
void onGBDirectionChanged(bool);
|
|
void onXDirectionEditChanged(double);
|
|
void onYDirectionEditChanged(double);
|
|
void onZDirectionEditChanged(double);
|
|
void onOffsetChanged(double);
|
|
void onMidplaneChanged(bool);
|
|
void onReversedChanged(bool);
|
|
void onButtonFace(const bool pressed = true);
|
|
void onFaceName(const QString& text);
|
|
void onModeChanged(int);
|
|
|
|
protected:
|
|
void changeEvent(QEvent *e) override;
|
|
|
|
private:
|
|
double getLength(void) const;
|
|
double getLength2(void) const;
|
|
bool getAlongCustom(void) const;
|
|
bool getCustom(void) const;
|
|
double getXDirection(void) const;
|
|
double getYDirection(void) const;
|
|
double getZDirection(void) const;
|
|
double getOffset(void) const;
|
|
bool getReversed(void) const;
|
|
bool getMidplane(void) const;
|
|
int getMode(void) const;
|
|
QString getFaceName(void) const;
|
|
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
|
|
void updateUI(int index);
|
|
void updateDirectionEdits(void);
|
|
|
|
private:
|
|
QWidget* proxy;
|
|
std::unique_ptr<Ui_TaskPadParameters> ui;
|
|
};
|
|
|
|
/// simulation dialog for the TaskView
|
|
class TaskDlgPadParameters : public TaskDlgSketchBasedParameters
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
TaskDlgPadParameters(ViewProviderPad *PadView, bool newObj=false);
|
|
|
|
ViewProviderPad* getPadView() const
|
|
{ return static_cast<ViewProviderPad*>(vp); }
|
|
};
|
|
|
|
} //namespace PartDesignGui
|
|
|
|
#endif // GUI_TASKVIEW_TASKAPPERANCE_H
|