Fix bug with "internal variable" in localized form.
Some tools have internal variables, if click button Apply a dialog lost information about such a variable. --HG-- branch : develop
This commit is contained in:
parent
685f8a7d70
commit
8a19d8a0b1
|
@ -161,9 +161,6 @@ void DialogAlongLine::DeployFormulaTextEdit()
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogAlongLine::~DialogAlongLine()
|
DialogAlongLine::~DialogAlongLine()
|
||||||
{
|
{
|
||||||
VContainer *locData = const_cast<VContainer *> (data);
|
|
||||||
locData->RemoveVariable(currentLength);
|
|
||||||
|
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,9 +92,6 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogSeamAllowance::~DialogSeamAllowance()
|
DialogSeamAllowance::~DialogSeamAllowance()
|
||||||
{
|
{
|
||||||
VContainer *locData = const_cast<VContainer *> (data);
|
|
||||||
locData->RemoveVariable(currentSeamAllowance);
|
|
||||||
|
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1108,6 +1108,11 @@ void DialogTool::SetAssociatedTool(VAbstractTool *tool)
|
||||||
{
|
{
|
||||||
associatedTool = tool;
|
associatedTool = tool;
|
||||||
SetToolId(tool->getId());
|
SetToolId(tool->getId());
|
||||||
|
data = tool->getData();
|
||||||
|
if (not vis.isNull())
|
||||||
|
{
|
||||||
|
vis->SetData(data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -120,6 +120,18 @@ void Visualization::setMainColor(const QColor &value)
|
||||||
InitPen();
|
InitPen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
const VContainer *Visualization::GetData() const
|
||||||
|
{
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void Visualization::SetData(const VContainer *data)
|
||||||
|
{
|
||||||
|
this->data = data;
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void Visualization::SetFactor(qreal factor)
|
void Visualization::SetFactor(qreal factor)
|
||||||
{
|
{
|
||||||
|
|
|
@ -59,6 +59,9 @@ public:
|
||||||
virtual void VisualMode(const quint32 &pointId);
|
virtual void VisualMode(const quint32 &pointId);
|
||||||
void setMainColor(const QColor &value);
|
void setMainColor(const QColor &value);
|
||||||
|
|
||||||
|
const VContainer *GetData() const;
|
||||||
|
void SetData(const VContainer *data);
|
||||||
|
|
||||||
Mode GetMode() const;
|
Mode GetMode() const;
|
||||||
void SetMode(const Mode &value);
|
void SetMode(const Mode &value);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user