From d80f7d5db196e72294b6fb40cfe2738b5218675b Mon Sep 17 00:00:00 2001 From: davila <> Date: Mon, 11 Oct 2010 06:31:22 +0000 Subject: [PATCH] *** empty log message *** --- .../bbsKernelEditorGraphic/GPortModel.cxx | 38 ++++----- .../bbsKernelEditorGraphic/GlobalConstants.h | 8 +- .../vtkGBlackBoxView.cxx | 85 +++++++++++++------ .../bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h | 30 ++++--- 4 files changed, 100 insertions(+), 61 deletions(-) diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx index 1d16dc1..eebe523 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx @@ -1,4 +1,4 @@ -/*========================================================================= +/*========================================================================= Program: bbtk Module: $RCSfile$ Language: C++ @@ -11,26 +11,26 @@ Version: $Revision$ * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html * or in the file LICENSE.txt. * * As a counterpart to the access to the source code and rights to copy, * modify and redistribute granted by the license, users are provided only * with a limited warranty and the software's author, the holder of the * economic rights, and the successive licensors have only limited -* liability. +* liability. * * The fact that you are presently reading this means that you have had * knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ /** -* \file -* \brief Class bbtk::GPortModel +* \file +* \brief Class bbtk::GPortModel */ /**** @@ -46,7 +46,7 @@ namespace bbtk //========================================================================= GPortModel::GPortModel() - { + { _parentBox = NULL; _portType=-1; _posInBox=0; @@ -90,15 +90,15 @@ namespace bbtk } //Attribute '_posInBox' starts with value 0 and it represents the position of the port in the box from left to right - posX = xInic + (PORT_WIDTH/2) + _posInBox*1.6*PORT_WIDTH; - + posX = xInic + (PORT_WIDTH/2) + _posInBox*1.1*PORT_WIDTH; + setInicPoint(posX,posY,posZ); posX=posX+PORT_WIDTH; posY=posY-PORT_HEIGHT; - setFinalPoint(posX,posY,posZ); - + setFinalPoint(posX,posY,posZ); + } //========================================================================= @@ -116,11 +116,11 @@ namespace bbtk } //========================================================================= - + std::string GPortModel::getStatusText() { std::string temp = ""; - + temp+=_bbtkName; if(isValueSet()) { @@ -149,7 +149,7 @@ namespace bbtk } //========================================================================= - + void GPortModel::setConnected(bool value) { _isConnected=value; @@ -173,7 +173,7 @@ namespace bbtk } //========================================================================= - + std::string GPortModel::getValue() { return _value; diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h index a475fd4..dddf4fb 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h @@ -61,10 +61,10 @@ namespace bbtk // Object dimensions const double BOX_HEIGHT = 10; const double BOX_WIDTH = 100; - const double PORT_HEIGHT = 3.8; - const double PORT_WIDTH = 3.8; - const double COMPLEXPORT_HEIGHT = 6; - const double COMPLEXPORT_WIDTH = 6; + const double PORT_HEIGHT = 1.8; + const double PORT_WIDTH = 2.8; + const double COMPLEXPORT_HEIGHT = 8; + const double COMPLEXPORT_WIDTH = 8; // Commands const int NO_COMMAND = 201; diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx index 4dbbbed..ea07a9a 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx @@ -1,4 +1,4 @@ -/*========================================================================= +/*========================================================================= Program: bbtk Module: $RCSfile$ Language: C++ @@ -11,26 +11,26 @@ Version: $Revision$ * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html * or in the file LICENSE.txt. * * As a counterpart to the access to the source code and rights to copy, * modify and redistribute granted by the license, users are provided only * with a limited warranty and the software's author, the holder of the * economic rights, and the successive licensors have only limited -* liability. +* liability. * * The fact that you are presently reading this means that you have had * knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ /** -* \file -* \brief Class bbtk::vtkGBlackBoxView +* \file +* \brief Class bbtk::vtkGBlackBoxView */ @@ -42,7 +42,7 @@ namespace bbtk //========================================================================= vtkGBlackBoxView::vtkGBlackBoxView() - { + { } //========================================================================= @@ -50,13 +50,52 @@ namespace bbtk { } + //========================================================================= + void vtkGBlackBoxView::update_X_Fin() + { + double xInic, yInic,zInic,xFin, yFin,zFin; + _model->getInicPoint(xInic,yInic,zInic); + double *bounds = _boxTextActor->GetBounds(); + _model->getFinalPoint(xFin, yFin,zFin); + + double xFin1,xFin2,xFin3; + // position referens from box name + xFin1 = xInic+(bounds[1]-bounds[0])/2 + 20; + xFin2=xFin1; + xFin3=xFin1; + // position referens from input ports + GBoxModel* gbm=(GBoxModel*)_model; + if ( gbm->getNumInputPorts()>0 ) + { + GPortModel* gpm = gbm->getInputPort( gbm->getNumInputPorts()-1 ); + double xpFin, ypFin, zpFin; + gpm->getFinalPoint(xpFin, ypFin, zpFin); + xFin2 = xpFin+1; + } + // position referens from output ports + if ( gbm->getNumOutputPorts()>0 ) + { + GPortModel* gpm = gbm->getOutputPort( gbm->getNumOutputPorts()-1 ); + double xpFin, ypFin, zpFin; + gpm->getFinalPoint(xpFin, ypFin, zpFin); + xFin3 = xpFin+2; + } + xFin=xFin1; + if (xFin2>xFin) xFin=xFin2; + if (xFin3>xFin) xFin=xFin3; + _model->setFinalPoint( xFin , yFin , zFin ); + } + //========================================================================= void vtkGBlackBoxView::update(int idController,int command) { updateColors(); - + double xInic, yInic,zInic,xFin, yFin,zFin; _model->getInicPoint(xInic,yInic,zInic); + + updatePositionTextActor(xInic, yInic,zInic); + update_X_Fin(); _model->getFinalPoint(xFin, yFin,zFin); // RaC In the actual version, zInic=zFin=900 @@ -72,8 +111,6 @@ namespace bbtk _fillPolyMapper->Modified(); //----------- - updatePositionTextActor(xInic, yInic,zInic); - //----------- setRefreshWaiting(); } @@ -84,12 +121,12 @@ namespace bbtk { //------------ - _pts = vtkPoints::New(); + _pts = vtkPoints::New(); vtkCellArray *lines = vtkCellArray::New(); vtkPolyData *_pd = vtkPolyData::New(); _borderPolyMapper = vtkPolyDataMapper::New(); _borderObjectActor = vtkActor::New(); - + _pts->SetNumberOfPoints(4); double xInic, yInic,zInic,xFin, yFin,zFin; @@ -107,16 +144,16 @@ namespace bbtk _pts->SetPoint(1, xInic, yFin, zInic ); _pts->SetPoint(2, 1000, 1000, 1000 ); _pts->SetPoint(3, xFin, yInic, zFin ); - - - + + + lines->InsertNextCell(5); lines->InsertCellPoint(0); lines->InsertCellPoint(1); lines->InsertCellPoint(2); lines->InsertCellPoint(3); lines->InsertCellPoint(0); - + _pd->SetPoints( _pts ); _pd->SetLines( lines ); @@ -124,7 +161,7 @@ namespace bbtk _borderObjectActor->SetMapper(_borderPolyMapper); _borderPolyMapper->Modified(); - + ///************************* FILL ************************* vtkCellArray *strip = vtkCellArray::New(); @@ -140,7 +177,7 @@ namespace bbtk strip->InsertCellPoint(2); strip->InsertCellPoint(0); strip->InsertCellPoint(3); - + pdFill->SetPoints( _pts ); pdFill->SetStrips( strip ); @@ -210,12 +247,12 @@ namespace bbtk _borderObjectActor->GetProperty()->SetColor(BOXBORDER_NH_R,0.9,BOXBORDER_HIGHLIGHTED_B); _fillObjectActor->GetProperty()->SetColor(BOXFILL_NH_R,0.9,BOXFILL_HIGHLIGHTED_B); } - + } else if(_state==HIGHLIGHTED) { _borderObjectActor->GetProperty()->SetLineWidth(2); - + _borderObjectActor->GetProperty()->SetColor(BOXBORDER_HIGHLIGHTED_R,BOXBORDER_HIGHLIGHTED_G,BOXBORDER_HIGHLIGHTED_B); _fillObjectActor->GetProperty()->SetColor(BOXFILL_HIGHLIGHTED_R,BOXFILL_HIGHLIGHTED_G,BOXFILL_HIGHLIGHTED_B); _boxTextActor->GetTextProperty()->SetColor(BOXTEXT_HIGHLIGHTED_R,BOXTEXT_HIGHLIGHTED_G,BOXTEXT_HIGHLIGHTED_B); diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h index b17f19d..dcdbae7 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h @@ -1,4 +1,4 @@ -/*========================================================================= +/*========================================================================= Program: bbtk Module: $RCSfile$ Language: C++ @@ -11,28 +11,28 @@ Version: $Revision$ * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html * or in the file LICENSE.txt. * * As a counterpart to the access to the source code and rights to copy, * modify and redistribute granted by the license, users are provided only * with a limited warranty and the software's author, the holder of the * economic rights, and the successive licensors have only limited -* liability. +* liability. * * The fact that you are presently reading this means that you have had * knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ /** -* \file -* \brief Class bbtk::vtkGBlackBoxView : abstract black-box interface. +* \file +* \brief Class bbtk::vtkGBlackBoxView : abstract black-box interface. */ /**** @@ -75,13 +75,13 @@ namespace bbtk class vtkGBlackBoxView : public vtkGBoxView { - public: + public: //Constructors vtkGBlackBoxView(); ~vtkGBlackBoxView(); - - //Public methods + + //Public methods private: @@ -94,7 +94,7 @@ namespace bbtk protected: //Protected Attributes - + //Protected Methods virtual void addVtkActors(); virtual void removeVtkActors(); @@ -102,6 +102,8 @@ namespace bbtk virtual void update(int idController,int command); virtual void updateColors(); + virtual void update_X_Fin(); + }; -- 2.45.1