//EED 15 oct 2012 BlackBoxDescriptor::Pointer descriptor = GObjectsMVCFactory::getInstance()->getBlackBoxDescriptor(packageName, boxType);
+
Package::Pointer k;
std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc;
try{
std::map<std::string, BlackBoxInputDescriptor*> descriptorInMap =
descriptor->GetInputDescriptorMap();
std::map<std::string, BlackBoxInputDescriptor*>::iterator itInput;
-
int i = 0;
for (itInput = descriptorInMap.begin(); itInput != descriptorInMap.end(); ++itInput) {
BlackBoxInputDescriptor *desc = itInput->second;
std::map<std::string, BlackBoxOutputDescriptor*> descriptorOutMap =
descriptor->GetOutputDescriptorMap();
std::map<std::string, BlackBoxOutputDescriptor*>::iterator itOutput;
-
i = 0;
for (itOutput = descriptorOutMap.begin(); itOutput
!= descriptorOutMap.end(); ++itOutput) {
//(NOTE: Refresh is only made by the view)
view->setModel(model);
view->setBaseView(_baseView);
+
view->initVtkObjects();
//Associates the controller with the correspondent model and view
//(NOTE: Refresh is only made by the view)
view->setModel(model);
view->setBaseView(_baseView);
- view->initVtkObjects();
+
+//EED017 view->initVtkObjects();
+ view->createVtkObjects();
+// view->addVtkActors();
+
//Associates the controller with the correspondent model and view
controller->setModelAndView(model, view);
addObjectController(controller);
return (GPortController*) controller;
+
}
//=========================================================================
* JGRR AND CM
* Width increased from 2 to 3, it simplifies line handling and spline control :P
* @param WidthLine
- */
+ */
+ //EED2017
manContourView->SetWidthLine( 3 ) ;
manContourView->SetShowText(false);
script += LineNumber(wln, lnNmbr);
script += "new ";
int id = boxes[i];
- GObjectController *control = _controllers[id];
- GBlackBoxModel *model = (GBlackBoxModel*) control->getModel();
+ GObjectController *control = _controllers[id];
+ GBlackBoxModel *model = (GBlackBoxModel*) control->getModel();
+ script += model->getBBTKPackage()+":";
script += model->getBBTKType();
script += " ";
script += model->getBBTKName();
}
else
{
+ script += LineNumber(wln, lnNmbr);
script += "connect ";
script += startBox->getBBTKName();
script += ".";
script += "\n";
}
+ script += LineNumber(wln, lnNmbr);
script += "\n";
}
script += LineNumber(wln, lnNmbr);
script += "\n";
+ script += LineNumber(wln, lnNmbr);
script += "\n";
+
+ script += LineNumber(wln, lnNmbr);
script += "# Complex input ports\n";
script += complexInputs;
- script += LineNumber(wln, lnNmbr);
- script += "message ";
- script += _MessageKind;
- script += " ";
- script += _MessageLevel;
- script += "\n";
+ if((_MessageKind!=" ")&&(_MessageLevel!=" ")){
+ script += LineNumber(wln, lnNmbr);
+ script += "message ";
+ script += _MessageKind;
+ script += " ";
+ script += _MessageLevel;
+ script += "\n";
+ }
for (i = 0; i < (int) execBoxes.size(); i++) {
script += LineNumber(wln, lnNmbr);
GObjectController *control = _controllers[id];
GBlackBoxModel *model = (GBlackBoxModel*) control->getModel();
+ script += model->getBBTKPackage()+":";
script += model->getBBTKType();
script += " ";
script += model->getBBTKName();
}
//=========================================================================
-void wxVtkSceneManager::refreshScene() {
+void wxVtkSceneManager::refreshScene()
+{
_baseView->RefreshView();
}
//=========================================================================
-void wxVtkSceneManager::centerView() {
+void wxVtkSceneManager::centerView()
+{
+ double bb[6];
+ _baseView->GetRenderer()->ComputeVisiblePropBounds(bb);
+
double temp[3];
_baseView->GetRenderer()->GetActiveCamera()->GetFocalPoint(temp);
_baseView->GetRenderer()->GetActiveCamera()->SetFocalPoint(0, 0, temp[2]);
_baseView->GetRenderer()->GetActiveCamera()->GetPosition(temp);
_baseView->GetRenderer()->GetActiveCamera()->SetPosition(0, 0, temp[2]);
+
+ _baseView->GetRenderer()->ResetCamera();
+ _baseView->GetRenderer()->ResetCameraClippingRange();
+
+/*
+ double tt=_baseView->GetRenderer()->GetNearClippingPlaneTolerance();
+ printf("EED wxVtkSceneManager::centerView() tolerance=%f\n",tt);
+ double cr1,cr2;
+ _baseView->GetRenderer()->GetActiveCamera()->GetClippingRange(cr1,cr2);
+ printf("EED wxVtkSceneManager::centerView() cr1=%f cr2=%f\n",cr1,cr2);
+ _baseView->GetRenderer()->GetActiveCamera()->SetClippingRange(0.01,100000);
+ _baseView->GetRenderer()->GetActiveCamera()->GetClippingRange(cr1,cr2);
+ printf("EED wxVtkSceneManager::centerView() cr1=%f cr2=%f\n",cr1,cr2);
+*/
+
+ _baseView->GetRenderer()->Render();
}
//=========================================================================
-void wxVtkSceneManager::saveDiagram(std::string &content) {
+void wxVtkSceneManager::saveDiagram(std::string &content)
+{
char buffer[50];
content += "CATEGORY:";
for (int i = 0; i < bsize; i++) {
int id = boxes[i];
- std::cout<<"id "<<id<<std::endl;//CFT
+// std::cout<<"id "<<id<<std::endl;//CFT
GObjectController *cont = _controllers[id];
- std::cout<<"nombre: "<<cont->getStatusText()<<std::endl;//CFT
- std::cout<<"tipo: "<<cont->getModel()->getBBTKType()<<std::endl;//CFT
- //boxesDiagram[i] = cont->getModel()->getBBTKType();//CFT
- std::cout<<"nname: "<<cont->getModel()->getBBTKName()<<std::endl;//CFT
- std::cout<<"categorie: "<<GetCategory()<<std::endl;//CFT
- std::cout<<"type: "<<cont->getModel()->getGObjectType()<<std::endl;//CFT
+// std::cout<<"nombre: "<<cont->getStatusText()<<std::endl;//CFT
+// std::cout<<"tipo: "<<cont->getModel()->getBBTKType()<<std::endl;//CFT
+// //boxesDiagram[i] = cont->getModel()->getBBTKType();//CFT
+// std::cout<<"nname: "<<cont->getModel()->getBBTKName()<<std::endl;//CFT
+// std::cout<<"categorie: "<<GetCategory()<<std::endl;//CFT
+// std::cout<<"type: "<<cont->getModel()->getGObjectType()<<std::endl;//CFT
cont->getModel()->save(content);
}
//=========================================================================
void wxVtkSceneManager::loadDiagram(stringstream &inputStream)
{
-
int size;
std::string version = "<void>";
std::string line = "";
std::istringstream is(result);
is >> numBoxes;
- for (int i = 0; i < numBoxes; i++) {
+ for (int i = 0; i < numBoxes; i++)
+ {
//----------
getCleanLine(inputStream, line);//BOX
getCleanLine(inputStream, line);//package:type:name
bool boxExecutable = false;
- if (isExec == "TRUE") {
+ if (isExec == "TRUE")
+ {
boxExecutable = true;
}
isCons >> numConns;
- for (int i = 0; i < numConns; i++) {
+ for (int i = 0; i < numConns; i++)
+ {
//----------
getCleanLine(inputStream, line);//CONNECTION
getCleanLine(inputStream, line);//Startbox.PortName:EndBox.PortName
result = strtok(NULL, delims);
std::string nameEndPort(result);
-
int idCon = configGConnetion(nameStartBox, nameStartPort,nameEndBox, nameEndPort);
if (version != "1.0") {