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

+ fix build problems with MSVC and libpack

Browse Source
This commit is contained in:
wmayer
2015-09-21 00:45:03 +02:00
parent e6d54c6df9
commit e0bdf24c95
10 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
View File

@@ -28,6 +28,8 @@
# include <QTimer>
#endif
#include <boost/math/special_functions/round.hpp>
#include "ui_TaskLinearPatternParameters.h"
#include "TaskLinearPatternParameters.h"
#include "TaskMultiTransformParameters.h"
@@ -278,7 +280,7 @@ void TaskLinearPatternParameters::onOccurrences(const double n) {
if (blockUpdate)
return;
PartDesign::LinearPattern* pcLinearPattern = static_cast<PartDesign::LinearPattern*>(getObject());
pcLinearPattern->Occurrences.setValue(round(n));
pcLinearPattern->Occurrences.setValue(boost::math::round(n));
exitSelectionMode();
kickUpdateViewTimer();
@@ -380,7 +382,7 @@ const double TaskLinearPatternParameters::getLength(void) const
const unsigned TaskLinearPatternParameters::getOccurrences(void) const
{
return round(ui->spinOccurrences->value().getValue());
return boost::math::round(ui->spinOccurrences->value().getValue());
}

6
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@@ -28,6 +28,8 @@
# include <QTimer>
#endif
#include <boost/math/special_functions/round.hpp>
#include "ui_TaskPolarPatternParameters.h"
#include "TaskPolarPatternParameters.h"
#include "TaskMultiTransformParameters.h"
@@ -251,7 +253,7 @@ void TaskPolarPatternParameters::onOccurrences(const double n) {
if (blockUpdate)
return;
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
pcPolarPattern->Occurrences.setValue(round(n));
pcPolarPattern->Occurrences.setValue(boost::math::round(n));
exitSelectionMode();
kickUpdateViewTimer();
@@ -326,7 +328,7 @@ const double TaskPolarPatternParameters::getAngle(void) const
const unsigned TaskPolarPatternParameters::getOccurrences(void) const
{
return round(ui->spinOccurrences->value().getValue());
return boost::math::round(ui->spinOccurrences->value().getValue());
}

6
src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
View File

@@ -27,6 +27,8 @@
# include <QMessageBox>
#endif
#include <boost/math/special_functions/round.hpp>
#include "ui_TaskScaledParameters.h"
#include "TaskScaledParameters.h"
#include "TaskMultiTransformParameters.h"
@@ -160,7 +162,7 @@ void TaskScaledParameters::onOccurrences(const double n)
if (blockUpdate)
return;
PartDesign::Scaled* pcScaled = static_cast<PartDesign::Scaled*>(getObject());
pcScaled->Occurrences.setValue(round(n));
pcScaled->Occurrences.setValue(boost::math::round(n));
recomputeFeature();
}
@@ -183,7 +185,7 @@ const double TaskScaledParameters::getFactor(void) const
const unsigned TaskScaledParameters::getOccurrences(void) const
{
return round(ui->spinOccurrences->value().getValue());
return boost::math::round(ui->spinOccurrences->value().getValue());
}
TaskScaledParameters::~TaskScaledParameters()