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

[Image] remove unused headers and Xerces

Browse Source
This commit is contained in:
Uwe
2022-03-20 22:16:19 +01:00
parent 42d48103e8
commit dde71a21d5
19 changed files with 93 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Image/App/AppImage.cpp
View File

@@ -10,16 +10,11 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
#endif
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/PyObjectBase.h>
#include "ImagePlane.h"

77
src/Mod/Image/App/CMakeLists.txt
View File

@@ -1,39 +1,38 @@
if(WIN32)
add_definitions(-DFCAppImage)
endif(WIN32)
if(OPENCV2_FOUND)
add_definitions(-DHAVE_OPENCV2)
endif(OPENCV2_FOUND)
include_directories(
${OPENCV_INCLUDE2_DIR}
${PYTHON_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
set(Image_LIBS
${OPENCV2_LIBRARIES}
FreeCADApp
)
set(Image_SRCS
ImageBase.cpp
ImageBase.h
ImagePlane.cpp
ImagePlane.h
PreCompiled.cpp
PreCompiled.h
AppImage.cpp
)
add_library(Image SHARED ${Image_SRCS})
target_link_libraries(Image ${Image_LIBS})
SET_BIN_DIR(Image Image /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(Image)
INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(WIN32)
add_definitions(-DFCAppImage)
endif(WIN32)
if(OPENCV2_FOUND)
add_definitions(-DHAVE_OPENCV2)
endif(OPENCV2_FOUND)
include_directories(
${OPENCV_INCLUDE2_DIR}
${PYTHON_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)
set(Image_LIBS
${OPENCV2_LIBRARIES}
FreeCADApp
)
set(Image_SRCS
ImageBase.cpp
ImageBase.h
ImagePlane.cpp
ImagePlane.h
PreCompiled.cpp
PreCompiled.h
AppImage.cpp
)
add_library(Image SHARED ${Image_SRCS})
target_link_libraries(Image ${Image_LIBS})
SET_BIN_DIR(Image Image /Mod/Image)
SET_PYTHON_PREFIX_SUFFIX(Image)
INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})

7
src/Mod/Image/App/ImageBase.cpp
View File

@@ -16,13 +16,10 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <cmath>
# include <cstring>
#endif
#include "ImageBase.h"
#include <Base/Exception.h>
#include "ImageBase.h"
using namespace Image;

2
src/Mod/Image/App/ImageBase.h
View File

@@ -18,8 +18,6 @@
#ifndef IMAGEBASE_H
#define IMAGEBASE_H
#include <Mod/Image/ImageGlobal.h>
namespace Image
{

7
src/Mod/Image/App/ImagePlane.cpp
View File

@@ -20,15 +20,10 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "ImagePlane.h"
#include <App/DocumentObjectPy.h>
#include <Base/Placement.h>
using namespace Image;
using namespace App;

2
src/Mod/Image/App/ImagePlane.h
View File

@@ -20,14 +20,12 @@
* *
***************************************************************************/
#ifndef Image_ImagePlane_H
#define Image_ImagePlane_H
#include <App/GeoFeature.h>
#include <App/PropertyFile.h>
#include <App/PropertyUnits.h>
#include <Mod/Image/ImageGlobal.h>
namespace Image
{

3
src/Mod/Image/App/PreCompiled.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef __PRECOMPILED__
#define __PRECOMPILED__
@@ -52,8 +51,6 @@
#include <set>
#include <bitset>
#include <Python.h>
#endif // _PreComp_
#endif

6
src/Mod/Image/Gui/AppImageGui.cpp
View File

@@ -9,20 +9,18 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
#endif
#include <Base/Console.h>
#include <Base/PyObjectBase.h>
#include <Gui/Application.h>
#include <Gui/Language/Translator.h>
#include "ImageView.h"
#include "Workbench.h"
#include "ViewProviderImagePlane.h"
// use a different name to CreateCommand()
void CreateImageCommands();

1
src/Mod/Image/Gui/CMakeLists.txt
View File

@@ -11,7 +11,6 @@ include_directories(
${OPENCV2_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
if(MSVC)

13
src/Mod/Image/Gui/Command.cpp
View File

@@ -11,7 +11,6 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QAction>
# include <QFileDialog>
# include <QImage>
# include <QImageReader>
@@ -24,16 +23,18 @@
#include <sys/timeb.h>
#endif
#include <Base/Exception.h>
#include <Base/Tools.h>
#include <Base/Interpreter.h>
#include <App/Document.h>
#include <Base/Exception.h>
#include <Base/Interpreter.h>
#include <Base/Tools.h>
#include <Gui/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/Command.h>
#include <Gui/BitmapFactory.h>
#include <Gui/MainWindow.h>
#include "ImageOrientationDialog.h"
#if HAVE_OPENCV2
# include "opencv2/opencv.hpp"
#endif

8
src/Mod/Image/Gui/ImageOrientationDialog.cpp
View File

@@ -21,19 +21,17 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QPixmap>
# include <QDialog>
#endif
#include <Base/Tools.h>
#include <Gui/BitmapFactory.h>
#include <Gui/MainWindow.h>
#include <Base/Tools.h>
#include <Base/UnitsApi.h>
#include "ui_ImageOrientationDialog.h"
#include "ImageOrientationDialog.h"
#include "ui_ImageOrientationDialog.h"
using namespace ImageGui;

11
src/Mod/Image/Gui/ImageView.cpp
View File

@@ -21,17 +21,16 @@
# include <QApplication>
# include <QMenu>
# include <QMouseEvent>
# include <QSlider>
# include <QStatusBar>
# include <QToolBar>
# include <cmath>
#endif
#include "ImageView.h"
#include "../App/ImageBase.h"
#include "XpmImages.h"
#include <Base/Parameter.h>
#include <App/Application.h>
#include <Base/Parameter.h>
#include "ImageView.h"
#include "XpmImages.h"
using namespace ImageGui;

5
src/Mod/Image/Gui/ImageView.h
View File

@@ -20,8 +20,9 @@
#include <QMouseEvent>
#include <Gui/MDIView.h>
#include <Mod/Image/Gui/OpenGLImageBox.h>
#include <Mod/Image/ImageGlobal.h>
#include "OpenGLImageBox.h"
class QSlider;
class QAction;

8
src/Mod/Image/Gui/OpenGLImageBox.cpp
View File

@@ -20,13 +20,13 @@
#ifndef _PreComp_
# include <cmath>
# include <QDebug>
# include <QOpenGLDebugMessage>
# include <QOpenGLContext>
# include <QOpenGLFunctions>
# include <QSurfaceFormat>
# include <QMessageBox>
# include <QOpenGLContext>
# include <QOpenGLDebugMessage>
# include <QOpenGLFunctions>
# include <QPainter>
# include <QPainterPath>
# include <QSurfaceFormat>
#endif
#if defined(__MINGW32__)

31
src/Mod/Image/Gui/PreCompiled.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef __PRECOMPILED_GUI__
#define __PRECOMPILED_GUI__
@@ -35,7 +34,6 @@
# define ImageGuiExport
#endif
// here get the warnings of too long specifiers disabled (needed for VC6)
#ifdef _MSC_VER
# pragma warning(disable : 4005)
@@ -46,35 +44,40 @@
#ifdef _PreComp_
// Python
#include <Python.h>
// standard
#include <iostream>
#include <assert.h>
#include <cmath>
#include <iostream>
#include <sstream>
// STL
#include <vector>
#include <map>
#include <string>
#include <list>
#include <set>
#include <algorithm>
#include <stack>
#include <queue>
#include <bitset>
#include <list>
#include <map>
#include <queue>
#include <set>
#include <stack>
#include <string>
#include <vector>
#ifdef FC_OS_WIN32
# include <windows.h>
#endif
// Inventor
# include <Inventor/nodes/SoCoordinate3.h>
# include <Inventor/nodes/SoFaceSet.h>
# include <Inventor/nodes/SoMaterial.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoTexture2.h>
# include <Inventor/nodes/SoTextureCoordinate2.h>
// Qt Toolkit
#ifndef __QtAll__
# include <Gui/QtAll.h>
#endif
#endif //_PreComp_
#endif // __PRECOMPILED_GUI__

22
src/Mod/Image/Gui/ViewProviderImagePlane.cpp
View File

@@ -20,35 +20,29 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Inventor/SbVec3f.h>
# include <Inventor/nodes/SoSeparator.h>
#include <sstream>
# include <Inventor/nodes/SoCoordinate3.h>
# include <Inventor/nodes/SoDrawStyle.h>
# include <Inventor/nodes/SoFaceSet.h>
# include <Inventor/nodes/SoShapeHints.h>
# include <Inventor/nodes/SoImage.h>
# include <Inventor/nodes/SoMaterial.h>
# include <Inventor/nodes/SoTextureCoordinate2.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoTexture2.h>
# include <Inventor/nodes/SoTextureCoordinate2.h>
# include <QFile>
# include <QFileInfo>
# include <QImage>
# include <QString>
#endif
#include <App/Document.h>
#include <Base/FileInfo.h>
#include <Gui/BitmapFactory.h>
#include <Mod/Image/App/ImagePlane.h>
#include "ViewProviderImagePlane.h"
#include <Mod/Image/App/ImagePlane.h>
#include <App/Document.h>
#include <Gui/BitmapFactory.h>
#include <Base/FileInfo.h>
#include <Base/Stream.h>
#include <Base/Console.h>
#include <sstream>
using namespace Gui;
using namespace ImageGui;

3
src/Mod/Image/Gui/ViewProviderImagePlane.h
View File

@@ -20,12 +20,11 @@
* *
***************************************************************************/
#ifndef IMAGE_ViewProviderImagePlane_H
#define IMAGE_ViewProviderImagePlane_H
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Image/ImageGlobal.h>
class SoCoordinate3;
class SoDrawStyle;

6
src/Mod/Image/Gui/Workbench.cpp
View File

@@ -20,16 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <qobject.h>
#endif
#include "Workbench.h"
#include <Gui/ToolBarManager.h>
using namespace ImageGui;
#if 0 // needed for Qt's lupdate utility

2
src/Mod/Image/Gui/Workbench.h
View File

@@ -20,12 +20,10 @@
* *
***************************************************************************/
#ifndef IMAGE_WORKBENCH_H
#define IMAGE_WORKBENCH_H
#include <Gui/Workbench.h>
#include <Mod/Image/ImageGlobal.h>
namespace ImageGui {