Bug #1362, Bug #1361

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
index bdec8ae4b6e14e5e24889e09c7ff789d0a6ccfd6..8c73675eeab4d6779ba589759cdc27d9bc297667 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx
@@ -75,6 +75,7 @@ namespace bbtk
                                {
                                        _view->setState(HIGHLIGHTED);
                                }
+                                               return true; // to avoid to redraw all if nothing
                        } // state
 
                        if( state==HIGHLIGHTED)

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index 0eec429fa6f1b4438bee7883163b39c107f79d34..97c2605f7bbaefc5739dfe1e9bd53ccfdf5d1471 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -193,10 +193,12 @@ namespace bbtk
                vtkTextProperty *prop =  vtkTextProperty::New();
                prop->BoldOn();
                prop->SetFontFamilyToArial();
-               prop->SetFontSize(100);
+               _boxTextActor->GetTextProperty()->BoldOn();
+               prop->SetFontSize(80);
                _boxTextActor->SetTextProperty(prop);
-               //_boxTextActor->GetTextProperty()->SetFontSize(80);
-               //_boxTextActor->GetTextProperty()->BoldOn();
+       
+       //      _boxTextActor->GetTextProperty()->SetFontSize(80);
+               
 
                //------------
 
@@ -207,9 +209,10 @@ namespace bbtk
 
        void vtkGBlackBoxView::addVtkActors()//virtual
        {
+               
                _baseView->GetRenderer()->AddActor(_borderObjectActor);
-               _baseView->GetRenderer()->AddActor(_boxTextActor);
                vtkGObjectView::addVtkActors();
+               _baseView->GetRenderer()->AddActor(_boxTextActor);
        }
 
        //=========================================================================
@@ -229,7 +232,7 @@ namespace bbtk
                temp+=":";
                temp+=_model->getBBTKName();
                _boxTextActor->SetInput(temp.c_str());
-               _boxTextActor->SetPosition(xInic+4,yInic-7,zInic);
+               _boxTextActor->SetPosition(xInic+4,yInic-7,zInic+1);
                _boxTextActor->SetScale(0.05,0.05,1);
        }
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 94d6e548caf7a07d41f3e9a869ce39bc26694b02..209007fc096074a549d862dc95c03921dcb5c862 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -767,9 +767,10 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
                wxString fileName = openFileDialog->GetPath();
                ifstream inputStream;
                std::string fName = (const char*) (fileName.mb_str());
+
                inputStream.open(fName.c_str());
+               assert(inputStream.good()); // fails
                _tabsMgr->addNewTab(openFileDialog->GetFilename());
-
                _tabsMgr->loadDiagram(inputStream, fName);
 
                inputStream.close();

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index bd327721ba3c4e24723805aff9ae0b3f6804b597..6225ee313d1a0691c4c966387d9285c229ee11e7 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -216,7 +216,7 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
        {
                this->SetFullPath(path);
                stringstream ss;
-               ss << inputStream ;
+               ss << inputStream.rdbuf() ;
                _sceneManager->loadDiagram(ss);
        }
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
index 7a6b39fe21b2a34866a3bd97714bf3908fd5e68b..d305732e9b17a70d4d5736a6fe497fa8c7b0a0b4 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
@@ -57,7 +57,7 @@ Version:   $Revision$
 #include <wxVtk3DBaseView.h>
 
 //Includes std
-#include <iostream>
+#include <fstream>
 
 namespace bbtk
 {