]> Creatis software - bbtkGEditor.git/commitdiff
Changements minimals
authorcorredor <>
Wed, 5 May 2010 15:08:28 +0000 (15:08 +0000)
committercorredor <>
Wed, 5 May 2010 15:08:28 +0000 (15:08 +0000)
lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx

index 57a0358507298ace767884de7f363bc98f33790a..24099d8c0ddb0b9f355984cfaa738a96b8d9a634 100644 (file)
@@ -947,10 +947,8 @@ namespace bbtk
        {
                double temp[3];
                _baseView->GetRenderer()->GetActiveCamera()->GetFocalPoint(temp);
-               printf("RaC wxVtkSceneManager::deleteAllBoxes() GetFocalPoint x:%f y:%f z:%f \n",temp[0],temp[1],temp[2]);
                _baseView->GetRenderer()->GetActiveCamera()->SetFocalPoint(0,0,temp[2]);
                _baseView->GetRenderer()->GetActiveCamera()->GetPosition(temp);
-               printf("RaC wxVtkSceneManager::deleteAllBoxes() GetPosition x:%f y:%f z:%f \n",temp[0],temp[1],temp[2]);
                _baseView->GetRenderer()->GetActiveCamera()->SetPosition(0,0,temp[2]);
                _baseView->RefreshView();
 
index 8d63e0db11f9b519e53d3321b980e68c0eab0ff0..ed6f61ff1d8ffdae0e026a46c95ed0c53b3985cb 100644 (file)
@@ -47,21 +47,21 @@ namespace bbtk
                _frameAUIMgr = new wxAuiManager(this);
                
 
-               //std::string datadir( crea::System::GetExecutablePath() );
+               /*std::string datadir( crea::System::GetExecutablePath() );
                std::string datadir (".");
                cout<<"RaC //------------------"<<endl;
                cout<<"RaC //TODO wxGUIEditorGraphicBBS constructor.Initialize datadir with  crea::System::GetExecutablePath() ."<<endl;
                cout<<"RaC //------------------"<<endl;
 
-           #ifdef LINUX /* assume this is OSX */
+           #ifdef LINUX // assume this is OSX 
                   datadir=datadir+"/../share/creaContours";
            #endif // MACOSX    
        
-               #ifdef MACOSX /* assume this is OSX */
+               #ifdef MACOSX // assume this is OSX 
                        datadir=datadir+"/../../../../share/creaContours";
                #endif // MACOSX        
 
-               _dataDir = datadir;
+               _dataDir = datadir;*/
 
                initMenu();
                initToolbar();
index fdde6ad262f97e498ac6892df30ddd81aaf52d3d..db284eb191063058806388bfdfa65e37b8d63033 100644 (file)
@@ -150,8 +150,12 @@ namespace bbtk
 
                for(int i=0;i<_lstValues.size();i++)
                {
-                       std::string text = wx2std(_lstValues[i]->GetLabelText());               
-                       _model->setValueToInputPort(i,text);
+                       std::string text = wx2std(_lstValues[i]->GetLabelText());
+                       //TOFIX Search a better alternative
+                       if(text!="--No editable--" && text!="--Port Connected--")
+                       {
+                               _model->setValueToInputPort(i,text);
+                       }
                }
 
                Close(true);