#3084 bbGEditor Bug New Normal - Color refresh for inputs and outputs

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
index d924c66910983472723c2f8657bf6886a25a7c2c..b8c4e4eae69d8dcf7d128cc1225a2c1a23c3bd3d 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.cxx
@@ -64,19 +64,16 @@ Version:   $Revision$
 namespace bbtk
 {
        //=========================================================================
 namespace bbtk
 {
        //=========================================================================

-

        GBoxModel::GBoxModel()
        {               
        }
 
        //=========================================================================
        GBoxModel::GBoxModel()
        {               
        }
 
        //=========================================================================

-

        GBoxModel::~GBoxModel()
        {
        }
 
        //=========================================================================
        GBoxModel::~GBoxModel()
        {
        }
 
        //=========================================================================

-

        void GBoxModel::setInicPoint(double& x, double& y, double& z)
        {
                GObjectModel::setInicPoint(x,y,z);
        void GBoxModel::setInicPoint(double& x, double& y, double& z)
        {
                GObjectModel::setInicPoint(x,y,z);


@@ -85,56 +82,47 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        void GBoxModel::addInputPort(GPortModel *inputport)
        {
                _inputs.push_back(inputport);
        }
 
        //=========================================================================
        void GBoxModel::addInputPort(GPortModel *inputport)
        {
                _inputs.push_back(inputport);
        }
 
        //=========================================================================

-

        void GBoxModel::addOutputPort(GPortModel *outputport)
        {
                _outputs.push_back(outputport);
        }
 
        //=========================================================================
        void GBoxModel::addOutputPort(GPortModel *outputport)
        {
                _outputs.push_back(outputport);
        }
 
        //=========================================================================

-

        int GBoxModel::getNumInputPorts()
        {
                return _inputs.size();
        }
 
        //=========================================================================
        int GBoxModel::getNumInputPorts()
        {
                return _inputs.size();
        }
 
        //=========================================================================

-

        int GBoxModel::getNumOutputPorts()
        {
                return _outputs.size();
        }
 
        //=========================================================================
        int GBoxModel::getNumOutputPorts()
        {
                return _outputs.size();
        }
 
        //=========================================================================

-

        void GBoxModel::move(double xx,double yy,double zz)
        {
                setInicPoint(xx,yy,zz);
        void GBoxModel::move(double xx,double yy,double zz)
        {
                setInicPoint(xx,yy,zz);

-

                //Refresh inputs position
                int i;
                for(i=0;i<(int)_inputs.size();i++)
                {
                        _inputs[i]->updatePortPosition();
                }
                //Refresh inputs position
                int i;
                for(i=0;i<(int)_inputs.size();i++)
                {
                        _inputs[i]->updatePortPosition();
                }

-               

                //Refresh outputs position
                for(i=0;i<(int)_outputs.size();i++)
                {
                        _outputs[i]->updatePortPosition();
                }
                //Refresh outputs position
                for(i=0;i<(int)_outputs.size();i++)
                {
                        _outputs[i]->updatePortPosition();
                }

-

        }
        
        //=========================================================================
        }
        
        //=========================================================================

-       

        std::string GBoxModel::getStatusText()
        {
                std::string temp = "";
        std::string GBoxModel::getStatusText()
        {
                std::string temp = "";


@@ -143,21 +131,18 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        std::vector<GPortModel*> GBoxModel::getInputPorts()
        {
                return _inputs;
        }
 
        //=========================================================================
        std::vector<GPortModel*> GBoxModel::getInputPorts()
        {
                return _inputs;
        }
 
        //=========================================================================

-

        std::vector<GPortModel*> GBoxModel::getOutputPorts()
        {
                return _outputs;
        }
 
        //=========================================================================     
        std::vector<GPortModel*> GBoxModel::getOutputPorts()
        {
                return _outputs;
        }
 
        //=========================================================================     

-

        void GBoxModel::save(std::string &content)
        {
                content+="\n";
        void GBoxModel::save(std::string &content)
        {
                content+="\n";


@@ -165,7 +150,6 @@ namespace bbtk
        
 
        //=========================================================================
        
 
        //=========================================================================

-

        GPortModel* GBoxModel::getInputPort(std::string name)
        {
                for(int i = 0; i<(int)_inputs.size();i++)
        GPortModel* GBoxModel::getInputPort(std::string name)
        {
                for(int i = 0; i<(int)_inputs.size();i++)


@@ -179,7 +163,6 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-       

        GPortModel* GBoxModel::getOutputPort(std::string name)
        {
                for(int i = 0; i<(int)_outputs.size();i++)
        GPortModel* GBoxModel::getOutputPort(std::string name)
        {
                for(int i = 0; i<(int)_outputs.size();i++)


@@ -193,12 +176,10 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        GPortModel* GBoxModel::getInputPort(int pos)
        {
                return _inputs[pos];
        }
        GPortModel* GBoxModel::getInputPort(int pos)
        {
                return _inputs[pos];
        }

-

        //=========================================================================
        
        GPortModel* GBoxModel::getOutputPort(int pos)
        //=========================================================================
        
        GPortModel* GBoxModel::getOutputPort(int pos)

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.h
index 63d2ed50833154d7f00a1bd0bb105130936ce5f7..313325286fc4a1b6b55e7a860d73a8d5d13039e2 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBoxModel.h
@@ -121,25 +121,16 @@ namespace bbtk
                // Updates the position and finally the view of inputs and outputs
                void updatePorts();
 
                // Updates the position and finally the view of inputs and outputs
                void updatePorts();
 

-

                void addColons(std::string &text);
                void removeColons(std::string &text);
                void addColons(std::string &text);
                void removeColons(std::string &text);

-

        private:
        private:

-

                //Private Attributes
                //Private Attributes

-
-

                //Private Methods
                //Private Methods

-

        protected:
                //Protected Attributes
        protected:
                //Protected Attributes

-

                std::vector<GPortModel*> _inputs;
                std::vector<GPortModel*> _outputs;
                std::vector<GPortModel*> _inputs;
                std::vector<GPortModel*> _outputs;

-

                //Protected methods
                //Protected methods

-               

        };
 
 
        };
 
 

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.h
index 5021593d75503c93cda5563062ce4f15b1fc2c74..ed995fc94d71b75384b3b556cd37048a34de4385 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.h
@@ -122,32 +122,20 @@ namespace bbtk
                virtual std::string getStatusText();
                virtual void save(std::string &content);
                
                virtual std::string getStatusText();
                virtual void save(std::string &content);
                

-

        private:
        private:

-

                //Private Attributes
                //Private Attributes

-               

                GBoxModel *_parentBox;
                GBoxModel *_parentBox;

-               

                // Port type (INPUT/OUTPUT)
                int _portType;
                // Port type (INPUT/OUTPUT)
                int _portType;

-

                // The position of the port in the box
                int _posInBox;
                // The position of the port in the box
                int _posInBox;

-

                bool _isConnected;
                bool _isConnected;

-

                std::string _value;
                bool _isValueSet;
                std::string _value;
                bool _isValueSet;

-

                //Private Methods
                //Private Methods

-

        protected:
                //Protected methods
        protected:
                //Protected methods

-               

        };
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.h
index 9372d5a07ed82cd25ea21f8fb22c84a405793095..156cdd84e50eb3823324c84d92418d0c5931bdad 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBoxController.h
@@ -79,42 +79,26 @@ Version:   $Revision$
 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class GBoxController : public GObjectController
        {
        class GBoxController : public GObjectController
        {

-

        public: 
        public: 

-

                //Constructors
                GBoxController();
                //Constructors
                GBoxController();

-               ~GBoxController();
-               
+               ~GBoxController();      

                //Public methods
                //Public methods

-               
-
-

        private:
        private:

-

                //Attributes
                //Attributes

-

                //Private Methods
                //Private Methods

-

        protected:
        protected:

-

                // Methods from InteractorStyleMaracas
                virtual bool  OnMouseMove();
                virtual bool  OnLeftButtonDown(); 
                virtual bool  OnLeftButtonUp();
                virtual bool  OnMiddleButtonDown(); 
                virtual bool  OnRightButtonUp();
                // Methods from InteractorStyleMaracas
                virtual bool  OnMouseMove();
                virtual bool  OnLeftButtonDown(); 
                virtual bool  OnLeftButtonUp();
                virtual bool  OnMiddleButtonDown(); 
                virtual bool  OnRightButtonUp();

-
-

        };
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.h
index 511d74ad9fe76b9f5d13175a2f410568933037dd..c3562cc687a4b2cc867b804e93cdc98a33431f05 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorController.h
@@ -80,22 +80,15 @@ Version:   $Revision$
 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-
-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class GConnectorController : public GObjectController
        {
        class GConnectorController : public GObjectController
        {

-

        public: 
        public: 

-

                //Constructors
                GConnectorController();
                ~GConnectorController();
                //Constructors
                GConnectorController();
                ~GConnectorController();

-               

                //Public methods
                //Public methods

-

                // Methods from InteractorStyleMaracas
                virtual bool  OnMouseMove();
                virtual bool  OnLeftButtonDown(); 
                // Methods from InteractorStyleMaracas
                virtual bool  OnMouseMove();
                virtual bool  OnLeftButtonDown(); 


@@ -105,31 +98,20 @@ namespace bbtk
                virtual bool  OnRightButtonUp();
                virtual bool  OnMiddleButtonDown();
                virtual bool  OnMiddleButtonUp();
                virtual bool  OnRightButtonUp();
                virtual bool  OnMiddleButtonDown();
                virtual bool  OnMiddleButtonUp();

-

                // Implementation of the creaMaracasVisu controller
                manualConnectorContourController* getManualContourController();
                void setManualContourController(manualConnectorContourController* controller);
                // Implementation of the creaMaracasVisu controller
                manualConnectorContourController* getManualContourController();
                void setManualContourController(manualConnectorContourController* controller);

-

                virtual void removeFromScene();
                virtual void removeFromScene();

-

                // Reports the end in the contour creation
                void endContourCreation();
                // Reports the end in the contour creation
                void endContourCreation();

-

        private:
        private:

-

                //Attributes
                //Attributes

-

                // Implementation of the creaMaracasVisu contour (manualContourControler) controller
                manualConnectorContourController* _controller;
                // Implementation of the creaMaracasVisu contour (manualContourControler) controller
                manualConnectorContourController* _controller;

-

                //Private Methods
                //Private Methods

-

        protected:
                //Protected methods
        protected:
                //Protected methods

-               

        };
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.h
index fed4a545c0675cf19d0feb92c931a18b7e7f926b..ff37a2f7e8d641b5ae1eaa633cfe12f0a1a4e005 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.h
@@ -81,63 +81,39 @@ Version:   $Revision$
 #include <iostream>
 
 namespace bbtk {
 #include <iostream>
 
 namespace bbtk {

-

     class GObjectController : public InteractorStyleMaracas {
     public:
     class GObjectController : public InteractorStyleMaracas {
     public:

-

         //Constructors
         GObjectController( );
         ~ GObjectController( );
         //Constructors
         GObjectController( );
         ~ GObjectController( );

-

         //Public methods
         //Public methods

-

         void setModelAndView( GObjectModel* model, vtkGObjectView* view );
         void setModelAndView( GObjectModel* model, vtkGObjectView* view );

-

         // Same type of the saved in the model of the graphical objects
         int getGObjectType( );
         // Same type of the saved in the model of the graphical objects
         int getGObjectType( );

-
-        GObjectModel* getModel( );
+        GObjectModel*  getModel( );

         vtkGObjectView* getView( );
         vtkGObjectView* getView( );

-

         std::string getStatusText( );
         std::string getStatusText( );

-

         // Same ObjectID from the model
         int getId( );
         void setId( int id );
         // Same ObjectID from the model
         int getId( );
         void setId( int id );

-

         virtual void removeFromScene( );
         virtual void removeFromScene( );

-

     private:
     private:

-

         //Attributes
         //Attributes

-
-
-

         //Private Methods
         //Private Methods

-

     protected:
     protected:

-

         //Protected Attributes
         //Protected Attributes

-
-        GObjectModel *_model;
-        vtkGObjectView *_view;
-
+        GObjectModel   *_model;
+        vtkGObjectView         *_view;

         bool _isLeftClickDown;
         bool _isLeftClickDown;

-

         //Protected Methods
         //Protected Methods

-

         // Methods from InteractorStyleMaracas
         virtual bool OnMouseMove( );
         virtual bool OnLeftButtonDown( );
         virtual bool OnLeftButtonUp( );
         virtual bool OnLeftDClick( );
         virtual bool OnMiddleButtonDown( );
         // Methods from InteractorStyleMaracas
         virtual bool OnMouseMove( );
         virtual bool OnLeftButtonDown( );
         virtual bool OnLeftButtonUp( );
         virtual bool OnLeftDClick( );
         virtual bool OnMiddleButtonDown( );

-

         virtual void moveObject( int X, int Y );
         virtual void moveObject( int X, int Y );

-

     };
     };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.h
index a1b297637fe74952df7cb1f4797fd2440e5cd994..224320030f3a6536525bfb77ed8b6370bc524f97 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GPortController.h
@@ -80,36 +80,22 @@ Version:   $Revision$
 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class GPortController : public GObjectController
        {
        class GPortController : public GObjectController
        {

-

        public: 
        public: 

-

                //Constructors
                GPortController();
                ~GPortController();
                //Constructors
                GPortController();
                ~GPortController();

-               

                //Public methods
                //Public methods

-

                virtual bool  OnLeftButtonDown(); 
                virtual bool  OnLeftButtonUp();
                virtual bool  OnLeftButtonDown(); 
                virtual bool  OnLeftButtonUp();

-

        private:
        private:

-

                //Attributes
                //Attributes

-               
-

                //Private Methods
                //Private Methods

-

        protected:
        protected:

-

        };
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 97e98f4c55b0eb4818825e5abfaf5c570ebd7ff5..c5effa8ab9a3b4dbbf094f664622440b7205f7be 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -286,6 +286,9 @@ namespace bbtk
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_SELECTED_R,BOXFILL_SELECTED_G,BOXFILL_SELECTED_B);
                        _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_SELECTED_R,BOXTEXT_SELECTED_G,BOXTEXT_SELECTED_B);
                }
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_SELECTED_R,BOXFILL_SELECTED_G,BOXFILL_SELECTED_B);
                        _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_SELECTED_R,BOXTEXT_SELECTED_G,BOXTEXT_SELECTED_B);
                }

+
+               updateColorsPorts();
+

        }
 
        //=========================================================================
        }
 
        //=========================================================================

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
index 4bd437d523b48a050c53e66b4bcd9268d0474318..538ef7eb666a6da30c33f10b562d472d41c9d48b 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
@@ -89,49 +89,34 @@ Version:   $Revision$
 #include "vtkTextActor3D.h"
 #include "vtkTextProperty.h"
 
 #include "vtkTextActor3D.h"
 #include "vtkTextProperty.h"
 

-

 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class vtkGBlackBoxView : public vtkGBoxView
        {
        class vtkGBlackBoxView : public vtkGBoxView
        {

-

        public:
        public:

-

                //Constructors
                vtkGBlackBoxView();
                ~vtkGBlackBoxView();
                //Constructors
                vtkGBlackBoxView();
                ~vtkGBlackBoxView();

-

                //Public methods
                //Public methods

-

        private:
        private:

-

                //Private Attributes
                vtkTextActor3D          *_boxTextActor;
                //Private Attributes
                vtkTextActor3D          *_boxTextActor;

-

                //Private Methods
                void updatePositionTextActor(double xInic, double yInic, double zInic);
                //Private Methods
                void updatePositionTextActor(double xInic, double yInic, double zInic);

-

        protected:
        protected:

-

                //Protected Attributes
                //Protected Attributes

-

                //Protected Methods
                virtual void addVtkActors();
                virtual void removeVtkActors();
                virtual void createVtkObjects();
                //Protected Methods
                virtual void addVtkActors();
                virtual void removeVtkActors();
                virtual void createVtkObjects();

-

                virtual void update(int idController,int command);
                virtual void updateColors();
                virtual void update_X_Fin();
                virtual void update(int idController,int command);
                virtual void updateColors();
                virtual void update_X_Fin();

-
+       protected:

        };
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx
index 24db98a14240ae4e82838753eaeee126b2b84d16..a8789d779f407038f2ff23a1107a7667307b8a75 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.cxx
@@ -108,13 +108,6 @@ namespace bbtk
                _TrianglesInputsPts                             = vtkPoints::New();
                _TrianglesInputsPts->SetNumberOfPoints( 3*numberOfTriangles );
 
                _TrianglesInputsPts                             = vtkPoints::New();
                _TrianglesInputsPts->SetNumberOfPoints( 3*numberOfTriangles );
 

-//EED 2017-03-02
-//             if (numberOfTriangles>0)
-//             {
-//                     _TrianglesInputsPts->SetPoint(0, -1000, -1000, -1000 );
-//                     _TrianglesInputsPts->SetPoint(1, 1000, 1000, 1000 );
-//             }
-

                vtkCellArray *stripTrianglesInputs = vtkCellArray::New();
                vtkPolyData *pdTrianglesInputs  = vtkPolyData::New();
                _TrianglesInputsPolyMapper              = vtkPolyDataMapper::New();
                vtkCellArray *stripTrianglesInputs = vtkCellArray::New();
                vtkPolyData *pdTrianglesInputs  = vtkPolyData::New();
                _TrianglesInputsPolyMapper              = vtkPolyDataMapper::New();


@@ -129,17 +122,17 @@ namespace bbtk
                }
 
                // Create cell data
                }
 
                // Create cell data

-               vtkUnsignedCharArray *cellDataInputTriangles = vtkUnsignedCharArray::New();
-               cellDataInputTriangles->SetNumberOfComponents(3);
-               cellDataInputTriangles->SetNumberOfTuples(numberOfTriangles);
+               _cellDataInputTriangles = vtkUnsignedCharArray::New();
+               _cellDataInputTriangles->SetNumberOfComponents(3);
+               _cellDataInputTriangles->SetNumberOfTuples(numberOfTriangles);

                for (int i = 0; i < numberOfTriangles; i++)
                {
                        rgb[0] = 100;
                        rgb[1] = 100;
                        rgb[2] = 100;
                for (int i = 0; i < numberOfTriangles; i++)
                {
                        rgb[0] = 100;
                        rgb[1] = 100;
                        rgb[2] = 100;

-                       cellDataInputTriangles->SetTuple(i, rgb);
+                       _cellDataInputTriangles->SetTuple(i, rgb);

                } // for colors  
                } // for colors  

-               pdTrianglesInputs->GetCellData()->SetScalars(cellDataInputTriangles);
+               pdTrianglesInputs->GetCellData()->SetScalars( _cellDataInputTriangles );

 
                pdTrianglesInputs->SetPoints( _TrianglesInputsPts );
                pdTrianglesInputs->SetStrips( stripTrianglesInputs );
 
                pdTrianglesInputs->SetPoints( _TrianglesInputsPts );
                pdTrianglesInputs->SetStrips( stripTrianglesInputs );


@@ -148,7 +141,6 @@ namespace bbtk
                _TrianglesInputsPolyMapper->Modified();
 
 
                _TrianglesInputsPolyMapper->Modified();
 
 

-

                ///************************* Inputs Fill (triangles) *************************
 
                ///************************* Outputs Fill (triangles) *************************
                ///************************* Inputs Fill (triangles) *************************
 
                ///************************* Outputs Fill (triangles) *************************


@@ -156,13 +148,6 @@ namespace bbtk
                _TrianglesOutputsPts                                    = vtkPoints::New();
                _TrianglesOutputsPts->SetNumberOfPoints( 3*numberOfTriangles );
 
                _TrianglesOutputsPts                                    = vtkPoints::New();
                _TrianglesOutputsPts->SetNumberOfPoints( 3*numberOfTriangles );
 

-//EED 2017-03-02
-//             if (numberOfTriangles>0)
-//             {
-//                     _TrianglesOutputsPts->SetPoint(0, -1000, -1000, -1000 );
-//                     _TrianglesOutputsPts->SetPoint(1, 1000, 1000, 1000 );
-//             }
-

                vtkCellArray *stripTrianglesOutputs     = vtkCellArray::New();
                vtkPolyData *pdTrianglesOutputs                 = vtkPolyData::New();
                _TrianglesOutputsPolyMapper                             = vtkPolyDataMapper::New();
                vtkCellArray *stripTrianglesOutputs     = vtkCellArray::New();
                vtkPolyData *pdTrianglesOutputs                 = vtkPolyData::New();
                _TrianglesOutputsPolyMapper                             = vtkPolyDataMapper::New();


@@ -176,17 +161,17 @@ namespace bbtk
                        stripTrianglesOutputs->InsertCellPoint(i*3+2);
                } // for
                // Create cell data
                        stripTrianglesOutputs->InsertCellPoint(i*3+2);
                } // for
                // Create cell data

-               vtkUnsignedCharArray *cellDataOutputTriangle = vtkUnsignedCharArray::New();
-               cellDataOutputTriangle->SetNumberOfComponents(3);
-               cellDataOutputTriangle->SetNumberOfTuples(numberOfTriangles);
+               _cellDataOutputTriangles = vtkUnsignedCharArray::New();
+               _cellDataOutputTriangles->SetNumberOfComponents(3);
+               _cellDataOutputTriangles->SetNumberOfTuples(numberOfTriangles);

                for (int i = 0; i < numberOfTriangles; i++)
                {
                        rgb[0] = 000;
                        rgb[1] = 255;
                        rgb[2] = 255;
                for (int i = 0; i < numberOfTriangles; i++)
                {
                        rgb[0] = 000;
                        rgb[1] = 255;
                        rgb[2] = 255;

-                       cellDataOutputTriangle->SetTuple(i, rgb);
+                       _cellDataOutputTriangles->SetTuple(i, rgb);

                } // for colors  
                } // for colors  

-               pdTrianglesOutputs->GetCellData()->SetScalars(cellDataOutputTriangle);
+               pdTrianglesOutputs->GetCellData()->SetScalars( _cellDataOutputTriangles );

                pdTrianglesOutputs->SetPoints( _TrianglesOutputsPts );
                pdTrianglesOutputs->SetStrips( stripTrianglesOutputs );
                _TrianglesOutputsPolyMapper->SetInput( pdTrianglesOutputs );
                pdTrianglesOutputs->SetPoints( _TrianglesOutputsPts );
                pdTrianglesOutputs->SetStrips( stripTrianglesOutputs );
                _TrianglesOutputsPolyMapper->SetInput( pdTrianglesOutputs );


@@ -289,6 +274,7 @@ namespace bbtk
 
        void vtkGBoxView::updateColors()
        {
 
        void vtkGBoxView::updateColors()
        {

+               printf("EED vtkGBoxView::updateColors\n");

                _fillObjectActor->GetProperty()->SetAmbient(0.6);
 
                if(_state==NOTHING_HAPPENS)
                _fillObjectActor->GetProperty()->SetAmbient(0.6);
 
                if(_state==NOTHING_HAPPENS)


@@ -315,24 +301,57 @@ namespace bbtk
 //                     _borderObjectActor->GetProperty()->SetLineWidth(2);
 //                     _borderObjectActor->GetProperty()->SetColor(BOXBORDER_SELECTED_R,BOXBORDER_SELECTED_G,BOXBORDER_SELECTED_B);
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_SELECTED_R,BOXFILL_SELECTED_G,BOXFILL_SELECTED_B);
 //                     _borderObjectActor->GetProperty()->SetLineWidth(2);
 //                     _borderObjectActor->GetProperty()->SetColor(BOXBORDER_SELECTED_R,BOXBORDER_SELECTED_G,BOXBORDER_SELECTED_B);
                        _fillObjectActor->GetProperty()->SetColor(BOXFILL_SELECTED_R,BOXFILL_SELECTED_G,BOXFILL_SELECTED_B);

-               }
+               } // if state box
+
+               updateColorsPorts();

        }
 
        }
 

+

        //=========================================================================
        //=========================================================================

+       void vtkGBoxView::updateColorsPorts()
+       {
+               // Input ports
+               float rgb[3];
+               vtkGPortView    *portView;
+               GBoxModel               *boxModel       = (GBoxModel*)_model;
+               int numberOfTriangles           = boxModel->getNumInputPorts();
+               for (int i=0 ; i<numberOfTriangles; i++)
+               {
+                       portView = _inputsG[i];
+                       portView->getColors(rgb);
+                       rgb[0]=rgb[0]*255;
+                       rgb[1]=rgb[1]*255;
+                       rgb[2]=rgb[2]*255;
+                       _cellDataInputTriangles->SetTuple(i, rgb);
+               } // for

 
 

+               numberOfTriangles               = boxModel->getNumOutputPorts();
+               for (int i=0 ; i<numberOfTriangles; i++)
+               {
+                       portView = _outputsG[i];
+                       portView->getColors(rgb);
+                       rgb[0]=rgb[0]*255;
+                       rgb[1]=rgb[1]*255;
+                       rgb[2]=rgb[2]*255;
+                       _cellDataOutputTriangles->SetTuple(i, rgb);
+               } // for
+       }
+
+
+       //=========================================================================

        void vtkGBoxView::updatePorts()
        {
                double xInic, yInic,zInic,xFin, yFin,zFin;
 
        void vtkGBoxView::updatePorts()
        {
                double xInic, yInic,zInic,xFin, yFin,zFin;
 

-               GBoxModel* boxModel =(GBoxModel*)_model;
+               GBoxModel* boxModel = (GBoxModel*)_model;

                boxModel->updatePorts();
 
 // update position for one Actor that represents all InputPorts
                boxModel->updatePorts();
 
 // update position for one Actor that represents all InputPorts

-               GPortModel      *portModel;
+               GPortModel              *portModel;

                int numberOfTriangles                   = boxModel->getNumInputPorts();
                for (int i=0;i<numberOfTriangles;i++)
                {
                int numberOfTriangles                   = boxModel->getNumInputPorts();
                for (int i=0;i<numberOfTriangles;i++)
                {

-                       portModel= boxModel->getInputPort(i);
+                       portModel = boxModel->getInputPort(i);

                portModel->getInicPoint( xInic , yInic , zInic ) ;
                portModel->getFinalPoint( xFin , yFin , zFin ) ;
                // RaC In the actual version, zInic=zFin=GPOSITION_Z
                portModel->getInicPoint( xInic , yInic , zInic ) ;
                portModel->getFinalPoint( xFin , yFin , zFin ) ;
                // RaC In the actual version, zInic=zFin=GPOSITION_Z


@@ -363,6 +382,17 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

+       void vtkGBoxView::addInputPort(vtkGPortView *inputport)
+       {
+               _inputsG.push_back(inputport);
+       }
+
+       //=========================================================================
+       void vtkGBoxView::addOutputPort(vtkGPortView *outputport)
+       {
+               _outputsG.push_back(outputport);
+       }
+

 
 }  // EO namespace bbtk
 
 
 }  // EO namespace bbtk
 

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.h
index df91361af8f9ddf1cc742e8653221b5f687af986..66fd90da22e41fbe606fc51ef2b1d58bf6bccf3a 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBoxView.h
@@ -73,6 +73,7 @@ Version:   $Revision$
 //Includes same project
 #include "GlobalConstants.h"
 #include "vtkGObjectView.h"
 //Includes same project
 #include "GlobalConstants.h"
 #include "vtkGObjectView.h"

+#include "vtkGPortView.h"

 #include "GBoxModel.h"
 
 //Includes creaMaracasVisu
 #include "GBoxModel.h"
 
 //Includes creaMaracasVisu


@@ -90,56 +91,48 @@ Version:   $Revision$
 #include "vtkTextActor3D.h"
 #include "vtkTextProperty.h"
 
 #include "vtkTextActor3D.h"
 #include "vtkTextProperty.h"
 

-

 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class vtkGBoxView : public vtkGObjectView
        {
        class vtkGBoxView : public vtkGObjectView
        {

-

        public: 
        public: 

-

                //Constructors
                vtkGBoxView();
                ~vtkGBoxView();
                //Constructors
                vtkGBoxView();
                ~vtkGBoxView();

-               

                //Public methods                
                //Public methods                

-
+               void addInputPort(vtkGPortView *inputport);
+               void addOutputPort(vtkGPortView *outputport);

        private:
        private:

-

                //Private Attributes
                //Private Attributes

-

                // Input Triangles
                // Input Triangles

-               vtkPoints                       *_TrianglesInputsPts;
-               vtkPolyDataMapper       *_TrianglesInputsPolyMapper;
-               vtkActor                        *_TrianglesInputsActor;
+               vtkPoints                                       *_TrianglesInputsPts;
+               vtkPolyDataMapper                       *_TrianglesInputsPolyMapper;
+               vtkActor                                        *_TrianglesInputsActor;
+               vtkUnsignedCharArray            *_cellDataInputTriangles;  // input output port colors Color

                // Output Triangles
                // Output Triangles

-               vtkPoints                       *_TrianglesOutputsPts;
-               vtkPolyDataMapper       *_TrianglesOutputsPolyMapper;
-               vtkActor                        *_TrianglesOutputsActor;
-
+               vtkPoints                                       *_TrianglesOutputsPts;
+               vtkPolyDataMapper                       *_TrianglesOutputsPolyMapper;
+               vtkActor                                        *_TrianglesOutputsActor;
+               vtkUnsignedCharArray            *_cellDataOutputTriangles;  // input output port colors Color

                //Private Methods
                //Private Methods

-

        protected:
        protected:

-

                //Protected Attributes
                //Protected Attributes

-               
+               //Protected Attributes
+               std::vector<vtkGPortView*>      _inputsG;
+               std::vector<vtkGPortView*>      _outputsG;

                //Protected Methods
                virtual void addVtkActors();
                virtual void removeVtkActors();
                virtual void createVtkObjects();
                //Protected Methods
                virtual void addVtkActors();
                virtual void removeVtkActors();
                virtual void createVtkObjects();

-                       void createVtkInputOutputPorts();
-
+                               void createVtkInputOutputPorts();

                virtual void update(int idController,int command);
                virtual void updateColors();
                virtual void update(int idController,int command);
                virtual void updateColors();

+                               void updateColorsPorts();

                void updatePorts();
        };
                void updatePorts();
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h
index 30a58c615bd51dca1db36ff2f26f26be22740666..7a86b3decc2da763d4ae84e9dd952dbc1ab41eb3 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h
@@ -80,37 +80,25 @@ Version:   $Revision$
 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class vtkGConnectorView : public vtkGObjectView
        {
        class vtkGConnectorView : public vtkGObjectView
        {

-

        public: 
        public: 

-

                //Constructors
                vtkGConnectorView();
                ~vtkGConnectorView();
                //Constructors
                vtkGConnectorView();
                ~vtkGConnectorView();

-               

                //Public methods
                void setManualContourView(manualViewContour* viewContour);
                manualViewContour* getManualContourView();
                void updateStartEndPoints();
                //Public methods
                void setManualContourView(manualViewContour* viewContour);
                manualViewContour* getManualContourView();
                void updateStartEndPoints();

-

        private:
        private:

-

                //Attributes
                manualViewContour* manViewContour;
                //Attributes
                manualViewContour* manViewContour;

-

                //Private Methods
                //Private Methods

-

        protected:
                //Protected methods
        protected:
                //Protected methods

-               

        };
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
index 3427debfebb29fb9c8909ab20928d2b00c7f0565..d9d784edee1c657624a76a68c3e8132972799aa5 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
@@ -65,7 +65,6 @@ Version:   $Revision$
 namespace bbtk
 {
 
 namespace bbtk
 {
 

-

        //=========================================================================
        vtkGObjectView::vtkGObjectView()
        {
        //=========================================================================
        vtkGObjectView::vtkGObjectView()
        {


@@ -82,28 +81,24 @@ namespace bbtk
        {
        }
        //=========================================================================
        {
        }
        //=========================================================================

-

        void vtkGObjectView::update(int idController,int command)//virtual
        {
                //virtual
        }
 
        //=========================================================================
        void vtkGObjectView::update(int idController,int command)//virtual
        {
                //virtual
        }
 
        //=========================================================================

-       

        void vtkGObjectView::setModel(GObjectModel *model)
        {
                _model = model;
        }
 
        //=========================================================================
        void vtkGObjectView::setModel(GObjectModel *model)
        {
                _model = model;
        }
 
        //=========================================================================

-       

        void vtkGObjectView::setBaseView(wxVtkBaseView* baseView)
        {
                _baseView = baseView;
        }
 
        //=========================================================================
        void vtkGObjectView::setBaseView(wxVtkBaseView* baseView)
        {
                _baseView = baseView;
        }
 
        //=========================================================================

-

        void vtkGObjectView::initVtkObjects()
        {
                createVtkObjects();
        void vtkGObjectView::initVtkObjects()
        {
                createVtkObjects();


@@ -111,21 +106,18 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        void vtkGObjectView::createVtkObjects() //virtual
        {
                //virtual
        }
 
        //=========================================================================
        void vtkGObjectView::createVtkObjects() //virtual
        {
                //virtual
        }
 
        //=========================================================================

-

        void vtkGObjectView::updateColors() //virtual
        {
                //virtual
        }
 
        //=========================================================================
        void vtkGObjectView::updateColors() //virtual
        {
                //virtual
        }
 
        //=========================================================================

-

        void vtkGObjectView::addVtkActors()//virtual
        {               
                _baseView->GetRenderer()->AddActor(_fillObjectActor);
        void vtkGObjectView::addVtkActors()//virtual
        {               
                _baseView->GetRenderer()->AddActor(_fillObjectActor);


@@ -133,7 +125,6 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        void vtkGObjectView::removeVtkActors()//virtual
        {
                _baseView->GetRenderer()->RemoveActor(_fillObjectActor);
        void vtkGObjectView::removeVtkActors()//virtual
        {
                _baseView->GetRenderer()->RemoveActor(_fillObjectActor);


@@ -141,7 +132,6 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        bool vtkGObjectView::isPointInside(int X,int Y) //virtual
        {
                // RaC In the actual version, always z=GPOSITION_Z
        bool vtkGObjectView::isPointInside(int X,int Y) //virtual
        {
                // RaC In the actual version, always z=GPOSITION_Z


@@ -151,10 +141,8 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        void vtkGObjectView::moveObject(int X,int Y) //virtual
        {               
        void vtkGObjectView::moveObject(int X,int Y) //virtual
        {               

-

                // RaC In the actual version, always z=GPOSITION_Z
                double xx=X,yy=Y,zz=GPOSITION_Z;
                _baseView->TransCoordScreenToWorld(xx,yy,zz);
                // RaC In the actual version, always z=GPOSITION_Z
                double xx=X,yy=Y,zz=GPOSITION_Z;
                _baseView->TransCoordScreenToWorld(xx,yy,zz);


@@ -168,11 +156,9 @@ namespace bbtk
                        dragDifY=yy-yInic;      
                }
                _model->move(xx-dragDifX,yy-dragDifY,zz);
                        dragDifY=yy-yInic;      
                }
                _model->move(xx-dragDifX,yy-dragDifY,zz);

-

        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        void vtkGObjectView::setStartDragging(bool param)
        {
                _isStartDragging=param;
        void vtkGObjectView::setStartDragging(bool param)
        {
                _isStartDragging=param;


@@ -181,28 +167,24 @@ namespace bbtk
        }
 
        //=========================================================================
        }
 
        //=========================================================================

-

        void vtkGObjectView::setState(int state)
        {
                _state = state;
        }
 
        //=========================================================================
        void vtkGObjectView::setState(int state)
        {
                _state = state;
        }
 
        //=========================================================================

-

        int vtkGObjectView::getState()
        {
                return _state;
        }
 
        //=========================================================================
        int vtkGObjectView::getState()
        {
                return _state;
        }
 
        //=========================================================================

-

        void vtkGObjectView::setRefreshWaiting()
        {
                ((vtkInteractorStyleBaseView*)_baseView->GetInteractorStyleBaseView())->SetRefresh_waiting();
        }
 
        //=========================================================================
        void vtkGObjectView::setRefreshWaiting()
        {
                ((vtkInteractorStyleBaseView*)_baseView->GetInteractorStyleBaseView())->SetRefresh_waiting();
        }
 
        //=========================================================================

-       

        void vtkGObjectView::removeFromScene()
        {
                removeVtkActors();
        void vtkGObjectView::removeFromScene()
        {
                removeVtkActors();

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
index 13a12aba5b50a36820bb8ce69952b2d8f5612c92..5b096afd2b4fe0fc03ce50f6429c142b12035ab1 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
@@ -85,83 +85,55 @@ Version:   $Revision$
 #include "vtkPolyDataMapper.h"
 #include "vtkActor.h"
 
 #include "vtkPolyDataMapper.h"
 #include "vtkActor.h"
 

-

 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class vtkGObjectView : public Observer
        {
        class vtkGObjectView : public Observer
        {

-

        public: 
        public: 

-

                //Constructors
                vtkGObjectView();
                ~vtkGObjectView();
                //Constructors
                vtkGObjectView();
                ~vtkGObjectView();

-               

                //Public methods
                //Public methods

-

                void setModel(GObjectModel *model);
                void setBaseView(wxVtkBaseView* baseView);
                void initVtkObjects();
                void setModel(GObjectModel *model);
                void setBaseView(wxVtkBaseView* baseView);
                void initVtkObjects();

-               

                void setStartDragging(bool param);
                void setStartDragging(bool param);

-

                void setState(int state);
                int getState();
                void setState(int state);
                int getState();

-

                // Method to force a vtk refresh to the list of controllers of the wxVtkBaseView
                void setRefreshWaiting();
                // Method to force a vtk refresh to the list of controllers of the wxVtkBaseView
                void setRefreshWaiting();

-               

                virtual bool isPointInside(int X,int Y);
                virtual void moveObject(int X, int Y);
                virtual bool isPointInside(int X,int Y);
                virtual void moveObject(int X, int Y);

-

                virtual void removeFromScene();
                virtual void removeFromScene();

-

                virtual void update(int idController,int command);              
                virtual void update(int idController,int command);              

-

 //protected
                virtual void createVtkObjects();
                virtual void addVtkActors();
 //protected
                virtual void createVtkObjects();
                virtual void addVtkActors();

-
-               

        private:
        private:

-

                //Private Attributes
                //Private Attributes

-               bool _isStartDragging;
-
+               bool                            _isStartDragging;

                //Makes a difference between the first point clicked and the new position, in order to move the selected objects
                //Makes a difference between the first point clicked and the new position, in order to move the selected objects

-               double dragDifX;
-               double dragDifY;
-
-
+               double                          dragDifX;
+               double                          dragDifY;

                //Private Methods
                //Private Methods

-               

        protected:
        protected:

-

                //Protected Attributes
                //Protected Attributes

-               

                wxVtkBaseView           * _baseView;
                GObjectModel            * _model;
 //             vtkActor                        * _borderObjectActor;
                vtkActor                        * _fillObjectActor;
                vtkPolyDataMapper       * _fillPolyMapper;
 //             vtkPolyDataMapper       * _borderPolyMapper;
                wxVtkBaseView           * _baseView;
                GObjectModel            * _model;
 //             vtkActor                        * _borderObjectActor;
                vtkActor                        * _fillObjectActor;
                vtkPolyDataMapper       * _fillPolyMapper;
 //             vtkPolyDataMapper       * _borderPolyMapper;

-

                vtkPoints                       *_pts;
                vtkPoints                       *_pts;

-

                // State of the object (See GlobalConstants.h)
                // State of the object (See GlobalConstants.h)

-               int  _state;
-               
+               int  _state;    

                //Protected Methods
                virtual void removeVtkActors();
                virtual void updateColors();
        };
                //Protected Methods
                virtual void removeVtkActors();
                virtual void updateColors();
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
index bffe9538080f184af78bb970ec9a7a1d23609cae..cd2332fb16a170b9ad4c62a376631b516e75d772 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
@@ -123,10 +123,10 @@ namespace bbtk {
 
         ///************************* FILL *************************
 
 
         ///************************* FILL *************************
 

-        vtkCellArray *strip = vtkCellArray::New( ) ;
-        vtkPolyData *pdFill = vtkPolyData::New( ) ;
-        _fillPolyMapper = vtkPolyDataMapper::New( ) ;
-        _fillObjectActor = vtkActor::New( ) ;
+        vtkCellArray   *strip          = vtkCellArray::New( ) ;
+        vtkPolyData    *pdFill         = vtkPolyData::New( ) ;
+                       _fillPolyMapper         = vtkPolyDataMapper::New( ) ;
+                       _fillObjectActor        = vtkActor::New( ) ;

 
         // RaC In the actual version, zInic=zFin=GPOSITION_Z
 
 
         // RaC In the actual version, zInic=zFin=GPOSITION_Z
 


@@ -151,29 +151,37 @@ namespace bbtk {
 
     //=========================================================================
 
 
     //=========================================================================
 

-    void vtkGPortView::updateColors( ) {
-        _fillObjectActor->GetProperty( )->SetColor( 0.45 , 0.45 , 0.45 ) ;
+    void vtkGPortView::updateColors( ) 
+       {
+//EED2017-04-08
+               float rgb[3];
+               getColors(rgb);
+        _fillObjectActor->GetProperty( )->SetColor( rgb[0] , rgb[1] , rgb[2] ) ;
+    }
+
+    //=========================================================================
+//EED2017-04-08
+       void vtkGPortView::getColors(float* rgb)
+       {
+               rgb[0]=0.45; rgb[1]=0.45; rgb[2]=0.45;

 
         if ( _state == POSSIBLE_CONNECTION ) {
 
         if ( _state == POSSIBLE_CONNECTION ) {

-            _fillObjectActor->GetProperty( )->SetColor( 1 , 1 , 0 ) ;
+                       rgb[0]=1; rgb[1]=1; rgb[2]=0;

         } else if ( _state == SELECTED_POSSIBLE_CONNECTION ) {
         } else if ( _state == SELECTED_POSSIBLE_CONNECTION ) {

-            _fillObjectActor->GetProperty( )->SetColor( 0 , 1 , 0 ) ;
+                       rgb[0]=0; rgb[1]=1; rgb[2]=0;

         } else if ( _state == HIGHLIGHTED ) {
         } else if ( _state == HIGHLIGHTED ) {

-            _fillObjectActor->GetProperty( )->SetColor( 0 , 0 , 1 ) ;
+                       rgb[0]=0; rgb[1]=0; rgb[2]=1;

         } else {
             GPortModel* portm = ( GPortModel* ) _model ;
             if ( portm->isConnected( ) ) {
         } else {
             GPortModel* portm = ( GPortModel* ) _model ;
             if ( portm->isConnected( ) ) {

-                _fillObjectActor->GetProperty( )->SetColor( 0.15 , 0.15 , 0.15 ) ;
+                               rgb[0]=0.15; rgb[1]=0.15; rgb[2]=0.15;

             } else if ( portm->isValueSet( ) ) {
             } else if ( portm->isValueSet( ) ) {

-                _fillObjectActor->GetProperty( )->SetColor( 0.55 , 0.25 , 0.25 ) ;
+                               rgb[0]=0.55; rgb[1]=0.25; rgb[2]=0.25;

             } else {
             } else {

-                _fillObjectActor->GetProperty( )->SetColor( 0.45 , 0.45 , 0.45 ) ;
-            }
-        }
-    }
-
-    //=========================================================================
-
+                               rgb[0]=0.45; rgb[1]=0.45; rgb[2]=0.45;
+            } // if portm
+        } // if  _state
+       }

 
 } // EO namespace bbtk
 
 
 } // EO namespace bbtk
 

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h
index 854a1aed6b273098a150ebcf6ce9656bbce8aa62..f24c8a53ec00455e00513944019915ef795df5e2 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h
@@ -86,37 +86,30 @@ Version:   $Revision$
 #include "vtkRenderer.h"
 #include "vtkCellArray.h"
 
 #include "vtkRenderer.h"
 #include "vtkCellArray.h"
 

-

 //Includes std
 #include <iostream>
 
 //Includes std
 #include <iostream>
 

-

 namespace bbtk
 {
 namespace bbtk
 {

-

        class vtkGPortView : public vtkGObjectView
        {
        class vtkGPortView : public vtkGObjectView
        {

-

        public: 
                //Constructors
                vtkGPortView();
        public: 
                //Constructors
                vtkGPortView();

-               ~vtkGPortView();
-               
+               ~vtkGPortView();        

                //Public methods
                virtual void update(int idController,int command);
                //Public methods
                virtual void update(int idController,int command);

+                       void getColors(float* rgb);
+

        private:
                //Private Attributes
        private:
                //Private Attributes

-

                //Private Methods
                //Private Methods

-

        protected:
                //Protected Attributes          
                //Protected Methods
                virtual void createVtkObjects();
                virtual void updateColors();
        };
        protected:
                //Protected Attributes          
                //Protected Methods
                virtual void createVtkObjects();
                virtual void updateColors();
        };

-
-

 }
 // namespace bbtk
 #endif
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 1376327ad2bea388f833aa242751243f2d530bec..8d57977bdddad8338abfda8f21e5a1c845e0ad81 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -111,18 +111,14 @@ wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent)
 }
 
 //=========================================================================
 }
 
 //=========================================================================

-wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS() {
-
-       printf("EED %p ~wxGUIEditorGraphicBBS()\n", this);
-
+wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS() 
+{

        //EED02JUIN2010         delete _tabsMgr;
        //EED02JUIN2010         delete _tabsMgr;

-

        _frameAUIMgr->UnInit();
        // FCY memory leaks
        delete _frameAUIMgr;
        delete _notebook;
        delete _tabsMgr;
        _frameAUIMgr->UnInit();
        // FCY memory leaks
        delete _frameAUIMgr;
        delete _notebook;
        delete _tabsMgr;

-

 }
 
 //=========================================================================
 }
 
 //=========================================================================


@@ -1017,12 +1013,14 @@ void wxGUIEditorGraphicBBS::OnExportConsoleExecCommand(wxCommandEvent& event)
 
 //=========================================================================
 
 
 //=========================================================================
 

-void wxGUIEditorGraphicBBS::refreshGUIControls() {
+void wxGUIEditorGraphicBBS::refreshGUIControls() 
+{

        std::string stundo;
        std::string stredo;
        //RaC2012 2ndHackFest Next line seems weird ... To keep in mind for other devels
        wxToolBar* toolbar = GetToolBar();
        std::string stundo;
        std::string stredo;
        //RaC2012 2ndHackFest Next line seems weird ... To keep in mind for other devels
        wxToolBar* toolbar = GetToolBar();

-       if (_tabsMgr->isActualDiagramComplexBox()) {
+       if (_tabsMgr->isActualDiagramComplexBox()) 
+       {

                toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
                //toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, true); RaC2012 2nd HackFest
                toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT, true);
                toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
                //toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, true); RaC2012 2nd HackFest
                toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT, true);

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
index 9415e26131c12b4031c198593594f402289b4860..464c7059d038504e0cad5919d997b18389ada438 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
@@ -183,18 +183,17 @@ namespace bbtk
         void SetAuthor(std::string author);
         void SetCategory(std::string category);
         void SetDescription(std::string description);
         void SetAuthor(std::string author);
         void SetCategory(std::string category);
         void SetDescription(std::string description);

-                               void SetMessageKind(std::string kind);
+               void SetMessageKind(std::string kind);

         void SetMessageLevel(std::string level);
         //Getters
         std::string GetFullPath( );
         std::string GetFileName( );
         void SetMessageLevel(std::string level);
         //Getters
         std::string GetFullPath( );
         std::string GetFileName( );

-        

         std::string GetCbName();
         std::string GetCbPackageName();
         std::string GetAuthor();
         std::string GetDescription();
         std::string GetCategory();
         std::string GetCbName();
         std::string GetCbPackageName();
         std::string GetAuthor();
         std::string GetDescription();
         std::string GetCategory();

-                               std::string GetMessageKind();
+               std::string GetMessageKind();

         std::string GetMessageLevel();
 
        //=========================================================================
         std::string GetMessageLevel();
 
        //=========================================================================


@@ -204,14 +203,12 @@ namespace bbtk
                std::vector<std::string>::iterator _actualdo;   // actual position on modifications vector
                std::vector<std::string> sstates;                               // represents string of each modification of the tab. Maxixum size 100!!
                std::vector<std::string>::iterator _sactualdo;  // actual position onstring  modifications vector
                std::vector<std::string>::iterator _actualdo;   // actual position on modifications vector
                std::vector<std::string> sstates;                               // represents string of each modification of the tab. Maxixum size 100!!
                std::vector<std::string>::iterator _sactualdo;  // actual position onstring  modifications vector

-

                int                                             _id;
                wxAuiManager                    *_panelAUIMgr;
                wxVtkSceneManager               *_sceneManager;
                wxTabPanelsManager              *_panelsManager;
                std::string                             _fullPath;
                std::string                             _fileName;
                int                                             _id;
                wxAuiManager                    *_panelAUIMgr;
                wxVtkSceneManager               *_sceneManager;
                wxTabPanelsManager              *_panelsManager;
                std::string                             _fullPath;
                std::string                             _fileName;

-               

        protected:
                Factory::Pointer                _bbtkfactory;
 
        protected:
                Factory::Pointer                _bbtkfactory;
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
index 9e6fa1550d8c3a3221d1082799032b8df1131c3e..351551e1403b8dd319e165bd4b14396e67a7fd9b 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
@@ -257,7 +257,6 @@ namespace bbtk
 
        void wxTabPanelsManager::VerifyLastTabPanel()
        {
 
        void wxTabPanelsManager::VerifyLastTabPanel()
        {

-printf("wxTabPanelsManager::VerifyActualTabPanel  %d \n", this->_notebook->GetPageCount() );

             if (this->_notebook->GetPageCount()==0)
             {
                 this->_actual=NULL;
             if (this->_notebook->GetPageCount()==0)
             {
                 this->_actual=NULL;

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 002e5895014dc0ed85cfa6f5b4c7862632469d4d..731585d7ac15b80496e0cc030a37f53f072113f2 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -116,7 +116,6 @@ wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView
 
 void wxVtkSceneManager::disconnectDrop() 
 {
 
 void wxVtkSceneManager::disconnectDrop() 
 {

-       printf("EED %p ~wxVtkSceneManager::disconnectDrop()\n", this);

        //EED02JUIN2010         _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget(NULL);
        //      _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget( new tmpClasswxTextDropTarget() );
 }
        //EED02JUIN2010         _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget(NULL);
        //      _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget( new tmpClasswxTextDropTarget() );
 }


@@ -126,10 +125,8 @@ void wxVtkSceneManager::disconnectDrop()
 wxVtkSceneManager::~wxVtkSceneManager() 
 {
        //FCY memory leaks
 wxVtkSceneManager::~wxVtkSceneManager() 
 {
        //FCY memory leaks

-       printf("EED %p ~wxVtkSceneManager() START\n", this);

        disconnectDrop();
        delete _baseView;
        disconnectDrop();
        delete _baseView;

-       printf("EED %p ~wxVtkSceneManager() END\n", this);

 }
 
 //=========================================================================
 }
 
 //=========================================================================


@@ -329,14 +326,28 @@ int wxVtkSceneManager::createGBlackBox(int x, int y, std::string packageName,std
        model->addObserver(view);
        model->addObserver(this);
 
        model->addObserver(view);
        model->addObserver(this);
 

+
+//EED2017 change order
+       //Associates the view with the correspondent renderer and the  model.
+       //(NOTE: Refresh is only made by the view)
+       view->setModel(model);
+       view->setBaseView(_baseView);
+
+       //Associates the controller with the correspondent model and view
+       controller->setModelAndView(model, view);
+
+

        //Iterate and create the input ports
        std::map<std::string, BlackBoxInputDescriptor*> descriptorInMap =
                        descriptor->GetInputDescriptorMap();
        std::map<std::string, BlackBoxInputDescriptor*>::iterator itInput;
        int i = 0;
        //Iterate and create the input ports
        std::map<std::string, BlackBoxInputDescriptor*> descriptorInMap =
                        descriptor->GetInputDescriptorMap();
        std::map<std::string, BlackBoxInputDescriptor*>::iterator itInput;
        int i = 0;

-       for (itInput = descriptorInMap.begin(); itInput != descriptorInMap.end(); ++itInput) {
+       for (itInput = descriptorInMap.begin(); itInput != descriptorInMap.end(); ++itInput) 
+       {

                BlackBoxInputDescriptor *desc = itInput->second;
                BlackBoxInputDescriptor *desc = itInput->second;

-               createGInputPort(GINPUTPORT, i, model, desc);
+//EED2017-04-07
+//             createGInputPort(GINPUTPORT, i, model, desc);
+               createGInputPort(GINPUTPORT, i, controller, desc);

                i++;
        }
 
                i++;
        }
 


@@ -345,26 +356,20 @@ int wxVtkSceneManager::createGBlackBox(int x, int y, std::string packageName,std
                        descriptor->GetOutputDescriptorMap();
        std::map<std::string, BlackBoxOutputDescriptor*>::iterator itOutput;
        i = 0;
                        descriptor->GetOutputDescriptorMap();
        std::map<std::string, BlackBoxOutputDescriptor*>::iterator itOutput;
        i = 0;

-       for (itOutput = descriptorOutMap.begin(); itOutput
-                       != descriptorOutMap.end(); ++itOutput) {
+       for (itOutput = descriptorOutMap.begin(); itOutput!= descriptorOutMap.end(); ++itOutput) 
+       {

                BlackBoxOutputDescriptor *desc = itOutput->second;
                BlackBoxOutputDescriptor *desc = itOutput->second;

-               createGOutputPort(GOUTPUTPORT, i, model, desc);
+//EED2017-04-07
+//             createGOutputPort(GOUTPUTPORT, i, model, desc);
+               createGOutputPort(GOUTPUTPORT, i, controller, desc);

                i++;
        }
 
                i++;
        }
 

-       //Associates the view with the correspondent renderer and the  model.
-       //(NOTE: Refresh is only made by the view)
-       view->setModel(model);
-       view->setBaseView(_baseView);
-
+//EED2017 change order

        view->initVtkObjects();
 
        view->initVtkObjects();
 

-       //Associates the controller with the correspondent model and view
-       controller->setModelAndView(model, view);
-

        //Resgiter change to the observers of the actual model
        model->notifyObservers(_idManager);
        //Resgiter change to the observers of the actual model
        model->notifyObservers(_idManager);

-

        int newId = addObjectController(controller);
 
        return newId;
        int newId = addObjectController(controller);
 
        return newId;


@@ -479,21 +484,35 @@ int wxVtkSceneManager::createGComplexBoxOutputPort(std::string outputName) {
 
 //=========================================================================
 
 
 //=========================================================================
 

-int wxVtkSceneManager::createGInputPort(int portType, int posinBox, GBoxModel *blackBox, BlackBoxInputDescriptor *desc) 
+//EED2017-04-08
+//int wxVtkSceneManager::createGInputPort(int portType, int posinBox, GBoxModel *blackBox, BlackBoxInputDescriptor *desc) 
+int wxVtkSceneManager::createGInputPort(int portType, int posinBox, GObjectController *gBoxControler, BlackBoxInputDescriptor *desc) 

 {
 {

+       GBoxModel *blackBox=(GBoxModel*)gBoxControler->getModel();

        GPortController* portController = createGPort(portType, desc->GetName(),
                        desc->GetTypeName(), desc->GetDescription(), posinBox, blackBox);
        GPortController* portController = createGPort(portType, desc->GetName(),
                        desc->GetTypeName(), desc->GetDescription(), posinBox, blackBox);

-       blackBox->addInputPort((GPortModel*) portController->getModel());
+       blackBox->addInputPort( (GPortModel*)portController->getModel() );
+
+       vtkGBoxView *vtkgboxView=(vtkGBoxView*)gBoxControler->getView();
+       vtkgboxView->addInputPort( (vtkGPortView*)portController->getView() );
+

        return portController->getId();
 }
 
 //=========================================================================
 
        return portController->getId();
 }
 
 //=========================================================================
 

-int wxVtkSceneManager::createGOutputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxOutputDescriptor *desc) 
+//EED2017-04-08
+//int wxVtkSceneManager::createGOutputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxOutputDescriptor *desc) 
+int wxVtkSceneManager::createGOutputPort(int portType, int posinBox,GObjectController *gBoxControler, BlackBoxOutputDescriptor *desc) 

        {
        {

+       GBoxModel *blackBox=(GBoxModel*)gBoxControler->getModel();

        GPortController* portController = createGPort(portType, desc->GetName(),
                        desc->GetTypeName(),desc->GetDescription(), posinBox, blackBox);
        blackBox->addOutputPort((GPortModel*) portController->getModel());
        GPortController* portController = createGPort(portType, desc->GetName(),
                        desc->GetTypeName(),desc->GetDescription(), posinBox, blackBox);
        blackBox->addOutputPort((GPortModel*) portController->getModel());

+
+       vtkGBoxView *vtkgboxView=(vtkGBoxView*)gBoxControler->getView();
+       vtkgboxView->addOutputPort( (vtkGPortView*)portController->getView() );
+

        return portController->getId();
 }
 
        return portController->getId();
 }
 


@@ -504,43 +523,28 @@ GPortController* wxVtkSceneManager::createGPort(int portType,std::string bbtkNam
        int type = GPORT;
 
        //Create the MVC Objects
        int type = GPORT;
 
        //Create the MVC Objects

-       GPortModel
-                       *model =
-                                       (GPortModel*) GObjectsMVCFactory::getInstance()->createGObjectModel(
-                                                       type);
-       vtkGObjectView *view =
-                       GObjectsMVCFactory::getInstance()->createGObjectView(type);
-       GObjectController* controller =
-                       GObjectsMVCFactory::getInstance()->createGObjectController(type);
-
+       GPortModel                      *model          =       (GPortModel*) GObjectsMVCFactory::getInstance()->createGObjectModel(type);
+       vtkGObjectView          *view           =       GObjectsMVCFactory::getInstance()->createGObjectView(type);
+       GObjectController       *controller =   GObjectsMVCFactory::getInstance()->createGObjectController(type);

        model->registerInBox(blackBox, portType, posInBox);
        model->registerInBox(blackBox, portType, posInBox);

-

        model->setBBTKType(bbtkType);
        model->setBBTKName(bbtkName);
        model->setBBTKDescription(bbtkDescription);
        model->setBBTKType(bbtkType);
        model->setBBTKName(bbtkName);
        model->setBBTKDescription(bbtkDescription);

-

        model->addObserver(view);
        model->addObserver(this);
        model->addObserver(view);
        model->addObserver(this);

-

        //Associates the view with the correspondent renderer and the  model.
        //(NOTE: Refresh is only made by the view)
        view->setModel(model);
        view->setBaseView(_baseView);
        //Associates the view with the correspondent renderer and the  model.
        //(NOTE: Refresh is only made by the view)
        view->setModel(model);
        view->setBaseView(_baseView);

-

 //EED017       view->initVtkObjects();
        view->createVtkObjects();
 //  view->addVtkActors();
 
 //EED017       view->initVtkObjects();
        view->createVtkObjects();
 //  view->addVtkActors();
 

-

        //Associates the controller with the correspondent model and view
        controller->setModelAndView(model, view);
        //Associates the controller with the correspondent model and view
        controller->setModelAndView(model, view);

-

        model->notifyObservers(_idManager);
        model->notifyObservers(_idManager);

-

        addObjectController(controller);
        addObjectController(controller);

-

        return (GPortController*) controller;
        return (GPortController*) controller;

-

 }
 
 //=========================================================================
 }
 
 //=========================================================================


@@ -711,10 +715,10 @@ void wxVtkSceneManager::update(int idController, int command) {
                                 // Highliht element 
                                 obc->getView( )->setState( POSSIBLE_CONNECTION ) ;                             
                                 //obc->getView( )->setState( HIGHLIGHTED ) ;
                                 // Highliht element 
                                 obc->getView( )->setState( POSSIBLE_CONNECTION ) ;                             
                                 //obc->getView( )->setState( HIGHLIGHTED ) ;

-                            }
-                        }
-                    }
-                }
+                            } // if obc_type
+                        } // for c_it
+                    } // if
+                } // if iter

 
                 // EO JGRR & CM WH  
                      
 
                 // EO JGRR & CM WH  
                      


@@ -776,7 +780,6 @@ void wxVtkSceneManager::update(int idController, int command) {
                                     if ((obc_type == GPORT) && (obc_state == SELECTED_POSSIBLE_CONNECTION)) {
                                         // Change element to connected state
                                         obc->getView()->setState(HIGHLIGHTED);
                                     if ((obc_type == GPORT) && (obc_state == SELECTED_POSSIBLE_CONNECTION)) {
                                         // Change element to connected state
                                         obc->getView()->setState(HIGHLIGHTED);

-

                                     }
 
                                 }
                                     }
 
                                 }

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
index 000b62e2e10d03e97d7f2e53642626d5187cbadd..c5cb8cbf591157234be8279bbd8e3e8c3614883e 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
@@ -144,8 +144,13 @@ namespace bbtk
                int createGComplexBoxInputPort(std::string inputName);
                int createGComplexBoxOutputPort(std::string outputName);
                GPortController* createGPort(int portType, std::string bbtkName, std::string bbtkType, std::string bbtkDescription, int posinBox,GBoxModel *blackBox);
                int createGComplexBoxInputPort(std::string inputName);
                int createGComplexBoxOutputPort(std::string outputName);
                GPortController* createGPort(int portType, std::string bbtkName, std::string bbtkType, std::string bbtkDescription, int posinBox,GBoxModel *blackBox);

-               int createGInputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxInputDescriptor *desc);
-               int createGOutputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxOutputDescriptor *desc);
+
+//EED2017-04-07
+//             int createGInputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxInputDescriptor *desc);
+//             int createGOutputPort(int portType, int posinBox,GBoxModel *blackBox, BlackBoxOutputDescriptor *desc);
+               int createGInputPort(int portType, int posinBox,GObjectController *gBoxControler, BlackBoxInputDescriptor *desc);
+               int createGOutputPort(int portType, int posinBox,GObjectController *gBoxControler, BlackBoxOutputDescriptor *desc);
+

                int createGConnector(GPortModel* startPort);
 
                void configGBlackBox(int idBox, double xIn, double yIn, double zIn, std::string name, bool boxExecutable,double xEn,double yEn,double zEn);
                int createGConnector(GPortModel* startPort);
 
                void configGBlackBox(int idBox, double xIn, double yIn, double zIn, std::string name, bool boxExecutable,double xEn,double yEn,double zEn);


@@ -229,15 +234,14 @@ namespace bbtk
         void SetAuthor(std::string author);
         void SetCategory(std::string category);
         void SetDescription(std::string description);
         void SetAuthor(std::string author);
         void SetCategory(std::string category);
         void SetDescription(std::string description);

-                               void SetMessageKind(std::string kind);
-                               void SetMessageLevel(std::string Level);
-
+               void SetMessageKind(std::string kind);
+               void SetMessageLevel(std::string Level);

         std::string GetCbName();
         std::string GetCbPackageName();
         std::string GetAuthor();
         std::string GetCategory();
         std::string GetDescription();
         std::string GetCbName();
         std::string GetCbPackageName();
         std::string GetAuthor();
         std::string GetCategory();
         std::string GetDescription();

-                               std::string GetMessageKind();
+               std::string GetMessageKind();

         std::string GetMessageLevel();
   
         // RaC2012 2nd HackFest
         std::string GetMessageLevel();
   
         // RaC2012 2nd HackFest


@@ -245,15 +249,10 @@ namespace bbtk
         // Get names of all external inputs
         std::vector< std::string> GetExternalInputsNames();
                void getCleanLine(std::stringstream &inputStream, std::string &line);
         // Get names of all external inputs
         std::vector< std::string> GetExternalInputsNames();
                void getCleanLine(std::stringstream &inputStream, std::string &line);

-               

         // JGRR & CM
         void printAll( int com, int sta );
         // JGRR & CM
         void printAll( int com, int sta );

-
-               

                std::vector<std::string> boxesDiagram;//CFT
                std::vector<std::string> boxesDiagram;//CFT

-

        private:
        private:

-

         std::string                         _cbName;
         std::string                         _cbPackageName;
         std::string                         _Author;
         std::string                         _cbName;
         std::string                         _cbPackageName;
         std::string                         _Author;


@@ -261,58 +260,39 @@ namespace bbtk
         std::string                         _Description;
                std::string                                     _MessageKind;
                std::string                                     _MessageLevel;
         std::string                         _Description;
                std::string                                     _MessageKind;
                std::string                                     _MessageLevel;

-

                //wxPanel that uses the manager
                wxGEditorTabPanel                                       *_parent;
                //wxPanel that uses the manager
                wxGEditorTabPanel                                       *_parent;

-

                // Id of the manager, the same of the panel
                int                                                                     _idManager;
                // Id of the manager, the same of the panel
                int                                                                     _idManager;

-

                // Boxes number in the scene
                int                                                                     _numBoxes;
                // Boxes number in the scene
                int                                                                     _numBoxes;

-

                // StartDragging
                bool                                                            _startDragging;
                // StartDragging
                bool                                                            _startDragging;

-

                // creaMaracasVisu viewer
                wxVtk3DBaseView                                         *_baseView;
                // creaMaracasVisu viewer
                wxVtk3DBaseView                                         *_baseView;

-

                // State of the 3D Scene or the virtual world
                int _worldState;
                // State of the 3D Scene or the virtual world
                int _worldState;

-

                //Map of id - objectController
                std::map<int,GObjectController*>        _controllers;
                //Map of id - objectController
                std::map<int,GObjectController*>        _controllers;

-

                //Saves the id's of the selected objects in the controllers map
                std::vector<int>                                        _selectedObjects;
                //Saves the id's of the selected objects in the controllers map
                std::vector<int>                                        _selectedObjects;

-

                //Is the diagram in state complex box
                bool                                                            _isComplexBox;
                //Is the diagram in state complex box
                bool                                                            _isComplexBox;

-

                int                                                                     _idConnectionInCreation;
                int                                                                     _idConnectionInCreation;

-

                int _contLastId;
                int _contLastId;

-

                vtkTextActor3D                                          *_textActor;
                std::string                                                     _bugTextActor_text;
                int                                                                     _bugTextActor_status;
                vtkTextActor3D                                          *_textActor;
                std::string                                                     _bugTextActor_text;
                int                                                                     _bugTextActor_status;

-

                vtkPoints                                                       *_pts;
                vtkActor                                                        *_fillObjectActor;
                vtkDataSetMapper                                        *_aPolygonMapper;
                vtkPoints                                                       *_pts;
                vtkActor                                                        *_fillObjectActor;
                vtkDataSetMapper                                        *_aPolygonMapper;

-

                Factory::Pointer                                        _bbtkfactory;
                Factory::Pointer                                        _bbtkfactory;

-               
-               

         std::string LineNumber(bool withLineNumber, int &value);
         int GetIndexInSelected(int idControler);
         void UnSelectBlackBoxes();
         GObjectController *GetGBlackBoxControlerPointedByMouse();
                void CancelConnection();
         std::string LineNumber(bool withLineNumber, int &value);
         int GetIndexInSelected(int idControler);
         void UnSelectBlackBoxes();
         GObjectController *GetGBlackBoxControlerPointedByMouse();
                void CancelConnection();

-               
-

        protected:
        protected:

-

        };
 
 
        };