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

fix errors from merge of master

Browse Source
This commit is contained in:
jriegel 2014-12-22 16:30:58 +01:00 committed by Stefan Tröger
parent ade02b5643
commit 1e01f8c223
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp vendored
View File

@ -157,6 +157,9 @@ Driver_Mesh::Status DriverSTL_R_SMDS_Mesh::Perform()
// static methods // static methods
#pragma warning(push)
#pragma warning(disable : 4805)
static Standard_Real readFloat(OSD_File& theFile) static Standard_Real readFloat(OSD_File& theFile)
{ {
union { union {
@ -176,6 +179,7 @@ static Standard_Real readFloat(OSD_File& theFile)
return u.f; return u.f;
} }
#pragma warning(pop)
static SMDS_MeshNode* addNode(const gp_Pnt& P, static SMDS_MeshNode* addNode(const gp_Pnt& P,
DriverSTL_DataMapOfPntNodePtr& uniqnodes, DriverSTL_DataMapOfPntNodePtr& uniqnodes,

2
src/Mod/PartDesign/Gui/TaskChamferParameters.ui
View File

@ -42,7 +42,7 @@
<widget class="QListWidget" name="listWidgetReferences"/> <widget class="QListWidget" name="listWidgetReferences"/>
</item> </item>
<item> <item>
<widget class="Gui::QuantitySpinBox" name="chamferDistance"/> <widget class="Gui::QuantitySpinBox" name="chamferDistance"/>
</item> </item>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">

11
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@ -107,6 +107,7 @@ PartDesign::Body *Workbench::setUpPart(const App::Part *part)
void Workbench::_doMigration(const App::Document* doc) void Workbench::_doMigration(const App::Document* doc)
{ {
bool groupCreated = false;
if(doc->countObjects() != 0) { if(doc->countObjects() != 0) {
// show a warning about the convertion // show a warning about the convertion
@ -165,7 +166,7 @@ void Workbench::_doMigration(const App::Document* doc)
// Always create at least the first body, even if the document is empty // Always create at least the first body, even if the document is empty
// This adds both the base planes and the body // This adds both the base planes and the body
Gui::Command::runCommand(Gui::Command::Doc, "FreeCADGui.runCommand('PartDesign_Body')"); Gui::Command::runCommand(Gui::Command::Doc, "FreeCADGui.runCommand('PartDesign_Body')");
activeBody = PartDesignGui::ActivePartObject; PartDesign::Body *activeBody = PartDesignGui::ActivePartObject;
// Create one Body for every root and put the appropriate features into it // Create one Body for every root and put the appropriate features into it
@ -391,17 +392,17 @@ void Workbench::_switchToDocument(const App::Document* doc)
void Workbench::slotActiveDocument(const Gui::Document& Doc) void Workbench::slotActiveDocument(const Gui::Document& Doc)
{ {
switchToDocument(Doc.getDocument()); _switchToDocument(Doc.getDocument());
} }
void Workbench::slotNewDocument(const App::Document& Doc) void Workbench::slotNewDocument(const App::Document& Doc)
{ {
switchToDocument(&Doc); _switchToDocument(&Doc);
} }
void Workbench::slotFinishRestoreDocument(const App::Document& Doc) void Workbench::slotFinishRestoreDocument(const App::Document& Doc)
{ {
switchToDocument(&Doc); _switchToDocument(&Doc);
} }
void Workbench::slotDeleteDocument(const App::Document&) void Workbench::slotDeleteDocument(const App::Document&)
@ -616,7 +617,7 @@ void Workbench::activated()
// make the previously used active Body active again // make the previously used active Body active again
PartDesignGui::ActivePartObject = NULL; PartDesignGui::ActivePartObject = NULL;
switchToDocument(App::GetApplication().getActiveDocument()); _switchToDocument(App::GetApplication().getActiveDocument());
addTaskWatcher(Watcher); addTaskWatcher(Watcher);
Gui::Control().showTaskView(); Gui::Control().showTaskView();