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

fix CIDs 154889, 151939, 151763, 154892, 154891, 151802, 151936, 151803, 153359

Browse Source
This commit is contained in:
wmayer 2016-12-18 14:12:13 +01:00
parent 0ada809ec5
commit 76c529d47d
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/TechDraw/App/DrawProjGroup.cpp
View File

@ -453,7 +453,8 @@ void DrawProjGroup::arrangeViewPointers(DrawProjGroupItem *viewPtrs[10]) const
if (oView) { if (oView) {
const char *viewTypeCStr = oView->Type.getValueAsString(); const char *viewTypeCStr = oView->Type.getValueAsString();
if (strcmp(viewTypeCStr, "Front") == 0) { if (strcmp(viewTypeCStr, "Front") == 0) {
viewPtrs[thirdAngle ? 4 : 4] = oView; //viewPtrs[thirdAngle ? 4 : 4] = oView;
viewPtrs[4] = oView;
} else if (strcmp(viewTypeCStr, "Left") == 0) { } else if (strcmp(viewTypeCStr, "Left") == 0) {
viewPtrs[thirdAngle ? 3 : 5] = oView; viewPtrs[thirdAngle ? 3 : 5] = oView;
} else if (strcmp(viewTypeCStr, "Right") == 0) { } else if (strcmp(viewTypeCStr, "Right") == 0) {

5
src/Mod/TechDraw/App/DrawProjectSplit.h
View File

@ -55,7 +55,10 @@ struct splitPoint {
class edgeSortItem class edgeSortItem
{ {
public: public:
edgeSortItem() {} edgeSortItem() {
startAngle = endAngle = 0.0;
idx = 0;
}
~edgeSortItem() {} ~edgeSortItem() {}
Base::Vector3d start; Base::Vector3d start;

2
src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
View File

@ -246,7 +246,7 @@ std::string DrawViewSpreadsheet::getSheetImage(void)
celltext = field.str(); celltext = field.str();
} }
// get colors, style, alignment and span // get colors, style, alignment and span
int alignment; int alignment = 0;
std::string bcolor = "none"; std::string bcolor = "none";
std::string fcolor = c.asCSSString(); std::string fcolor = c.asCSSString();
std::string textstyle = ""; std::string textstyle = "";

2
src/Mod/TechDraw/App/Geometry.h
View File

@ -164,7 +164,7 @@ class TechDrawExport BezierSegment: public BaseGeom
{ {
public: public:
BezierSegment(const TopoDS_Edge &e); BezierSegment(const TopoDS_Edge &e);
BezierSegment() {} BezierSegment() { poles = degree = 0; }
~BezierSegment() = default; ~BezierSegment() = default;
int poles; int poles;

5
src/Mod/TechDraw/Gui/QGIView.cpp
View File

@ -66,6 +66,7 @@ const float labelCaptionFudge = 0.2f; // temp fiddle for devel
QGIView::QGIView() QGIView::QGIView()
:QGraphicsItemGroup(), :QGraphicsItemGroup(),
viewObj(nullptr),
locked(false), locked(false),
borderVisible(true), borderVisible(true),
m_innerView(false) m_innerView(false)
@ -304,7 +305,9 @@ void QGIView::setViewFeature(TechDraw::DrawView *obj)
void QGIView::toggleCache(bool state) void QGIView::toggleCache(bool state)
{ {
// temp for devl. chaching was hiding problems WF // temp for devl. chaching was hiding problems WF
setCacheMode((state)? NoCache : NoCache); //setCacheMode((state)? NoCache : NoCache);
Q_UNUSED(state);
setCacheMode(NoCache);
} }
void QGIView::toggleBorder(bool state) void QGIView::toggleBorder(bool state)

3
src/Mod/TechDraw/Gui/QGIViewPart.cpp
View File

@ -755,7 +755,8 @@ void QGIViewPart::toggleCache(bool state)
QList<QGraphicsItem*> items = childItems(); QList<QGraphicsItem*> items = childItems();
for(QList<QGraphicsItem*>::iterator it = items.begin(); it != items.end(); it++) { for(QList<QGraphicsItem*>::iterator it = items.begin(); it != items.end(); it++) {
//(*it)->setCacheMode((state)? DeviceCoordinateCache : NoCache); //TODO: fiddle cache settings if req'd for performance //(*it)->setCacheMode((state)? DeviceCoordinateCache : NoCache); //TODO: fiddle cache settings if req'd for performance
(*it)->setCacheMode((state)? NoCache : NoCache); Q_UNUSED(state);
(*it)->setCacheMode(NoCache);
(*it)->update(); (*it)->update();
} }
} }

8
src/Mod/TechDraw/Gui/TaskProjGroup.cpp
View File

@ -418,7 +418,7 @@ Base::Vector3d TaskProjGroup::get3DViewDir()
Base::Vector3d viewDir(0.0,-1.0,0.0); //default to front Base::Vector3d viewDir(0.0,-1.0,0.0); //default to front
std::list<MDIView*> mdis = Gui::Application::Instance->activeDocument()->getMDIViews(); std::list<MDIView*> mdis = Gui::Application::Instance->activeDocument()->getMDIViews();
Gui::View3DInventor *view; Gui::View3DInventor *view;
Gui::View3DInventorViewer *viewer; Gui::View3DInventorViewer *viewer = nullptr;
for (auto& m: mdis) { //find the 3D viewer for (auto& m: mdis) { //find the 3D viewer
view = dynamic_cast<Gui::View3DInventor*>(m); view = dynamic_cast<Gui::View3DInventor*>(m);
if (view) { if (view) {
@ -491,8 +491,10 @@ bool TaskProjGroup::reject()
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//TODO: Do we really need to hang on to the TaskDlgProjGroup in this class? IR //TODO: Do we really need to hang on to the TaskDlgProjGroup in this class? IR
TaskDlgProjGroup::TaskDlgProjGroup(TechDraw::DrawProjGroup* featView, bool mode) : TaskDialog(), TaskDlgProjGroup::TaskDlgProjGroup(TechDraw::DrawProjGroup* featView, bool mode)
multiView(featView) : TaskDialog()
, viewProvider(nullptr)
, multiView(featView)
{ {
//viewProvider = dynamic_cast<const ViewProviderProjGroup *>(featView); //viewProvider = dynamic_cast<const ViewProviderProjGroup *>(featView);
widget = new TaskProjGroup(featView,mode); widget = new TaskProjGroup(featView,mode);