]> Creatis software - bbtkGEditor.git/commitdiff
no message
authordavila <>
Mon, 27 Sep 2010 23:11:25 +0000 (23:11 +0000)
committerdavila <>
Mon, 27 Sep 2010 23:11:25 +0000 (23:11 +0000)
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx

index 86750fc35833f4ee646b04e3a0d14805fe7a97fc..a1e42a01a27185087d1bf9cd40f96bd23f541a21 100644 (file)
@@ -44,10 +44,9 @@ namespace bbtk
        //=========================================================================
        wxTabPanelsManager::wxTabPanelsManager(wxGUIEditorGraphicBBS *parent)
        {
-               printf ("EED %p wxTabPanelsManager()\n" , this );
-               _parent = parent;
-               _lastId = 0;
-               _notebook = _parent->getAuiNotebook();
+               _parent         = parent;
+               _lastId         = 0;
+               _notebook       = _parent->getAuiNotebook();
                addNewTab();
                _notebook->Connect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED,wxAuiNotebookEventHandler(wxTabPanelsManager::OnTabChanged),0,this);
        }
@@ -55,7 +54,6 @@ namespace bbtk
        //=========================================================================
        wxTabPanelsManager::~wxTabPanelsManager()
        {
-               printf ("EED %p ~wxTabPanelsManager()\n" , this );
        }
        
        //=========================================================================
index 5c8e2106dc569c61634e2ebbb6c1e4765d43ccc4..badd95b02ddcbf5270d8a14bf6373fcf0f55b5b4 100644 (file)
@@ -125,20 +125,43 @@ namespace bbtk
                double                          xInic                           = 0;
                double                          yInic                           = 0;
                double                          zInic                           = 900;
-/*
-               vtkCellArray            *strip                          = vtkCellArray::New();
-               vtkPolyData                     *pdFill                         = vtkPolyData::New();
-               _fillObjectActor                                                = vtkActor::New();
-                                                       _fillPolyMapper         = vtkPolyDataMapper::New();
-*/
-printf ("EED wxVtkSceneManager::configureBaseView 1...\n");
 
                vtkPolygon *aPolygon = vtkPolygon::New();
                _fillObjectActor                                                = vtkActor::New();
 
                                                        _pts                            = vtkPoints::New();     
 //ups4 EED Borrame
-               _pts->SetNumberOfPoints(7);
+               
+               double w=100,h=10,b=h/15,t=3;
+               _pts->SetNumberOfPoints(21);
+               _pts->InsertPoint(0, xInic+w*0.33-t/2   , yInic                 , zInic );
+               _pts->InsertPoint(1, xInic+w*0.33               , yInic-t               , zInic );
+               _pts->InsertPoint(2, xInic+w*0.33+t/2   , yInic                 , zInic );
+               _pts->InsertPoint(3, xInic+w*0.33+t/2   , yInic                 , zInic );
+               _pts->InsertPoint(4, xInic+w-b*4                , yInic+b*0             , zInic );
+               
+               _pts->InsertPoint( 5, xInic+w-b*4       , yInic+b*0             , zInic );
+               _pts->InsertPoint( 6, xInic+w-b*2       , yInic+b*1             , zInic );
+               _pts->InsertPoint( 7, xInic+w-b*1       , yInic+b*2             , zInic );
+               _pts->InsertPoint( 8, xInic+w-b*0       , yInic+b*4             , zInic );
+               
+               _pts->InsertPoint( 9, xInic+w-b*0       , yInic+h-b*4   , zInic );
+               _pts->InsertPoint(10, xInic+w-b*1       , yInic+h-b*2   , zInic );
+               _pts->InsertPoint(11, xInic+w-b*2       , yInic+h-b*1   , zInic );
+               _pts->InsertPoint(12, xInic+w-b*4       , yInic+h-b*0   , zInic );
+               
+               _pts->InsertPoint(13, xInic+b*4         , yInic+h-b*0   , zInic );
+               _pts->InsertPoint(14, xInic+b*2         , yInic+h-b*1   , zInic );
+               _pts->InsertPoint(15, xInic+b*1         , yInic+h-b*2   , zInic );
+               _pts->InsertPoint(16, xInic+b*0         , yInic+h-b*4   , zInic );
+
+               _pts->InsertPoint(17, xInic+b*0         , yInic+b*4             , zInic );
+               _pts->InsertPoint(18, xInic+b*1         , yInic+b*2             , zInic );
+               _pts->InsertPoint(19, xInic+b*2         , yInic+b*1             , zInic );
+               _pts->InsertPoint(20, xInic+b*4         , yInic+b*0             , zInic );
+               
+               
+               /*
                _pts->InsertPoint(0, xInic              , yInic         , zInic );
                _pts->InsertPoint(1, xInic+50   , yInic         , zInic );
                _pts->InsertPoint(2, xInic+50   , yInic+50      , zInic );
@@ -146,46 +169,25 @@ printf ("EED wxVtkSceneManager::configureBaseView 1...\n");
                _pts->InsertPoint(4, xInic+20           , yInic+55      , zInic );
                _pts->InsertPoint(5, xInic+15           , yInic+50      , zInic );
                _pts->InsertPoint(6, xInic              , yInic+50      , zInic );
-
-/*
-               strip->InsertNextCell(8);
-               strip->InsertCellPoint(0);
-               strip->InsertCellPoint(1);
-               strip->InsertCellPoint(2);
-               strip->InsertCellPoint(0);
-               strip->InsertCellPoint(3);
-               pdFill->SetPoints( _pts );
-               pdFill->SetStrips( strip );
-               _fillPolyMapper->SetInput(pdFill);
-*/
-
-printf ("EED wxVtkSceneManager::configureBaseView 2...\n");
-
-               aPolygon->GetPointIds()->SetNumberOfIds(7);
-               aPolygon->GetPointIds()->SetId(0, 0);
-               aPolygon->GetPointIds()->SetId(1, 1);
-               aPolygon->GetPointIds()->SetId(2, 2);
-               aPolygon->GetPointIds()->SetId(3, 3);
-               aPolygon->GetPointIds()->SetId(4, 4);
-               aPolygon->GetPointIds()->SetId(5, 5);
-               aPolygon->GetPointIds()->SetId(6, 6);
-
-printf ("EED wxVtkSceneManager::configureBaseView 3...\n");
-
+               */
+               
+               aPolygon->GetPointIds()->SetNumberOfIds(21);
+               for (int i=0;i<21; i++)
+               {
+                       aPolygon->GetPointIds()->SetId(i, i);
+               }
+               
                vtkUnstructuredGrid *aPolygonGrid = vtkUnstructuredGrid::New();
                aPolygonGrid->Allocate(1, 1);
                aPolygonGrid->InsertNextCell(aPolygon->GetCellType(), aPolygon->GetPointIds());
                aPolygonGrid->SetPoints(_pts);
-printf ("EED wxVtkSceneManager::configureBaseView 4...\n");
                _aPolygonMapper = vtkDataSetMapper::New();
                _aPolygonMapper->SetInput(aPolygonGrid);
                _fillObjectActor->SetMapper(_aPolygonMapper);
-printf ("EED wxVtkSceneManager::configureBaseView 5...\n");
                _fillObjectActor->GetProperty()->SetColor(PORTFILL_NH_R,PORTFILL_NH_G,PORTFILL_NH_B);
                _aPolygonMapper->Modified();
 
                _baseView->GetRenderer()->AddActor( _fillObjectActor );         
-printf ("EED wxVtkSceneManager::configureBaseView fin...\n");
        }
 
        //=========================================================================