diff --git a/src/Mod/Path/PathScripts/PathHelix.py b/src/Mod/Path/PathScripts/PathHelix.py index acb0ad8b00..52a6a0ac39 100644 --- a/src/Mod/Path/PathScripts/PathHelix.py +++ b/src/Mod/Path/PathScripts/PathHelix.py @@ -48,7 +48,7 @@ class ObjectHelix(PathCircularHoleBase.ObjectOp): def initCircularHoleOperation(self, obj): '''initCircularHoleOperation(obj) ... create helix specific properties.''' - obj.addProperty("App::PropertyEnumeration", "Direction", "Helix Drill", translate("PathHelix", "The direction of the circular cuts, clockwise (CW), or counter clockwise (CCW)")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Helix Drill", translate("PathHelix", "The direction of the circular cuts, ClockWise (CW), or CounterClockWise (CCW)")) obj.Direction = ['CW', 'CCW'] obj.addProperty("App::PropertyEnumeration", "StartSide", "Helix Drill", translate("PathHelix", "Start cutting from the inside or outside")) diff --git a/src/Mod/Path/PathScripts/PathPocketBase.py b/src/Mod/Path/PathScripts/PathPocketBase.py index 55d65f65c6..837adec25e 100644 --- a/src/Mod/Path/PathScripts/PathPocketBase.py +++ b/src/Mod/Path/PathScripts/PathPocketBase.py @@ -69,7 +69,7 @@ class ObjectPocket(PathAreaOp.ObjectOp): PathLog.track() # Pocket Properties - obj.addProperty("App::PropertyEnumeration", "CutMode", "Pocket", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "CutMode", "Pocket", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise (CW) or CounterClockWise (CCW)")) obj.CutMode = ['Climb', 'Conventional'] obj.addProperty("App::PropertyDistance", "ExtraOffset", "Pocket", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra offset to apply to the operation. Direction is operation dependent.")) obj.addProperty("App::PropertyEnumeration", "StartAt", "Pocket", QtCore.QT_TRANSLATE_NOOP("App::Property", "Start pocketing at center or boundary")) @@ -140,4 +140,3 @@ def SetupProperties(): setup.append('ZigZagAngle') setup.append('OffsetPattern') return setup - diff --git a/src/Mod/Path/PathScripts/PathProfileBase.py b/src/Mod/Path/PathScripts/PathProfileBase.py index d893879411..b72bd13b42 100644 --- a/src/Mod/Path/PathScripts/PathProfileBase.py +++ b/src/Mod/Path/PathScripts/PathProfileBase.py @@ -54,7 +54,7 @@ class ObjectProfile(PathAreaOp.ObjectOp): # Profile Properties obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Outside', 'Inside'] # side of profile that cutter is on in relation to direction of profile - obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise (CW) or CounterClockWise (CCW)")) obj.Direction = ['CW', 'CCW'] # this is the direction that the profile runs obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make True, if using Cutter Radius Compensation")) diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp index 0e79a70401..a861413a5f 100644 --- a/src/Mod/Raytracing/Gui/Command.cpp +++ b/src/Mod/Raytracing/Gui/Command.cpp @@ -63,7 +63,7 @@ #include #include #include - + #include "FreeCADpov.h" @@ -94,11 +94,11 @@ void CmdRaytracingWriteCamera::activated(int) if (ppReturn) { std::string str(ppReturn); if (str.find("PerspectiveCamera") == std::string::npos) { - int ret = QMessageBox::warning(Gui::getMainWindow(), + int ret = QMessageBox::warning(Gui::getMainWindow(), qApp->translate("CmdRaytracingWriteView","No perspective camera"), qApp->translate("CmdRaytracingWriteView","The current view camera is not perspective" - " and thus the result of the POV-Ray image later might look different to" - " what you expect.\nDo you want to continue?"), + " and thus resulting in a POV-Ray image that may look different than" + " what was expected.\nDo you want to continue?"), QMessageBox::Yes|QMessageBox::No); if (ret != QMessageBox::Yes) return; @@ -135,18 +135,18 @@ void CmdRaytracingWriteCamera::activated(int) filter << QString::fromLatin1("%1 (*.pov)").arg(QObject::tr("POV-Ray")); filter << QString::fromLatin1("%1 (*.*)").arg(QObject::tr("All Files")); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page"), QString(), filter.join(QLatin1String(";;"))); - if (fn.isEmpty()) + if (fn.isEmpty()) return; std::string cFullName = (const char*)fn.toUtf8(); // building up the python string std::stringstream out; - out << "Raytracing.writeCameraFile(\"" << strToPython(cFullName) << "\"," - << "(" << pos.getValue()[0] <<"," << pos.getValue()[1] <<"," << pos.getValue()[2] <<")," + out << "Raytracing.writeCameraFile(\"" << strToPython(cFullName) << "\"," + << "(" << pos.getValue()[0] <<"," << pos.getValue()[1] <<"," << pos.getValue()[2] <<")," << "(" << lookat.getValue()[0] <<"," << lookat.getValue()[1] <<"," << lookat.getValue()[2] <<")," ; lookat *= Dist; lookat += pos; - out << "(" << lookat.getValue()[0] <<"," << lookat.getValue()[1] <<"," << lookat.getValue()[2] <<")," + out << "(" << lookat.getValue()[0] <<"," << lookat.getValue()[1] <<"," << lookat.getValue()[2] <<")," << "(" << upvec.getValue()[0] <<"," << upvec.getValue()[1] <<"," << upvec.getValue()[2] <<") )" ; doCommand(Doc,"import Raytracing"); @@ -186,7 +186,7 @@ void CmdRaytracingWritePart::activated(int) filter << QString::fromLatin1("%1 (*.pov)").arg(QObject::tr("POV-Ray")); filter << QString::fromLatin1("%1 (*.*)").arg(QObject::tr("All Files")); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page"), QString(), filter.join(QLatin1String(";;"))); - if (fn.isEmpty()) + if (fn.isEmpty()) return; std::string cFullName = (const char*)fn.toUtf8(); @@ -233,11 +233,11 @@ void CmdRaytracingWriteView::activated(int) if (ppReturn) { std::string str(ppReturn); if (str.find("PerspectiveCamera") == std::string::npos) { - int ret = QMessageBox::warning(Gui::getMainWindow(), + int ret = QMessageBox::warning(Gui::getMainWindow(), qApp->translate("CmdRaytracingWriteView","No perspective camera"), qApp->translate("CmdRaytracingWriteView","The current view camera is not perspective" - " and thus the result of the POV-Ray image later might look different to" - " what you expect.\nDo you want to continue?"), + " and thus resulting in a POV-Ray image that may look different than" + " what was expected.\nDo you want to continue?"), QMessageBox::Yes|QMessageBox::No); if (ret != QMessageBox::Yes) return; @@ -249,7 +249,7 @@ void CmdRaytracingWriteView::activated(int) filter << QString::fromLatin1("%1 (*.*)").arg(QObject::tr("All Files")); QString fn = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(), QObject::tr("Export page"), QString(), filter.join(QLatin1String(";;"))); - if (fn.isEmpty()) + if (fn.isEmpty()) return; std::string cFullName = (const char*)fn.toUtf8(); @@ -332,11 +332,11 @@ void CmdRaytracingNewPovrayProject::activated(int iMsg) if (ppReturn) { std::string str(ppReturn); if (str.find("PerspectiveCamera") == std::string::npos) { - int ret = QMessageBox::warning(Gui::getMainWindow(), + int ret = QMessageBox::warning(Gui::getMainWindow(), qApp->translate("CmdRaytracingWriteView","No perspective camera"), qApp->translate("CmdRaytracingWriteView","The current view camera is not perspective" - " and thus the result of the POV-Ray image later might look different to" - " what you expect.\nDo you want to continue?"), + " and thus resulting in a POV-Ray image that may look different than" + " what was expected.\nDo you want to continue?"), QMessageBox::Yes|QMessageBox::No); if (ret != QMessageBox::Yes) return; @@ -609,7 +609,7 @@ void CmdRaytracingRender::activated(int) } else { renderType = Raytracing::RayProject::getClassTypeId(); } - + // checking if renderer is present ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Raytracing"); std::string renderer; @@ -642,9 +642,9 @@ void CmdRaytracingRender::activated(int) } } } - + std::vector Sel = getSelection().getSelectionEx(0, renderType); - + if (renderType == Raytracing::RayProject::getClassTypeId()) { Raytracing::RayProject* proj = static_cast(Sel[0].getObject()); QFileInfo fi(QString::fromUtf8(proj->PageResult.getValue())); @@ -731,7 +731,7 @@ void CmdRaytracingRender::activated(int) doCommand(Doc,"f.write(PageFile.read())"); doCommand(Doc,"f.close()"); doCommand(Doc,"subprocess.Popen([\"%s\",TempFile])",renderer.c_str()); - doCommand(Doc,"del TempFile,PageFile"); + doCommand(Doc,"del TempFile,PageFile"); commitCommand(); } } @@ -766,11 +766,11 @@ void CmdRaytracingNewLuxProject::activated(int iMsg) if (ppReturn) { std::string str(ppReturn); if (str.find("PerspectiveCamera") == std::string::npos) { - int ret = QMessageBox::warning(Gui::getMainWindow(), + int ret = QMessageBox::warning(Gui::getMainWindow(), qApp->translate("CmdRaytracingWriteView","No perspective camera"), qApp->translate("CmdRaytracingWriteView","The current view camera is not perspective" - " and thus the result of the luxrender image later might look different to" - " what you expect.\nDo you want to continue?"), + " and thus resulting in a luxrender image that may look different than" + " what was expected.\nDo you want to continue?"), QMessageBox::Yes|QMessageBox::No); if (ret != QMessageBox::Yes) return; diff --git a/src/Mod/Start/Gui/DlgStartPreferences.ui b/src/Mod/Start/Gui/DlgStartPreferences.ui index 171ce44857..26163cd888 100644 --- a/src/Mod/Start/Gui/DlgStartPreferences.ui +++ b/src/Mod/Start/Gui/DlgStartPreferences.ui @@ -607,7 +607,7 @@ - Close & switch on opening file + Close and switch on opening file