GDAL and PROJ environment variables are no longer used.

TIDOP-USAL · Oct 3, 2023 · dea43d6 · dea43d6
1 parent 9281602
commit dea43d6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 12 deletions.
diff --git a/src/graphos/components/images/impl/ImageLoaderTask.cpp b/src/graphos/components/images/impl/ImageLoaderTask.cpp
@@ -194,16 +194,21 @@ void LoadImagesTask::loadImage(size_t imageId)
                 epsg_out = mEPSG.toStdString();
             }
 
-            bool bTrfCrs = mCrsIn->isValid() && mCrsOut->isValid();
-            tl::CrsTransform crs_trf(mCrsIn, mCrsOut);
-            tl::Point3<double> pt_in(longitude_degrees.value(), latitude_degrees.value(), altitude);
-            tl::Point3<double> pt_out = crs_trf.transform(pt_in);
-
-            CameraPose camera_pose;
-            camera_pose.setPosition(pt_out);
-            camera_pose.setCrs(epsg_out.c_str());
-            camera_pose.setSource("EXIF");
-            (*mImages)[imageId].setCameraPose(camera_pose);
+            try {
+
+                bool bTrfCrs = mCrsIn->isValid() && mCrsOut->isValid();
+                tl::CrsTransform crs_trf(mCrsIn, mCrsOut);
+                tl::Point3<double> pt_in(longitude_degrees.value(), latitude_degrees.value(), altitude);
+                tl::Point3<double> pt_out = crs_trf.transform(pt_in);
+
+                CameraPose camera_pose;
+                camera_pose.setPosition(pt_out);
+                camera_pose.setCrs(epsg_out.c_str());
+                camera_pose.setSource("EXIF");
+                (*mImages)[imageId].setCameraPose(camera_pose);
+            } catch (std::exception &e) {
+                tl::printException(e);
+            }
         }
 
         tl::Message::instance().resumeMessages();

diff --git a/src/graphos/components/properties/impl/PropertiesModel.cpp b/src/graphos/components/properties/impl/PropertiesModel.cpp
@@ -813,8 +813,12 @@ std::unordered_map<QString, std::list<std::pair<QString, QString>>> PropertiesMo
 
 std::unordered_map<QString, std::list<std::pair<QString, QString>>> PropertiesModelImp::parse(const QString &parser, const QString &file) const
 {
-    auto properties_parser = PropertiesParserFactory::create(parser);
-    return properties_parser->parse(file);
+    try {
+        auto properties_parser = PropertiesParserFactory::create(parser);
+        return properties_parser->parse(file);
+    } catch (...) {
+        TL_THROW_EXCEPTION_WITH_NESTED("");
+    }
 }
 
 void PropertiesModelImp::init()

diff --git a/src/graphos/core/Application.h b/src/graphos/core/Application.h
@@ -39,6 +39,7 @@
 
 
 class QMainWindow;
+class ccGenericPrimitive;
 
 namespace tl
 {
@@ -101,6 +102,7 @@ class Viewer3D
                            double y,
                            double z,
                            const std::array<std::array<float, 3>, 3> &rot) = 0;
+    virtual void addPrimitive(ccGenericPrimitive *primitive) = 0;
     virtual bool isEDL() const = 0;
 
 protected:

diff --git a/src/graphos/gui/main.cpp b/src/graphos/gui/main.cpp
@@ -122,6 +122,10 @@
 #include <tidop/core/log.h>
 #include <tidop/core/msg/message.h>
 
+#include <gdal.h>
+#include <cpl_conv.h>
+#include <ogr_srs_api.h>
+
 #include <QAction>
 
 #ifdef HAVE_VLD
@@ -138,6 +142,19 @@ using namespace graphos;
 
 int main(int argc, char *argv[])
 {
+    tl::Path app_path(argv[0]);
+    tl::Path graphos_path = app_path.parentPath().parentPath();
+    tl::Path gdal_data_path(graphos_path);
+    gdal_data_path.append("gdal\\data");
+    tl::Path proj_data_path(graphos_path);
+    proj_data_path.append("proj");
+    CPLSetConfigOption( "GDAL_DATA", gdal_data_path.toString().c_str());
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3,7,0)
+    CPLSetConfigOption( "PROJ_DATA", proj_data_path.toString().c_str());
+#else
+    const char *proj_data[] {proj_data_path.toString().c_str(), nullptr};
+    OSRSetPROJSearchPaths(proj_data);
+#endif
 
     Application app(argc, argv);
     app.setApplicationName("GRAPHOS");

diff --git a/src/graphos/widgets/Viewer3d.cpp b/src/graphos/widgets/Viewer3d.cpp
@@ -43,6 +43,7 @@ TL_DISABLE_WARNINGS
 #include <ccCameraSensor.h>
 #include <cc2DLabel.h>
 #include <cc2DViewportLabel.h>
+#include <ccGenericPrimitive.h>
 
 /* Qt */
 #include <QMouseEvent>
@@ -462,6 +463,11 @@ void CCViewer3D::addCamera(const QString &id,
     addToDB(camera);
 }
 
+void CCViewer3D::addPrimitive(ccGenericPrimitive *primitive)
+{
+    addToDB(primitive);
+}
+
 void CCViewer3D::activatePicker(PickingMode pickerMode)
 {
     deactivatePicker();

diff --git a/src/graphos/widgets/Viewer3d.h b/src/graphos/widgets/Viewer3d.h
@@ -162,6 +162,7 @@ class CCViewer3D
                    double y,
                    double z,
                    const std::array<std::array<float, 3>, 3> &rot) override;
+    void addPrimitive(ccGenericPrimitive *primitive) override;
 
     void activatePicker(PickingMode pickerMode);
     void deactivatePicker();