#endif
#include <stdio.h>
-#include "xmlParser.h"
+#include "bbtkXML.h"
#include <iostream>
#include <fstream>
#include <sstream>
std::string mTemplateImplementation;
std::vector<std::string> mInclude;
+ std::vector<std::string> mTypedef;
std::string mUserConstructor;
std::string mUserCopyConstructor;
{
std::string name;
std::string type;
+ std::string nature;
std::string descr;
std::string special;
std::string generic_type;
//==========================================================================
-//==========================================================================
-void GetTextOrClear(const XMLNode& node, std::string& var)
-{
- if (node.nText()>0)
- {
- var = node.getText();
- }
- else if (node.nClear()>0)
- {
- var = node.getClear().lpszValue;
- }
- else
- {
- std::string mess("Error : element <");
- mess += node.getName();
- mess += "> : no text nor <PRE></PRE> clear tag found";
- throw bbfyException(mess);
- }
-}
-//==========================================================================
-
//==========================================================================
void bbfy::ParseXML()
{
throw bbfyException("Error : blackbox type '"+itkImageToImageFilterString+"' but no <itkparent> tag found (mandatory)");
}
- GetTextOrClear(BB.getChildNode("itkparent"),mItkParent);
+ bbtk::GetTextOrClear(BB.getChildNode("itkparent"),mItkParent);
//
mGeneric = false;
if (BB.isAttributeSet("generic")) mGeneric=true;
+vtkImageAlgorithmString
+"' but no <vtkparent> tag found (mandatory)");
}
- GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
+ bbtk::GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
//
}
else if (bbtype == vtkPolyDataAlgorithmString )
+vtkPolyDataAlgorithmString
+"' but no <vtkparent> tag found (mandatory)");
}
- GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
+ bbtk::GetTextOrClear(BB.getChildNode("vtkparent"),mVtkParent);
//
}
else
for (i=0,j=0; i<BB.nChildNode("author"); i++)
{
std::string val;
- GetTextOrClear(BB.getChildNode("author",&j),val);
+ bbtk::GetTextOrClear(BB.getChildNode("author",&j),val);
mAuthor += val;
}
for (i=0,j=0; i<BB.nChildNode("description"); i++)
{
std::string val;
- GetTextOrClear(BB.getChildNode("description",&j),val);
+ bbtk::GetTextOrClear(BB.getChildNode("description",&j),val);
mDescription += val;
}
for (i=0,j=0; i<BB.nChildNode("category"); i++)
{
std::string val;
- GetTextOrClear(BB.getChildNode("category",&j),val);
+ bbtk::GetTextOrClear(BB.getChildNode("category",&j),val);
mCategory += val;
}
// Namespace
if (BB.nChildNode("namespace"))
{
- GetTextOrClear(BB.getChildNode("namespace"),mNamespace);
+ bbtk::GetTextOrClear(BB.getChildNode("namespace"),mNamespace);
}
// UserConstructor body
- if (BB.nChildNode("constructor"))
+ if (BB.nChildNode("userconstructor"))
{
- GetTextOrClear(BB.getChildNode("constructor"),mUserConstructor);
+ bbtk::GetTextOrClear(BB.getChildNode("userconstructor"),mUserConstructor);
}
// UserCopyConstructor body
- if (BB.nChildNode("copyconstructor"))
+ if (BB.nChildNode("usercopyconstructor"))
{
- GetTextOrClear(BB.getChildNode("copyconstructor"),mUserCopyConstructor);
+ bbtk::GetTextOrClear(BB.getChildNode("usercopyconstructor"),mUserCopyConstructor);
}
// UserDestructor body
- if (BB.nChildNode("destructor"))
+ if (BB.nChildNode("userdestructor"))
{
- GetTextOrClear(BB.getChildNode("destructor"),mUserDestructor);
+ bbtk::GetTextOrClear(BB.getChildNode("userdestructor"),mUserDestructor);
}
// Template parameters
{
mTemplateDeclaration += "class ";
std::string val;
- GetTextOrClear(BB.getChildNode("template",&j),val);
+ bbtk::GetTextOrClear(BB.getChildNode("template",&j),val);
mTemplateDeclaration += val;
mTemplateDeclaration += ",";
mTemplateImplementation += val;
}
mTemplateDeclaration += "class ";
std::string val;
- GetTextOrClear(BB.getChildNode("template",&j),val);
+ bbtk::GetTextOrClear(BB.getChildNode("template",&j),val);
mTemplateDeclaration += val;
mTemplateDeclaration += ">";
mTemplateImplementation += val;
for (i=0,j=0; i<BB.nChildNode("include"); i++)
{
std::string val;
- GetTextOrClear(BB.getChildNode("include",&j),val);
+ bbtk::GetTextOrClear(BB.getChildNode("include",&j),val);
mInclude.push_back(val);
}
+ // Typedef
+ for (i=0,j=0; i<BB.nChildNode("typedef"); i++)
+ {
+ std::string val;
+ bbtk::GetTextOrClear(BB.getChildNode("typedef",&j),val);
+ mTypedef.push_back(val);
+ }
// Inputs
for (i=0,j=0; i<BB.nChildNode("input"); i++)
io.special = n.getAttribute("special");
}
+ if (n.isAttributeSet("nature"))
+ {
+ io.nature = n.getAttribute("nature");
+ }
+
if (n.isAttributeSet("generic_type"))
{
io.generic_type = n.getAttribute("generic_type");
io.special = n.getAttribute("special");
}
+ if (n.isAttributeSet("nature"))
+ {
+ io.nature = n.getAttribute("nature");
+ }
+
if (n.isAttributeSet("generic_type"))
{
io.generic_type = n.getAttribute("generic_type");
// process tag given ?
if (BB.nChildNode("process"))
{
- GetTextOrClear(BB.getChildNode("process"),mProcess);
+ bbtk::GetTextOrClear(BB.getChildNode("process"),mProcess);
}
// CreateWidget
// createwidget tag given ?
if (BB.nChildNode("createwidget"))
{
- GetTextOrClear(BB.getChildNode("createwidget"),mCreateWidget);
+ bbtk::GetTextOrClear(BB.getChildNode("createwidget"),mCreateWidget);
}
}
//==========================================================================
if (mGeneric) mFile << "#include \"bbitkImage.h\"\n";
mFile << "\n";
+ if (mType == itkImageToImageFilter )
+ {
+ mFile << "#include \"bbtkItkBlackBoxMacros.h\"\n";
+ }
+ else if ( (mType == vtkImageAlgorithm) ||
+ (mType == vtkPolyDataAlgorithm) )
+ {
+ mFile << "#include \"bbtkVtkBlackBoxMacros.h\"\n";
+ }
// Namespace
BeginNamespace();
mFile << "{\n";
// Interface
- mFile << " BBTK_USER_BLACK_BOX_INTERFACE("
+ mFile << " BBTK_BLACK_BOX_INTERFACE("
<< mName << ","
<< mParentBlackBox << ");\n";
(mType == vtkPolyDataAlgorithm) )
{
mFile << " typedef " <<mVtkParent <<" vtkParent;"<<std::endl;
- mFile << " void bbDelete() { vtkParent::Delete(); }"<<std::endl;
+ mFile << " BBTK_VTK_DELETE(vtkParent);"<<std::endl;
+ }
+ for (i=mTypedef.begin(); i!=mTypedef.end(); ++i)
+ {
+ mFile << *i <<"\n";
}
// Declare user constructor / copy cons /destr
// Process
if ((mType == STD)||(mProcess.size()))
{
- mFile << " BBTK_PROCESS(DoProcess);\n" ;
- mFile << " void DoProcess();\n";
+ mFile << " BBTK_PROCESS(Process);\n" ;
+ mFile << " void Process();\n";
}
else if (mType == itkImageToImageFilter)
{
// CreateWidget
if (mIsWidget)
{
- mFile << " BBTK_CREATE_WIDGET(DoCreateWidget);\n" ;
- mFile << " void DoCreateWidget();\n";
+ mFile << " BBTK_CREATE_WIDGET(CreateWidget);\n" ;
+ mFile << " void CreateWidget();\n";
}
// Category
mFile << "BBTK_CATEGORY(\""<<mCategory<< "\");\n";
+
+ for (i=mTypedef.begin(); i!=mTypedef.end(); ++i)
+ {
+ mFile << *i <<"\n";
+ }
// Inputs
for (ioi=mInput.begin(); ioi!=mInput.end(); ++ioi)
mFile << "BBTK_INPUT(";
}
mFile << mName << "," << ioi->name << ",\""
- << ioi->descr << "\"," << ioi->type <<");\n";
+ << ioi->descr << "\"," << ioi->type << ",\""
+ << ioi->nature<<"\");\n";
}
// Outputs
mFile << "BBTK_OUTPUT(";
}
mFile << mName << "," << ioi->name << ",\""
- << ioi->descr << "\"," << ioi->type <<");\n";
+ << ioi->descr << "\"," << ioi->type << ",\""
+ << ioi->nature<<"\");\n";
}
// EO black box description
mFile << "{\n";
// Interface
- mFile << " BBTK_USER_BLACK_BOX_INTERFACE("
+ mFile << " BBTK_BLACK_BOX_INTERFACE("
<< mName << "Generic,bbtk::AtomicBlackBox);\n";
// Inputs
if (mTemplateParam.size()>0)
{
// Implementation
- mFile << "BBTK_USER_BLACK_BOX_TEMPLATE_IMPLEMENTATION("
+ mFile << "BBTK_BLACK_BOX_TEMPLATE_IMPLEMENTATION("
<< mName << ","
<< mParentBlackBox << ");\n";
if (mGeneric)
{
// Implementation
- mFile << "BBTK_USER_BLACK_BOX_IMPLEMENTATION("
+ mFile << "BBTK_BLACK_BOX_IMPLEMENTATION("
<< mName << "Generic,bbtk::AtomicBlackBox);\n";
// Package
mFile << "BBTK_ADD_BLACK_BOX_TO_PACKAGE("
<< mName << ")\n";
// Implementation
- mFile << "BBTK_USER_BLACK_BOX_IMPLEMENTATION("
+ mFile << "BBTK_BLACK_BOX_IMPLEMENTATION("
<< mName << ","
<< mParentBlackBox << ");\n";
}
// Process
if ((mType == STD)||(mProcess.size()))
{
- mFile << "void "<<mName<<"::DoProcess()\n{\n";
+ mFile << "void "<<mName<<"::Process()\n{\n";
mFile << mProcess << "\n";
mFile << "}\n";
}
// CreateWidget
if (mIsWidget)
{
- mFile << "void "<<mName<<"::DoCreateWidget()\n{\n";
+ mFile << "void "<<mName<<"::CreateWidget()\n{\n";
mFile << mCreateWidget << "\n";
mFile << "}\n";
}