Fix categ

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule.h b/bbtk/src/bbcreaMaracasVisuCutModule.h
index 666c73ad9333e57fdaaa125ada78804cd07bf317..7bc4a92f82e7249da5b0c3bdf96a5ad541357c9d 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuCutModule.h
+++ b/bbtk/src/bbcreaMaracasVisuCutModule.h
@@ -12,7 +12,7 @@ class bbcreaMaracasVisu_EXPORT CutModule
  : 
    public bbtk::WxBlackBox
 {
-       
+
   BBTK_BLACK_BOX_INTERFACE(CutModule,bbtk::WxBlackBox);
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Interactor,vtkRenderWindowInteractor*);
@@ -32,7 +32,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(CutModule,bbtk::WxBlackBox);
 BBTK_NAME("CutModule");
 BBTK_AUTHOR("car-prie@uniandes.edu.co");
 BBTK_DESCRIPTION("extracts");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_CATEGORY("actor, image, filter");
 BBTK_INPUT(CutModule,In,"Image",vtkImageData*,"");
 BBTK_INPUT(CutModule,Interactor,"WindowInteractor",vtkRenderWindowInteractor*,"");
 BBTK_INPUT(CutModule,Renderer,"Renderer",vtkRenderer*,"");
@@ -43,4 +43,3 @@ BBTK_END_DESCRIBE_BLACK_BOX(CutModule);
 
 #endif // __bbcreaMaracasVisuCutModule_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-

diff --git a/bbtk/src/bbcreaMaracasVisuCutModule2.h b/bbtk/src/bbcreaMaracasVisuCutModule2.h
index a6d04e2723dea900ad0be92b36a9296541d3e29a..4c9a746ffac46e604176312261f5a8206d598915 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuCutModule2.h
+++ b/bbtk/src/bbcreaMaracasVisuCutModule2.h
@@ -12,7 +12,7 @@ class bbcreaMaracasVisu_EXPORT CutModule2
  : 
    public bbtk::WxBlackBox
 {
-       
+
   BBTK_BLACK_BOX_INTERFACE(CutModule2,bbtk::WxBlackBox);
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Interactor,vtkRenderWindowInteractor*);
@@ -32,7 +32,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(CutModule2,bbtk::WxBlackBox);
 BBTK_NAME("CutModule2");
 BBTK_AUTHOR("perez@creatis.insa-lyon.fr");
 BBTK_DESCRIPTION("extracts");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_CATEGORY("actor, image, filter");
 BBTK_INPUT(CutModule2,In,"Image",vtkImageData*,"");
 BBTK_INPUT(CutModule2,Interactor,"WindowInteractor",vtkRenderWindowInteractor*,"");
 BBTK_INPUT(CutModule2,Renderer,"Renderer",vtkRenderer*,"");
@@ -43,4 +43,3 @@ BBTK_END_DESCRIBE_BLACK_BOX(CutModule2);
 
 #endif // __bbcreaMaracasVisuCutModule_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-

diff --git a/bbtk/src/bbcreaMaracasVisuPlaneDirection.h b/bbtk/src/bbcreaMaracasVisuPlaneDirection.h
index 3e7d0f8057939228513de3ae23bec0155f9b478f..9ea9724d7f39dea2965beecf50b2b68a79a6a564 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuPlaneDirection.h
+++ b/bbtk/src/bbcreaMaracasVisuPlaneDirection.h
@@ -31,7 +31,7 @@ class bbcreaMaracasVisu_EXPORT PlaneDirection
   void CreateWidget(wxWindow*);
 
 private:
-       PlaneDirectionViewer*  _planedir;
+       PlaneDirectionViewer* _planedir;
        int radio;
        double colour[3];
        int opacity;
@@ -41,17 +41,17 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(PlaneDirection,bbtk::WxBlackBox);
 BBTK_NAME("PlaneDirection");
 BBTK_AUTHOR("car-prie@uniandes.edu.co");
 BBTK_DESCRIPTION("Given a list of points and grouping them in triplets, the box calculates the direction of the plane formed by the three points");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_CATEGORY("actor");
 
 BBTK_INPUT(PlaneDirection,In,"Image data to get the spacing, if not found set to 1 1 1",vtkImageData*,"");
 BBTK_INPUT(PlaneDirection,Renderer,"Renderer",vtkRenderer*,"");
 BBTK_INPUT(PlaneDirection,Filename,"Filename to save the points of the plane and the direction",std::string,"");
 
-BBTK_INPUT(PlaneDirection , lstPointsX , " list of points X ", std::vector<int> ,"");
-BBTK_INPUT(PlaneDirection , lstPointsY , " list of points Y ", std::vector<int> ,"");
-BBTK_INPUT(PlaneDirection , lstPointsZ , " list of points Z ", std::vector<int> ,"");
+BBTK_INPUT(PlaneDirection, lstPointsX, " list of points X ", std::vector<int>, "");
+BBTK_INPUT(PlaneDirection, lstPointsY, " list of points Y ", std::vector<int>, "");
+BBTK_INPUT(PlaneDirection, lstPointsZ, " list of points Z ", std::vector<int>, "");
 
-BBTK_INPUT(PlaneDirection , ArrowSize , "Size of the arrow ", int ,"");
+BBTK_INPUT(PlaneDirection, ArrowSize, "Size of the arrow ", int, "");
 
 BBTK_END_DESCRIBE_BLACK_BOX(PlaneDirection);
 }

diff --git a/bbtk/src/bbcreaMaracasVisuRenderingViewer.h b/bbtk/src/bbcreaMaracasVisuRenderingViewer.h
index e6451b33a91d91123bd828687b4818b69f6fdcd8..5fa4f099df9491e83e6511eb853aeabd1a3dd196 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuRenderingViewer.h
+++ b/bbtk/src/bbcreaMaracasVisuRenderingViewer.h
@@ -42,7 +42,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(RenderingViewer,bbtk::WxBlackBox);
 BBTK_NAME("RenderingViewer");
 BBTK_AUTHOR("Carolina Perez");
 BBTK_DESCRIPTION("Complex box which gathers VolumeRendering and SurfaceRendering funtionalities");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_CATEGORY("actor");
 //BBTK_INPUT(RenderingViewer,Title,"Title prepended to the text",std::string,"");
 BBTK_INPUT(RenderingViewer,Renderer,"Renderer to show volume rendering image" ,vtkRenderer*, "");
 BBTK_INPUT(RenderingViewer,wxVtkBaseView,"wxVtkBaseView",wxVtkBaseView*,"");

diff --git a/bbtk/src/bbcreaMaracasVisuSTL.cxx b/bbtk/src/bbcreaMaracasVisuSTL.cxx
index 425b86889f836b7b392d2d6f57558f9c4babb5ba..0f2479af84f08ffb216e45f46ce86664f9ba82ea 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuSTL.cxx
+++ b/bbtk/src/bbcreaMaracasVisuSTL.cxx
@@ -1,18 +1,15 @@
 #include "bbcreaMaracasVisuSTL.h"
 #include "bbcreaMaracasVisuPackage.h"
 
-
 #include "wxSTLWidget_03.h"
 
 namespace bbcreaMaracasVisu
 {
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,STL)
-BBTK_BLACK_BOX_IMPLEMENTATION(STL,bbtk::WxBlackBox);
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu, STL)
+BBTK_BLACK_BOX_IMPLEMENTATION(STL, bbtk::WxBlackBox);
 void STL::Process()
 {
- 
-
        vtkImageData* img = bbGetInputIn();
        if(img != NULL){
                ((wxSTLWidget_03*)bbGetOutputWidget())->setImage(img);
@@ -20,16 +17,13 @@ void STL::Process()
        } 
   
 }
+
 void STL::CreateWidget(wxWindow* parent)
 {
- 
-
-       //mar = new marInterface();
-       
-       wxWindow* stl = new wxSTLWidget_03(parent);//, mar);
+   //mar = new marInterface();
+   wxWindow* stl = new wxSTLWidget_03(parent);//, mar);
    bbSetOutputWidget( stl ); 
    //Process(); 
-  
 }
 
        //-----------------------------------------------------------------     
@@ -37,20 +31,18 @@ void STL::CreateWidget(wxWindow* parent)
        {
                bbSetInputIn(NULL);     
        }
-       
+
        //-----------------------------------------------------------------     
        void STL::bbUserInitializeProcessing()
        {
        }
-       
+
        //-----------------------------------------------------------------     
        void STL::bbUserFinalizeProcessing()
        {
        }
-       
+
        //-----------------------------------------------------------------     
-       
-       
 }
 // EO namespace bbcreaMaracasVisu
 

diff --git a/bbtk/src/bbcreaMaracasVisuSTL.h b/bbtk/src/bbcreaMaracasVisuSTL.h
index fd59bb5d6928fc9b7da0d59946d39a4f7b0e17e2..4d8e79ec6f5d9b8282c9628de63d711d5e6bbeb2 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuSTL.h
+++ b/bbtk/src/bbcreaMaracasVisuSTL.h
@@ -16,7 +16,7 @@ class bbcreaMaracasVisu_EXPORT STL
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(STL,bbtk::WxBlackBox);
-  BBTK_DECLARE_INPUT(In,vtkImageData*);  
+  BBTK_DECLARE_INPUT(In, vtkImageData*);  
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
@@ -26,12 +26,12 @@ private:
        //marInterface* mar;
 };
 
-BBTK_BEGIN_DESCRIBE_BLACK_BOX(STL,bbtk::WxBlackBox);
+BBTK_BEGIN_DESCRIBE_BLACK_BOX(STL, bbtk::WxBlackBox);
 BBTK_NAME("STL");
 BBTK_AUTHOR("car-prie@uniandes.edu.co");
-BBTK_DESCRIPTION("BB of the module STL in Maracas");
-BBTK_CATEGORY("__CategoryBlackBox__");
-BBTK_INPUT(STL,In,"Image to the STL",vtkImageData*,"");
+BBTK_DESCRIPTION("Black Box from the module STL in Maracas");
+BBTK_CATEGORY("image, widget");
+BBTK_INPUT(STL, In, "Image to the STereoLithography", vtkImageData*, "");
 BBTK_END_DESCRIBE_BLACK_BOX(STL);
 }
 // EO namespace bbcreaMaracasVisu

diff --git a/bbtk/src/bbcreaMaracasVisuSurfaceRendering.h b/bbtk/src/bbcreaMaracasVisuSurfaceRendering.h
index aad663b5bdcebd68a809cf756af3f4b5bae42343..ad00af454641df8f013b305c2623b1d60661659d 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuSurfaceRendering.h
+++ b/bbtk/src/bbcreaMaracasVisuSurfaceRendering.h
@@ -43,8 +43,8 @@ private:
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(SurfaceRendering,bbtk::WxBlackBox);
 BBTK_NAME("SurfaceRendering");
 BBTK_AUTHOR("car-prie@uniandes.edu.co");
-BBTK_DESCRIPTION("BB of the module SurfaceRendering");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_DESCRIPTION("Black Box of the module SurfaceRendering");
+BBTK_CATEGORY("actor");
 //BBTK_INPUT(SurfaceRendering,In,"Renderer to show the different prop3D",vtkImageData*,"");
 BBTK_INPUT(SurfaceRendering,Renderer,"Renderer to show the different prop3D",vtkRenderer*,"");
 BBTK_INPUT(SurfaceRendering,Interactor,"Renderer to show the different prop3D",vtkRenderWindowInteractor*,"");

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
index 5a7de055d3618ffaf8d8ff91b43ca8f0adf039ed..3aec4f7440687162b0139dfcd63c99cd1d8fd24f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRendering.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/21 13:54:15 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2010/01/22 17:00:52 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -28,62 +28,61 @@
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 
-
-
 class  creaMaracasVisu_EXPORT  wxMaracasSurfaceRendering : public wxPanel
 {
 
 public:
-       wxMaracasSurfaceRendering( wxWindow* parent, std::string path);
+    wxMaracasSurfaceRendering( wxWindow* parent, std::string path);
     ~wxMaracasSurfaceRendering( );
 
-       static wxMaracasSurfaceRendering* getInstance(wxWindow* parent,std::string path="");
+    static wxMaracasSurfaceRendering* getInstance(wxWindow* parent,std::string path="");
 
-       static wxMaracasSurfaceRendering* getInstance();
+    static wxMaracasSurfaceRendering* getInstance();
 
-       void setRenderer(vtkRenderer*  renderer);
+    void setRenderer(vtkRenderer*  renderer);
 
-       void setInteractor(vtkRenderWindowInteractor*  interactor);
+    void setInteractor(vtkRenderWindowInteractor*  interactor);
 
-       void changeOpacity(int propid, int value);
+    void changeOpacity(int propid, int value);
 
-       void changeIsoValue(int propid, double value);
+    void changeIsoValue(int propid, double value);
 
     void addRemoveActor(int propid, bool addremove);
 
-       void addRemoveSurfaceBox(int propid, bool addremove);
+    void addRemoveSurfaceBox(int propid, bool addremove);
 
-       void changeColor(int propid, double red, double green, double blue);
+    void changeColor(int propid, double red, double green, double blue);
 
-       void addProp3D(vtkProp3D* prop3D, std::string dataname="");
+    void addProp3D(vtkProp3D* prop3D, std::string dataname="");
 
-       void addPropMHD(vtkImageData* imgdata, std::string dataname="");
+    void addPropMHD(vtkImageData* imgdata, std::string dataname="");
 
-       void loadProp3D(wxString filename, wxString dataname);
+    void loadProp3D(wxString filename, wxString dataname);
 
-       void loadPropMHD(wxString filename, wxString dataname);
+    void loadPropMHD(wxString filename, wxString dataname);
 
-       void onLoadImageFile();
+    void onLoadImageFile();
 
-       void addSurfaceRenderingPanel(wxMaracasSurfaceRenderingPanel* surrend, std::string dataname="");
+    void addSurfaceRenderingPanel(wxMaracasSurfaceRenderingPanel* surrend, std::string dataname="");
 
-       std::string getPath();
+    std::string getPath();
 
-       void deleteActor(int propid);
+    void deleteActor(int propid);
 
-       bool interactorSet();
-private:
-       static wxMaracasSurfaceRendering* instance;
+    bool interactorSet();
 
-       wxMaracasSurfaceRenderingManager* surrendmanager;
-       wxAuiManager* wxauimanager;
-       wxToolBar* _toolb;
-
-       std::string _path;
+private:
+    static wxMaracasSurfaceRendering* instance;
 
-       void createFileChooser();
+    wxMaracasSurfaceRenderingManager* surrendmanager;
        
+    wxAuiManager* wxauimanager;
+    
+    wxToolBar* _toolb;
 
+    std::string _path;
+
+    void createFileChooser();
 };
 
 class ToolBarEventHandler : public wxEvtHandler{
@@ -101,17 +100,13 @@ class ToolBarEventHandler : public wxEvtHandler{
 
 class ToolBar : public wxToolBar{
 
-       
 public:
        ToolBar(wxWindow * parent,std::string iconsdir);
        ~ToolBar(void);
 
-
 private:
 
        ToolBarEventHandler* _evthand;
-
 };
 
 #endif
-