From 4fd52852986c50976626eea39cfa37d944b12fd7 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Fri, 7 Jun 2024 16:30:02 +0200
Subject: [PATCH] Use typedefs for I/O containers and clean clutter
---
.../GeoModelDBManager/GMDBManager.h | 14 +--
.../GeoModelDBManager/src/GMDBManager.cpp | 99 ++++++++++---------
GeoModelIO/GeoModelRead/src/BuildGeoShapes.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Box.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Box.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Cons.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Cons.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Para.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Para.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Pcon.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Pcon.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Pgon.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Pgon.h | 2 +-
.../src/BuildGeoShapes_SimplePolygonBrep.cpp | 2 +-
.../src/BuildGeoShapes_SimplePolygonBrep.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Trap.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Trap.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Trd.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Trd.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Tube.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Tube.h | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Tubs.cpp | 2 +-
.../GeoModelRead/src/BuildGeoShapes_Tubs.h | 2 +-
.../src/BuildGeoShapes_TwistedTrap.cpp | 2 +-
.../src/BuildGeoShapes_TwistedTrap.h | 2 +-
.../src/BuildGeoShapes_UnidentifiedShape.cpp | 2 +-
.../src/BuildGeoShapes_UnidentifiedShape.h | 2 +-
.../GeoModelWrite/WriteGeoModel.h | 9 +-
.../GeoModelWrite/src/WriteGeoModel.cpp | 38 ++++---
29 files changed, 104 insertions(+), 106 deletions(-)
diff --git a/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h b/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h
index 1d9b0794f..a0c06efb6 100644
--- a/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h
+++ b/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h
@@ -220,11 +220,11 @@ class GMDBManager {
bool addListOfRecords(const std::string geoType,
const std::vector<std::vector<std::string>> records);
bool addListOfRecords(const std::string geoType,
- const std::vector<std::vector<std::variant<int, long, float, double, std::string>>> records);
+ const DBRowsList records);
bool addRecordsToTable(
const std::string tableName,
- const std::vector<std::variant<int, long, float, double, std::string>>
+ const DBRowEntry
records);
bool addListOfChildrenPositions(
@@ -309,9 +309,9 @@ class GMDBManager {
std::unordered_map<unsigned int, std::string> getAll_TableIDsNodeTypes();
std::unordered_map<std::string, unsigned int> getAll_NodeTypesTableIDs();
- std::vector<std::vector<std::string>> getTableRecords_String(const std::string_view tableName) const;
- std::vector<std::variant<int, long, float, double, std::string>> getTableRecords_VecData(const std::string_view tableName) const;
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>> getTableRecords_VecVecData(const std::string_view tableName) const;
+ std::vector<std::vector<std::string>> getTableRecords(std::string tableName) const;
+ DBRowEntry getTableRecords_VecData(std::string tableName) const;
+ DBRowsList getTableRecords_VecVecData(std::string tableName) const;
//! Test if a given table exists
//! This requires the *full* table name (i.e. prefix_suffix)
@@ -335,7 +335,7 @@ class GMDBManager {
const std::vector<std::string> tableColNames,
const std::vector<std::string> tableColTypes,
const std::vector<
- std::vector<std::variant<int, long, float, double, std::string>>>
+ DBRowEntry>
&records);
@@ -351,7 +351,7 @@ class GMDBManager {
bool addListOfRecordsToTable(
const std::string tableName,
const std::vector<
- std::vector<std::variant<int, long, float, double, std::string>>>
+ DBRowEntry>
records);
// bool addListOfRecordsToTableOld(const QString tableName, const
// std::vector<QStringList> records); // for the old SQlite only
diff --git a/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp b/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp
index bb619bff1..542f99a8d 100644
--- a/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp
+++ b/GeoModelIO/GeoModelDBManager/src/GMDBManager.cpp
@@ -294,12 +294,13 @@ std::vector<std::vector<std::string>> GMDBManager::getTableRecords_String(
return records;
}
-std::vector<std::vector<std::variant<int, long, float, double, std::string>>> GMDBManager::getTableRecords_VecVecData(
- const std::string_view tableName) const
+// New version with variant
+DBRowsList GMDBManager::getTableRecords_VecVecData(
+ std::string tableName) const
{
// container to be returned
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>> records;
+ DBRowsList records;
// get the query statetement ready to be executed
sqlite3_stmt *stmt = nullptr;
@@ -323,7 +324,7 @@ std::vector<std::vector<std::variant<int, long, float, double, std::string>>> GM
res = sqlite3_step(stmt); // Execute SQL Statement.
if (res == SQLITE_ROW)
{
- std::vector<std::variant<int, long, float, double, std::string>>
+ DBRowEntry
nodeParams; // stores the data items contained in a
// single row
// Loop times the number of columns in the table
@@ -409,14 +410,14 @@ std::vector<std::vector<std::variant<int, long, float, double, std::string>>> GM
return records;
}
// New version with variant
-std::vector<std::variant<int, long, float, double, std::string>> GMDBManager::getTableRecords_VecData(
- const std::string_view tableName) const
+DBRowEntry GMDBManager::getTableRecords_VecData(
+ std::string tableName) const
{
if (!checkTableFromCache(tableName)) {
THROW_EXCEPTION("ERROR!!! Table name '" + std::string(tableName) + "' does not exist in cache! (It has not been loaded from the DB)");
}
// container to be returned
- std::vector<std::variant<int, long, float, double, std::string>> records;
+ DBRowEntry records;
// get the query statetement ready to be executed
sqlite3_stmt *stmt = nullptr;
@@ -534,15 +535,14 @@ std::vector<std::vector<std::string>> GMDBManager::getTableFromNodeType_String(
{
std::mutex coutMutex;
coutMutex.lock();
- printf(
- "\t ===> WARNING! The geometry input file does not contain a "
- "table "
- "for the %s nodes. That means that you are probably using an "
- "old "
- "geometry file. Unless you know exactly what you are doing, "
- "please "
- "expect to see incomplete geometries or crashes.\n",
- nodeType.c_str());
+ std::string errMsg = "\t ===> WARNING! The geometry input file does not contain a "
+ "table for the "
+ + nodeType
+ + " nodes. That means that you are probably using an "
+ + "old geometry file."
+ + "Unless you know exactly what you are doing, "
+ + "please expect to see incomplete geometries or crashes.\n";
+ std::cout << errMsg << std::endl;
coutMutex.unlock();
}
else
@@ -567,15 +567,13 @@ DBRowsList GMDBManager::getTableFromNodeType_VecVecData(
{
std::mutex coutMutex;
coutMutex.lock();
- printf(
- "\t ===> WARNING! The geometry input file does not contain a "
- "table "
- "for the %s nodes. That means that you are probably using an "
- "old "
- "geometry file. Unless you know exactly what you are doing, "
- "please "
- "expect to see incomplete geometries or crashes.\n",
- nodeType.c_str());
+ std::cout <<
+ "\t ===> WARNING! The geometry input file does not contain a table for the"
+ << nodeType
+ << "nodes. That means that you are probably using an "
+ << "old geometry file. Unless you know exactly what you are doing, "
+ << "please expect to see incomplete geometries or crashes.\n"
+ << std::endl;
coutMutex.unlock();
}
else
@@ -591,20 +589,21 @@ DBRowsList GMDBManager::getTableFromNodeType_VecVecData(
DBRowsList GMDBManager::getTableFromTableName_VecVecData(
std::string tableName)
{
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>> out;
+ DBRowsList out;
if (tableName.empty())
{
std::mutex coutMutex;
coutMutex.lock();
- printf(
+ std::cout <<
"\t ===> WARNING! The geometry input file does not contain a "
- "table "
- "for the %s nodes. That means that you are probably using an "
- "old "
- "geometry file. Unless you know exactly what you are doing, "
- "please "
- "expect to see incomplete geometries or crashes.\n",
- tableName.c_str());
+ "table for the "
+ << tableName
+ << "nodes. That means that you are probably using an "
+ << "old "
+ << "geometry file. Unless you know exactly what you are doing, "
+ << "please "
+ << "expect to see incomplete geometries or crashes.\n"
+ << std::endl;
coutMutex.unlock();
}
else
@@ -625,15 +624,14 @@ DBRowEntry GMDBManager::getTableFromTableName_VecData(
{
std::mutex coutMutex;
coutMutex.lock();
- printf(
- "\t ===> WARNING! The geometry input file does not contain a "
- "table "
- "for the %s nodes. That means that you are probably using an "
- "old "
- "geometry file. Unless you know exactly what you are doing, "
- "please "
- "expect to see incomplete geometries or crashes.\n",
- tableName.c_str());
+ std::cout << "\t ===> WARNING! The geometry input file does not contain a "
+ << "table "
+ << "for the "
+ << tableName
+ << "nodes. That means that you are probably using an "
+ << "old geometry file. Unless you know exactly what you are doing, "
+ << "please expect to see incomplete geometries or crashes.\n"
+ << std::endl;
coutMutex.unlock();
}
else
@@ -649,7 +647,7 @@ DBRowEntry GMDBManager::getTableFromTableName_VecData(
std::vector<double> GMDBManager::getTableFromTableName_VectorDouble(std::string tableName)
{
- std::vector<std::variant<int, long, float, double, std::string>> inputRecords = getTableFromTableName_VecData(tableName);
+ DBRowEntry inputRecords = getTableFromTableName_VecData(tableName);
std::vector<double> outRecords;
for (const auto &rec : inputRecords)
{
@@ -665,6 +663,9 @@ std::vector<double> GMDBManager::getTableFromTableName_VectorDouble(std::string
}
return outRecords;
}
+
+// TODO: make template
+// from Johannes: Couldn't you declare this method as a general template method to downcast the variant?
std::deque<double> GMDBManager::getTableFromTableName_DequeDouble(std::string tableName)
{
std::vector<double> inputRecords = getTableFromTableName_VectorDouble(tableName);
@@ -765,7 +766,7 @@ bool GMDBManager::addListOfRecords(
bool GMDBManager::addListOfRecords(
const std::string geoType,
- const std::vector<std::vector<std::variant<int, long, float, double, std::string>>> records) {
+ const DBRowsList records) {
// if (m_debug) qDebug() << "GMDBManager::addListOfRecords():" <<
// geoType;
@@ -845,7 +846,7 @@ bool GMDBManager::addListOfRecordsToTable(
bool GMDBManager::addListOfRecordsToTable(
const std::string tableName,
const std::vector<
- std::vector<std::variant<int, long, float, double, std::string>>>
+ DBRowEntry>
records) {
if ( !(hasTableBeenCreatedInDB(tableName)) ) {
@@ -867,7 +868,7 @@ bool GMDBManager::addListOfRecordsToTable(
std::string sql =
fmt::format("INSERT INTO {0} {1} VALUES ", tableName, tableColString);
unsigned int id = 0;
- for (const std::vector<std::variant<int, long, float, double, std::string>>&
+ for (const DBRowEntry&
rec : records) {
++id;
// a vector to store string-conversions of values, to build the SQL
@@ -922,7 +923,7 @@ bool GMDBManager::addListOfRecordsToTable(
bool GMDBManager::addRecordsToTable(
const std::string tableName,
- const std::vector<std::variant<int, long, float, double, std::string>>
+ const DBRowEntry
records)
{
if (records.size() > 0) {
@@ -1504,7 +1505,7 @@ bool GMDBManager::createCustomTable(
const std::string tableName, const std::vector<std::string> tableColNames,
const std::vector<std::string> tableColTypes,
const std::vector<
- std::vector<std::variant<int, long, float, double, std::string>>>&
+ DBRowEntry>&
records) {
if (tableColNames.size() == 0)
throw std::runtime_error(
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes.h
index 3713c4beb..71927390f 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes.h
@@ -34,7 +34,7 @@ public:
BuildGeoShapes(std::string_view shapeType, const unsigned size);
BuildGeoShapes(std::string_view shapeType, const unsigned size, DBRowsList shapesData);
- virtual void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) = 0;
+ virtual void buildShape(const DBRowEntry row) = 0;
// --- methods for caching GeoShape nodes ---
void storeBuiltShape(const unsigned id, GeoShape *nodePtr);
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.cpp
index bd9176330..b76a7b19f 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Box::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Box::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.h
index 1489796a3..b3f5dbab0 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Box.h
@@ -22,7 +22,7 @@ class BuildGeoShapes_Box : public BuildGeoShapes
{
public:
BuildGeoShapes_Box(const unsigned size):BuildGeoShapes("Box", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.cpp
index ebab087d5..e884f7f90 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Cons::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Cons::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.h
index e414ff8c9..fdfdda6b6 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Cons.h
@@ -23,7 +23,7 @@ class BuildGeoShapes_Cons : public BuildGeoShapes
{
public:
BuildGeoShapes_Cons(const unsigned size):BuildGeoShapes("Cons", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.cpp
index d5372870e..fb387e2a2 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Para::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Para::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.h
index 3c2a883fa..2a5aa7857 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Para.h
@@ -23,7 +23,7 @@ class BuildGeoShapes_Para : public BuildGeoShapes
{
public:
BuildGeoShapes_Para(const unsigned size):BuildGeoShapes("Para", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.cpp
index 0d9cf455f..6a7a303be 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.cpp
@@ -16,7 +16,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Pcon::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Pcon::buildShape(const DBRowEntry row)
{
if (!(m_shape_data.size())) {
THROW_EXCEPTION("ERROR! GeoPcon shape has no ZPlanes data!! [m_shape_data.size() == 0]");
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.h
index 6721ba1ea..5d66e1a69 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pcon.h
@@ -24,7 +24,7 @@ class BuildGeoShapes_Pcon : public BuildGeoShapes
{
public:
BuildGeoShapes_Pcon(const unsigned size, DBRowsList shapeData):BuildGeoShapes("Pcon", size, shapeData){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.cpp
index 3391eb0f9..666ede875 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.cpp
@@ -16,7 +16,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Pgon::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Pgon::buildShape(const DBRowEntry row)
{
if (!(m_shape_data.size())) {
THROW_EXCEPTION("ERROR! GeoPgon shape has no ZPlanes data!! [m_shape_data.size() == 0]");
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.h
index 33679a99d..89880b326 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Pgon.h
@@ -24,7 +24,7 @@ class BuildGeoShapes_Pgon : public BuildGeoShapes
{
public:
BuildGeoShapes_Pgon(const unsigned size, DBRowsList shapeData):BuildGeoShapes("Pgon", size, shapeData){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.cpp
index 131c2760d..d78a1eb11 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.cpp
@@ -16,7 +16,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_SimplePolygonBrep::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_SimplePolygonBrep::buildShape(const DBRowEntry row)
{
if (!(m_shape_data.size()))
{
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.h
index c7442b675..cff630dc0 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_SimplePolygonBrep.h
@@ -24,7 +24,7 @@ class BuildGeoShapes_SimplePolygonBrep : public BuildGeoShapes
{
public:
BuildGeoShapes_SimplePolygonBrep(const unsigned size, DBRowsList shapeData):BuildGeoShapes("SimplePolygonBrep", size, shapeData){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.cpp
index 3a7f816ba..ae847a0e3 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Trap::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Trap::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.h
index f42b86c67..1292a45c5 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trap.h
@@ -23,7 +23,7 @@ class BuildGeoShapes_Trap : public BuildGeoShapes
{
public:
BuildGeoShapes_Trap(const unsigned size):BuildGeoShapes("Trap", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.cpp
index b001e988d..f81d01efa 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Trd::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Trd::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.h
index caf4a47dc..9625b83b3 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Trd.h
@@ -23,7 +23,7 @@ class BuildGeoShapes_Trd : public BuildGeoShapes
{
public:
BuildGeoShapes_Trd(const unsigned size):BuildGeoShapes("Trd", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.cpp
index 4e9659650..4c486e77b 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Tube::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Tube::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.h
index 5087d9287..4a8856bfa 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tube.h
@@ -22,7 +22,7 @@ class BuildGeoShapes_Tube : public BuildGeoShapes
{
public:
BuildGeoShapes_Tube(const unsigned size):BuildGeoShapes("Tube", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.cpp
index c05bf1710..e4ada4eb0 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_Tubs::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_Tubs::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.h
index 6e3e603e6..eeb330db9 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_Tubs.h
@@ -22,7 +22,7 @@ class BuildGeoShapes_Tubs : public BuildGeoShapes
{
public:
BuildGeoShapes_Tubs(const unsigned size):BuildGeoShapes("Tubs", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.cpp
index 1f778cbba..da3a20dc9 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_TwistedTrap::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_TwistedTrap::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.h
index 72b8c98a5..874cca862 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_TwistedTrap.h
@@ -22,7 +22,7 @@ class BuildGeoShapes_TwistedTrap : public BuildGeoShapes
{
public:
BuildGeoShapes_TwistedTrap(const unsigned size):BuildGeoShapes("TwistedTrap", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.cpp b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.cpp
index ef31a5811..a7d87a835 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.cpp
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.cpp
@@ -15,7 +15,7 @@
#include <vector>
#include <iostream>
-void BuildGeoShapes_UnidentifiedShape::buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row)
+void BuildGeoShapes_UnidentifiedShape::buildShape(const DBRowEntry row)
{
// === get shape numeric data from the DB row
// shape ID
diff --git a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.h b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.h
index d076b39a2..4e277c8f6 100644
--- a/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.h
+++ b/GeoModelIO/GeoModelRead/src/BuildGeoShapes_UnidentifiedShape.h
@@ -22,7 +22,7 @@ class BuildGeoShapes_UnidentifiedShape : public BuildGeoShapes
{
public:
BuildGeoShapes_UnidentifiedShape(const unsigned size):BuildGeoShapes("UnidentifiedShape", size){};
- void buildShape(const std::vector<std::variant<int, long, float, double, std::string>> row) override;
+ void buildShape(const DBRowEntry row) override;
};
#endif
diff --git a/GeoModelIO/GeoModelWrite/GeoModelWrite/WriteGeoModel.h b/GeoModelIO/GeoModelWrite/GeoModelWrite/WriteGeoModel.h
index 51596afb3..686cbd86b 100644
--- a/GeoModelIO/GeoModelWrite/GeoModelWrite/WriteGeoModel.h
+++ b/GeoModelIO/GeoModelWrite/GeoModelWrite/WriteGeoModel.h
@@ -119,8 +119,7 @@ class WriteGeoModel : public GeoNodeAction {
void storeDataTable(
std::string tableName, std::vector<std::string> colNames,
std::vector<std::string> colTypes,
- std::vector<
- std::vector<std::variant<int, long, float, double, std::string>>>
+ DBRowsList
tableData);
void saveToDB(GeoPublisher *store = nullptr);
@@ -244,7 +243,7 @@ class WriteGeoModel : public GeoNodeAction {
unsigned int addShape(const std::string &type,
const std::string ¶meters);
unsigned int addShape(const std::string &type,
- const std::vector<std::variant<int, long, float, double, std::string>> ¶meters);
+ const DBRowEntry ¶meters);
std::pair<unsigned, unsigned> addShapeData(const std::string type,
const DBRowsList &shapeData);
@@ -312,7 +311,7 @@ class WriteGeoModel : public GeoNodeAction {
// moved to an Utility class, so we can use it
// from TransFunctionRecorder as well.
std::string getShapeParameters(const GeoShape *);
- std::pair<std::vector<std::variant<int, long, float, double, std::string>>,
+ std::pair<DBRowEntry,
DBRowsList>
getShapeParametersV(const GeoShape *, const bool data = false);
@@ -400,7 +399,7 @@ class WriteGeoModel : public GeoNodeAction {
DBRowsList m_functions; // operators used in Function's expression
// caches for additional data to be saved into the DB
- std::vector<std::variant<int, long, float, double, std::string>> m_exprData; // numbers used in Function's expression
+ DBRowEntry m_exprData; // numbers used in Function's expression
// caches for Metadata to be saved into the DB
// std::vector<std::string> m_rootVolume;
diff --git a/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp b/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
index a785f401d..0006e5c8c 100644
--- a/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
+++ b/GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
@@ -972,16 +972,16 @@ void WriteGeoModel::handleReferencedVPhysVol(const GeoVPhysVol* vol) {
}
// Get shape parameters
-std::pair<std::vector<std::variant<int, long, float, double, std::string>>,
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>>>
+std::pair<DBRowEntry,
+ DBRowsList>
WriteGeoModel::getShapeParametersV(const GeoShape *shape, const bool data)
{
const std::string shapeType = shape->type();
- std::vector<std::variant<int, long, float, double, std::string>> shapePars;
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>> shapeData;
- std::pair<std::vector<std::variant<int, long, float, double, std::string>>, std::vector<std::vector<std::variant<int, long, float, double, std::string>>>> shapePair;
- std::vector<std::variant<int, long, float, double, std::string>> dataRow;
+ DBRowEntry shapePars;
+ DBRowsList shapeData;
+ std::pair<DBRowEntry, DBRowsList> shapePair;
+ DBRowEntry dataRow;
// init the 'computedVolume' column with a dummy value: '-1'
// the real value will be added later, when the DB will be passed throug
@@ -1978,8 +1978,8 @@ unsigned int WriteGeoModel::addRecord(
}
unsigned int WriteGeoModel::addRecord(
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>>* container,
- const std::vector<std::variant<int, long, float, double, std::string>> values) const {
+ DBRowsList* container,
+ const DBRowEntry values) const {
container->push_back(values);
unsigned int idx =
container->size(); // index of pushed element = size after pushing, to
@@ -1988,8 +1988,8 @@ unsigned int WriteGeoModel::addRecord(
}
std::pair<unsigned, unsigned> WriteGeoModel::addRecordData(
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>> *container,
- const std::vector<std::vector<std::variant<int, long, float, double, std::string>>> values) const
+ DBRowsList *container,
+ const DBRowsList values) const
{
const unsigned dataStart = container->size() + 1;
// Note: ^ we add +1 because start filling the table
@@ -2009,7 +2009,7 @@ std::pair<unsigned, unsigned> WriteGeoModel::addRecordData(
std::vector<unsigned> WriteGeoModel::addExprData(
const std::deque<double>& exprData)
{
- std::vector<std::variant<int, long, float, double, std::string>> *container = &m_exprData;
+ DBRowEntry *container = &m_exprData;
const unsigned dataStart = container->size() + 1;
// Note: ^ we add +1 because start filling the table
// from a new row with respect to what we currently have
@@ -2399,8 +2399,8 @@ unsigned int WriteGeoModel::addIdentifierTag(const int& identifier) {
unsigned int WriteGeoModel::addFunction(const std::string& expression, const unsigned &dataStart, const unsigned &dataEnd) {
// std::vector<std::vector<std::string>>* container = &m_functions;
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>>* container = &m_functions;
- std::vector<std::variant<int, long, float, double, std::string>> values;
+ DBRowsList* container = &m_functions;
+ DBRowEntry values;
values.push_back(expression);
values.push_back(dataStart);
values.push_back(dataEnd);
@@ -2459,9 +2459,9 @@ unsigned int WriteGeoModel::addShape(const std::string& type,
return addRecord(container, values);
}
unsigned int WriteGeoModel::addShape(const std::string &type,
- const std::vector<std::variant<int, long, float, double, std::string>> ¶meters)
+ const DBRowEntry ¶meters)
{
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>> *container = nullptr;
+ DBRowsList *container = nullptr;
if ("Box" == type)
{
container = &m_shapes_Box;
@@ -2573,8 +2573,8 @@ unsigned int WriteGeoModel::addLogVol(const std::string& name,
const unsigned int& shapeId,
std::string_view shapeType,
const unsigned int& materialId) {
- std::vector<std::vector<std::variant<int, long, float, double, std::string>>>* container = &m_logVols;
- std::vector<std::variant<int, long, float, double, std::string>> values;
+ DBRowsList* container = &m_logVols;
+ DBRowEntry values;
values.push_back(name);
values.push_back(shapeId);
values.push_back(std::string(shapeType));
@@ -2871,9 +2871,7 @@ std::vector<std::vector<std::string>> tableData )
void WriteGeoModel::storeDataTable(
std::string tableName, std::vector<std::string> colNames,
std::vector<std::string> colTypes,
- std::vector<
- std::vector<std::variant<int, long, float, double, std::string>>>
- tableData) {
+ DBRowsList tableData) {
m_auxiliaryTablesVar[tableName] = std::make_pair(colNames, colTypes);
m_auxiliaryTablesVarData[tableName] = tableData;
}
--
GitLab