kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Import: PR6497 move return statement to new line

Browse Source
This commit is contained in:
Chris Hennes
2022-03-29 12:36:18 -05:00
parent cb9c4ad696
commit a9c33d8f58
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Import/App/dxf.cpp
View File

@@ -2675,7 +2675,8 @@ bool CDxfRead::ReadLwPolyLine()
case 70:
// flags
get_line();
if(sscanf(m_str, "%d", &flags) != 1)return false;
if(sscanf(m_str, "%d", &flags) != 1)
return false;
closed = ((flags & 1) != 0);
break;
case 62:
@@ -2835,7 +2836,8 @@ bool CDxfRead::ReadPolyLine()
case 70:
// flags
get_line();
if(sscanf(m_str, "%d", &flags) != 1)return false;
if(sscanf(m_str, "%d", &flags) != 1)
return false;
closed = ((flags & 1) != 0);
break;
case 62:
@@ -3235,7 +3237,8 @@ bool CDxfRead::ReadLayer()
case 62:
// layer color ; if negative, layer is off
get_line();
if(sscanf(m_str, "%d", &aci) != 1)return false;
if(sscanf(m_str, "%d", &aci) != 1)
return false;
break;
case 6: // linetype name
@@ -3259,14 +3262,16 @@ bool CDxfRead::ReadLayer()
void CDxfRead::DoRead(const bool ignore_errors /* = false */ )
{
m_ignore_errors = ignore_errors;
if(m_fail)return;
if(m_fail)
return;
get_line();
while(!((*m_ifs).eof()))
{
if (!strcmp( m_str, "$INSUNITS" )){
if (!ReadUnits())return;
if (!ReadUnits())
return;
continue;
} // End if - then

6
src/Mod/Import/Gui/AppImportGuiPy.cpp
View File

@@ -298,7 +298,8 @@ public:
private:
virtual void applyFaceColors(Part::Feature* part, const std::vector<App::Color>& colors) override {
auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(Gui::Application::Instance->getViewProvider(part));
if (!vp) return;
if (!vp)
return;
if(colors.empty()) {
// vp->MapFaceColor.setValue(true);
// vp->MapLineColor.setValue(true);
@@ -316,7 +317,8 @@ private:
}
virtual void applyEdgeColors(Part::Feature* part, const std::vector<App::Color>& colors) override {
auto vp = dynamic_cast<PartGui::ViewProviderPartExt*>(Gui::Application::Instance->getViewProvider(part));
if (!vp) return;
if (!vp)
return;
// vp->MapLineColor.setValue(false);
if(colors.size() == 1)
vp->LineColor.setValue(colors.front());