//=========================================================================
-int wxVtkSceneManager::createGConnector(GPortModel* startPort) {
+int wxVtkSceneManager::createGConnector(GPortModel* startPort)
+{
+
+
+
int type = GCONNECTOR;
manualConnectorContourController *manContourControl = new manualConnectorContourController();
manContourView->SetColorEditContour(0.5, 0.5, 0.5);
manContourView->SetColorSelectContour(1, 0.8, 0);
+
+
/**
* JGRR AND CM
* Width increased from 2 to 3, it simplifies line handling and spline control :P
// The last one is the controller of the connector
std::map<int, GObjectController*>::iterator it2;
+
for (it2 = _controllers.begin(); it2 != _controllers.end(); ++it2) {
GObjectController *cont = it2->second;
if (cont->getGObjectType() == GPORT) {
//=========================================================================
-bool wxVtkSceneManager::OnMouseMove() {
+bool wxVtkSceneManager::OnMouseMove()
+{
int X, Y;
bool okStatusMessage = false;
bool okPortMessage = false;
desc->getModel()->getCenter(px, py, pz);
// JGRR & CM
- if ((state == HIGHLIGHTED) || (state == SELECTED_POSSIBLE_CONNECTION )) {
+ if ((state == HIGHLIGHTED) || (state == SELECTED_POSSIBLE_CONNECTION ))
+ {
// EO JGRR & CM
okStatusMessage = true;
updateStatusBar(desc->getStatusText());
- if (type == GBLACKBOX) {
+ if (type == GBLACKBOX)
+ {
GBlackBoxModel *mod = (GBlackBoxModel*) desc->getModel();
- _parent->displayBlackBoxInfo(mod->getBBTKPackage(),
- mod->getBBTKType());
+ _parent->displayBlackBoxInfo(mod->getBBTKPackage(),mod->getBBTKType());
} // if GBLACKBOX
- if (type == GPORT) {
+ if (type == GPORT)
+ {
// PortText
okPortMessage = true;
py = py + 5;
// FillPortText
px = px - 33;
- py = py;
+ //py = py;
_fillObjectActor->SetScale(1);
_fillObjectActor->GetProperty()->SetOpacity(0.50);
_fillObjectActor->SetPosition(px, py, 1);
} // for controllers it
}
}
- if (okStatusMessage == false) {
+ if (okStatusMessage == false)
+ {
updateStatusBar("");
}
- if (okPortMessage == false) {
+ if (okPortMessage == false)
+ {
_textActor->SetScale(0.0001);
_fillObjectActor->SetScale(0.0001);
}
//=========================================================================
-bool wxVtkSceneManager::OnLeftButtonDown() {
-
- if (_worldState == INIT_CREATION_CONTOUR) {
+bool wxVtkSceneManager::OnLeftButtonDown()
+{
+ if (_worldState == INIT_CREATION_CONTOUR)
+ {
bool isOverPort = false;
std::map<int, GObjectController*>::iterator it;
- for (it = _controllers.begin(); it != _controllers.end() && isOverPort
- == false; ++it) {
+ for (it = _controllers.begin(); it != _controllers.end() && isOverPort== false; ++it)
+ {
GObjectController *desc = it->second;
- if (desc->getGObjectType() == GPORT) {
+ if (desc->getGObjectType() == GPORT)
+ {
GPortModel *portmod = (GPortModel*) desc->getModel();
vtkGObjectView *portView = desc->getView();
- if (portmod->getPortType() == GINPUTPORT
- && portView->getState() == HIGHLIGHTED) {
+ if (portmod->getPortType() == GINPUTPORT && portView->getState() == HIGHLIGHTED)
+ {
isOverPort = true;
- } // if
- // JGRR & CM
- if ( portmod->getPortType( ) == GINPUTPORT && portView->getState( ) == SELECTED_POSSIBLE_CONNECTION ) {
- isOverPort = true ;
- portView->setState( HIGHLIGHTED);
- }
- // EO JGRR & CM
-
- } // if
+ } // if
+ // JGRR & CM
+ if ( portmod->getPortType( ) == GINPUTPORT && portView->getState( ) == SELECTED_POSSIBLE_CONNECTION ) {
+ isOverPort = true ;
+ portView->setState( HIGHLIGHTED);
+ }
+ // EO JGRR & CM
+
+ } // if
} // for
- if (isOverPort == false) {
+ if (isOverPort == false)
+ {
CancelConnection();
UnSelectBlackBoxes();
} // isOverPort
GObjectController *cont = GetGBlackBoxControlerPointedByMouse();
- if (GetGBlackBoxControlerPointedByMouse() != NULL) {
+ if (cont != NULL) {
int state = cont->getView()->getState();
if ((ctrlkey == 0) && (state == HIGHLIGHTED)) {
UnSelectBlackBoxes();
}
+ } else {
+ UnSelectBlackBoxes(); // EED 12/07/2012
}
for (int i = 0; i < (int) _selectedObjects.size(); i++) {
int id = _selectedObjects[i];
- GObjectController* cont = _controllers[id];
+ GObjectController *cont = _controllers[id];
cont->getView()->setState(DRAG);
cont->getModel()->notifyObservers(_idManager);
} // for
-
} // if _selectedObjects.size
//=========================================================================
-bool wxVtkSceneManager::OnLeftButtonUp() {
+bool wxVtkSceneManager::OnLeftButtonUp()
+{
if (_worldState == DRAG_OBJECTS) {
_worldState = NOTHING_HAPPENS;
}
//=========================================================================
-void wxVtkSceneManager::CancelConnection() {
- if (_worldState == INIT_CREATION_CONTOUR) {
+void wxVtkSceneManager::CancelConnection()
+{
+ if (_worldState == INIT_CREATION_CONTOUR)
+ {
_worldState = NOTHING_HAPPENS;
//int lastId = _controllers.size()-1;
_controllers.erase(_idConnectionInCreation);
std::map<int, GObjectController*>::iterator it;
- for (it = _controllers.begin(); it != _controllers.end(); ++it) {
+ for (it = _controllers.begin(); it != _controllers.end(); ++it)
+ {
GObjectController *desc = it->second;
desc->SetActive(true);
desc->getView()->setState(NOTHING_HAPPENS);
//=========================================================================
-bool wxVtkSceneManager::OnRightButtonUp() {
- if (_worldState == INIT_CREATION_CONTOUR) {
+bool wxVtkSceneManager::OnRightButtonUp()
+{
+ if (_worldState == INIT_CREATION_CONTOUR)
+ {
CancelConnection();
}
UnSelectBlackBoxes();
// KeyCode 127 : Delete Key
// KeyCode 8 : Backspace Key
+
+
+ if (keyCode == 8 || keyCode == 127 || keyCode == 27)
+ {
+ if (_worldState == INIT_CREATION_CONTOUR)
+ {
+ CancelConnection();
+ UnSelectBlackBoxes();
+ }
+ }
+
+
if (keyCode == 8 || keyCode == 127)
{
+
for (int i = 0; i < (int) _selectedObjects.size(); i++)
{
int id = _selectedObjects[i];
#endif
if(_selectedObjects.size()){
std::cout<<"objects to copy :";
- for(int i=0;i<_selectedObjects.size();i++){
+ for(int i=0;i<_selectedObjects.size();i++)
+ {
std::cout<<_selectedObjects.at(i)<<" ";
}
DuplicateObjects(getSelectedObjects());
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 ";
}
}
+ 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++) {
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";
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<int> inputs = getComplexInputPorts();
int insize = inputs.size();
GObjectController *cont = _controllers[id];
cont->getModel()->save(content);
}
+ */
//Print info complex output ports
std::vector<int> outputs = getComplexOutputPorts();
content += "FALSE\n";
}
+ // CHANGE TO THE VERSION 1.4 RaC2012 2nd HackFest
+ // External inputs are possible for applications and complex boxes
+ std::vector<int> 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<int> boxes = getBlackBoxes();
int bsize = boxes.size();
{
getline(inputStream, line,'\n');
int size = line.length();
- if ( line[ size-1 ]==13 )
+ if (size>0)
{
- line.erase(size-1,1);
- }
+ if ( line[ size-1 ]==13 )
+ {
+ line.erase(size-1,1);
+ } // if line
+ } // if size
}
//=========================================================================
-
void wxVtkSceneManager::loadDiagram(stringstream &inputStream)
{
int size;
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;
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
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
}
getCleanLine(inputStream, line);//FIN_COMPLEX_PORT
+ configGComBoxInputOutputPort(true, inputPortName, xIn, yIn, zIn);
- configGComBoxInputOutputPort(false, outputPortName, xIn, yIn, zIn);
+ } // for external input
+ }
- } // for output complex box
-
- } // complex box
//----------
getCleanLine(inputStream, line);//BOXES:num
}
} // for
- if ((_isComplexBox) && (boxModel == NULL)) {
+
+
+ if (boxModel == NULL) {
std::vector<int> lstInputs = getComplexInputPorts();
for (j = 0; j < (int) lstInputs.size(); j++) {
idB = lstInputs[j];
}
} // for
+ if(_isComplexBox)
+ {
std::vector<int> lstOutputs = getComplexOutputPorts();
for (j = 0; j < (int) lstOutputs.size(); j++) {
int idB = lstOutputs[j];
boxModel = bMod;
}
} // for
+ }
- } // complex box
+ } // inputs/outputs
return boxModel;
}
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){
}
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){
//ups2
int idCon = createGConnector(startP);
+
_worldState = NOTHING_HAPPENS;
GConnectorController *tempp = (GConnectorController*) _controllers[idCon];
//=========================================================================
+std::vector< std::string> wxVtkSceneManager::GetExternalInputsNames()
+{
+
+ std::vector< std::string> extInputs;
+ std::map<int, GObjectController*>::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 ){
git://git.creatis.insa-lyon.fr / bbtkGEditor.git / blobdiff