diff Framework/Widgets/LayeredSceneWidget.cpp @ 61:ca644004d2ee wasm

MAJOR - removal of Start/Stop and observers in IWidget
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 May 2017 17:55:13 +0200
parents c2dc924f1a63
children f5f54ed8d307
line wrap: on
line diff
--- a/Framework/Widgets/LayeredSceneWidget.cpp	Wed May 10 16:10:47 2017 +0200
+++ b/Framework/Widgets/LayeredSceneWidget.cpp	Wed May 10 17:55:13 2017 +0200
@@ -395,7 +395,6 @@
   bool LayeredSceneWidget::RenderScene(CairoContext& context,
                                        const ViewportGeometry& view) 
   {
-    assert(IsStarted());
     return renderers_->RenderScene(context, view);
   }
 
@@ -490,12 +489,6 @@
   ILayerRendererFactory& LayeredSceneWidget::AddLayer(size_t& layerIndex,
                                                       ILayerRendererFactory* factory)
   {
-    if (IsStarted())
-    {
-      // Start() has already been invoked
-      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
-    }
-
     layerIndex = layers_.size();
     layers_.push_back(new Layer(factory, *pendingLayers_, layers_.size()));
 
@@ -586,14 +579,9 @@
   }
 
 
+#if 0
   void LayeredSceneWidget::Start()
   {
-    if (IsStarted())
-    {
-      // Start() has already been invoked
-      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
-    }
-
     for (size_t i = 0; i < layers_.size(); i++)
     {
       layers_[i]->Start();
@@ -610,14 +598,7 @@
 
   void LayeredSceneWidget::Stop()
   {
-    if (!IsStarted())
-    {
-      // Stop() has already been invoked
-      throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
-    }
-
     pendingLayers_->Stop();
-    WorldSceneWidget::Stop();
 
     renderers_.reset(NULL);
     pendingRenderers_.reset(NULL);
@@ -627,4 +608,5 @@
       layers_[i]->Stop();
     }
   }
+#endif
 }