[Points] remove unused includes (#7900)

- also some sorting
This commit is contained in:
Uwe
2022-11-29 04:44:35 +01:00
committed by GitHub
parent dff9b44d5b
commit bdaee726ae
22 changed files with 113 additions and 168 deletions

View File

@@ -20,31 +20,26 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <memory>
#endif
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/FileInfo.h>
#include <App/Application.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <App/DocumentObjectPy.h>
#include <App/Property.h>
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/FileInfo.h>
#include "Points.h"
#include "PointsPy.h"
#include "PointsAlgos.h"
#include "Structured.h"
#include "PointsPy.h"
#include "Properties.h"
#include "Structured.h"
namespace Points {
class Module : public Py::ExtensionModule<Module>

View File

@@ -20,25 +20,22 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <cmath>
# include <iostream>
# include <QtConcurrentMap>
#endif
#include <boost/math/special_functions/fpclassify.hpp>
#include <QtConcurrentMap>
#include <Base/Exception.h>
#include <Base/Matrix.h>
#include <Base/Persistence.h>
#include <Base/Stream.h>
#include <Base/Writer.h>
#include "Points.h"
#include "PointsAlgos.h"
#include "PointsPy.h"
#ifdef _MSC_VER
# include <ppl.h>

View File

@@ -27,20 +27,19 @@
#include <vector>
#include <iterator>
#include <Base/Vector3D.h>
#include <App/ComplexGeoData.h>
#include <App/PropertyGeo.h>
#include <Base/Matrix.h>
#include <Base/Reader.h>
#include <Base/Vector3D.h>
#include <Base/Writer.h>
#include <App/ComplexGeoData.h>
#include <App/PropertyStandard.h>
#include <App/PropertyGeo.h>
#include <Mod/Points/PointsGlobal.h>
namespace Points
{
/** Point kernel
*/
class PointsExport PointKernel : public Data::ComplexGeoData

View File

@@ -20,34 +20,30 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#ifdef FC_OS_LINUX
# include <unistd.h>
#endif
# ifdef FC_OS_LINUX
# include <unistd.h>
# endif
# include <memory>
# include <sstream>
#endif
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
#include <boost/algorithm/string.hpp>
#include "PointsAlgos.h"
#include "Points.h"
#include <Base/Console.h>
#include <Base/Converter.h>
#include <Base/Exception.h>
#include <Base/FileInfo.h>
#include <Base/Console.h>
#include <Base/Sequencer.h>
#include <Base/Stream.h>
#include <memory>
#include <boost/regex.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <E57Format.h>
#include "PointsAlgos.h"
using namespace Points;
void PointsAlgos::Load(PointKernel &points, const char *FileName)

View File

@@ -20,13 +20,14 @@
* *
***************************************************************************/
#ifndef _PointsAlgos_h_
#define _PointsAlgos_h_
#include <Eigen/Core>
#include "Points.h"
#include "Properties.h"
#include <Eigen/Core>
namespace Points
{

View File

@@ -20,24 +20,16 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <vector>
#endif
#include <vector>
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Base/Stream.h>
#include <Base/Writer.h>
#include "PointsFeature.h"
using namespace Points;
using namespace Points;
//===========================================================================
// Feature

View File

@@ -20,15 +20,14 @@
* *
***************************************************************************/
#ifndef POINTS_FEATURE_H
#define POINTS_FEATURE_H
#include <App/GeoFeature.h>
#include <App/GeoFeature.h> // must be first include
#include <App/FeatureCustom.h>
#include <App/FeaturePython.h>
#include <App/PropertyLinks.h>
#include <App/PropertyGeo.h>
#include "Points.h"
#include "PropertyPointKernel.h"

View File

@@ -20,17 +20,15 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
#endif
#include "PointsGrid.h"
using namespace Points;
PointsGrid::PointsGrid (const PointKernel &rclM)

View File

@@ -20,19 +20,19 @@
* *
***************************************************************************/
#ifndef POINTS_GRID_H
#define POINTS_GRID_H
#include <set>
#include "Points.h"
#include <Base/Vector3D.h>
#include <Base/BoundBox.h>
#include <Base/Vector3D.h>
#define POINTS_CT_GRID 256 // Default value for number of elements per grid
#define POINTS_MAX_GRIDS 100000 // Default value for maximum number of grids
#define POINTS_CT_GRID_PER_AXIS 20
#include "Points.h"
#define POINTS_CT_GRID 256 // Default value for number of elements per grid
#define POINTS_MAX_GRIDS 100000 // Default value for maximum number of grids
#define POINTS_CT_GRID_PER_AXIS 20
#define PONTSGRID_BBOX_EXTENSION 10.0f

View File

@@ -20,20 +20,21 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#include "Mod/Points/App/Points.h"
#include <Base/Builder3D.h>
#include <Base/Converter.h>
#include <Base/VectorPy.h>
#include <Base/GeometryPyCXX.h>
#include <boost/math/special_functions/fpclassify.hpp>
#include <Base/Builder3D.h>
#include <Base/Converter.h>
#include <Base/GeometryPyCXX.h>
#include <Base/VectorPy.h>
#include "Points.h"
// inclusion of the generated files (generated out of PointsPy.xml)
#include "PointsPy.h"
#include "PointsPy.cpp"
using namespace Points;
// returns a string which represents the object e.g. when printed in python

View File

@@ -35,26 +35,30 @@
#ifdef _PreComp_
// Qt
# include <QtConcurrentMap>
// standard
#include <cstdio>
#include <cassert>
# include <cstdio>
# include <cassert>
// STL
#include <algorithm>
#include <iostream>
#include <fstream>
#include <list>
#include <map>
#include <queue>
#include <set>
#include <sstream>
#include <stack>
#include <string>
#include <vector>
#include <bitset>
#include <cfloat>
#include <cmath>
#include <cstdlib>
# include <algorithm>
# include <bitset>
# include <cfloat>
# include <cmath>
# include <cstdlib>
# include <iostream>
# include <fstream>
# include <list>
# include <map>
# include <memory>
# include <queue>
# include <set>
# include <sstream>
# include <stack>
# include <string>
# include <vector>
#endif //_PreComp_

View File

@@ -20,31 +20,29 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
# include <cmath>
# include <iostream>
# include <algorithm>
# include <QtConcurrentMap>
#endif
#include <Base/Converter.h>
#include <Base/Exception.h>
#include <Base/Matrix.h>
#include <Base/Persistence.h>
#include <Base/Stream.h>
#include <Base/Writer.h>
#include <Base/VectorPy.h>
#include <Base/Writer.h>
#include "Points.h"
#include "Properties.h"
#include "PointsPy.h"
#include "Points.h"
#include <QtConcurrentMap>
#ifdef _MSC_VER
# include <ppl.h>
#endif
using namespace Points;
using namespace std;

View File

@@ -20,26 +20,22 @@
* *
***************************************************************************/
#ifndef POINTS_POINTPROPERTIES_H
#define POINTS_POINTPROPERTIES_H
#include <vector>
#include <Base/Vector3D.h>
#include <App/PropertyStandard.h>
#include <Base/Matrix.h>
#include <Base/Reader.h>
#include <Base/Writer.h>
#include <App/PropertyStandard.h>
#include <App/PropertyGeo.h>
#include "Points.h"
namespace Points
{
/** Greyvalue property.
*/
class PointsExport PropertyGreyValue : public App::PropertyFloat

View File

@@ -20,23 +20,21 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
# include <cmath>
# include <iostream>
# include <algorithm>
#endif
#include <Base/Exception.h>
#include <Base/Matrix.h>
#include <Base/Stream.h>
#include <Base/Writer.h>
#include "PropertyPointKernel.h"
#include "PointsPy.h"
using namespace Points;
TYPESYSTEM_SOURCE(Points::PropertyPointKernel , App::PropertyComplexGeoData)

View File

@@ -20,20 +20,15 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <vector>
#endif
#include <vector>
#include <Base/Console.h>
#include <Base/Exception.h>
#include "Structured.h"
using namespace Points;

View File

@@ -20,16 +20,7 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include "ViewProvider.h"
#include "Workbench.h"
#include <Base/Console.h>
#include <Base/Interpreter.h>
@@ -38,6 +29,10 @@
#include <Gui/Language/Translator.h>
#include <Mod/Points/App/PropertyPointKernel.h>
#include "ViewProvider.h"
#include "Workbench.h"
// use a different name to CreateCommand()
void CreatePointsCommands();

View File

@@ -20,29 +20,25 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <algorithm>
# include <QFileInfo>
# include <QInputDialog>
# include <Inventor/events/SoMouseButtonEvent.h>
#endif
#include <Base/Exception.h>
#include <Base/Interpreter.h>
#include <Base/Matrix.h>
#include <Base/Tools.h>
#include <Base/UnitsApi.h>
#include <App/Application.h>
#include <App/Document.h>
#include <Base/Exception.h>
#include <Base/Interpreter.h>
#include <Base/Tools.h>
#include <Base/UnitsApi.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/FileDialog.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/ViewProvider.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/WaitCursor.h>
@@ -50,6 +46,7 @@
#include "../App/PointsFeature.h"
#include "../App/Structured.h"
#include "../App/Properties.h"
#include "DlgPointsReadImp.h"
#include "ViewProvider.h"

View File

@@ -21,16 +21,13 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "DlgPointsReadImp.h"
#include "ui_DlgPointsRead.h"
using namespace PointsGui;
DlgPointsReadImp::DlgPointsReadImp(const char *FileName, QWidget* parent, Qt::WindowFlags fl )
: QDialog( parent, fl )
, ui(new Ui_DlgPointsRead)

View File

@@ -28,28 +28,29 @@
#ifdef FC_OS_WIN32
# ifndef NOMINMAX
# define NOMINMAX
# define NOMINMAX
# endif
#endif
#ifdef _PreComp_
// standard
#include <cstdio>
#include <cassert>
# include <cstdio>
# include <cassert>
// STL
#include <algorithm>
#include <iostream>
#include <list>
#include <map>
#include <queue>
#include <set>
#include <sstream>
#include <stack>
#include <string>
#include <vector>
#include <bitset>
# include <algorithm>
# include <bitset>
# include <iostream>
# include <limits>
# include <list>
# include <map>
# include <queue>
# include <set>
# include <sstream>
# include <stack>
# include <string>
# include <vector>
#ifdef FC_OS_WIN32
# include <windows.h>

View File

@@ -20,44 +20,34 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <limits>
# include <Inventor/errors/SoDebugError.h>
# include <Inventor/events/SoMouseButtonEvent.h>
# include <Inventor/nodes/SoCamera.h>
# include <Inventor/nodes/SoCoordinate3.h>
# include <Inventor/nodes/SoDrawStyle.h>
# include <Inventor/nodes/SoPointSet.h>
# include <Inventor/nodes/SoIndexedPointSet.h>
# include <Inventor/nodes/SoMaterial.h>
# include <Inventor/nodes/SoMaterialBinding.h>
# include <Inventor/nodes/SoNormal.h>
# include <Inventor/errors/SoDebugError.h>
# include <Inventor/events/SoMouseButtonEvent.h>
# include <Inventor/nodes/SoPointSet.h>
#endif
#include <boost/math/special_functions/fpclassify.hpp>
#include <limits>
/// Here the FreeCAD includes sorted by Base,App,Gui,...
#include <Base/Console.h>
#include <Base/Parameter.h>
#include <Base/Exception.h>
#include <Base/Sequencer.h>
#include <Base/Tools2D.h>
#include <Base/Vector3D.h>
#include <App/Application.h>
#include <App/Document.h>
#include <Base/Vector3D.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/SoFCSelection.h>
#include <Gui/Window.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Points/App/PointsFeature.h>
#include <Mod/Points/App/Properties.h>
#include "ViewProvider.h"
#include "../App/Properties.h"
using namespace PointsGui;

View File

@@ -23,10 +23,9 @@
#ifndef POINTSGUI_VIEWPROVIDERPOINTS_H
#define POINTSGUI_VIEWPROVIDERPOINTS_H
#include <Base/Vector3D.h>
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderBuilder.h>
#include <Inventor/SbVec2f.h>
#include <Mod/Points/PointsGlobal.h>

View File

@@ -20,16 +20,13 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <qobject.h>
#endif
#include <Gui/MenuManager.h>
#include <Gui/ToolBarManager.h>
#include "Workbench.h"
#include <Gui/ToolBarManager.h>
#include <Gui/MenuManager.h>
using namespace PointsGui;