Merge remote-tracking branch 'origin/master'

Author: DanielsCreation

config/config-colormaps.xml

@@ -2,12 +2,20 @@
 <COCONFIG version="1">
 <GLOBAL>
   <Colormaps>
+    <!-- <Voltage> -->
+    <!--   <Point r="0.859" g="0.169" b="0.153" a="1" x="0" index="0"/> -->
+    <!--   <Point r="0.992" g="0.749" b="0.067" a="1" x="0.25" index="1"/> -->
+    <!--   <Point r="0.333" g="0.718" b="0.282" a="1" x="0.5" index="2"/> -->
+    <!--   <Point r="0.000" g="1.000" b="1.000" a="1" x="0.75" index="3"/> -->
+    <!--   <Point r="0.086" g="0.588" b="0.824" a="1" x="1.0" index="4"/> -->
+    <!-- </Voltage> -->
     <Voltage>
-      <Point r="0.859" g="0.169" b="0.153" a="1" x="0" index="0"/>
-      <Point r="0.992" g="0.749" b="0.067" a="1" x="0.25" index="1"/>
-      <Point r="0.333" g="0.718" b="0.282" a="1" x="0.5" index="2"/>
-      <Point r="0.000" g="1.000" b="1.000" a="1" x="0.75" index="3"/>
-      <Point r="0.086" g="0.588" b="0.824" a="1" x="1.0" index="4"/>
+      <Point r="1.000" g="1.000" b="1.0" a="1" x="0.0" index="0"/>
+      <Point r="0.859" g="0.169" b="0.153" a="1" x="0.001" index="1"/>
+      <Point r="0.992" g="0.749" b="0.067" a="1" x="0.25" index="2"/>
+      <Point r="0.333" g="0.718" b="0.282" a="1" x="0.5" index="3"/>
+      <Point r="0.000" g="1.000" b="1.000" a="1" x="0.75" index="4"/>
+      <Point r="0.086" g="0.588" b="0.824" a="1" x="1.0" index="5"/>
     </Voltage>
     <Utilization>
       <Point r="0.333" g="0.718" b="0.282" a="1" x="0" index="0"/>

src/OpenCOVER/DataClient/DataClient.h

@@ -49,7 +49,7 @@ class DATACLIENTEXPORT Client {
 
     //register nodes to get updates pushed by the server
     //keep the ObserverHandle as long as you want to observe
-    virtual [[nodiscard]] ObserverHandle observeNode(const std::string &name) = 0;
+    [[nodiscard]] virtual ObserverHandle observeNode(const std::string &name) = 0;
 
     // Pull-style access
     virtual double getNumericScalar(const std::string &name, double *timestep = nullptr) = 0;

src/OpenCOVER/fixLOD/fixLOD.cpp

@@ -16,12 +16,14 @@
 #include <filesystem>
 
 
-int fixLOD(float factor, const std::string& filename)
+int fixLOD(float factor, const std::string& filename, bool includeData)
 {
 
     osgDB::Options *options= new osgDB::Options;
-
-    options->setOptionString("WriteImageHint=IncludeFile");
+    if (includeData)
+        options->setOptionString("WriteImageHint=IncludeData");
+    else
+        options->setOptionString("WriteImageHint=IncludeFile");
     osg::Node *root=nullptr;
     std::filesystem::path p;
     p = filename;
@@ -40,7 +42,10 @@ int fixLOD(float factor, const std::string& filename)
             nrl.push_back(ranges[i]);
         }
         double newRad = factor * plod->getRadius();
-        nrl[0].first = newRad;
+        if((int)ranges.size()==1)
+            nrl[0].first = 0;
+        else
+            nrl[0].first = newRad;
         nrl[0].second = 1.0E10;
         for (int i = 1; i< (int)ranges.size(); i++)
         {
@@ -96,19 +101,28 @@ int fixLOD(float factor, const std::string& filename)
 }
 
 int main(int argc, char **argv) {
+    int argOffset = 0;
+    bool writeAsData = false;
+    if (argc > 1 && strcmp(argv[1], "data") == 0)
+    {
+        argc--;
+        argOffset++;
+        writeAsData = true;
+    }
     if (argc == 2)
     {
-        std::string filename = argv[1];
-        return fixLOD(5.0, filename);
+        std::string filename = argv[1+ argOffset];
+        return fixLOD(5.0, filename, writeAsData);
     }
     else if (argc == 3)
     {
-        std::string filename = argv[2];
-        return fixLOD(atof(argv[1]), filename);
+        std::string filename = argv[2 + argOffset];
+        return fixLOD(atof(argv[1 + argOffset]), filename, writeAsData);
     }
     else
     {
-        std::cerr << "Usage: fixLOD [scaleFactor] [file.osgb]" << std::endl;
+        std::cerr << "Usage: fixLOD [data] [scaleFactor] [file.osgb]" << std::endl;
+        std::cerr << "if pictures are missing, use data option" << std::endl;
     }
 
     return 0;