suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source
This commit is contained in:
wmayer 2015-01-10 15:15:42 +01:00
commit 0954adf784
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Base/TimeInfo.cpp
View File

@ -71,6 +71,10 @@ void TimeInfo::setTime_t (uint64_t seconds)
std::string TimeInfo::currentDateTimeString() std::string TimeInfo::currentDateTimeString()
{ {
#if (QT_VERSION >= 0x050300)
return QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC)
.toString(Qt::ISODate).toStdString();
#else
QDateTime local = QDateTime::currentDateTime(); QDateTime local = QDateTime::currentDateTime();
QDateTime utc = local.toUTC(); QDateTime utc = local.toUTC();
utc.setTimeSpec(Qt::LocalTime); utc.setTimeSpec(Qt::LocalTime);
@ -78,6 +82,7 @@ std::string TimeInfo::currentDateTimeString()
local.setUtcOffset(utcOffset); local.setUtcOffset(utcOffset);
QString dm = local.toString(Qt::ISODate); QString dm = local.toString(Qt::ISODate);
return dm.toStdString(); return dm.toStdString();
#endif
} }
std::string TimeInfo::diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd ) std::string TimeInfo::diffTime(const TimeInfo &timeStart,const TimeInfo &timeEnd )

3
src/Mod/Draft/importDXF.py
View File

@ -1357,6 +1357,9 @@ def getArcData(edge):
ang1,ang2=edge.ParameterRange ang1,ang2=edge.ParameterRange
else: else:
ang2,ang1=edge.ParameterRange ang2,ang1=edge.ParameterRange
if edge.Curve.XAxis != FreeCAD.Vector(1,0,0):
ang1 -= DraftVecUtils.angle(edge.Curve.XAxis)
ang2 -= DraftVecUtils.angle(edge.Curve.XAxis)
return DraftVecUtils.tup(ce), radius, math.degrees(ang1),\ return DraftVecUtils.tup(ce), radius, math.degrees(ang1),\
math.degrees(ang2) math.degrees(ang2)

4
src/Mod/Part/App/modelRefine.cpp
View File

@ -739,7 +739,7 @@ FaceTypedCylinder& ModelRefine::getCylinderObject()
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////
// TODO: change this version after occ fix. Freecad Mantis 1450 // TODO: change this version after occ fix. Freecad Mantis 1450
#if OCC_VERSION_HEX <= 0x070000 #if OCC_VERSION_HEX <= 0x7fffff
void collectConicEdges(const TopoDS_Shell &shell, TopTools_IndexedMapOfShape &map) void collectConicEdges(const TopoDS_Shell &shell, TopTools_IndexedMapOfShape &map)
{ {
TopTools_IndexedMapOfShape edges; TopTools_IndexedMapOfShape edges;
@ -1026,7 +1026,7 @@ bool FaceUniter::process()
BRepLib_FuseEdges edgeFuse(workShell); BRepLib_FuseEdges edgeFuse(workShell);
// TODO: change this version after occ fix. Freecad Mantis 1450 // TODO: change this version after occ fix. Freecad Mantis 1450
#if OCC_VERSION_HEX <= 0x070000 #if OCC_VERSION_HEX <= 0x7fffff
TopTools_IndexedMapOfShape map; TopTools_IndexedMapOfShape map;
collectConicEdges(workShell, map); collectConicEdges(workShell, map);
edgeFuse.AvoidEdges(map); edgeFuse.AvoidEdges(map);