From feb4218d064dca815f1464d3d09149e7a579b294 Mon Sep 17 00:00:00 2001 From: luz paz Date: Sun, 7 Aug 2022 16:23:24 -0400 Subject: [PATCH] FEM: remove trailing whitespace from various FEM files --- src/Mod/Fem/App/FemAnalysis.h | 2 +- src/Mod/Fem/App/FemMesh.cpp | 26 ++++++++++---------- src/Mod/Fem/App/FemPostFilter.cpp | 2 +- src/Mod/Fem/App/FemPostPipeline.cpp | 2 +- src/Mod/Fem/Gui/Command.cpp | 6 ++--- src/Mod/Fem/Gui/TaskFemConstraintContact.cpp | 4 +-- src/Mod/Fem/Gui/TaskPostBoxes.cpp | 6 ++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h index 38b012fe64..d4461f5c32 100644 --- a/src/Mod/Fem/App/FemAnalysis.h +++ b/src/Mod/Fem/App/FemAnalysis.h @@ -33,7 +33,7 @@ namespace Fem { /** * @brief Container of objects relevant to one simulation. - * + * * @details * A Analysis contains all objects necessary for a complete specification * of a simulation. After computing it also contains the result of the diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 567ab86d04..a1ba7e20f8 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1674,7 +1674,7 @@ void FemMesh::readNastran95(const std::string &Filename) node = std::make_shared(); node->read(line1, ""); } - + //1D else if (line1.substr(0,6)=="CBAR") { @@ -1699,40 +1699,40 @@ void FemMesh::readNastran95(const std::string &Filename) else if (line1.substr(0, 6) == "CQUAD1") { //D06 - //CTRMEM 322 1 179 180 185 + //CTRMEM 322 1 179 180 185 elem = std::make_shared(); elem->read(line1, ""); } - + //3d element else if (line1.find("CTETRA")!= std::string::npos) { - //d011121a.inp - //CTETRA 3 200 104 114 3 103 + //d011121a.inp + //CTETRA 3 200 104 114 3 103 elem = std::make_shared(); elem->read(line1, ""); } else if (line1.find("CWEDGE")!= std::string::npos) { - //d011121a.inp - //CWEDGE 11 200 6 17 16 106 117 116 + //d011121a.inp + //CWEDGE 11 200 6 17 16 106 117 116 elem = std::make_shared(); elem->read(line1, ""); } else if (line1.find("CHEXA1")!= std::string::npos) { - //d011121a.inp - //CHEXA1 1 200 1 2 13 12 101 102 +SOL1 - //+SOL1 113 112 + //d011121a.inp + //CHEXA1 1 200 1 2 13 12 101 102 +SOL1 + //+SOL1 113 112 std::getline(inputfile,line2); elem = std::make_shared(); elem->read(line1, line2); } else if (line1.find("CHEXA2")!= std::string::npos) { - //d011121a.inp - //CHEXA1 1 200 1 2 13 12 101 102 +SOL1 - //+SOL1 113 112 + //d011121a.inp + //CHEXA1 1 200 1 2 13 12 101 102 +SOL1 + //+SOL1 113 112 std::getline(inputfile,line2); elem = std::make_shared(); elem->read(line1, line2); diff --git a/src/Mod/Fem/App/FemPostFilter.cpp b/src/Mod/Fem/App/FemPostFilter.cpp index 2db4c09916..44f1db9d59 100644 --- a/src/Mod/Fem/App/FemPostFilter.cpp +++ b/src/Mod/Fem/App/FemPostFilter.cpp @@ -79,7 +79,7 @@ DocumentObjectExecReturn* FemPostFilter::execute(void) { } else { pipe.source->SetInputDataObject(getInputData()); - pipe.target->Update(); + pipe.target->Update(); Data.setValue(pipe.target->GetOutputDataObject(0)); } diff --git a/src/Mod/Fem/App/FemPostPipeline.cpp b/src/Mod/Fem/App/FemPostPipeline.cpp index a075e40576..7bf64f5e85 100644 --- a/src/Mod/Fem/App/FemPostPipeline.cpp +++ b/src/Mod/Fem/App/FemPostPipeline.cpp @@ -120,7 +120,7 @@ bool FemPostPipeline::canRead(Base::FileInfo File) { File.hasExtension("vtr") || File.hasExtension("vti") || File.hasExtension("vtu") || - File.hasExtension("pvtu")) + File.hasExtension("pvtu")) return true; return false; diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index d4bfd8bd68..5c9211ed30 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -1199,7 +1199,7 @@ void setupFilter(Gui::Command* cmd, std::string Name) { cmd->doCommand(Gui::Command::Doc, "__list__.append(App.ActiveDocument.%s)", FeatName.c_str()); cmd->doCommand(Gui::Command::Doc, "App.ActiveDocument.%s.Filter = __list__", pipeline->getNameInDocument()); cmd->doCommand(Gui::Command::Doc, "del __list__"); - + // set display to assure the user sees the new object cmd->doCommand(Gui::Command::Doc, "App.activeDocument().ActiveObject.ViewObject.DisplayMode = \"Surface\""); // Set SelectionStyle to BoundBox because the idea is that the user gets the useful result @@ -1219,7 +1219,7 @@ void setupFilter(Gui::Command* cmd, std::string Name) { } -std::string Plot() +std::string Plot() { auto xAxisLabel = QCoreApplication::translate("CmdFemPostLinearizedStressesFilter", "Thickness [mm]", "Plot X-Axis Label").toStdString(); auto yAxisLabel = QCoreApplication::translate("CmdFemPostLinearizedStressesFilter", "Stress [MPa]", "Plot Y-Axis Label").toStdString(); @@ -1495,7 +1495,7 @@ void CmdFemPostLinearizedStressesFilter::activated(int) // names need to match with names in FemVTKTools.cpp, this is not failsafe, but ATM there is no better way for test on a stress result in vtk pipeline ) { // TODO FIXME only works if the data along the line object has the name DataAlongLine - // we should get the selected data along the line object + // we should get the selected data along the line object App::DocumentObjectT objT(DataAlongLine); std::string ObjName = objT.getObjectPython(); Gui::doCommandT(Gui::Command::Doc, "t_coords = %s.XAxisData", ObjName); diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp index d9ed7dc2ab..33596f254c 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp @@ -94,12 +94,12 @@ TaskFemConstraintContact::TaskFemConstraintContact(ViewProviderFemConstraintCont // QMessageBox::warning(this, tr("Objects.size"), QString::number(Objects.size())); if (Objects.size() == 1) { - QMessageBox::warning(this, tr("Selection error"), tr("Only one face in object! - moved to master face")); + QMessageBox::warning(this, tr("Selection error"), tr("Only one face in object! - moved to master face")); ui->lw_referencesMaster->addItem(makeRefText(Objects[0], SubElements[0])); } if (Objects.size() == 2 ) { - ui->lw_referencesMaster->addItem(makeRefText(Objects[1], SubElements[1])); + ui->lw_referencesMaster->addItem(makeRefText(Objects[1], SubElements[1])); ui->lw_referencesSlave->addItem(makeRefText(Objects[0], SubElements[0])); } diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index d3b144d4df..a61df82c00 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -436,7 +436,7 @@ void TaskPostDisplay::applyPythonCode() { // *************************************************************************** // ? // the icon fem-post-geo-plane might be wrong but I do not know any better since the plane is one of the implicit functions -TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent) +TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent) : TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-post-geo-plane"), tr("Implicit function"), parent) { @@ -1101,7 +1101,7 @@ void TaskPostDataAtPoint::on_Field_activated(int i) { static_cast(getObject())->FieldName.setValue(FieldName); // Set the unit for the different known result types. - + // CCX names if ( (FieldName == "von Mises Stress") || (FieldName == "Tresca Stress") || (FieldName == "Major Principal Stress") || (FieldName == "Minor Principal Stress") @@ -1214,7 +1214,7 @@ TaskPostScalarClip::TaskPostScalarClip(ViewProviderDocumentObject* view, QWidget // sync the slider // slider min = 0%, slider max = 100% // - // scalar_factor + // scalar_factor // slider_value = --------------- x 100 // max //