]> Creatis software - bbtkGEditor.git/commitdiff
no message
authordavila <>
Tue, 21 Sep 2010 06:40:17 +0000 (06:40 +0000)
committerdavila <>
Tue, 21 Sep 2010 06:40:17 +0000 (06:40 +0000)
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.h
lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx

index 20088210306a3ead5603396abfc1b52601d9b55f..c6b5a780041e326380a0c42d6a993daf62f994ba 100644 (file)
@@ -61,11 +61,12 @@ namespace bbtk
                _factory                = factory;
                _sceneManager   = sceneManager;
                
-               _xGeneral               = 10;
+               _xGeneral               = -100;
                _yGeneral               = 10;
                _zGeneral               = 900;   //  ?????
-
-               _complexbox = false;
+               _countBoxes             = 0;
+               
+               _complexbox             = false;
                bbtk::InterpreterVirtual::Init();
                
        }
@@ -83,13 +84,14 @@ namespace bbtk
        /// Creates a new black box in current complex box
     void InterpreterBBS::commandNew( const std::string& boxType, const std::string& boxName) // virtual
        {
-               printf("EED InterpreterBBS::New\n");
                std::string packagename = _factory->GetPackageNameOfaBlackBox(boxType);
-               
                int idBox                               = _sceneManager->createGBlackBox( 0,0, packagename ,boxType);
-               _sceneManager->configGBlackBox(idBox, _xGeneral,_yGeneral,_zGeneral,boxName, false , _xGeneral+100, _yGeneral-10 , _zGeneral );
+               _countBoxes++;
+               _yGeneral                               = _yGeneral + 30;               
+               double px                               = _xGeneral + (_countBoxes%2)*100;
+               double py                               = _yGeneral;
                
-               _yGeneral = _yGeneral + 30;
+               _sceneManager->configGBlackBox(idBox, px,py,_zGeneral,boxName, false , px+100, py-10 , _zGeneral );             
        }
        //=========================================================================
 
@@ -101,7 +103,6 @@ namespace bbtk
                                                                  const std::string &boxto,
                                                                  const std::string &input)                     // virtual
        {
-               printf("EED InterpreterBBS::Connect\n");
                _sceneManager->configGConnetion(_complexbox, boxfrom,output,boxto,input);
        }
        //=========================================================================
@@ -111,7 +112,6 @@ namespace bbtk
        /// sets the input of the box with the value
        void InterpreterBBS::commandSet(const std::string &box,const std::string &input,const std::string &value) // virtual
        {
-               printf("EED InterpreterBBS::Set\n");
                GBlackBoxModel *bbMod = _sceneManager->findGBox(box);
                bbMod->setValueToInput(input,"\""+value+"\"");                                  
        }
@@ -142,6 +142,23 @@ namespace bbtk
        }
        //=========================================================================
        
+
+       void InterpreterBBS::commandAuthor(const std::string &author)  // virtual 
+       {
+               printf("EED InterpreterBBS::commandAuthor   Warning !!!!!  method not implemented.. \n");
+       }
+       
+       void InterpreterBBS::commandCategory(const std::string &categorytype)  // virtual
+       {
+               printf("EED InterpreterBBS::commandCategory   Warning !!!!!  method not implemented.. \n");
+       }
+       
+       void InterpreterBBS::commandDescription(const std::string &description)  // virtual
+       {
+               printf("EED InterpreterBBS::commandDescription   Warning !!!!!  method not implemented.. \n");
+       }
+       
+       
        
        
 }  // EO namespace bbtk
index 400c467201faccc3896e01219aba6007c9d83f17..f31b8ffd335a85f5c70a8662dbbc20b694d30362 100644 (file)
@@ -76,10 +76,16 @@ namespace bbtk
                virtual void commandEndDefine();
                
                virtual void commandExec(const std::string &word);
+               
+               virtual void commandAuthor(const std::string &author);
+               virtual void commandCategory(const std::string &categorytype);
+               virtual void commandDescription(const std::string &description);
+               
 
                double              _xGeneral;
                double              _yGeneral;
                double              _zGeneral;
+               int                                     _countBoxes;
                wxVtkSceneManager   *_sceneManager;
                Factory::Pointer    _factory;
                
index 26deb1419775f151635a9fbe12aef97804854c84..3c8825175f33f32c5ba19337e7bcf54b4a42cf02 100644 (file)
@@ -1096,7 +1096,7 @@ namespace bbtk
                                script+="\n";
                        }
 
-                       for(i = 0; i<execBoxes.size();i++)
+                       for(i = 0; i<(int)execBoxes.size();i++)
                        {
                                script+="exec ";
                                int id = execBoxes[i];
@@ -1171,11 +1171,13 @@ namespace bbtk
                        script+=packages[i];
                        script+="\n";
                }
+               script+="\n";
 
                // Definition of a complex box
                script+="define ";
                script+=cbName;
                script+="\n";
+               script+="\n";
 
                script+="author \" ";
                script+=cbAuthor;
@@ -1184,9 +1186,10 @@ namespace bbtk
                script+="description \" ";
                script+=cbDescription;
                script+="\"\n";
+               script+="\n";
 
                // Create boxes
-               for(i = 0; i<boxes.size();i++)
+               for(i = 0; i<(int)boxes.size();i++)
                {
                        script+="new ";
                        int id = boxes[i];
@@ -1204,7 +1207,7 @@ namespace bbtk
                                        GPortModel* inputPort = inputs[j];
                                        if(inputPort->isValueSet())
                                        {
-                                               script+="set ";
+                                               script+="  set ";
                                                script+=model->getBBTKName();
                                                script+=".";
                                                script+=inputPort->getBBTKName();
@@ -1213,6 +1216,7 @@ namespace bbtk
                                                script+="\n";
                                        }
                                }
+                               script+="\n";
 
                        }
 
@@ -1220,6 +1224,7 @@ namespace bbtk
 
                        std::string complexInputs="";
                        std::string complexOutputs="";
+                       script+="\n";
 
                        for(i = 0; i<(int)connections.size();i++)
                        {
@@ -1282,6 +1287,8 @@ namespace bbtk
                                }
                        }
 
+                   script+="\n";
+               
                        for(i = 0; i<(int)execBoxes.size();i++)
                        {
                                script+="exec ";