linux fixes

Author: uwewoessner

src/OpenCOVER/plugins/hlrs/LamurePointCloud/Lamure.cpp

@@ -102,7 +102,7 @@ static opencover::FileHandler handler = {
 };
 
 
-Lamure::Lamure() :coVRPlugin(COVER_PLUGIN_NAME), opencover::ui::Owner("Lamure", opencover::cover->ui)
+Lamure::Lamure() :coVRPlugin(COVER_PLUGIN_NAME), opencover::ui::Owner("LamurePlugin", opencover::cover->ui)
 {
     fprintf(stderr, "LamurePlugin\n");
     opencover::coVRFileManager::instance()->registerFileHandler(&handler);
@@ -214,6 +214,9 @@ int Lamure::unloadBvh(const char* filename, const char* covise_key)
 
 
 bool Lamure::init2() {
+    if(initialized)
+        return false;
+    initialized = true;
     std::cout << "init2()" << std::endl;
 
     plugin->loadSettingsFromCovise();
@@ -257,6 +260,7 @@ bool Lamure::init2() {
     opencover::coVRNavigationManager::instance()->setNavMode("Point");
     if (m_settings.use_initial_view || m_settings.use_initial_navigation)
         plugin->applyInitialTransforms();
+    return true;
 }
 
 

src/OpenCOVER/plugins/hlrs/LamurePointCloud/Lamure.h

@@ -266,6 +266,7 @@ class Lamure : public opencover::coVRPlugin, public opencover::ui::Owner
     ModelInfo&  getModelInfo()  { return m_model_info; }
     RenderInfo& getRenderInfo() { return m_render_info; }
     Trackball&  getTrackball()  { return m_trackball; }
+    bool initialized = false;
     bool getProvValid() const { return prov_valid; }
     lamure::ren::Data_Provenance& getDataProvenance() { return m_data_provenance; }
 

src/OpenCOVER/plugins/hlrs/LamurePointCloud/LamureUI.cpp

@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <iostream>
 
-LamureUI::LamureUI(Lamure* plugin, const std::string& name) : opencover::ui::Owner(name, opencover::cover->ui), m_plugin(plugin) 
+LamureUI::LamureUI(Lamure* plugin, const std::string& name) : m_plugin(plugin) 
 {
 
 }
@@ -18,7 +18,7 @@ LamureUI::~LamureUI()
 
 void LamureUI::setupUi() {
     std::cout << "LamureUI::setupUi()" << std::endl;
-    m_lamure_menu = new opencover::ui::Menu("Lamure", this);
+    m_lamure_menu = new opencover::ui::Menu("Lamure", m_plugin);
     m_lamure_menu->setText("Lamure");
     m_lamure_menu->allowRelayout(true);
 

src/OpenCOVER/plugins/hlrs/LamurePointCloud/LamureUI.h

@@ -15,7 +15,7 @@
 
 class Lamure;
 
-class LamureUI : public opencover::ui::Owner {
+class LamureUI {
 public:
     LamureUI(Lamure* lamure_plugin, const std::string& name);
     ~LamureUI();