echo -e " (this file is also used for sourcing environment before compilation if it has sh or bash syntax,"
echo -e " if the syntax is csh, it is not sourced and for compiling (-c option) environment must be set up before)"
echo -e " -s script_extension : to use if your environment file name doesn't have extension"
+ echo -e " -g : to create a gui part in your component building tree"
echo -e " -c : to compile after generation"
echo -e " (use this option only if you don't have dependencies in your header or libraries"
echo -e " if it is the case, you'll have to adapt your Makefile.in"
# outputs
echo -e "\n IDL file:"
cat parse_result > hxx2salome_journal
- echo -e "\n----------------- IDL file ------------------\n">>hxx2salome_journal
+ echo -e "\n----------------- IDL file ------------------\n" >> hxx2salome_journal
cat code_idl >> hxx2salome_journal
cat code_idl
echo -e "\n----------------- hxx file ------------------\n" >> hxx2salome_journal
#
echo -e "\n-> Duplicate template module" | tee hxx2salome_journal
tar xvfz ${gene_dir}/template_src.tgz >> hxx2salome_journal
- mv TEMPLATE_SRC ${CLASS_NAME}_SRC
- ${gene_dir}/renameSalomeModule -i TEMPLATE ${CLASS_NAME} ${CLASS_NAME}_SRC >> hxx2salome_journal
+ mv HXX2SALOME_GENERIC_CLASS_NAME_SRC ${CLASS_NAME}_SRC
+ ${gene_dir}/renameSalomeModule -i HXX2SALOME_GENERIC_CLASS_NAME ${CLASS_NAME} ${CLASS_NAME}_SRC >> hxx2salome_journal
+#
+ if [ $make_gui -eq 0 ]
+ then
+ echo -e "\n-> Delete GUI part from the tree" >> hxx2salome_journal
+ 'rm' -rf ${CLASS_NAME}_SRC/src/${CLASS_NAME}GUI
+ sed "s/${CLASS_NAME}GUI//" < ${CLASS_NAME}_SRC/src/Makefile.in > /tmp/h2smkf.$$
+ mv /tmp/h2smkf.$$ ${CLASS_NAME}_SRC/src/Makefile.in
+ fi
#
echo -e "\n-> Substitute generated code in idl file"
echo "// this idl file was generated by hxx2salome" > tmpfile
copy_component_source()
{
mv ${tmp_dir}/${CLASS_NAME}_SRC/* ${NEW_COMPONENT_SRC_DIR}
+ mkdir -p ${NEW_COMPONENT_BUILD_DIR}
+ mkdir -p ${NEW_COMPONENT_ROOT_DIR}
}
good_bye()
echo -e "\trun Salome"
echo -e "\tadd ${CLASS_NAME} to the Salome modules list"
echo -e "\t\t(with the --modules option of the runSalome command or"
- echo -e "\t\tby editing the ~/.salome_2.2.4/salome.launch file)"
+ echo -e "\t\tby editing your own per-user configuration file ~/.SalomeApprc.3.x.x)"
echo -e "\nIf the header of your component includes other headers that are not in the same directories,"
- echo -e "or if yout library has dependencies you want to specify,"
- echo -e "you'll have to modify the following Makefile:in : "
+ echo -e "or if your library has dependencies you want to specify,"
+ echo -e "you'll have to modify the following files Makefile.in: "
echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}/Makefile.in"
+ echo -e "\t\${${CLASS_NAME}_SRC_DIR}/src/${CLASS_NAME}GUI/Makefile.in"
}
launch_salome()
NEW_COMPONENT_ROOT_DIR=
NEW_COMPONENT_SRC_DIR=
NEW_COMPONENT_BUILD_DIR=
+SHELL_EXT=sh
do_compile=0
do_launch=0
-#
+make_gui=0
+ #
welcome # print some welcome info
#
-while getopts "cs:e:h:l" Option
+while getopts "cs:e:h:lg" Option
do
case $Option in
h) usage
csh) SHELL_EXT=csh;;
*) SHELL_EXT=sh;;
esac;;
+ g) make_gui=1;;
c) do_compile=1;;
l) do_launch=1;;
*) echo "Unimplemented option chosen : $Option."
#
# get class name
#
-CLASS_NAME=`awk '$1 == "class" && $0 !~ /;/ {print $2}' ${hxx_file}`
+CLASS_NAME=`awk '$1 == "class" && $0 !~ /;/ {print $2}' ${hxx_file}|awk -F: '{print $1}'`
echo " Name of class :" $CLASS_NAME
if [ ! $CLASS_NAME ]
then
idl_arg_type["const MEDMEM::MESH*"]="in SALOME_MED::MESH"
idl_arg_type["const MEDMEM::FIELD<double>*"]="in SALOME_MED::FIELDDOUBLE"
idl_arg_type["const MEDMEM::FIELD<double>&"]="in SALOME_MED::FIELDDOUBLE"
- idl_arg_type["const std::vector<double>&"]="in SALOME::SenderDouble"
idl_arg_type["MEDMEM::FIELD<double>*&"]="out SALOME_MED::FIELDDOUBLE"
+ idl_arg_type["const std::vector<double>&"]="in SALOME::SenderDouble"
+ idl_arg_type["const std::vector<std::vector<double> >&"]="in SALOME::Matrix"
+ idl_arg_type["std::vector<double>*&"]="out SALOME::SenderDouble"
idl_arg_type["const MEDMEM::FIELD<int>*"]="in SALOME_MED::FIELDINT"
idl_arg_type["const MEDMEM::FIELD<int>&"]="in SALOME_MED::FIELDINT"
- idl_arg_type["const std::vector<int>&"]="in SALOME::SenderInt"
idl_arg_type["MEDMEM::FIELD<int>*&"]="out SALOME_MED::FIELDINT"
+ idl_arg_type["const std::vector<int>&"]="in SALOME::SenderInt"
+ idl_arg_type["std::vector<int>*&"]="out SALOME::SenderInt"
#
#
# mapping for returned types
idl_rtn_type["MEDMEM::FIELD<double>&"]="SALOME_MED::FIELDDOUBLE"
idl_rtn_type["const MEDMEM::FIELD<double>&"]="SALOME_MED::FIELDDOUBLE"
idl_rtn_type["std::vector<double>*"]="SALOME::SenderDouble"
+ idl_rtn_type["std::vector<std::vector<double> >*"]="SALOME::Matrix"
idl_rtn_type["const MEDMEM::FIELD<int>*"]="SALOME_MED::FIELDINT"
idl_rtn_type["MEDMEM::FIELD<int>*"]="SALOME_MED::FIELDINT"
idl_rtn_type["MEDMEM::FIELD<int>&"]="SALOME_MED::FIELDINT"
#
# Corba mapping table (for argument's types and returned types)
#
-# CNC commented types are not yet implemented
idl_impl_hxx["in long"]="CORBA::Long"
idl_impl_hxx["in double"]="CORBA::Double"
idl_impl_hxx["in float"]="CORBA::Float"
idl_impl_hxx["out string"]="CORBA::String_out"
idl_impl_hxx["in SALOME_MED::MESH"]="SALOME_MED::MESH_ptr"
idl_impl_hxx["in SALOME_MED::FIELDDOUBLE"]="SALOME_MED::FIELDDOUBLE_ptr"
- idl_impl_hxx["in SALOME::SenderDouble"]="SALOME::SenderDouble_ptr"
idl_impl_hxx["out SALOME_MED::FIELDDOUBLE"]="SALOME_MED::FIELDDOUBLE_out"
+ idl_impl_hxx["in SALOME::SenderDouble"]="SALOME::SenderDouble_ptr"
+ idl_impl_hxx["out SALOME::SenderDouble"]="SALOME::SenderDouble_out"
+ idl_impl_hxx["in SALOME::Matrix"]="SALOME::Matrix_ptr"
idl_impl_hxx["in SALOME_MED::FIELDINT"]="SALOME_MED::FIELDINT_ptr"
- idl_impl_hxx["in SALOME::SenderInt"]="SALOME::SenderInt_ptr"
idl_impl_hxx["out SALOME_MED::FIELDINT"]="SALOME_MED::FIELDINT_out"
+ idl_impl_hxx["in SALOME::SenderInt"]="SALOME::SenderInt_ptr"
+ idl_impl_hxx["out SALOME::SenderInt"]="SALOME::SenderInt_out"
idl_impl_hxx["void"]="void"
idl_impl_hxx["long"]="CORBA::Long"
idl_impl_hxx["double"]="CORBA::Double"
idl_impl_hxx["SALOME_MED::MESH"]="SALOME_MED::MESH_ptr"
idl_impl_hxx["SALOME_MED::FIELDDOUBLE"]="SALOME_MED::FIELDDOUBLE_ptr"
idl_impl_hxx["SALOME::SenderDouble"]="SALOME::SenderDouble_ptr"
+ idl_impl_hxx["SALOME::Matrix"]="SALOME::Matrix_ptr"
idl_impl_hxx["SALOME_MED::FIELDINT"]="SALOME_MED::FIELDINT_ptr"
idl_impl_hxx["SALOME::SenderInt"]="SALOME::SenderInt_ptr"
#
cpp_impl_a["const MEDMEM::MESH&"]="\tMEDMEM::MESHClient* _%s = new MEDMEM::MESHClient(%s);\n" # MESHClient cannot be created on the stack (private constructor), so we create it on the heap and dereference it later (in treatment 4)
cpp_impl_a["const MEDMEM::MESH*"]="\tMEDMEM::MESHClient* _%s = new MEDMEM::MESHClient(%s);\n"
cpp_impl_a["MEDMEM::FIELD<double>*&"]="\tMEDMEM::FIELD<double>* _%s;\n"
- cpp_impl_a["const MEDMEM::FIELD<double>*"]="\tstd::auto_ptr<MEDMEM::FIELD<double> > _%s ( new MEDMEM::FIELDClient<double>(%s) );\n"
- cpp_impl_a["const MEDMEM::FIELD<double>&"]="\tMEDMEM::FIELDClient<double> _%s(%s);\n"
+ cpp_impl_a["const MEDMEM::FIELD<double>*"]="\tstd::auto_ptr<MEDMEM::FIELD<double> > _%s ( new MEDMEM::FIELDClient<double,MEDMEM::FullInterlace>(%s) );\n"
+ cpp_impl_a["const MEDMEM::FIELD<double>&"]="\tMEDMEM::FIELDClient<double,MEDMEM::FullInterlace> _%s(%s);\n"
cpp_impl_a["const std::vector<double>&"]="\tlong _%s_size;\n\tdouble *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\
"\tstd::vector<double> _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;"
+ cpp_impl_a["std::vector<double>*&"]="\tstd::vector<double>* _%s;\n"
+ cpp_impl_a["const std::vector<std::vector<double> >&"]="\tMatrixClient _%s_client;\n\tint _%s_nbRow;\n\tint _%s_nbCol;\n"\
+ "\tdouble* _%s_tab = _%s_client.getValue(%s,_%s_nbCol,_%s_nbRow);\n\tstd::vector<std::vector<double> > _%s(_%s_nbRow);\n"\
+ "\tfor (int i=0; i!=_%s_nbRow; ++i)\n\t{\n\t _%s.reserve(_%s_nbCol);\n"\
+ "\t std::copy(_%s_tab+_%s_nbCol*i,_%s_tab+_%s_nbCol*(i+1), _%s[i].begin());\n\t}\n\tdelete [] _%s_tab;\n"
cpp_impl_a["MEDMEM::FIELD<int>*&"]="\tMEDMEM::FIELD<int>* _%s;\n"
cpp_impl_a["const MEDMEM::FIELD<int>*"]="\tstd::auto_ptr<MEDMEM::FIELD<int> > _%s ( new MEDMEM::FIELDClient<int>(%s) );\n"
cpp_impl_a["const MEDMEM::FIELD<int>&"]="\tMEDMEM::FIELDClient<int> _%s(%s);\n"
cpp_impl_a["const std::vector<int>&"]="\tlong _%s_size;\n\tint *_%s_value = ReceiverFactory::getValue(%s,_%s_size);\n"\
"\tstd::vector<int> _%s(_%s_value,_%s_value+_%s_size);\n\tdelete [] _%s_value;"
+ cpp_impl_a["std::vector<int>*&"]="\tstd::vector<int>* _%s;\n"
+
#
#
# table for c++ code generation : returned value processing
"\tMEDMEM::MESH_i * _rtn_mesh_i = new MEDMEM::MESH_i(const_cast<MEDMEM::MESH*>(_rtn_cpp));\n"\
"\tSALOME_MED::MESH_ptr _rtn_ior = _rtn_mesh_i->_this();\n"
cpp_impl_b["const MEDMEM::FIELD<double>*"]=\
- "\tMEDMEM::FIELDDOUBLE_i * _rtn_field_i = new MEDMEM::FIELDDOUBLE_i(const_cast<MEDMEM::FIELD<double>*>(_rtn_cpp),false);\n"\
+ "\tMEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace> * _rtn_field_i = new MEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace>(const_cast<MEDMEM::FIELD<double>*>(_rtn_cpp),false);\n"\
"\tSALOME_MED::FIELDDOUBLE_ptr _rtn_ior = _rtn_field_i->_this();\n"
cpp_impl_b["MEDMEM::FIELD<double>*"]=\
- "\tMEDMEM::FIELDDOUBLE_i * _rtn_field_i = new MEDMEM::FIELDDOUBLE_i(_rtn_cpp,true);\n"\
+ "\tMEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace> * _rtn_field_i = new MEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace>(_rtn_cpp,true);\n"\
"\tSALOME_MED::FIELDDOUBLE_ptr _rtn_ior = _rtn_field_i->_this();\n"
cpp_impl_b["MEDMEM::FIELD<double>&"]=\
- "\tMEDMEM::FIELDDOUBLE_i * _rtn_field_i = new MEDMEM::FIELDDOUBLE_i(&_rtn_cpp,false);\n"\
+ "\tMEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace> * _rtn_field_i = new MEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace>(&_rtn_cpp,false);\n"\
"\tSALOME_MED::FIELDDOUBLE_ptr _rtn_ior = _rtn_field_i->_this();\n"
cpp_impl_b["const MEDMEM::FIELD<double>&"]=\
- "\tMEDMEM::FIELDDOUBLE_i * _rtn_field_i = new MEDMEM::FIELDDOUBLE_i(const_cast<MEDMEM::FIELD<double>*>(&_rtn_cpp),false);\n"\
+ "\tMEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace> * _rtn_field_i = new MEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace>(const_cast<MEDMEM::FIELD<double>*>(&_rtn_cpp),false);\n"\
"\tSALOME_MED::FIELDDOUBLE_ptr _rtn_ior = _rtn_field_i->_this();\n"
cpp_impl_b["std::vector<double>*"]=\
"\tSALOME::SenderDouble_ptr _rtn_ior = SenderFactory::buildSender(*this,&(*_rtn_cpp)[0],(*_rtn_cpp).size(),true);\n"
+ cpp_impl_b["std::vector<std::vector<double> >*"]=\
+ "\tint _rtn_cpp_i=(*_rtn_cpp).size();\n\tint _rtn_cpp_j=(*_rtn_cpp)[0].size();\n"\
+ "\tdouble* _rtn_tab = new double[_rtn_cpp_i*_rtn_cpp_j];\n"\
+ "\tfor (int i=0; i!=_rtn_cpp_i; ++i)\n\t std::copy((*_rtn_cpp)[i].begin(),(*_rtn_cpp)[i].end(),_rtn_tab+i*_rtn_cpp_j);\n"\
+ "\tSALOME_Matrix_i* _rtn_matrix_i = new SALOME_Matrix_i(*this,_rtn_tab,_rtn_cpp_j,_rtn_cpp_i,true);\n"\
+ "\tSALOME::Matrix_ptr _rtn_ior = _rtn_matrix_i->_this();\n\tdelete _rtn_cpp;\n"
cpp_impl_b["const MEDMEM::FIELD<int>*"]=\
"\tMEDMEM::FIELDINT_i * _rtn_field_i = new MEDMEM::FIELDINT_i(const_cast<MEDMEM::FIELD<int>*>(_rtn_cpp),false);\n"\
"\tSALOME_MED::FIELDINT_ptr _rtn_ior = _rtn_field_i->_this();\n"
# table for c++ code generation : out parameters processing and removeRef for reference counted objects
#
cpp_impl_c["MEDMEM::FIELD<double>*&"]=\
- "\tMEDMEM::FIELDDOUBLE_i * %s_ior = new MEDMEM::FIELDDOUBLE_i(_%s, true);\n"\
+ "\tMEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace> * %s_ior = new MEDMEM::FIELDTEMPLATE_I<double,MEDMEM::FullInterlace>(_%s, true);\n"\
"\t%s = %s_ior->_this();\n"
cpp_impl_c["MEDMEM::FIELD<int>*&"]=\
"\tMEDMEM::FIELDINT_i * %s_ior = new MEDMEM::FIELDINT_i(_%s, true);\n"\
"\t%s = %s_ior->_this();\n"
+ cpp_impl_c["std::vector<double>*&"]=\
+ "\t%s = SenderFactory::buildSender(*this,&(*_%s)[0],(*_%s).size(),true);\n"
+ cpp_impl_c["std::vector<int>*&"]=\
+ "\t%s = SenderFactory::buildSender(*this,&(*_%s)[0],(*_%s).size(),true);\n"
cpp_impl_c["std::string&"]="\t%s = CORBA::string_dup(_%s.c_str());\n"
cpp_impl_c["int&"]="\t%s = _%s"
cpp_impl_c["double&"]="\t%s = _%s"
if ( NF >= 2 ){
printf "//\tArguments processing\n" >> cxx_file
for (i=2; i<=NF; i++)
- printf cpp_impl_a[type[i]],name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i] >> cxx_file
+ printf cpp_impl_a[type[i]],name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i],\
+ name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i],name[i] >> cxx_file
}
# c) generate the call to the c++ component
<x>0</x>
<y>0</y>
<width>520</width>
- <height>383</height>
+ <height>429</height>
</rect>
</property>
<property name="caption">
</widget>
<widget class="QPushButton">
<property name="name">
- <cstring>CloseButton</cstring>
+ <cstring>GenButton</cstring>
</property>
<property name="geometry">
<rect>
- <x>390</x>
- <y>340</y>
+ <x>30</x>
+ <y>380</y>
<width>86</width>
<height>28</height>
</rect>
</property>
<property name="text">
- <string>Close</string>
+ <string>Generate</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
- <cstring>GenButton</cstring>
+ <cstring>CloseButton</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
- <y>340</y>
+ <x>390</x>
+ <y>380</y>
<width>86</width>
<height>28</height>
</rect>
</property>
<property name="text">
- <string>Generate</string>
+ <string>Close</string>
</property>
</widget>
<widget class="QGroupBox">
<x>10</x>
<y>200</y>
<width>500</width>
- <height>130</height>
+ <height>160</height>
</rect>
</property>
<property name="title">
<string>Output</string>
</property>
- <widget class="QPushButton">
+ <widget class="QLabel">
<property name="name">
- <cstring>OutputTreeButton</cstring>
+ <cstring>OutputTreeLabel</cstring>
</property>
<property name="geometry">
<rect>
- <x>380</x>
+ <x>30</x>
<y>30</y>
- <width>80</width>
+ <width>140</width>
<height>30</height>
</rect>
</property>
<property name="text">
- <string>Browse ...</string>
+ <string>Salome component tree</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="QLineEdit">
<property name="name">
- <cstring>OutputTreeLabel</cstring>
+ <cstring>OutputTreeText</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
+ <x>180</x>
<y>30</y>
- <width>140</width>
+ <width>190</width>
+ <height>30</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>230</x>
+ <y>120</y>
+ <width>259</width>
<height>30</height>
</rect>
</property>
<property name="text">
- <string>Salome component tree</string>
+ <string>(if checked, generation can take a long time)</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="QPushButton">
<property name="name">
- <cstring>OutputTreeText</cstring>
+ <cstring>OutputTreeButton</cstring>
</property>
<property name="geometry">
<rect>
- <x>180</x>
+ <x>380</x>
<y>30</y>
- <width>190</width>
+ <width>80</width>
<height>30</height>
</rect>
</property>
+ <property name="text">
+ <string>Browse ...</string>
+ </property>
</widget>
<widget class="QComboBox">
<item>
</widget>
<widget class="QCheckBox">
<property name="name">
- <cstring>Compile</cstring>
+ <cstring>makeGUI</cstring>
</property>
<property name="geometry">
<rect>
<x>200</x>
<y>70</y>
- <width>210</width>
- <height>30</height>
+ <width>241</width>
+ <height>31</height>
</rect>
</property>
<property name="text">
- <string>Compile Salome Component</string>
+ <string>Generate file structure for GUI</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="QCheckBox">
<property name="name">
- <cstring>textLabel1</cstring>
+ <cstring>Compile</cstring>
</property>
<property name="geometry">
<rect>
- <x>230</x>
- <y>90</y>
- <width>259</width>
+ <x>200</x>
+ <y>100</y>
+ <width>210</width>
<height>30</height>
</rect>
</property>
<property name="text">
- <string>(if checked, generation can take a long time)</string>
+ <string>Compile Salome Component</string>
</property>
</widget>
</widget>
<slot>ShellChoice_activated(int)</slot>
</connection>
</connections>
-<includes>
- <include location="local" impldecl="in implementation">hxx2salome.ui.h</include>
-</includes>
<variables>
<variable>QString CppLibDir;</variable>
<variable>QString SalomeDir;</variable>
