+ fix build problems with MSVC and libpack
This commit is contained in:
@@ -14,6 +14,7 @@ include_directories(
|
||||
${OCC_INCLUDE_DIR}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${XercesC_INCLUDE_DIRS}
|
||||
${QT_QTCORE_INCLUDE_DIR}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
link_directories(${OCC_LIBRARY_DIR})
|
||||
|
||||
@@ -11,6 +11,7 @@ include_directories(
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${XercesC_INCLUDE_DIRS}
|
||||
${QT_QTCORE_INCLUDE_DIR}
|
||||
)
|
||||
link_directories(${OCC_LIBRARY_DIR})
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -15,6 +15,7 @@ include_directories(
|
||||
${EIGEN3_INCLUDE_DIR}
|
||||
${PCL_INCLUDE_DIRS}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${QT_QTCORE_INCLUDE_DIR}
|
||||
${XercesC_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
@@ -11,6 +11,7 @@ include_directories(
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${OCC_INCLUDE_DIR}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${QT_QTCORE_INCLUDE_DIR}
|
||||
${XercesC_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user