Move image loading to core

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -108,7 +108,6 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_DRAFT "Build the FreeCAD draft module" ON)
     option(BUILD_DRAWING "Build the FreeCAD drawing module" OFF)
     option(BUILD_IDF "Build the FreeCAD idf module" ON)
-    option(BUILD_IMAGE "Build the FreeCAD image module" ON)
     option(BUILD_IMPORT "Build the FreeCAD import module" ON)
     option(BUILD_INSPECTION "Build the FreeCAD inspection module" ON)
     option(BUILD_JTREADER "Build the FreeCAD jt reader module" OFF)

src/App/Application.cpp

@@ -94,6 +94,7 @@
 #include "FeaturePython.h"
 #include "GeoFeature.h"
 #include "GeoFeatureGroupExtension.h"
+#include "ImagePlane.h"
 #include "InventorObject.h"
 #include "Link.h"
 #include "LinkBaseExtensionPy.h"
@@ -119,7 +120,7 @@
 // If you stumble here, run the target "BuildExtractRevision" on Windows systems
 // or the Python script "SubWCRev.py" on Linux based systems which builds
 // src/Build/Version.h. Or create your own from src/Build/Version.h.in!
 #include <Build/Version.h>
 #include "Branding.h"
 
 
@@ -140,7 +141,7 @@
 # include <new>
 #endif
 
 FC_LOG_LEVEL_INIT("App", true, true)
 
 using namespace App;
 using namespace Base;
@@ -154,12 +155,12 @@
 // Application
 //==========================================================================
 
 Base::Reference<ParameterManager> App::Application::_pcSysParamMngr;
 Base::Reference<ParameterManager> App::Application::_pcUserParamMngr;
 Base::ConsoleObserverStd  *Application::_pConsoleObserverStd = nullptr;
 Base::ConsoleObserverFile *Application::_pConsoleObserverFile = nullptr;
 
 AppExport std::map<std::string, std::string> Application::mConfig;
 
 
 //**************************************************************************
@@ -2053,12 +2054,13 @@
     App::DocumentObjectGroup       ::init();
     App::DocumentObjectGroupPython ::init();
     App::DocumentObjectFileIncluded::init();
+    App::ImagePlane                ::init();
     App::InventorObject            ::init();
     App::VRMLObject                ::init();
     App::Annotation                ::init();
     App::AnnotationLabel           ::init();
     App::MeasureDistance           ::init();
-    App ::MaterialObject           ::init();
+    App::MaterialObject            ::init();
     App::MaterialObjectPython      ::init();
     App::TextDocument              ::init();
     App::Placement                 ::init();

src/App/CMakeLists.txt

@@ -147,6 +147,7 @@ SET(Document_CPP_SRCS
     GeoFeature.cpp
     GeoFeatureGroupExtensionPyImp.cpp
     GeoFeatureGroupExtension.cpp
+    ImagePlane.cpp
     OriginGroupExtensionPyImp.cpp
     OriginGroupExtension.cpp
     PartPyImp.cpp
@@ -192,6 +193,7 @@ SET(Document_HPP_SRCS
     FeatureTest.h
     GeoFeature.h
     GeoFeatureGroupExtension.h
+    ImagePlane.h
     OriginGroupExtension.h
     Part.h
     Origin.h

src/Mod/Image/App/ImagePlane.cpp → src/App/ImagePlane.cpp

@@ -25,19 +25,36 @@
 #include "ImagePlane.h"
 
 
-using namespace Image;
 using namespace App;
 
-PROPERTY_SOURCE(Image::ImagePlane, App::GeoFeature)
+PROPERTY_SOURCE(App::ImagePlane, App::GeoFeature)
 
 
 ImagePlane::ImagePlane()
+    : XPixelsPerMeter{1000.0}
+    , YPixelsPerMeter{1000.0}
 {
     ADD_PROPERTY_TYPE( ImageFile,(nullptr)  , "ImagePlane",Prop_None,"File of the image");
     ADD_PROPERTY_TYPE( XSize,    (100), "ImagePlane",Prop_None,"Size of a pixel in X");
     ADD_PROPERTY_TYPE( YSize,    (100), "ImagePlane",Prop_None,"Size of a pixel in Y");
 }
 
-ImagePlane::~ImagePlane()
+int ImagePlane::getXSizeInPixel()
 {
+    return int(XSize.getValue() * XPixelsPerMeter / 1000);
+}
+
+int ImagePlane::getYSizeInPixel()
+{
+    return int(YSize.getValue() * YPixelsPerMeter / 1000);
+}
+
+void ImagePlane::setXSizeInPixel(int value)
+{
+    XSize.setValue(double(value) * 1000.0 / XPixelsPerMeter);
+}
+
+void ImagePlane::setYSizeInPixel(int value)
+{
+    YSize.setValue(double(value) * 1000.0 / YPixelsPerMeter);
 }

src/Mod/Image/App/ImagePlane.h → src/App/ImagePlane.h

@@ -20,37 +20,44 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef Image_ImagePlane_H
-#define Image_ImagePlane_H
+#ifndef App_ImagePlane_H
+#define App_ImagePlane_H
 
 #include <App/GeoFeature.h>
 #include <App/PropertyFile.h>
 #include <App/PropertyUnits.h>
-#include <Mod/Image/ImageGlobal.h>
 
-namespace Image
+namespace App
 {
 
-class ImageExport ImagePlane : public App::GeoFeature
+class AppExport ImagePlane : public App::GeoFeature
 {
-    PROPERTY_HEADER_WITH_OVERRIDE(Image::ImagePlane);
+    PROPERTY_HEADER_WITH_OVERRIDE(App::ImagePlane);
 
 public:
     /// Constructor
     ImagePlane();
-    ~ImagePlane() override;
+    ~ImagePlane() override = default;
 
     App::PropertyFileIncluded ImageFile;
     App::PropertyLength       XSize;
     App::PropertyLength       YSize;
 
+    int getXSizeInPixel();
+    int getYSizeInPixel();
+    void setXSizeInPixel(int);
+    void setYSizeInPixel(int);
+
+    double XPixelsPerMeter;
+    double YPixelsPerMeter;
+
     /// returns the type name of the ViewProvider
     const char* getViewProviderName() const override {
-        return "ImageGui::ViewProviderImagePlane";
+        return "Gui::ViewProviderImagePlane";
     }
 };
 
-} //namespace Image
+} //namespace App
 
 
-#endif // Image_ImagePlane_H
+#endif // App_ImagePlane_H

src/Gui/Application.cpp

@@ -29,6 +29,7 @@
 # include <QCloseEvent>
 # include <QDir>
 # include <QFileInfo>
+# include <QImageReader>
 # include <QLocale>
 # include <QMessageBox>
 # include <QMessageLogContext>
@@ -70,7 +71,7 @@
 #include "ExpressionBindingPy.h"
 #include "FileDialog.h"
 #include "GuiApplication.h"
 #include "GuiInitScript.h"
 #include "LinkViewPy.h"
 #include "MainWindow.h"
 #include "Macro.h"
@@ -101,6 +102,7 @@
 #include "ViewProviderGeoFeatureGroup.h"
 #include "ViewProviderGeometryObject.h"
 #include "ViewProviderGroupExtension.h"
+#include "ViewProviderImagePlane.h"
 #include "ViewProviderInventorObject.h"
 #include "ViewProviderLine.h"
 #include "ViewProviderLink.h"
@@ -328,6 +330,22 @@
 
 } // namespace Gui
 
+namespace {
+    void setImportImageFormats()
+    {
+        QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
+        std::stringstream str;
+        str << "Image formats (";
+        for (const auto& ext : supportedFormats) {
+            str << "*." << ext.constData() << " ";
+        }
+        str << ")";
+
+        std::string filter = str.str();
+        App::GetApplication().addImportType(filter.c_str(), "FreeCADGui");
+    }
+}
+
 Application::Application(bool GUIenabled)
 {
     //App::GetApplication().Attach(this);
@@ -1808,6 +1826,7 @@
     Gui::ViewProviderDocumentObjectGroupPython  ::init();
     Gui::ViewProviderDragger                    ::init();
     Gui::ViewProviderGeometryObject             ::init();
+    Gui::ViewProviderImagePlane                 ::init();
     Gui::ViewProviderInventorObject             ::init();
     Gui::ViewProviderVRMLObject                 ::init();
     Gui::ViewProviderAnnotation                 ::init();
@@ -2053,8 +2072,8 @@
         mw.setWindowTitle(mainApp.applicationName());
     }
 
     QObject::connect(&mainApp, SIGNAL(messageReceived(const QList<QByteArray> &)),
                      &mw, SLOT(processMessages(const QList<QByteArray> &)));
 
     ParameterGrp::handle hDocGrp = WindowParameter::getDefaultParameter()->GetGroup("Document");
     int timeout = hDocGrp->GetInt("AutoSaveTimeout", 15); // 15 min
@@ -2156,6 +2175,7 @@
     try {
         Base::Console().Log("Run Gui init script\n");
         runInitGuiScript();
+        setImportImageFormats();
     }
     catch (const Base::Exception& e) {
         Base::Console().Error("Error in FreeCADGuiInit.py: %s\n", e.what());
@@ -2243,7 +2263,7 @@
     Instance->d->startingUp = false;
 
     // gets called once we start the event loop
     QTimer::singleShot(0, &mw, SLOT(delayedStartup()));
 
     // run the Application event loop
     Base::Console().Log("Init: Entering event loop\n");

src/Gui/ApplicationPy.cpp

@@ -51,6 +51,7 @@
 #include "DocumentObserverPython.h"
 #include "DownloadManager.h"
 #include "EditorView.h"
+#include "FileHandler.h"
 #include "Macro.h"
 #include "MainWindow.h"
 #include "MainWindowPy.h"
@@ -494,7 +495,7 @@
             break;
         }
     }
     while(false);
 
     if (!pcDoc) {
         PyErr_SetString(PyExc_TypeError, "Either string or App.Document expected");
@@ -599,60 +600,9 @@
     PyMem_Free(Name);
     PY_TRY {
         QString fileName = QString::fromUtf8(Utf8Name.c_str());
-        QFileInfo fi;
-        fi.setFile(fileName);
-        QString ext = fi.suffix().toLower();
-        QList<EditorView*> views = getMainWindow()->findChildren<EditorView*>();
-        for (QList<EditorView*>::Iterator it = views.begin(); it != views.end(); ++it) {
-            if ((*it)->fileName() == fileName) {
-                (*it)->setFocus();
-                Py_Return;
-            }
-        }
-
-        if (ext == QLatin1String("iv")) {
-            if (!Application::Instance->activeDocument())
-                App::GetApplication().newDocument();
-            //QString cmd = QString("Gui.activeDocument().addAnnotation(\"%1\",\"%2\")").arg(fi.baseName()).arg(fi.absoluteFilePath());
-            QString cmd = QString::fromLatin1(
-                "App.ActiveDocument.addObject(\"App::InventorObject\",\"%1\")."
-                "FileName=\"%2\"\n"
-                "App.ActiveDocument.ActiveObject.Label=\"%1\"\n"
-                "App.ActiveDocument.recompute()")
-                .arg(fi.baseName(), fi.absoluteFilePath());
-            Base::Interpreter().runString(cmd.toUtf8());
-        }
-        else if (ext == QLatin1String("wrl") ||
-                 ext == QLatin1String("vrml") ||
-                 ext == QLatin1String("wrz")) {
-            if (!Application::Instance->activeDocument())
-                App::GetApplication().newDocument();
-
-            // Add this to the search path in order to read inline files (#0002029)
-            QByteArray path = fi.absolutePath().toUtf8();
-            SoInput::addDirectoryFirst(path.constData());
-
-            //QString cmd = QString("Gui.activeDocument().addAnnotation(\"%1\",\"%2\")").arg(fi.baseName()).arg(fi.absoluteFilePath());
-            QString cmd = QString::fromLatin1(
-                "App.ActiveDocument.addObject(\"App::VRMLObject\",\"%1\")."
-                "VrmlFile=\"%2\"\n"
-                "App.ActiveDocument.ActiveObject.Label=\"%1\"\n"
-                "App.ActiveDocument.recompute()")
-                .arg(fi.baseName(), fi.absoluteFilePath());
-            Base::Interpreter().runString(cmd.toUtf8());
-            SoInput::removeDirectory(path.constData());
-        }
-        else if (ext == QLatin1String("py") ||
-                 ext == QLatin1String("fcmacro") ||
-                 ext == QLatin1String("fcscript")) {
-            auto editor = new PythonEditor();
-            editor->setWindowIcon(Gui::BitmapFactory().iconFromTheme("applications-python"));
-            auto edit = new PythonEditorView(editor, getMainWindow());
-            edit->open(fileName);
-            edit->resize(400, 300);
-            getMainWindow()->addWindow( edit );
-        }
-        else {
+        FileHandler handler(fileName);
+        if (!handler.openFile()) {
+            QString ext = handler.extension();
             Base::Console().Error("File type '%s' not supported\n", ext.toLatin1().constData());
         }
     }
@@ -673,60 +623,9 @@
 
     PY_TRY {
         QString fileName = QString::fromUtf8(Utf8Name.c_str());
-        QFileInfo fi;
-        fi.setFile(fileName);
-        QString ext = fi.suffix().toLower();
-        if (ext == QLatin1String("iv")) {
-            App::Document *doc = nullptr;
-            if (DocName)
-                doc = App::GetApplication().getDocument(DocName);
-            else
-                doc = App::GetApplication().getActiveDocument();
-            if (!doc)
-                doc = App::GetApplication().newDocument(DocName);
-
-            App::DocumentObject* obj = doc->addObject("App::InventorObject",
-                (const char*)fi.baseName().toUtf8());
-            obj->Label.setValue((const char*)fi.baseName().toUtf8());
-            static_cast<App::PropertyString*>(obj->getPropertyByName("FileName"))
-                ->setValue((const char*)fi.absoluteFilePath().toUtf8());
-            doc->recompute();
-        }
-        else if (ext == QLatin1String("wrl") ||
-                 ext == QLatin1String("vrml") ||
-                 ext == QLatin1String("wrz")) {
-            App::Document *doc = nullptr;
-            if (DocName)
-                doc = App::GetApplication().getDocument(DocName);
-            else
-                doc = App::GetApplication().getActiveDocument();
-            if (!doc)
-                doc = App::GetApplication().newDocument(DocName);
-
-            // Add this to the search path in order to read inline files (#0002029)
-            QByteArray path = fi.absolutePath().toUtf8();
-            SoInput::addDirectoryFirst(path.constData());
-
-            App::DocumentObject* obj = doc->addObject("App::VRMLObject",
-                (const char*)fi.baseName().toUtf8());
-            obj->Label.setValue((const char*)fi.baseName().toUtf8());
-            static_cast<App::PropertyFileIncluded*>(obj->getPropertyByName("VrmlFile"))
-                ->setValue((const char*)fi.absoluteFilePath().toUtf8());
-            doc->recompute();
-
-            SoInput::removeDirectory(path.constData());
-        }
-        else if (ext == QLatin1String("py") ||
-                 ext == QLatin1String("fcmacro") ||
-                 ext == QLatin1String("fcscript")) {
-            auto editor = new PythonEditor();
-            editor->setWindowIcon(Gui::BitmapFactory().iconFromTheme("applications-python"));
-            auto edit = new PythonEditorView(editor, getMainWindow());
-            edit->open(fileName);
-            edit->resize(400, 300);
-            getMainWindow()->addWindow( edit );
-        }
-        else {
+        FileHandler handler(fileName);
+        if (!handler.importFile(std::string(DocName ? DocName : ""))) {
+            QString ext = handler.extension();
             Base::Console().Error("File type '%s' not supported\n", ext.toLatin1().constData());
         }
     } PY_CATCH;