From 273ade812a58774539ee0f52b64b8955951ef054 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Thu, 4 Jul 2019 15:17:18 +0200
Subject: [PATCH] cleaning cmake code and header file
---
GeoModelRead/CMakeLists.txt | 2 +-
GeoModelRead/GeoModelRead/ReadGeoModel.h | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/GeoModelRead/CMakeLists.txt b/GeoModelRead/CMakeLists.txt
index c98ddbb..bd856cd 100644
--- a/GeoModelRead/CMakeLists.txt
+++ b/GeoModelRead/CMakeLists.txt
@@ -56,6 +56,6 @@ install( TARGETS GeoModelRead
# Install a CMake description of the project/library.
install( EXPORT GeoModelReadConfig DESTINATION cmake )
-# new test GeoModelIO
+# Export as part of GeoModelIO
install( TARGETS GeoModelRead EXPORT GeoModelRead-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelRead )
diff --git a/GeoModelRead/GeoModelRead/ReadGeoModel.h b/GeoModelRead/GeoModelRead/ReadGeoModel.h
index 6369ced..c5ab11f 100644
--- a/GeoModelRead/GeoModelRead/ReadGeoModel.h
+++ b/GeoModelRead/GeoModelRead/ReadGeoModel.h
@@ -86,13 +86,20 @@ private:
void checkInputString(QString input);
+ void printTrf(GeoTrf::Transform3D t);
+ void printTransformationValues(QStringList t);
+ QList<double> convertQstringListToDouble(QStringList listin);
+
+
// input arguments
std::string _dbName;
GeoPhysVol* _root;
GMDBManager* m_dbManager;
- unsigned long* m_progress;
bool m_deepDebug;
+ // callback handles
+ unsigned long* m_progress;
+
// data containers
QHash<QString, QMap<unsigned int, QStringList>> _allchildren; // key = "parentId:parentTable", item = list of children parameters, inserted by child position
QHash<unsigned int, QStringList> _physVols;
--
GitLab