Show set's dialog ...

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.cxx
index 4b722db..bd4ecf3 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.cxx
@@ -152,6 +152,11 @@ namespace bbtk
 
        //=========================================================================
 
+       bool GConnectorModel::isPointInside(double x,double y, double z)//virtual
+       {
+               return false;
+       }
+
 }  // EO namespace bbtk
 
 // EOF

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.h
index fde5eee..9e7d7f7 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GConnectorModel.h
@@ -77,6 +77,7 @@ namespace bbtk
                manualContourModel* getManualContourModel();
                void updateStartEndPoints();
                void disconnectConnection();
+               virtual bool isPointInside(double x,double y, double z);
                
        private:
 

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index cab3936..3a5c196 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -307,6 +307,7 @@ namespace bbtk
                connectorModel->setManualContourModel(manContourModel);
                connectorView->setManualContourView(manContourView);
                connectorView->setModel(connectorModel);
+               connectorView->setBaseView(_baseView);
                connectorcontroller->setModelAndView(connectorModel,connectorView);
 
                int newId = _controllers.size();
@@ -645,9 +646,9 @@ namespace bbtk
                        GObjectController *cont = it->second;
                        int type = cont->getGObjectType();
                        
-                       if(type==GBLACKBOX)
+                       if(cont->getView()->isPointInside(X,Y))
                        {
-                               if(cont->getView()->isPointInside(X,Y))
+                               if(type==GBLACKBOX)
                                {
                                        for (int i=0; i<_selectedObjects.size(); i++)
                                        {
@@ -666,7 +667,7 @@ namespace bbtk
 
                if(clickOnObject==false)
                {
-                       _parent->editDiagramParameters(this);
+                       //_parent->editDiagramParameters(this);
                }
 
                return true;