X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.cxx;h=62ecce36189b7f9a345cafd7db5e67e2cd59bbbc;hb=de7c0454ab8fc1b0b97dcd7112dfdb4a55ac0215;hp=3a411d84aae13f951de908eb7ca225c46b5dfe04;hpb=e4d5a319ef249bde6c4f4ddfee66f6258558bf91;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index 3a411d8..62ecce3 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -1416,32 +1416,66 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) { script += LineNumber(wln, lnNmbr); script += "\n"; + + std::string complexInputs=""; + for (i = 0; i < (int) connections.size(); i++) { - script += LineNumber(wln, lnNmbr); - script += "connect "; + //script += LineNumber(wln, lnNmbr); + //script += "connect "; int id = connections[i]; GObjectController *control = _controllers[id]; GConnectorModel *model = (GConnectorModel*) control->getModel(); - //Start Connection info - GPortModel *start = model->getStartPort(); - script += start->getParentBox()->getBBTKName(); - script += "."; - script += start->getBBTKName(); - script += " "; + //Connection info + GPortModel *start = model->getStartPort(); + GBoxModel *startBox = start->getParentBox(); - //End Connection info GPortModel *end = model->getEndPort(); - script += end->getParentBox()->getBBTKName(); - script += "."; - script += end->getBBTKName(); + GBoxModel *endBox = end->getParentBox(); + + if (startBox->getGObjectType() == GCOMPLEXINPUTPORT) + { + complexInputs += "input "; + complexInputs += startBox->getBBTKName(); + + complexInputs += " "; + complexInputs += endBox->getBBTKName(); + complexInputs += "."; + complexInputs += end->getBBTKName(); + + complexInputs += " "; + complexInputs += "\" \""; + + complexInputs += "\n"; + } + else + { + script += "connect "; + script += startBox->getBBTKName(); + script += "."; + script += start->getBBTKName(); + + script += " "; + + //End Connection info + script += endBox->getBBTKName(); + script += "."; + script += end->getBBTKName(); + + script += "\n"; + } script += "\n"; } script += LineNumber(wln, lnNmbr); script += "\n"; + + script += "\n"; + script += "# Complex input ports\n"; + script += complexInputs; + for (i = 0; i < (int) execBoxes.size(); i++) { script += LineNumber(wln, lnNmbr); script += "exec "; @@ -1617,6 +1651,14 @@ std::string wxVtkSceneManager::saveComplexBoxBBS() { } } + script += "\n"; + script += "# Complex input ports\n"; + script += complexInputs; + + script += "\n"; + script += "# Complex output ports\n"; + script += complexOutputs; + script += "\n"; for (i = 0; i < (int) execBoxes.size(); i++) { @@ -1629,14 +1671,6 @@ std::string wxVtkSceneManager::saveComplexBoxBBS() { script += "\n"; } - script += "\n"; - script += "# Complex input ports\n"; - script += complexInputs; - - script += "\n"; - script += "# Complex output ports\n"; - script += complexOutputs; - script += "\n"; script += "endefine"; script += "\n"; @@ -1709,6 +1743,8 @@ void wxVtkSceneManager::saveDiagram(std::string &content) { content += GetCbPackageName(); content += "\n"; + /* CHANGE TO THE VERSION 1.4 RaC2012 2nd HackFest + * External inputs are possible for applications and complex boxes //Print info complex input ports std::vector inputs = getComplexInputPorts(); int insize = inputs.size(); @@ -1722,6 +1758,7 @@ void wxVtkSceneManager::saveDiagram(std::string &content) { GObjectController *cont = _controllers[id]; cont->getModel()->save(content); } + */ //Print info complex output ports std::vector outputs = getComplexOutputPorts(); @@ -1741,6 +1778,21 @@ void wxVtkSceneManager::saveDiagram(std::string &content) { content += "FALSE\n"; } + // CHANGE TO THE VERSION 1.4 RaC2012 2nd HackFest + // External inputs are possible for applications and complex boxes + std::vector inputs = getComplexInputPorts(); + int insize = inputs.size(); + content += "COMPLEXINPUTS:"; + sprintf(buffer, "%d", insize); + content += buffer; + content += "\n"; + + for (int i = 0; i < insize; i++) { + int id = inputs[i]; + GObjectController *cont = _controllers[id]; + cont->getModel()->save(content); + } + //Print boxes std::vector boxes = getBlackBoxes(); int bsize = boxes.size(); @@ -1814,6 +1866,9 @@ void wxVtkSceneManager::loadDiagram(stringstream &inputStream) if (line == "# - BBTKGEditor v 1.3 BBG BlackBox Diagram file") { version = line.substr(18, 3); } + if (line == "# - BBTKGEditor v 1.4 BBG BlackBox Diagram file") { + version = line.substr(18, 3); + } } else if (line == "APP_START") { start = true; break; @@ -1873,24 +1928,78 @@ void wxVtkSceneManager::loadDiagram(stringstream &inputStream) SetCbPackageName(result); } + if(version < "1.4") + { + //----------------------- + //- COMPLEX INPUT PORTS + //----------------------- + getCleanLine(inputStream, line);//COMPLEXINPUTS:num + char inputs[30]; + strcpy(inputs, line.c_str()); + result = strtok(inputs, delims); + result = strtok(NULL, delims); + + int numInputs; + std::istringstream inps(result); + inps >> numInputs; + + for (int i = 0; i < numInputs; i++) { + //---------- + getCleanLine(inputStream, line);//COMPLEX_PORT + getCleanLine(inputStream, line);//name + std::string inputPortName(line); + + //---------- + getCleanLine(inputStream, line);//xInic:yInic:zInic + char coord[80]; + strcpy(coord, line.c_str()); + result = strtok(coord, delims);//xInic + std::string xInic(result); + result = strtok(NULL, delims);//yInic + std::string yInic(result); + result = strtok(NULL, delims);//zInic + std::string zInic(result); + + double xIn, yIn, zIn; + std::istringstream xSt(xInic); + xSt >> xIn; + std::istringstream ySt(yInic); + ySt >> yIn; + std::istringstream zSt(zInic); + zSt >> zIn; + + if (version<="1.2") + { + if (zIn==900) zIn=GPOSITION_Z; + } + + getCleanLine(inputStream, line);//FIN_COMPLEX_PORT + + configGComBoxInputOutputPort(true, inputPortName, xIn, yIn, zIn); + + } // for input complex box + } + + //----------------------- - //- COMPLEX INPUT PORTS + //- COMPLEX OUTPUT PORTS //----------------------- - getCleanLine(inputStream, line);//COMPLEXINPUTS:num - char inputs[30]; - strcpy(inputs, line.c_str()); - result = strtok(inputs, delims); + + getCleanLine(inputStream, line);//COMPLEXOUTPUTS:num + char outputs[30]; + strcpy(outputs, line.c_str()); + result = strtok(outputs, delims); result = strtok(NULL, delims); - int numInputs; - std::istringstream inps(result); - inps >> numInputs; + int numOutputs; + std::istringstream outps(result); + outps >> numOutputs; - for (int i = 0; i < numInputs; i++) { + for (int i = 0; i < numOutputs; i++) { //---------- getCleanLine(inputStream, line);//COMPLEX_PORT getCleanLine(inputStream, line);//name - std::string inputPortName(line); + std::string outputPortName(line); //---------- getCleanLine(inputStream, line);//xInic:yInic:zInic @@ -1918,30 +2027,33 @@ void wxVtkSceneManager::loadDiagram(stringstream &inputStream) getCleanLine(inputStream, line);//FIN_COMPLEX_PORT - configGComBoxInputOutputPort(true, inputPortName, xIn, yIn, zIn); + configGComBoxInputOutputPort(false, outputPortName, xIn, yIn, zIn); - } // for input complex box + } // for output complex box + } // complex box + // RaC2012 2nd Hackfest + if(version >= "1.4") + { //----------------------- - //- COMPLEX OUTPUT PORTS + //- EXTERNAL INPUT PORTS //----------------------- - - getCleanLine(inputStream, line);//COMPLEXOUTPUTS:num - char outputs[30]; - strcpy(outputs, line.c_str()); - result = strtok(outputs, delims); + getCleanLine(inputStream, line);//COMPLEXINPUTS:num + char inputs[30]; + strcpy(inputs, line.c_str()); + result = strtok(inputs, delims); result = strtok(NULL, delims); - int numOutputs; - std::istringstream outps(result); - outps >> numOutputs; + int numInputs; + std::istringstream inps(result); + inps >> numInputs; - for (int i = 0; i < numOutputs; i++) { + for (int i = 0; i < numInputs; i++) { //---------- getCleanLine(inputStream, line);//COMPLEX_PORT getCleanLine(inputStream, line);//name - std::string outputPortName(line); + std::string inputPortName(line); //---------- getCleanLine(inputStream, line);//xInic:yInic:zInic @@ -1968,12 +2080,11 @@ void wxVtkSceneManager::loadDiagram(stringstream &inputStream) } getCleanLine(inputStream, line);//FIN_COMPLEX_PORT + configGComBoxInputOutputPort(true, inputPortName, xIn, yIn, zIn); - configGComBoxInputOutputPort(false, outputPortName, xIn, yIn, zIn); - - } // for output complex box + } // for external input + } - } // complex box //---------- getCleanLine(inputStream, line);//BOXES:num @@ -2199,7 +2310,9 @@ GBoxModel* wxVtkSceneManager::findGBox(std::string boxname) { } } // for - if ((_isComplexBox) && (boxModel == NULL)) { + + + if (boxModel == NULL) { std::vector lstInputs = getComplexInputPorts(); for (j = 0; j < (int) lstInputs.size(); j++) { idB = lstInputs[j]; @@ -2209,6 +2322,8 @@ GBoxModel* wxVtkSceneManager::findGBox(std::string boxname) { } } // for + if(_isComplexBox) + { std::vector lstOutputs = getComplexOutputPorts(); for (j = 0; j < (int) lstOutputs.size(); j++) { int idB = lstOutputs[j]; @@ -2217,8 +2332,9 @@ GBoxModel* wxVtkSceneManager::findGBox(std::string boxname) { boxModel = bMod; } } // for + } - } // complex box + } // inputs/outputs return boxModel; } @@ -2235,6 +2351,10 @@ int wxVtkSceneManager::configGConnetion(std::string nameStartBox, GPortModel *endP = NULL; boxModel = findGBox(nameStartBox); + if(boxModel == NULL) + { + printf("RaC: ERROR in wxVtkSceneManager::configGConnetion A box to connect start port %s is null. Box name is probably wrong.\n", nameStartPort.c_str()); + } if (boxModel != NULL) { startP = boxModel->getOutputPort(nameStartPort); if(startP == NULL){ @@ -2243,6 +2363,10 @@ int wxVtkSceneManager::configGConnetion(std::string nameStartBox, } boxModel = findGBox(nameEndBox); + if(boxModel == NULL) + { + printf("RaC: ERROR in wxVtkSceneManager::configGConnetion A box to connect start port %s is null. Box name is probably wrong.\n", nameStartPort.c_str()); + } if (boxModel != NULL) { endP = boxModel->getInputPort(nameEndPort); if(endP == NULL){ @@ -2252,6 +2376,7 @@ int wxVtkSceneManager::configGConnetion(std::string nameStartBox, //ups2 int idCon = createGConnector(startP); + _worldState = NOTHING_HAPPENS; GConnectorController *tempp = (GConnectorController*) _controllers[idCon]; @@ -2727,7 +2852,6 @@ std::string wxVtkSceneManager::GetCategory() { //========================================================================= void wxVtkSceneManager::SetDescription(std::string description) { _Description = description; - std::cout<<"Description:"<<_Description< wxVtkSceneManager::GetExternalInputsNames() +{ + + std::vector< std::string> extInputs; + std::map::iterator it; + for (it = _controllers.begin(); it != _controllers.end(); ++it) + { + GObjectController *cont = it->second; + if (cont->getGObjectType() == GCOMPLEXINPUTPORT) + { + extInputs.push_back(cont->getModel()->getBBTKName()); + } + } + return extInputs; +} + +//========================================================================= + + void wxVtkSceneManager::printAll(int com , int sta ){