From 78e35be5c1ce2fe75d995cbcde0d1d631e8ac487 Mon Sep 17 00:00:00 2001 From: davila <> Date: Wed, 29 Sep 2010 13:34:26 +0000 Subject: [PATCH] no message --- .../bbsKernelEditorGraphic/GlobalConstants.h | 6 ++-- .../wxVtkSceneManager.cxx | 31 ++++--------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h index 63f718b..36fd776 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h @@ -134,9 +134,9 @@ namespace bbtk //Object Text colors - const double PORTFILL_NH_R = 0.50; - const double PORTFILL_NH_G = 0.50; - const double PORTFILL_NH_B = 0.50; + const double PORTFILL_NH_R = 0.0; + const double PORTFILL_NH_G = 0.0; + const double PORTFILL_NH_B = 0.0; const double PORTTEXT_NH_R = 1.0; const double PORTTEXT_NH_G = 1.0; diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index badd95b..5199260 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -112,7 +112,7 @@ namespace bbtk _textActor = vtkTextActor3D::New(); _textActor->SetPosition( -9999 , -9999 , 900 ); _textActor->SetInput( "" ); - _textActor->GetTextProperty()->SetFontSize(40); + _textActor->GetTextProperty()->SetFontSize(60); _textActor->GetTextProperty()->BoldOn(); _textActor->GetTextProperty()->SetColor(PORTTEXT_NH_R,PORTTEXT_NH_G,PORTTEXT_NH_B); @@ -160,17 +160,6 @@ namespace bbtk _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 ); - _pts->InsertPoint(3, xInic+25 , yInic+50 , zInic ); - _pts->InsertPoint(4, xInic+20 , yInic+55 , zInic ); - _pts->InsertPoint(5, xInic+15 , yInic+50 , zInic ); - _pts->InsertPoint(6, xInic , yInic+50 , zInic ); - */ - aPolygon->GetPointIds()->SetNumberOfIds(21); for (int i=0;i<21; i++) { @@ -753,21 +742,14 @@ namespace bbtk py=py+5; _textActor->SetInput( desc->getStatusText().c_str() ); _textActor->SetScale(0.1); - _textActor->SetPosition( px-25 ,py , pz+2 ); + _textActor->SetPosition( px-25 ,py+1 , pz+2 ); +//ups4 EED Borrame // FillPortText - px=px-35; - py=py-2; -/* - _pts->SetPoint(0, px , py , 900+1 ); - _pts->SetPoint(1, px+150 , py , 900+1 ); - _pts->SetPoint(2, px+150 , py+7 , 900+1 ); - _pts->SetPoint(3, px-150+40 , py+7 , 900+1 ); - _pts->SetPoint(4, px-150+40-5 , py+7+5 , 900+1 ); - _pts->SetPoint(5, px-150+40-10 , py+7 , 900+1 ); - _pts->SetPoint(6, px , py+7 , 900+1 ); -*/ + px=px-33; + py=py; _fillObjectActor->SetScale(1); + _fillObjectActor->GetProperty()->SetOpacity(0.50); _fillObjectActor->SetPosition(px,py,1); _aPolygonMapper->Modified(); } // if GPORT @@ -775,7 +757,6 @@ namespace bbtk } // for controllers it } } -//ups4 EED Borrame if (okStatusMessage==false) { updateStatusBar(""); -- 2.45.1