diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..3e4ddd42 --- /dev/null +++ b/.clang-format @@ -0,0 +1,104 @@ +--- +Language: Cpp +# BasedOnStyle: LLVM +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: true +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: true +BinPackArguments: false +BinPackParameters: false +BreakBeforeBraces: Custom +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false +BreakBeforeBinaryOperators: None +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 90 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IncludeCategories: + - Regex: '^"(gnuradio)/' + Priority: 1 + - Regex: '^<(gnuradio)/' + Priority: 2 + - Regex: '^<(boost)/' + Priority: 98 + - Regex: '^<[a-z]*>$' + Priority: 99 + - Regex: '^".*"$' + Priority: 0 + - Regex: '.*' + Priority: 10 + +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +IndentWidth: 4 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Left +ReflowComments: true +SortIncludes: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never diff --git a/.gitignore b/.gitignore index 049eb2a1..d27ad5db 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ build*/ debian/tmp/ debian/files .directory +.idea diff --git a/CMakeLists.txt b/CMakeLists.txt index a03ca94e..63f43003 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,28 @@ if(DEFINED ENV{PYBOMBS_PREFIX}) message(STATUS "PyBOMBS installed GNU Radio. Setting CMAKE_INSTALL_PREFIX to $ENV{PYBOMBS_PREFIX}") endif() +# Make sure our local CMake Modules path comes first +list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) +# Find gnuradio to get access to the cmake modules +find_package(Gnuradio "3.10" REQUIRED) + +# Set the version information here +set(VERSION_MAJOR 1) +set(VERSION_API 0) +set(VERSION_ABI 0) +set(VERSION_PATCH git) + +cmake_policy(SET CMP0011 NEW) + +# Enable generation of compile_commands.json for code completion engines +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +######################################################################## +# Minimum Version Requirements +######################################################################## + +include(GrMinReq) + # Select the release build type by default to get optimization flags if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") @@ -41,51 +63,18 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") # Make sure our local CMake Modules path comes first list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) -# Set the version information here -set(VERSION_MAJOR 1) -set(VERSION_API 0) -set(VERSION_ABI 0) -set(VERSION_PATCH git) - -cmake_policy(SET CMP0011 NEW) - # Enable generation of compile_commands.json for code completion engines set(CMAKE_EXPORT_COMPILE_COMMANDS ON) ######################################################################## -# Compiler specific setup +# Compiler settings ######################################################################## -if((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR - CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - AND NOT WIN32) - #http://gcc.gnu.org/wiki/Visibility - add_definitions(-fvisibility=hidden) -endif() -IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_STANDARD 11) -ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - SET(CMAKE_CXX_STANDARD 11) -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - SET(CMAKE_CXX_STANDARD 11) -ELSE() - message(WARNING "C++ standard could not be set because compiler is not GNU, Clang or MSVC.") -ENDIF() - -IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_C_STANDARD 11) -ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang") - SET(CMAKE_C_STANDARD 11) -ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC") - SET(CMAKE_C_STANDARD 11) -ELSE() - message(WARNING "C standard could not be set because compiler is not GNU, Clang or MSVC.") -ENDIF() +include(GrCompilerSettings) ######################################################################## # Install directories ######################################################################## -find_package(Gnuradio "3.8" REQUIRED COMPONENTS blocks filter fft CONFIG) include(GrVersion) include(GrPlatform) #define LIB_SUFFIX @@ -94,8 +83,8 @@ if(NOT CMAKE_MODULES_DIR) set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake) endif(NOT CMAKE_MODULES_DIR) -set(GR_INCLUDE_DIR include/grgsm) -set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/gsm) +set(GR_INCLUDE_DIR include/gsm) +set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/gnuradio-gsm) set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}) set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) @@ -159,13 +148,18 @@ add_custom_target(uninstall ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/grgsm) +add_subdirectory(include/gsm) add_subdirectory(lib) add_subdirectory(apps) add_subdirectory(docs) -add_subdirectory(swig) -add_subdirectory(python) -add_subdirectory(grc) +# NOTE: manually update below to use GRC to generate C++ flowgraphs w/o python +if(ENABLE_PYTHON) + message(STATUS "PYTHON and GRC components are enabled") + add_subdirectory(python/gsm) + add_subdirectory(grc) +else(ENABLE_PYTHON) + message(STATUS "PYTHON and GRC components are disabled") +endif(ENABLE_PYTHON) ######################################################################## # Install cmake search helper for this library @@ -173,6 +167,12 @@ add_subdirectory(grc) install( FILES - cmake/Modules/gr-gsmConfig.cmake - DESTINATION ${CMAKE_MODULES_DIR}/grgsm + cmake/Modules/gnuradio-gsmConfig.cmake + DESTINATION ${CMAKE_MODULES_DIR}/gsm ) + +include(CMakePackageConfigHelpers) +configure_package_config_file( + ${PROJECT_SOURCE_DIR}/cmake/Modules/targetConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake/Modules/${target}Config.cmake + INSTALL_DESTINATION ${GR_CMAKE_DIR}) diff --git a/README.md b/README.md index b6decde8..21a877a3 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Credits *Roman Khassraf* \ - blocks for demultiplexing and decoding of voice channels, decryption block supporting all ciphers used in GSM, blocks for storing and reading GSM bursts, project planning and user support -*Vadim Yanitskiy* \ - control and data interface for the transceiver, grgsm_trx application +*Vadim Yanitskiy* \ - control and data interface for the transceiver, gsm_trx application *Vasil Velichkov* \ - automatic compilation of grc applications, fixes and user support diff --git a/TESTING.md b/TESTING.md index b51e6473..7a4b6c9b 100644 --- a/TESTING.md +++ b/TESTING.md @@ -2,7 +2,7 @@ ## CI Testing -CI testing currently consists of attempting to build gr-gsm as described in the .docker files located under gr-gsm/tests/dockerfiles using travis-ci.org. If the build is successful, travis-ci will attempt to decode the test file located under gr-gsm/test_data and compare the results to this file: gr-gsm/tests/fixtures/grgsm_decode_test1_expected. See the gr-gsm/tests/scripts/decode.sh file for details. +CI testing currently consists of attempting to build gr-gsm as described in the .docker files located under gr-gsm/tests/dockerfiles using travis-ci.org. If the build is successful, travis-ci will attempt to decode the test file located under gr-gsm/test_data and compare the results to this file: gr-gsm/tests/fixtures/gsm_decode_test1_expected. See the gr-gsm/tests/scripts/decode.sh file for details. ## Integration testing diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 54a7774a..a4f50907 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -25,29 +25,29 @@ add_subdirectory(helpers) GRCC_COMPILE(grgsm_livemon) GRCC_COMPILE(grgsm_livemon_headless) -set(grgsm_flowgraphs "") +set(gsm_flowgraphs "") OPTION(ENABLE_GRCC "Compile the flowgraphs with grcc" ON) -OPTION(ENABLE_GRGSM_LIVEMON "Compile grgsm_livemon" ON) -OPTION(ENABLE_GRGSM_LIVEMON_HEADLESS "Compile grgsm_livemon_headless" ON) +OPTION(ENABLE_GSM_LIVEMON "Compile grgsm_livemon" ON) +OPTION(ENABLE_GSM_LIVEMON_HEADLESS "Compile grgsm_livemon_headless" ON) -if(ENABLE_GRC AND ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON) - list (APPEND grgsm_flowgraphs ${CMAKE_CURRENT_BINARY_DIR}/grgsm_livemon) +if(ENABLE_GRC AND ENABLE_GRCC AND ENABLE_GSM_LIVEMON) + list (APPEND gsm_flowgraphs ${CMAKE_CURRENT_BINARY_DIR}/grgsm_livemon) endif() -if(ENABLE_GRC AND ENABLE_GRCC AND ENABLE_GRGSM_LIVEMON_HEADLESS) - list (APPEND grgsm_flowgraphs ${CMAKE_CURRENT_BINARY_DIR}/grgsm_livemon_headless) +if(ENABLE_GRC AND ENABLE_GRCC AND ENABLE_GSM_LIVEMON_HEADLESS) + list (APPEND gsm_flowgraphs ${CMAKE_CURRENT_BINARY_DIR}/grgsm_livemon_headless) endif() GR_PYTHON_INSTALL( PROGRAMS - ${grgsm_flowgraphs} - grgsm_scanner grgsm_decode + grgsm_scanner grgsm_trx + ${gsm_flowgraphs} DESTINATION bin ) # The add_dependencies(...) is very important for the parallel build `make -j $(nproc)` # The `pygen_apps` target is generated in GR_PYTHON_INSTALL function which calls # GR_UNIQUE_TARGET that we redefine in GrccCompile. -add_dependencies(pygen_apps grgsm_swig) +add_dependencies(pygen_apps gsm_python copy_module_for_tests) diff --git a/apps/README b/apps/README index 4f7ca6e5..94f60465 100644 --- a/apps/README +++ b/apps/README @@ -1,18 +1,18 @@ This directory contains programs based on gr-gsm: -* grgsm_decode (old name: airprobe_decode.py) - program for decoding C0 channel +* grgsm_decode (old name: airprobe_decode.py) - program for decoding C0 channel which is most close in terms of functionality to the old gsm-receiver from Airprobe project, with ability to decode signalling channels and traffic channels with speech (analysis of the data can be performed in Wireshark, decoded sound is stored to an audio file), -* grgsm_livemon (old name: airprobe_rtlsdr.py) - interactive monitor of a single C0 channel with analysis +* grgsm_livemon (old name: airprobe_rtlsdr.py) - interactive monitor of a single C0 channel with analysis performed by Wireshark (command to run wireshark: sudo wireshark -k -f udp -Y gsmtap -i lo), -* grgsm_scanner (old name: airprobe_rtlsdr_scanner.py) - an application that scans GSM bands and prints +* grgsm_scanner (old name: airprobe_rtlsdr_scanner.py) - an application that scans GSM bands and prints information about base transceiver stations transmitting in the area. There are following helper programs for grgsm_decode program: -* grgsm_capture (old name: airprobe_rtlsdr_capture.py) - program for capturing GSM signal to a file +* grgsm_capture (old name: airprobe_rtlsdr_capture.py) - program for capturing GSM signal to a file that can be later processed by grgsm_decode, -* grgsm_channelize (old name: gsm_channelize.py) - splits wideband capture file into multiple files - each contain +* grgsm_channelize (old name: gsm_channelize.py) - splits wideband capture file into multiple files - each contain single GSM channel. * grgsm_livemon_headless - command line version of grgsm_livemon. It diff --git a/apps/apps_data/CMakeLists.txt b/apps/apps_data/CMakeLists.txt index 24ed3f0f..fb09f371 100644 --- a/apps/apps_data/CMakeLists.txt +++ b/apps/apps_data/CMakeLists.txt @@ -17,26 +17,26 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -set(grgsm_freedesktop_path ${GR_PKG_DATA_DIR}/gr-gsm/freedesktop) +set(gsm_freedesktop_path ${GR_PKG_DATA_DIR}/gr-gsm/freedesktop) install( FILES - grgsm-livemon.desktop - DESTINATION ${grgsm_freedesktop_path} + gsm-livemon.desktop + DESTINATION ${gsm_freedesktop_path} COMPONENT "gr-gsm" ) find_program(HAVE_XDG_UTILS xdg-desktop-menu) if(UNIX AND HAVE_XDG_UTILS) - set(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grgsm_freedesktop_path}) + set(SRCDIR ${CMAKE_INSTALL_PREFIX}/${gsm_freedesktop_path}) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/grgsm_setup_freedesktop.in - ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop + ${CMAKE_CURRENT_SOURCE_DIR}/gsm_setup_freedesktop.in + ${CMAKE_CURRENT_BINARY_DIR}/gsm_setup_freedesktop @ONLY) install( PROGRAMS - ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop + ${CMAKE_CURRENT_BINARY_DIR}/gsm_setup_freedesktop DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "gr-gsm" ) diff --git a/apps/apps_data/grgsm-livemon.desktop b/apps/apps_data/gsm-livemon.desktop similarity index 100% rename from apps/apps_data/grgsm-livemon.desktop rename to apps/apps_data/gsm-livemon.desktop diff --git a/apps/apps_data/grgsm_setup_freedesktop.in b/apps/apps_data/gsm_setup_freedesktop.in similarity index 100% rename from apps/apps_data/grgsm_setup_freedesktop.in rename to apps/apps_data/gsm_setup_freedesktop.in diff --git a/apps/grgsm_decode b/apps/grgsm_decode index 000440f8..7f633765 100755 --- a/apps/grgsm_decode +++ b/apps/grgsm_decode @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2015 by Roman Khassraf @@ -21,19 +21,21 @@ # # +from gnuradio import pdu from gnuradio import blocks +from gnuradio import network from gnuradio import eng_notation from gnuradio import gr from gnuradio.eng_option import eng_option from optparse import OptionParser, OptionGroup import collections -import grgsm +from gnuradio import gsm import pmt import socket import sys -class grgsm_decoder(gr.top_block): +class gsm_decoder(gr.top_block): def __init__(self, timeslot=0, subslot=None, chan_mode='BCCH', burst_file=None, @@ -73,58 +75,58 @@ class grgsm_decoder(gr.top_block): ################################################## if self.burst_file: - self.burst_file_source = grgsm.burst_file_source(burst_file) + self.burst_file_source = gsm.burst_file_source(burst_file) elif self.cfile: self.file_source = blocks.file_source(gr.sizeof_gr_complex*1, self.cfile, False) - self.receiver = grgsm.receiver(4, ([0]), ([])) + self.receiver = gsm.receiver(4, ([0]), ([])) if self.fc is not None: - self.input_adapter = grgsm.gsm_input(ppm=ppm, osr=4, fc=self.fc, samp_rate_in=samp_rate) - self.offset_control = grgsm.clock_offset_control(self.fc, self.samp_rate) + self.input_adapter = gsm.gsm_input(ppm=ppm, osr=4, fc=self.fc, samp_rate_in=samp_rate) + self.offset_control = gsm.clock_offset_control(self.fc, self.samp_rate) else: - self.input_adapter = grgsm.gsm_input(ppm=ppm, osr=4, samp_rate_in=samp_rate) + self.input_adapter = gsm.gsm_input(ppm=ppm, osr=4, samp_rate_in=samp_rate) - self.dummy_burst_filter = grgsm.dummy_burst_filter() - self.timeslot_filter = grgsm.burst_timeslot_filter(self.timeslot) + self.dummy_burst_filter = gsm.dummy_burst_filter() + self.timeslot_filter = gsm.burst_timeslot_filter(self.timeslot) self.subslot_filter = None if self.chan_mode == 'BCCH_SDCCH4' and self.subslot is not None: - self.subslot_filter = grgsm.burst_sdcch_subslot_filter(grgsm.SS_FILTER_SDCCH4, self.subslot) + self.subslot_filter = gsm.burst_sdcch_subslot_filter(gsm.SS_FILTER_SDCCH4, self.subslot) elif self.chan_mode == 'SDCCH8' and self.subslot is not None: - self.subslot_filter = grgsm.burst_sdcch_subslot_filter(grgsm.SS_FILTER_SDCCH8, self.subslot) + self.subslot_filter = gsm.burst_sdcch_subslot_filter(gsm.SS_FILTER_SDCCH8, self.subslot) if self.chan_mode == 'BCCH': - self.bcch_demapper = grgsm.gsm_bcch_ccch_demapper(self.timeslot) + self.bcch_demapper = gsm.gsm_bcch_ccch_demapper(self.timeslot) elif self.chan_mode == 'BCCH_SDCCH4': - self.bcch_sdcch4_demapper = grgsm.gsm_bcch_ccch_sdcch4_demapper(self.timeslot) + self.bcch_sdcch4_demapper = gsm.gsm_bcch_ccch_sdcch4_demapper(self.timeslot) elif self.chan_mode == 'SDCCH8': - self.sdcch8_demapper = grgsm.gsm_sdcch8_demapper(self.timeslot) + self.sdcch8_demapper = gsm.gsm_sdcch8_demapper(self.timeslot) elif self.chan_mode == 'TCHF': - self.tch_f_demapper = grgsm.tch_f_chans_demapper(self.timeslot) - self.tch_f_decoder = grgsm.tch_f_decoder(speech_codec, enable_voice_boundary_detection) - self.tch_f_pdu_to_tagged_stream = blocks.pdu_to_tagged_stream(blocks.byte_t, "packet_len") + self.tch_f_demapper = gsm.tch_f_chans_demapper(self.timeslot) + self.tch_f_decoder = gsm.tch_f_decoder(speech_codec, enable_voice_boundary_detection) + self.tch_f_pdu_to_tagged_stream = pdu.pdu_to_tagged_stream(gr.types.byte_t, "packet_len") self.tch_f_file_sink = blocks.file_sink(gr.sizeof_char*1, speech_file, False) elif self.chan_mode == 'TCHH': - self.tch_h_demapper = grgsm.tch_h_chans_demapper(self.timeslot, tch_h_channel) - self.tch_h_decoder = grgsm.tch_h_decoder(tch_h_channel, multi_rate, enable_voice_boundary_detection) - self.tch_f_pdu_to_tagged_stream = blocks.pdu_to_tagged_stream(blocks.byte_t, "packet_len") + self.tch_h_demapper = gsm.tch_h_chans_demapper(self.timeslot, tch_h_channel) + self.tch_h_decoder = gsm.tch_h_decoder(tch_h_channel, multi_rate, enable_voice_boundary_detection) + self.tch_f_pdu_to_tagged_stream = pdu.pdu_to_tagged_stream(gr.types.byte_t, "packet_len") self.tch_f_file_sink = blocks.file_sink(gr.sizeof_char*1, speech_file, False) if self.kc != [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]: - self.decryption = grgsm.decryption(self.kc, self.a5) - self.cch_decoder_decrypted = grgsm.control_channels_decoder() + self.decryption = gsm.decryption(self.kc, self.a5) + self.cch_decoder_decrypted = gsm.control_channels_decoder() if self.chan_mode in ('TCHF', 'TCHH'): - self.decryption_tch_sacch = grgsm.decryption(self.kc, self.a5) + self.decryption_tch_sacch = gsm.decryption(self.kc, self.a5) - self.cch_decoder = grgsm.control_channels_decoder() + self.cch_decoder = gsm.control_channels_decoder() - self.socket_pdu_server = blocks.socket_pdu("UDP_SERVER", "127.0.0.1", "4729", 10000) #added in order to avoid generating ICMP messages - self.socket_pdu = blocks.socket_pdu("UDP_CLIENT", "127.0.0.1", "4729", 10000) + self.socket_pdu_server = network.socket_pdu("UDP_SERVER", "127.0.0.1", "4729", 10000) #added in order to avoid generating ICMP messages + self.socket_pdu = network.socket_pdu("UDP_CLIENT", "127.0.0.1", "4729", 10000) if self.verbose: - self.message_printer = grgsm.message_printer(pmt.intern(""), True, True, False) + self.message_printer = gsm.message_printer(pmt.intern(""), True, True, False) if self.print_bursts: - self.bursts_printer = grgsm.bursts_printer(pmt.intern(""), True, True, True, True) + self.bursts_printer = gsm.bursts_printer(pmt.intern(""), True, True, True, True) @@ -244,18 +246,18 @@ if __name__ == '__main__': # List of channel configurations channel_modes = ['BCCH', 'BCCH_SDCCH4', 'SDCCH8', 'TCHF', 'TCHH'] - # mapping options to grgsm's enums + # mapping options to gsm's enums tch_codecs = collections.OrderedDict([ - ('FR', grgsm.TCH_FS), - ('EFR', grgsm.TCH_EFR), - ('AMR12.2', grgsm.TCH_AFS12_2), - ('AMR10.2', grgsm.TCH_AFS10_2), - ('AMR7.95', grgsm.TCH_AFS7_95), - ('AMR7.4', grgsm.TCH_AFS7_4), - ('AMR6.7', grgsm.TCH_AFS6_7), - ('AMR5.9', grgsm.TCH_AFS5_9), - ('AMR5.15', grgsm.TCH_AFS5_15), - ('AMR4.75', grgsm.TCH_AFS4_75) + ('FR', gsm.TCH_FS), + ('EFR', gsm.TCH_EFR), + ('AMR12.2', gsm.TCH_AFS12_2), + ('AMR10.2', gsm.TCH_AFS10_2), + ('AMR7.95', gsm.TCH_AFS7_95), + ('AMR7.4', gsm.TCH_AFS7_4), + ('AMR6.7', gsm.TCH_AFS6_7), + ('AMR5.9', gsm.TCH_AFS5_9), + ('AMR5.15', gsm.TCH_AFS5_15), + ('AMR4.75', gsm.TCH_AFS4_75) ]) kc = [] @@ -375,17 +377,17 @@ if __name__ == '__main__': arfcn = None fc = None if options.arfcn: - if not grgsm.arfcn.is_valid_arfcn(options.arfcn): + if not gsm.arfcn.is_valid_arfcn(options.arfcn): parser.error("ARFCN is not valid\n") else: arfcn = options.arfcn - fc = grgsm.arfcn.arfcn2downlink(arfcn) + fc = gsm.arfcn.arfcn2downlink(arfcn) elif options.fc: fc = options.fc - arfcn = grgsm.arfcn.downlink2arfcn(options.fc) + arfcn = gsm.arfcn.downlink2arfcn(options.fc) # instanciate decoder - tb = grgsm_decoder(timeslot=options.timeslot, subslot=options.subslot, chan_mode=options.chan_mode, + tb = gsm_decoder(timeslot=options.timeslot, subslot=options.subslot, chan_mode=options.chan_mode, burst_file=options.burst_file, cfile=options.cfile, fc=fc, samp_rate=options.samp_rate, a5=options.a5, a5_kc=kc, diff --git a/apps/grgsm_livemon.grc b/apps/grgsm_livemon.grc index e8bf4a59..64673641 100644 --- a/apps/grgsm_livemon.grc +++ b/apps/grgsm_livemon.grc @@ -1,6 +1,7 @@ options: parameters: author: Piotr Krysik + catch_exceptions: 'True' category: Custom cmake_opt: '' comment: '' @@ -41,7 +42,7 @@ blocks: gui_hint: '' label: Frequency min_len: '100' - orient: Qt.Horizontal + orient: QtCore.Qt.Horizontal rangeType: float start: 800e6 step: 2e5 @@ -62,7 +63,7 @@ blocks: gui_hint: '' label: Gain min_len: '100' - orient: Qt.Horizontal + orient: QtCore.Qt.Horizontal rangeType: float start: '0' step: '0.5' @@ -83,7 +84,7 @@ blocks: gui_hint: '' label: PPM Offset min_len: '100' - orient: Qt.Horizontal + orient: QtCore.Qt.Horizontal rangeType: float start: '-150' step: '0.1' @@ -123,6 +124,7 @@ blocks: maxoutbuf: '0' minoutbuf: '0' phase_inc: -2*pi*shiftoff/samp_rate + tag_inc_update: 'False' states: bus_sink: false bus_source: false @@ -130,46 +132,6 @@ blocks: coordinate: [256, 300] rotation: 0 state: enabled -- name: blocks_socket_pdu_0_0 - id: blocks_socket_pdu - parameters: - affinity: '' - alias: '' - comment: '' - host: 127.0.0.1 - maxoutbuf: '0' - minoutbuf: '0' - mtu: '10000' - port: serverport - tcp_no_delay: 'False' - type: UDP_SERVER - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [1632, 295] - rotation: 0 - state: enabled -- name: blocks_socket_pdu_0_1 - id: blocks_socket_pdu - parameters: - affinity: '' - alias: '' - comment: '' - host: collector - maxoutbuf: '0' - minoutbuf: '0' - mtu: '1500' - port: collectorport - tcp_no_delay: 'False' - type: UDP_CLIENT - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [1504, 295] - rotation: 0 - state: enabled - name: collector id: parameter parameters: @@ -196,7 +158,7 @@ blocks: label: UDP port number of collector short_id: '' type: str - value: '4729' + value: '4730' states: bus_sink: false bus_source: false @@ -213,7 +175,7 @@ blocks: label: GSM channel's central frequency short_id: f type: eng_float - value: 941.8e6 + value: '934200000' states: bus_sink: false bus_source: false @@ -352,7 +314,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1776, 302] + coordinate: [1680, 460.0] rotation: 0 state: enabled - name: gsm_receiver_0 @@ -408,14 +370,54 @@ blocks: parameters: alias: '' comment: '' - imports: from grgsm import arfcn + imports: import gnuradio.gsm.arfcn as arfcn states: bus_sink: false bus_source: false bus_structure: null - coordinate: [1016, 60] + coordinate: [1016, 148.0] rotation: 0 state: enabled +- name: network_socket_pdu_0 + id: network_socket_pdu + parameters: + affinity: '' + alias: '' + comment: '' + host: 127.0.0.1 + maxoutbuf: '0' + minoutbuf: '0' + mtu: '1500' + port: serverport + tcp_no_delay: 'False' + type: UDP_SERVER + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1504, 388.0] + rotation: 0 + state: true +- name: network_socket_pdu_1 + id: network_socket_pdu + parameters: + affinity: '' + alias: '' + comment: '' + host: collector + maxoutbuf: '0' + minoutbuf: '0' + mtu: '1500' + port: collectorport + tcp_no_delay: 'False' + type: UDP_CLIENT + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1664, 108.0] + rotation: 0 + state: true - name: osr id: parameter parameters: @@ -502,6 +504,7 @@ blocks: minoutbuf: '0' name: '""' nconnections: '1' + norm_window: 'False' showports: 'True' tr_chan: '0' tr_level: '0.0' @@ -520,7 +523,7 @@ blocks: width7: '1' width8: '1' width9: '1' - wintype: firdes.WIN_BLACKMAN_hARRIS + wintype: window.WIN_BLACKMAN_hARRIS ymax: '10' ymin: '-140' states: @@ -567,7 +570,7 @@ blocks: ant7: '' ant8: '' ant9: '' - args: str(grgsm.device.get_default_args(args)) + args: str(gsm.device.get_default_args(args)) bb_gain0: '20' bb_gain1: '20' bb_gain10: '20' @@ -913,7 +916,7 @@ blocks: label: UDP server listening port short_id: '' type: str - value: '4729' + value: '4730' states: bus_sink: false bus_source: false @@ -938,22 +941,67 @@ blocks: coordinate: [784, 11] rotation: 0 state: enabled +- name: soapy_custom_source_0 + id: soapy_custom_source + parameters: + affinity: '' + agc0: 'False' + agc1: 'False' + alias: '' + antenna0: TX/RX + antenna1: '' + bandwidth0: 250e3+abs(shiftoff) + bandwidth1: '0' + center_freq0: fc_slider-shiftoff + center_freq1: '0' + comment: '' + dc_offset0: '0' + dc_offset1: '0' + dc_removal0: 'True' + dc_removal1: 'True' + dev_args: str(gsm.device.get_default_args(args)) + driver: uhd + freq_correction0: '0' + freq_correction1: '0' + gain0: gain_slider + gain1: '0' + iq_balance0: '0' + iq_balance1: '0' + maxoutbuf: '0' + minoutbuf: '0' + nchan: '1' + samp_rate: samp_rate + settings0: '' + settings1: '' + stream_args: '' + tune_args0: '' + tune_args1: '' + type: fc32 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [48, 484.0] + rotation: 0 + state: disabled connections: - [blocks_rotator_cc_0, '0', gsm_input_0, '0'] - [blocks_rotator_cc_0, '0', qtgui_freq_sink_x_0, '0'] -- [blocks_socket_pdu_0_0, pdus, gsm_message_printer_1, msgs] - [gsm_bcch_ccch_demapper_0, bursts, gsm_control_channels_decoder_0, bursts] - [gsm_clock_offset_control_0, ctrl, gsm_input_0, ctrl_in] -- [gsm_control_channels_decoder_0, msgs, blocks_socket_pdu_0_1, pdus] -- [gsm_control_channels_decoder_0_0, msgs, blocks_socket_pdu_0_1, pdus] +- [gsm_control_channels_decoder_0, msgs, network_socket_pdu_1, pdus] +- [gsm_control_channels_decoder_0_0, msgs, network_socket_pdu_1, pdus] - [gsm_decryption_0, bursts, gsm_control_channels_decoder_0_0, bursts] - [gsm_input_0, '0', gsm_receiver_0, '0'] - [gsm_receiver_0, C0, gsm_bcch_ccch_demapper_0, bursts] - [gsm_receiver_0, C0, gsm_sdcch8_demapper_0, bursts] - [gsm_receiver_0, measurements, gsm_clock_offset_control_0, measurements] - [gsm_sdcch8_demapper_0, bursts, gsm_decryption_0, bursts] +- [network_socket_pdu_0, pdus, gsm_message_printer_1, msgs] - [rtlsdr_source_0, '0', blocks_rotator_cc_0, '0'] +- [soapy_custom_source_0, '0', blocks_rotator_cc_0, '0'] metadata: file_format: 1 + grc_version: v3.11.0.0git-91-gb554eeab diff --git a/apps/grgsm_livemon_headless.grc b/apps/grgsm_livemon_headless.grc index 8e2e3faa..a75ec51d 100644 --- a/apps/grgsm_livemon_headless.grc +++ b/apps/grgsm_livemon_headless.grc @@ -1,6 +1,7 @@ options: parameters: author: Piotr Krysik + catch_exceptions: 'True' category: Custom cmake_opt: '' comment: '' @@ -78,6 +79,7 @@ blocks: maxoutbuf: '0' minoutbuf: '0' phase_inc: -2*pi*shiftoff/samp_rate + tag_inc_update: 'False' states: bus_sink: false bus_source: false @@ -85,46 +87,6 @@ blocks: coordinate: [416, 300] rotation: 0 state: enabled -- name: blocks_socket_pdu_0_0 - id: blocks_socket_pdu - parameters: - affinity: '' - alias: '' - comment: '' - host: 127.0.0.1 - maxoutbuf: '0' - minoutbuf: '0' - mtu: '10000' - port: serverport - tcp_no_delay: 'False' - type: UDP_SERVER - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [1736, 295] - rotation: 0 - state: enabled -- name: blocks_socket_pdu_0_1 - id: blocks_socket_pdu - parameters: - affinity: '' - alias: '' - comment: '' - host: collector - maxoutbuf: '0' - minoutbuf: '0' - mtu: '1500' - port: collectorport - tcp_no_delay: 'False' - type: UDP_CLIENT - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [1608, 295] - rotation: 0 - state: enabled - name: collector id: parameter parameters: @@ -168,7 +130,7 @@ blocks: label: GSM channel's central frequency short_id: f type: eng_float - value: 957e6 + value: 925.8e6 states: bus_sink: false bus_source: false @@ -363,7 +325,7 @@ blocks: parameters: alias: '' comment: '' - imports: from grgsm import arfcn + imports: import gnuradio.gsm as gsm states: bus_sink: false bus_source: false @@ -371,6 +333,59 @@ blocks: coordinate: [200, 60] rotation: 0 state: enabled +- name: import_2 + id: import + parameters: + alias: '' + comment: '' + imports: from gnuradio.gsm import arfcn + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [208, 108.0] + rotation: 0 + state: true +- name: network_socket_pdu_0 + id: network_socket_pdu + parameters: + affinity: '' + alias: '' + comment: '' + host: collector + maxoutbuf: '0' + minoutbuf: '0' + mtu: '1500' + port: collectorport + tcp_no_delay: 'False' + type: UDP_CLIENT + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1632, 180.0] + rotation: 0 + state: true +- name: network_socket_pdu_1 + id: network_socket_pdu + parameters: + affinity: '' + alias: '' + comment: '' + host: 127.0.0.1 + maxoutbuf: '0' + minoutbuf: '0' + mtu: '1500' + port: serverport + tcp_no_delay: 'False' + type: UDP_SERVER + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1664, 332.0] + rotation: 0 + state: true - name: osr id: parameter parameters: @@ -459,7 +474,7 @@ blocks: ant7: '' ant8: '' ant9: '' - args: str(grgsm.device.get_default_args(args)) + args: str(gsm.device.get_default_args(args)) bb_gain0: '20' bb_gain1: '20' bb_gain10: '20' @@ -834,18 +849,19 @@ blocks: connections: - [blocks_head_0, '0', blocks_rotator_cc_0, '0'] - [blocks_rotator_cc_0, '0', gsm_input_0, '0'] -- [blocks_socket_pdu_0_0, pdus, gsm_message_printer_1, msgs] - [gsm_bcch_ccch_sdcch4_demapper_0, bursts, gsm_control_channels_decoder_0, bursts] - [gsm_clock_offset_control_0, ctrl, gsm_input_0, ctrl_in] -- [gsm_control_channels_decoder_0, msgs, blocks_socket_pdu_0_1, pdus] -- [gsm_control_channels_decoder_0_0, msgs, blocks_socket_pdu_0_1, pdus] +- [gsm_control_channels_decoder_0, msgs, network_socket_pdu_0, pdus] +- [gsm_control_channels_decoder_0_0, msgs, network_socket_pdu_0, pdus] - [gsm_decryption_0, bursts, gsm_control_channels_decoder_0_0, bursts] - [gsm_input_0, '0', gsm_receiver_0, '0'] - [gsm_receiver_0, C0, gsm_bcch_ccch_sdcch4_demapper_0, bursts] - [gsm_receiver_0, C0, gsm_sdcch8_demapper_0, bursts] - [gsm_receiver_0, measurements, gsm_clock_offset_control_0, measurements] - [gsm_sdcch8_demapper_0, bursts, gsm_decryption_0, bursts] +- [network_socket_pdu_1, pdus, gsm_message_printer_1, msgs] - [rtlsdr_source_0, '0', blocks_head_0, '0'] metadata: file_format: 1 + grc_version: v3.11.0.0git-46-g614681ba diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner index e3d7a618..2116b640 100755 --- a/apps/grgsm_scanner +++ b/apps/grgsm_scanner @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2015 by Piotr Krysik @@ -21,6 +21,7 @@ # Boston, MA 02110-1301, USA. # # +from gnuradio import network from gnuradio import blocks from gnuradio import gr from gnuradio import eng_notation @@ -29,14 +30,14 @@ from gnuradio.filter import firdes from gnuradio.filter import pfb from math import pi from optparse import OptionParser - -import grgsm +from gnuradio import gsm import numpy import os import osmosdr import pmt import time import sys +import gc # from wideband_receiver import * @@ -67,16 +68,16 @@ class receiver_with_decoder(gr.hier_block2): ################################################## # Blocks ################################################## - self.gsm_receiver_0 = grgsm.receiver(OSR, ([chan_num]), ([])) - self.gsm_input_0 = grgsm.gsm_input( + self.gsm_receiver_0 = gsm.receiver(OSR, ([chan_num]), ([])) + self.gsm_input_0 = gsm.gsm_input( ppm=ppm, osr=OSR, fc=fc, samp_rate_in=samp_rate, ) - self.gsm_control_channels_decoder_0 = grgsm.control_channels_decoder() - self.gsm_clock_offset_control_0 = grgsm.clock_offset_control(fc, samp_rate, osr=4) - self.gsm_bcch_ccch_demapper_0 = grgsm.gsm_bcch_ccch_demapper(0) + self.gsm_control_channels_decoder_0 = gsm.control_channels_decoder() + self.gsm_clock_offset_control_0 = gsm.clock_offset_control(fc, samp_rate, osr=4) + self.gsm_bcch_ccch_demapper_0 = gsm.gsm_bcch_ccch_demapper(0) ################################################## # Connections @@ -209,7 +210,7 @@ class wideband_scanner(gr.top_block): # if no file name is given process data from rtl_sdr source print("Args=", args) self.rtlsdr_source = osmosdr.source(args="numchan=" + str(1) + " " + - str(grgsm.device.get_default_args(args))) + str(gsm.device.get_default_args(args))) #self.rtlsdr_source.set_min_output_buffer(int(sample_rate*rec_len)) #this line causes segfaults on HackRF self.rtlsdr_source.set_sample_rate(sample_rate) @@ -236,7 +237,7 @@ class wideband_scanner(gr.top_block): self.blocks_rotator_cc = blocks.rotator_cc(-2 * pi * 0.1e6 / sample_rate) self.wideband_receiver = wideband_receiver(OSR=4, fc=carrier_frequency, samp_rate=sample_rate) - self.gsm_extract_system_info = grgsm.extract_system_info() + self.gsm_extract_system_info = gsm.extract_system_info() self.connect((self.rtlsdr_source, 0), (self.head, 0)) self.connect((self.head, 0), (self.blocks_rotator_cc, 0)) @@ -305,13 +306,13 @@ class channel_info(object): def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug = False): signallist = [] channels_num = int(samp_rate / 0.2e6) - for arfcn_range in grgsm.arfcn.get_arfcn_ranges(band): + for arfcn_range in gsm.arfcn.get_arfcn_ranges(band): first_arfcn = arfcn_range[0] last_arfcn = arfcn_range[1] last_center_arfcn = last_arfcn - int((channels_num / 2) - 1) - current_freq = grgsm.arfcn.arfcn2downlink(first_arfcn + int(channels_num / 2) - 1) - last_freq = grgsm.arfcn.arfcn2downlink(last_center_arfcn) + current_freq = gsm.arfcn.arfcn2downlink(first_arfcn + int(channels_num / 2) - 1) + last_freq = gsm.arfcn.arfcn2downlink(last_center_arfcn) stop_freq = last_freq + 0.2e6 * channels_num while current_freq < stop_freq: @@ -358,7 +359,7 @@ def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug = False): cell_arfcn_list = scanner.gsm_extract_system_info.get_cell_arfcns(chans[i]) neighbour_list = scanner.gsm_extract_system_info.get_neighbours(chans[i]) - info = channel_info(grgsm.arfcn.downlink2arfcn(found_freqs[i]), found_freqs[i], + info = channel_info(gsm.arfcn.downlink2arfcn(found_freqs[i]), found_freqs[i], cell_ids[i], lacs[i], mccs[i], mncs[i], ccch_confs[i], powers[i], neighbour_list, cell_arfcn_list) found_list.append(info) @@ -382,7 +383,7 @@ def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug = False): def argument_parser(): parser = OptionParser(option_class=eng_option, usage="%prog: [options]") - bands_list = ", ".join(grgsm.arfcn.get_bands()) + bands_list = ", ".join(gsm.arfcn.get_bands()) parser.add_option("-b", "--band", dest="band", default="GSM900", help="Specify the GSM band for the frequency.\nAvailable bands are: " + bands_list) parser.add_option("-s", "--samp-rate", dest="samp_rate", type="float", default=2e6, @@ -413,10 +414,10 @@ def main(options = None): (options, args) = argument_parser().parse_args() if options.list_devices: - grgsm.device.print_devices(options.args) + gsm.device.print_devices(options.args) sys.exit(0) - if options.band not in grgsm.arfcn.get_bands(): + if options.band not in gsm.arfcn.get_bands(): parser.error("Invalid GSM band\n") if options.speed < 0 or options.speed > 5: diff --git a/apps/grgsm_trx b/apps/grgsm_trx index fb5a005f..a41087a8 100755 --- a/apps/grgsm_trx +++ b/apps/grgsm_trx @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver @@ -29,8 +29,8 @@ from argparse import ArgumentParser from argparse import ArgumentTypeError from gnuradio import eng_notation -from grgsm.trx import RadioInterface -from grgsm.trx import Transceiver +from gnuradio.gsm.trx import RadioInterface +from gnuradio.gsm.trx import Transceiver COPYRIGHT = \ "Copyright (C) 2016-2018 by Vadim Yanitskiy \n" \ @@ -58,9 +58,9 @@ class Application: signal.signal(signal.SIGINT, self.sig_handler) if argv.driver == "uhd": - from grgsm.trx.radio_if_uhd import RadioInterfaceUHD as Radio + from gnuradio.gsm.trx.radio_if_uhd import RadioInterfaceUHD as Radio elif argv.driver == "lms": - from grgsm.trx.radio_if_lms import RadioInterfaceLMS as Radio + from gnuradio.gsm.trx.radio_if_lms import RadioInterfaceLMS as Radio else: raise ValueError("Unknown RadioInterface driver '%s'" % argv.driver) diff --git a/apps/helpers/CMakeLists.txt b/apps/helpers/CMakeLists.txt index 1eef9fe7..c20c724a 100644 --- a/apps/helpers/CMakeLists.txt +++ b/apps/helpers/CMakeLists.txt @@ -22,8 +22,8 @@ include(GrPython) GR_PYTHON_INSTALL( PROGRAMS - grgsm_capture - grgsm_channelize + grgsm_capture + grgsm_channelize DESTINATION bin ) diff --git a/apps/helpers/grgsm_capture b/apps/helpers/grgsm_capture index 43dce330..9906fa57 100755 --- a/apps/helpers/grgsm_capture +++ b/apps/helpers/grgsm_capture @@ -30,11 +30,11 @@ from gnuradio.filter import firdes from optparse import OptionParser, OptionGroup import osmosdr import time -import grgsm +from gnuradio import gsm import signal import sys -class grgsm_capture(gr.top_block): +class gsm_capture(gr.top_block): def __init__(self, freq, gain=30, @@ -54,7 +54,7 @@ class grgsm_capture(gr.top_block): ################################################## self.sdr_source = osmosdr.source(args="numchan=" + str(1) + " " + - str(grgsm.device.get_default_args(device_args))) + str(gsm.device.get_default_args(device_args))) self.sdr_source.set_sample_rate(samp_rate) self.sdr_source.set_center_freq(freq, 0) @@ -151,7 +151,7 @@ if __name__ == '__main__': (options, args) = parser.parse_args() if options.list_devices: - grgsm.device.print_devices(options.device_args) + gsm.device.print_devices(options.device_args) sys.exit(0) if not args: @@ -167,14 +167,14 @@ if __name__ == '__main__': arfcn = 0 freq = 0 if options.arfcn: - if not grgsm.arfcn.is_valid_arfcn(options.arfcn): + if not gsm.arfcn.is_valid_arfcn(options.arfcn): parser.error("ARFCN is not valid\n") else: - freq = grgsm.arfcn.arfcn2downlink(options.arfcn) + freq = gsm.arfcn.arfcn2downlink(options.arfcn) elif options.freq: freq = options.freq - tb = grgsm_capture(freq=freq, + tb = gsm_capture(freq=freq, gain=options.gain, freq_corr=options.freq_corr, samp_rate=options.samp_rate, diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize index 92b252e5..1898ba9c 100755 --- a/apps/helpers/grgsm_channelize +++ b/apps/helpers/grgsm_channelize @@ -36,7 +36,7 @@ from gnuradio import gr from gnuradio.eng_option import eng_option from gnuradio.filter import firdes from argparse import ArgumentParser, ArgumentTypeError, RawDescriptionHelpFormatter -import grgsm.arfcn as arfcn +import gnuradio.gsm.arfcn as arfcn from gnuradio.filter import pfb import math import os @@ -56,9 +56,9 @@ def eng_float(value): except: raise ArgumentTypeError("invalid engineering notation value: {0}".format(value)) -class grgsm_channelize(gr.top_block): +class gsm_channelize(gr.top_block): def __init__(self, arfcns, resamp_rate, fc, samp_rate, input_file, dest_dir, data_type="complex"): - gr.top_block.__init__(self, "grgsm_channelize") + gr.top_block.__init__(self, "gsm_channelize") ################################################## # Parameters @@ -149,7 +149,7 @@ if __name__ == '__main__': print("Output sample rate: " + eng_notation.num_to_str(args.out_samp_rate)) print("==> using resample rate of " + str(resamp_rate)) - tb = grgsm_channelize(arfcns=args.arfcns, + tb = gsm_channelize(arfcns=args.arfcns, resamp_rate=resamp_rate, fc=args.fc, samp_rate=args.samp_rate, diff --git a/bind_modules_helper.sh b/bind_modules_helper.sh new file mode 100755 index 00000000..edf5c84e --- /dev/null +++ b/bind_modules_helper.sh @@ -0,0 +1,50 @@ +gr_modtool bind endian +gr_modtool bind misc_utils/burst_file_source +gr_modtool bind misc_utils/fn_time +gr_modtool bind misc_utils/burst_file_sink +gr_modtool bind misc_utils/msg_to_tag +gr_modtool bind misc_utils/message_printer +gr_modtool bind misc_utils/burst_to_fn_time +gr_modtool bind misc_utils/tmsi_dumper +gr_modtool bind misc_utils/message_file_source +gr_modtool bind misc_utils/controlled_fractional_resampler_cc +gr_modtool bind misc_utils/extract_immediate_assignment +gr_modtool bind misc_utils/extract_assignment_cmd +gr_modtool bind misc_utils/bursts_printer +gr_modtool bind misc_utils/message_file_sink +gr_modtool bind misc_utils/controlled_rotator_cc +gr_modtool bind misc_utils/collect_system_info +gr_modtool bind misc_utils/extract_system_info +gr_modtool bind misc_utils/extract_cmc +gr_modtool bind gsm_constants +gr_modtool bind flow_control/burst_fnr_filter +gr_modtool bind flow_control/burst_sdcch_subslot_splitter +gr_modtool bind flow_control/burst_timeslot_filter +gr_modtool bind flow_control/dummy_burst_filter +gr_modtool bind flow_control/common +gr_modtool bind flow_control/burst_sdcch_subslot_filter +gr_modtool bind flow_control/burst_type_filter +gr_modtool bind flow_control/burst_timeslot_splitter +gr_modtool bind flow_control/uplink_downlink_splitter +gr_modtool bind transmitter/txtime_setter +gr_modtool bind transmitter/gen_test_ab +gr_modtool bind transmitter/preprocess_tx_burst +gr_modtool bind qa_utils/message_source +gr_modtool bind qa_utils/burst_sink +gr_modtool bind qa_utils/burst_source +gr_modtool bind qa_utils/message_sink +gr_modtool bind constants +gr_modtool bind decoding/tch_f_decoder +gr_modtool bind decoding/tch_h_decoder +gr_modtool bind decoding/control_channels_decoder +gr_modtool bind demapping/universal_ctrl_chans_demapper +gr_modtool bind demapping/tch_f_chans_demapper +gr_modtool bind demapping/tch_h_chans_demapper +gr_modtool bind receiver/receiver +gr_modtool bind receiver/clock_offset_control +gr_modtool bind receiver/cx_channel_hopper +gr_modtool bind plotting +gr_modtool bind gsmtap +gr_modtool bind trx/trx_burst_if +gr_modtool bind api +gr_modtool bind decryption/decryption diff --git a/cmake/Modules/CMakeParseArgumentsCopy.cmake b/cmake/Modules/CMakeParseArgumentsCopy.cmake index 7ce4c49a..66016cb2 100644 --- a/cmake/Modules/CMakeParseArgumentsCopy.cmake +++ b/cmake/Modules/CMakeParseArgumentsCopy.cmake @@ -58,7 +58,7 @@ # the new option. # E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in # MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would -# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. +# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore. #============================================================================= # Copyright 2010 Alexander Neundorf diff --git a/cmake/Modules/GrccCompile.cmake b/cmake/Modules/GrccCompile.cmake index d2bc2d8e..554e8b46 100644 --- a/cmake/Modules/GrccCompile.cmake +++ b/cmake/Modules/GrccCompile.cmake @@ -19,13 +19,7 @@ # Boston, MA 02110-1301, USA. SET(PYTHONPATH - ${CMAKE_SOURCE_DIR}/python - ${CMAKE_SOURCE_DIR}/python/misc_utils - ${CMAKE_SOURCE_DIR}/python/demapping - ${CMAKE_SOURCE_DIR}/python/receiver - ${CMAKE_SOURCE_DIR}/python/transmitter - ${CMAKE_SOURCE_DIR}/python/trx - ${CMAKE_BINARY_DIR}/swig + ${CMAKE_BINARY_DIR}/test_modules $ENV{PYTHONPATH} ) string(REPLACE ";" ":" PYTHONPATH "${PYTHONPATH}") diff --git a/cmake/Modules/gnuradio-gsmConfig.cmake b/cmake/Modules/gnuradio-gsmConfig.cmake new file mode 100644 index 00000000..bee468e2 --- /dev/null +++ b/cmake/Modules/gnuradio-gsmConfig.cmake @@ -0,0 +1,32 @@ +find_package(PkgConfig) + +PKG_CHECK_MODULES(PC_GSM gnuradio-gsm) + +FIND_PATH( + GSM_INCLUDE_DIRS + NAMES gnuradio/gsm/api.h + HINTS $ENV{GSM_DIR}/include + ${PC_GSM_INCLUDEDIR} + PATHS ${CMAKE_INSTALL_PREFIX}/include + /usr/local/include + /usr/include +) + +FIND_LIBRARY( + GSM_LIBRARIES + NAMES gnuradio-gsm + HINTS $ENV{GSM_DIR}/lib + ${PC_GSM_LIBDIR} + PATHS ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 + ) + +include("${CMAKE_CURRENT_LIST_DIR}/gnuradio-gsmTarget.cmake") + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSM DEFAULT_MSG GSM_LIBRARIES GSM_INCLUDE_DIRS) +MARK_AS_ADVANCED(GSM_LIBRARIES GSM_INCLUDE_DIRS) diff --git a/cmake/Modules/gr-gsmConfig.cmake b/cmake/Modules/gr-gsmConfig.cmake deleted file mode 100644 index f8a2fec7..00000000 --- a/cmake/Modules/gr-gsmConfig.cmake +++ /dev/null @@ -1,30 +0,0 @@ -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GR_GSM grgsm) - -FIND_PATH( - GR_GSM_INCLUDE_DIRS - NAMES grgsm/api.h - HINTS $ENV{GR_GSM_DIR}/include - ${PC_GR_GSM_INCLUDEDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/include - /usr/local/include - /usr/include -) - -FIND_LIBRARY( - GR_GSM_LIBRARIES - NAMES grgsm - HINTS $ENV{GR_GSM_DIR}/lib - ${PC_GR_GSM_LIBDIR} - PATHS ${CMAKE_INSTALL_PREFIX}/lib - ${CMAKE_INSTALL_PREFIX}/lib64 - /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GR_GSM DEFAULT_MSG GR_GSM_LIBRARIES GR_GSM_INCLUDE_DIRS) -MARK_AS_ADVANCED(GR_GSM_LIBRARIES GR_GSM_INCLUDE_DIRS) - diff --git a/cmake/Modules/targetConfig.cmake.in b/cmake/Modules/targetConfig.cmake.in index 79e4a283..4a1fb312 100644 --- a/cmake/Modules/targetConfig.cmake.in +++ b/cmake/Modules/targetConfig.cmake.in @@ -2,20 +2,8 @@ # # This file is part of GNU Radio # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. include(CMakeFindDependencyMacro) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index d2f9b1cc..c46b399d 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,21 +1,10 @@ # Copyright 2011 Free Software Foundation, Inc. # -# This file is part of GNU Radio +# This file was generated by gr_modtool, a tool from the GNU Radio framework +# This file is a part of gr-gsm # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. ######################################################################## # Setup dependencies @@ -50,6 +39,7 @@ function(BUILD_MAN_PAGE _sources _src _dst) add_custom_target(man_${_src} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_dst}) endfunction() + if(NOT RST2MAN_EXECUTABLE) message(WARNING "rst2man from python-docutils is required to build man pages") else() @@ -60,5 +50,3 @@ else() DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 ) endif() - - diff --git a/docs/README.gsm b/docs/README.gsm new file mode 100644 index 00000000..e3371254 --- /dev/null +++ b/docs/README.gsm @@ -0,0 +1,11 @@ +This is the gsm-write-a-block package meant as a guide to building +out-of-tree packages. To use the gsm blocks, the Python namespaces +is in 'gsm', which is imported as: + + from gnuradio import gsm + +See the Doxygen documentation for details about the blocks available +in this package. A quick listing of the details can be found in Python +after importing by using: + + help(gsm) diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index ce64cecf..42202796 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -3,20 +3,8 @@ # This file was generated by gr_modtool, a tool from the GNU Radio framework # This file is a part of gr-gsm # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. ######################################################################## # Create the doxygen configuration file @@ -29,6 +17,7 @@ file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} abs_top_builddir) set(HAVE_DOT ${DOXYGEN_DOT_FOUND}) set(enable_html_docs YES) set(enable_latex_docs NO) +set(enable_mathjax NO) set(enable_xml_docs YES) configure_file( @@ -50,8 +39,4 @@ add_custom_command( add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS}) -install( - DIRECTORY - ${BUILT_DIRS} - DESTINATION ${GR_PKG_DOC_DIR} -) +install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR}) diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 0b4cb7ee..ff960046 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -199,13 +199,6 @@ TAB_SIZE = 8 ALIASES = -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding -# "class=itcl::class" will allow you to use the command class in the -# itcl::class meaning. - -TCL_SUBST = - # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C # sources only. Doxygen will then generate output that is more tailored for C. # For instance, some of the names that are used will be different. The list @@ -723,8 +716,6 @@ EXCLUDE_PATTERNS = */.deps/* \ EXCLUDE_SYMBOLS = ad9862 \ numpy \ - *swig* \ - *Swig* \ *my_top_block* \ *my_graph* \ *app_top_block* \ @@ -790,7 +781,7 @@ INPUT_FILTER = # info on how filters are used. If FILTER_PATTERNS is empty or if # non of the patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = *.py="@top_srcdir@"/doc/doxygen/other/doxypy.py +FILTER_PATTERNS = *.py=@top_srcdir@/docs/doxygen/other/doxypy.py # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using # INPUT_FILTER) will be used to filter the input files when producing source @@ -879,12 +870,6 @@ VERBATIM_HEADERS = YES ALPHABETICAL_INDEX = YES -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - # In case all classes in a project start with a common prefix, all # classes will be put under the same header in the alphabetical index. # The IGNORE_PREFIX tag can be used to specify one or more prefixes that @@ -1220,14 +1205,14 @@ FORMULA_TRANSPARENT = YES # output. When enabled you may also need to install MathJax separately and # configure the path to it using the MATHJAX_RELPATH option. -USE_MATHJAX = NO +USE_MATHJAX = @enable_mathjax@ # When MathJax is enabled you can set the default output format to be used for # the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and # SVG. The default value is HTML-CSS, which is slower, but has the best # compatibility. -MATHJAX_FORMAT = HTML-CSS +MATHJAX_FORMAT = SVG # When MathJax is enabled you need to specify the location relative to the # HTML output directory using the MATHJAX_RELPATH option. The destination @@ -1239,12 +1224,12 @@ MATHJAX_FORMAT = HTML-CSS # However, it is strongly recommended to install a local # copy of MathJax from http://www.mathjax.org before deployment. -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest +MATHJAX_RELPATH = @MATHJAX2_PATH@ # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension # names that should be enabled during MathJax rendering. -MATHJAX_EXTENSIONS = +MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols # The MATHJAX_CODEFILE tag can be used to specify a file with javascript # pieces of code that will be used on startup of the MathJax code. @@ -1680,11 +1665,6 @@ EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -1697,15 +1677,6 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented # or is not a class. @@ -1834,7 +1805,7 @@ DIRECTORY_GRAPH = YES # HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible in IE 9+ (other browsers do not have this requirement). -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to # enable generation of interactive SVG images that allow zooming and panning. diff --git a/docs/doxygen/Doxyfile.swig_doc.in b/docs/doxygen/Doxyfile.swig_doc.in deleted file mode 100644 index cbe06d67..00000000 --- a/docs/doxygen/Doxyfile.swig_doc.in +++ /dev/null @@ -1,1878 +0,0 @@ -# Doxyfile 1.8.4 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed -# in front of the TAG it is preceding . -# All text after a hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" "). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or sequence of words) that should -# identify the project. Note that if you do not use Doxywizard you need -# to put quotes around the project name if it contains spaces. - -PROJECT_NAME = @CPACK_PACKAGE_NAME@ - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = @CPACK_PACKAGE_VERSION@ - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer -# a quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = - -# With the PROJECT_LOGO tag one can specify an logo or icon that is -# included in the documentation. The maximum height of the logo should not -# exceed 55 pixels and the maximum width should not exceed 200 pixels. -# Doxygen will copy the logo to the output directory. - -PROJECT_LOGO = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = "@OUTPUT_DIRECTORY@" - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian, -# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, -# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. Note that you specify absolute paths here, but also -# relative paths, which will be relative from the directory where doxygen is -# started. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful if your file system -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding -# "class=itcl::class" will allow you to use the command class in the -# itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, -# and language is one of the parsers supported by doxygen: IDL, Java, -# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, -# C++. For instance to make doxygen treat .inc files as Fortran files (default -# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note -# that for custom extensions you also need to set FILE_PATTERNS otherwise the -# files are not read by doxygen. - -EXTENSION_MAPPING = - -# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all -# comments according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you -# can mix doxygen, HTML, and XML commands with Markdown formatting. -# Disable only in case of backward compatibilities issues. - -MARKDOWN_SUPPORT = YES - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by by putting a % sign in front of the word -# or globally by setting AUTOLINK_SUPPORT to NO. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also makes the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = YES - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES (the -# default) will make doxygen replace the get and set methods by a property in -# the documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and -# unions are shown inside the group in which they are included (e.g. using -# @ingroup) instead of on a separate page (for HTML and Man pages) or -# section (for LaTeX and RTF). - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and -# unions with only public data fields or simple typedef fields will be shown -# inline in the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO (the default), structs, classes, and unions are shown on a separate -# page (for HTML and Man pages) or section (for LaTeX and RTF). - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can -# be an expensive process and often the same symbol appear multiple times in -# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too -# small doxygen will become slower. If the cache is too large, memory is wasted. -# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid -# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536 -# symbols. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal -# scope will be included in the documentation. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespaces are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to -# do proper type resolution of all parameters of a function it will reject a -# match between the prototype and the implementation of a member function even -# if there is only one candidate or it is obvious which candidate to choose -# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen -# will still accept a match between prototype and implementation in such cases. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if section-label ... \endif -# and \cond section-label ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or macro consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and macros in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. -# You can optionally specify a file name after the option, if omitted -# DoxygenLayout.xml will be used as the name of the layout file. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files -# containing the references data. This must be a list of .bib files. The -# .bib extension is automatically appended if omitted. Using this command -# requires the bibtex tool to be installed. See also -# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style -# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this -# feature you need bibtex and perl available in the search path. Do not use -# file names with spaces, bibtex cannot handle them. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = YES - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# The WARN_NO_PARAMDOC option can be enabled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = @INPUT_PATHS@ - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh -# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py -# *.f90 *.f *.for *.vhd *.vhdl - -FILE_PATTERNS = *.h - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be ignored. -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty or if -# non of the patterns match the file name, INPUT_FILTER is applied. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) -# and it is also possible to disable source filtering for a specific pattern -# using *.ext= (so without naming a filter). This option only has effect when -# FILTER_SOURCE_FILES is enabled. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C, C++ and Fortran comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = NO - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. Note that when using a custom header you are responsible -# for the proper inclusion of any scripts and style sheets that doxygen -# needs, which is dependent on the configuration options used. -# It is advised to generate a default header using "doxygen -w html -# header.html footer.html stylesheet.css YourConfigFile" and then modify -# that header. Note that the header is subject to change so you typically -# have to redo this when upgrading to a newer version of doxygen or when -# changing the value of configuration settings such as GENERATE_TREEVIEW! - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If left blank doxygen will -# generate a default style sheet. Note that it is recommended to use -# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this -# tag will in the future become obsolete. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional -# user-defined cascading style sheet that is included after the standard -# style sheets created by doxygen. Using this option one can overrule -# certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefore more -# robust against future updates. Doxygen will copy the style sheet file to -# the output directory. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that -# the files will be copied as-is; there are no commands or markers available. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. -# Doxygen will adjust the colors in the style sheet and background images -# according to this color. Hue is specified as an angle on a colorwheel, -# see http://en.wikipedia.org/wiki/Hue for more information. -# For instance the value 0 represents red, 60 is yellow, 120 is green, -# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. -# The allowed range is 0 to 359. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of -# the colors in the HTML output. For a value of 0 the output will use -# grayscales only. A value of 255 will produce the most vivid colors. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to -# the luminance component of the colors in the HTML output. Values below -# 100 gradually make the output lighter, whereas values above 100 make -# the output darker. The value divided by 100 is the actual gamma applied, -# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, -# and 100 does not change the gamma. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of -# entries shown in the various tree structured indices initially; the user -# can expand and collapse entries dynamically later on. Doxygen will expand -# the tree to such a level that at most the specified number of entries are -# visible (unless a fully collapsed tree already exceeds this amount). -# So setting the number of entries 1 will produce a full collapsed tree by -# default. 0 is a special value representing an infinite number of entries -# and will result in a full expanded tree by default. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely -# identify the documentation publisher. This should be a reverse domain-name -# style string, e.g. com.mycompany.MyDocSet.documentation. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated -# that can be used as input for Qt's qhelpgenerator to generate a -# Qt Compressed Help (.qch) of the generated HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to -# add. For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see -# -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's -# filter section matches. -# -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) -# at top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. Since the tabs have the same information as the -# navigation tree you can set this option to NO if you already set -# GENERATE_TREEVIEW to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. -# Since the tree basically has the same information as the tab index you -# could consider to set DISABLE_INDEX to NO when enabling this option. - -GENERATE_TREEVIEW = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values -# (range [0,1..20]) that doxygen will group on one line in the generated HTML -# documentation. Note that a value of 0 will completely suppress the enum -# values from appearing in the overview section. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open -# links to external symbols imported via tag files in a separate window. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are -# not supported properly for IE 6.0, but are supported on all modern browsers. -# Note that when changing this option you need to delete any form_*.png files -# in the HTML output before the changes have effect. - -FORMULA_TRANSPARENT = YES - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax -# (see http://www.mathjax.org) which uses client side Javascript for the -# rendering instead of using prerendered bitmaps. Use this if you do not -# have LaTeX installed or if you want to formulas look prettier in the HTML -# output. When enabled you may also need to install MathJax separately and -# configure the path to it using the MATHJAX_RELPATH option. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and -# SVG. The default value is HTML-CSS, which is slower, but has the best -# compatibility. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the -# HTML output directory using the MATHJAX_RELPATH option. The destination -# directory should contain the MathJax.js script. For instance, if the mathjax -# directory is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to -# the MathJax Content Delivery Network so you can quickly see the result without -# installing MathJax. -# However, it is strongly recommended to install a local -# copy of MathJax from http://www.mathjax.org before deployment. - -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest - -# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension -# names that should be enabled during MathJax rendering. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript -# pieces of code that will be used on startup of the MathJax code. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = YES - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. -# There are two flavours of web server based search depending on the -# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for -# searching and an index file used by the script. When EXTERNAL_SEARCH is -# enabled the indexing and searching needs to be provided by external tools. -# See the manual for details. - -SERVER_BASED_SEARCH = NO - -# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP -# script for searching. Instead the search results are written to an XML file -# which needs to be processed by an external indexer. Doxygen will invoke an -# external search engine pointed to by the SEARCHENGINE_URL option to obtain -# the search results. Doxygen ships with an example indexer (doxyindexer) and -# search engine (doxysearch.cgi) which are based on the open source search -# engine library Xapian. See the manual for configuration details. - -EXTERNAL_SEARCH = NO - -# The SEARCHENGINE_URL should point to a search engine hosted by a web server -# which will returned the search results when EXTERNAL_SEARCH is enabled. -# Doxygen ships with an example search engine (doxysearch) which is based on -# the open source search engine library Xapian. See the manual for configuration -# details. - -SEARCHENGINE_URL = - -# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed -# search data is written to a file for indexing by an external tool. With the -# SEARCHDATA_FILE tag the name of this file can be specified. - -SEARCHDATA_FILE = searchdata.xml - -# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the -# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is -# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple -# projects and redirect the results back to the right project. - -EXTERNAL_SEARCH_ID = - -# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen -# projects other than the one defined by this configuration file, but that are -# all added to the same external search index. Each project needs to have a -# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id -# of to a relative location where the documentation can be found. -# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ... - -EXTRA_SEARCH_MAPPINGS = - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, letter, legal and -# executive. If left blank a4 will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for -# the generated latex document. The footer should contain everything after -# the last chapter. If it is left blank doxygen will generate a -# standard footer. Notice: only use this tag if you know what you are doing! - -LATEX_FOOTER = - -# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images -# or other source files which should be copied to the LaTeX output directory. -# Note that the files will be copied as-is; there are no commands or markers -# available. - -LATEX_EXTRA_FILES = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -# The LATEX_BIB_STYLE tag can be used to specify the style to use for the -# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See -# http://en.wikipedia.org/wiki/BibTeX for more info. - -LATEX_BIB_STYLE = plain - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load style sheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = YES - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options related to the DOCBOOK output -#--------------------------------------------------------------------------- - -# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files -# that can be used to generate PDF. - -GENERATE_DOCBOOK = NO - -# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in -# front of it. If left blank docbook will be used as the default path. - -DOCBOOK_OUTPUT = docbook - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. -# This is useful -# if you want to understand what is going on. -# On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = YES - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# pointed to by INCLUDE_PATH will be searched when a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition that -# overrules the definition found in the source code. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all references to function-like macros -# that are alone on a line, have an all uppercase name, and do not end with a -# semicolon, because these will confuse the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. For each -# tag file the location of the external documentation should be added. The -# format of a tag file without this location is as follows: -# -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths -# or URLs. Note that each tag file must have a unique name (where the name does -# NOT include the path). If a tag file is not located in the directory in which -# doxygen is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed -# in the related pages index. If set to NO, only the current project's -# pages will be listed. - -EXTERNAL_PAGES = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option also works with HAVE_DOT disabled, but it is recommended to -# install and use dot, since it yields more powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is -# allowed to run in parallel. When set to 0 (the default) doxygen will -# base this on the number of processors available in the system. You can set it -# explicitly to a value larger than 0 to get control over the balance -# between CPU load and processing speed. - -DOT_NUM_THREADS = 0 - -# By default doxygen will use the Helvetica font for all dot files that -# doxygen generates. When you want a differently looking font you can specify -# the font name using DOT_FONTNAME. You need to make sure dot is able to find -# the font, which can be done by putting it in a standard location or by setting -# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the -# directory containing the font. - -DOT_FONTNAME = Helvetica - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the Helvetica font. -# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to -# set the path where dot can find it. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If the UML_LOOK tag is enabled, the fields and methods are shown inside -# the class node. If there are many fields or methods and many nodes the -# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS -# threshold limits the number of items for each type to make the size more -# manageable. Set this to 0 for no limit. Note that the threshold may be -# exceeded by 50% before the limit is enforced. - -UML_LIMIT_NUM_FIELDS = 10 - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will generate a graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are svg, png, jpg, or gif. -# If left blank png will be used. If you choose svg you need to set -# HTML_FILE_EXTENSION to xhtml in order to make the SVG files -# visible in IE 9+ (other browsers do not have this requirement). - -DOT_IMAGE_FORMAT = png - -# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to -# enable generation of interactive SVG images that allow zooming and panning. -# Note that this requires a modern browser other than Internet Explorer. -# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you -# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files -# visible. Older versions of IE do not have SVG support. - -INTERACTIVE_SVG = NO - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MSCFILE_DIRS tag can be used to specify one or more directories that -# contain msc files that are included in the documentation (see the -# \mscfile command). - -MSCFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = YES - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/docs/doxygen/doxyxml/__init__.py b/docs/doxygen/doxyxml/__init__.py index 3b0a580d..ff1ee665 100644 --- a/docs/doxygen/doxyxml/__init__.py +++ b/docs/doxygen/doxyxml/__init__.py @@ -4,20 +4,8 @@ # This file was generated by gr_modtool, a tool from the GNU Radio framework # This file is a part of gr-gsm # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. # """ Python interface to contents of doxygen xml documentation. @@ -64,10 +52,10 @@ u'Outputs the vital aadvark statistics.' """ -from __future__ import unicode_literals from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther + def _test(): import os this_dir = os.path.dirname(globals()['__file__']) @@ -79,6 +67,6 @@ def _test(): import doctest return doctest.testmod() + if __name__ == "__main__": _test() - diff --git a/docs/doxygen/doxyxml/base.py b/docs/doxygen/doxyxml/base.py index 071d8f18..5f7ed6c5 100644 --- a/docs/doxygen/doxyxml/base.py +++ b/docs/doxygen/doxyxml/base.py @@ -4,20 +4,8 @@ # This file was generated by gr_modtool, a tool from the GNU Radio framework # This file is a part of gr-gsm # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. # """ A base class is created. @@ -25,8 +13,6 @@ Classes based upon this are used to make more user-friendly interfaces to the doxygen xml docs than the generated classes provide. """ -from __future__ import print_function -from __future__ import unicode_literals import os import pdb @@ -97,8 +83,8 @@ def get_cls(self, mem): for cls in self.mem_classes: if cls.can_parse(mem): return cls - raise Exception(("Did not find a class for object '%s'." \ - % (mem.get_name()))) + raise Exception(("Did not find a class for object '%s'." + % (mem.get_name()))) def convert_mem(self, mem): try: diff --git a/docs/doxygen/doxyxml/doxyindex.py b/docs/doxygen/doxyxml/doxyindex.py index e00729e5..4a19ec5c 100644 --- a/docs/doxygen/doxyxml/doxyindex.py +++ b/docs/doxygen/doxyxml/doxyindex.py @@ -4,27 +4,13 @@ # This file was generated by gr_modtool, a tool from the GNU Radio framework # This file is a part of gr-gsm # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. # """ Classes providing more user-friendly interfaces to the doxygen xml docs than the generated classes provide. """ -from __future__ import absolute_import -from __future__ import unicode_literals import os @@ -32,6 +18,7 @@ from .base import Base from .text import description + class DoxyIndex(Base): """ Parses a doxygen xml directory. @@ -60,17 +47,8 @@ def _parse(self): self._members.append(converted) -def generate_swig_doc_i(self): - """ - %feature("docstring") gr_make_align_on_samplenumbers_ss::align_state " - Wraps the C++: gr_align_on_samplenumbers_ss::align_state"; - """ - pass - - class DoxyCompMem(Base): - kind = None def __init__(self, *args, **kwargs): @@ -106,9 +84,11 @@ def set_parameters(self, data): class DoxyCompound(DoxyCompMem): pass + class DoxyMember(DoxyCompMem): pass + class DoxyFunction(DoxyMember): __module__ = "gnuradio.utils.doxyxml" @@ -129,9 +109,11 @@ def _parse(self): self._data['params'].append(DoxyParam(prm)) brief_description = property(lambda self: self.data()['brief_description']) - detailed_description = property(lambda self: self.data()['detailed_description']) + detailed_description = property( + lambda self: self.data()['detailed_description']) params = property(lambda self: self.data()['params']) + Base.mem_classes.append(DoxyFunction) @@ -156,9 +138,11 @@ def description(self): return '\n\n'.join(descriptions) brief_description = property(lambda self: self.data()['brief_description']) - detailed_description = property(lambda self: self.data()['detailed_description']) + detailed_description = property( + lambda self: self.data()['detailed_description']) name = property(lambda self: self.data()['declname']) + class DoxyParameterItem(DoxyMember): """A different representation of a parameter in Doxygen.""" @@ -200,9 +184,11 @@ def _parse(self): self.process_memberdefs() brief_description = property(lambda self: self.data()['brief_description']) - detailed_description = property(lambda self: self.data()['detailed_description']) + detailed_description = property( + lambda self: self.data()['detailed_description']) params = property(lambda self: self.data()['params']) + Base.mem_classes.append(DoxyClass) @@ -223,7 +209,9 @@ def _parse(self): self.process_memberdefs() brief_description = property(lambda self: self.data()['brief_description']) - detailed_description = property(lambda self: self.data()['detailed_description']) + detailed_description = property( + lambda self: self.data()['detailed_description']) + Base.mem_classes.append(DoxyFile) @@ -244,6 +232,7 @@ def _parse(self): return self.process_memberdefs() + Base.mem_classes.append(DoxyNamespace) @@ -287,6 +276,7 @@ class DoxyFriend(DoxyMember): kind = 'friend' + Base.mem_classes.append(DoxyFriend) @@ -301,4 +291,5 @@ class DoxyOther(Base): def can_parse(cls, obj): return obj.kind in cls.kinds + Base.mem_classes.append(DoxyOther) diff --git a/docs/doxygen/doxyxml/generated/__init__.py b/docs/doxygen/doxyxml/generated/__init__.py index 23095c1f..39823979 100644 --- a/docs/doxygen/doxyxml/generated/__init__.py +++ b/docs/doxygen/doxyxml/generated/__init__.py @@ -5,4 +5,3 @@ resultant classes are not very friendly to navigate so the rest of the doxyxml module processes them further. """ -from __future__ import unicode_literals diff --git a/docs/doxygen/doxyxml/generated/compound.py b/docs/doxygen/doxyxml/generated/compound.py index de4f5061..321328bc 100644 --- a/docs/doxygen/doxyxml/generated/compound.py +++ b/docs/doxygen/doxyxml/generated/compound.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python """ Generated Mon Feb 9 19:08:05 2009 by generateDS.py. """ -from __future__ import absolute_import -from __future__ import unicode_literals from xml.dom import minidom @@ -24,13 +22,15 @@ def find(self, details): return self.compounddef.find(details) + supermod.DoxygenType.subclass = DoxygenTypeSub # end class DoxygenTypeSub class compounddefTypeSub(supermod.compounddefType): def __init__(self, kind=None, prot=None, id=None, compoundname='', title='', basecompoundref=None, derivedcompoundref=None, includes=None, includedby=None, incdepgraph=None, invincdepgraph=None, innerdir=None, innerfile=None, innerclass=None, innernamespace=None, innerpage=None, innergroup=None, templateparamlist=None, sectiondef=None, briefdescription=None, detaileddescription=None, inheritancegraph=None, collaborationgraph=None, programlisting=None, location=None, listofallmembers=None): - supermod.compounddefType.__init__(self, kind, prot, id, compoundname, title, basecompoundref, derivedcompoundref, includes, includedby, incdepgraph, invincdepgraph, innerdir, innerfile, innerclass, innernamespace, innerpage, innergroup, templateparamlist, sectiondef, briefdescription, detaileddescription, inheritancegraph, collaborationgraph, programlisting, location, listofallmembers) + supermod.compounddefType.__init__(self, kind, prot, id, compoundname, title, basecompoundref, derivedcompoundref, includes, includedby, incdepgraph, invincdepgraph, innerdir, innerfile, innerclass, + innernamespace, innerpage, innergroup, templateparamlist, sectiondef, briefdescription, detaileddescription, inheritancegraph, collaborationgraph, programlisting, location, listofallmembers) def find(self, details): @@ -50,13 +50,18 @@ def find(self, details): class listofallmembersTypeSub(supermod.listofallmembersType): def __init__(self, member=None): supermod.listofallmembersType.__init__(self, member) + + supermod.listofallmembersType.subclass = listofallmembersTypeSub # end class listofallmembersTypeSub class memberRefTypeSub(supermod.memberRefType): def __init__(self, virt=None, prot=None, refid=None, ambiguityscope=None, scope='', name=''): - supermod.memberRefType.__init__(self, virt, prot, refid, ambiguityscope, scope, name) + supermod.memberRefType.__init__( + self, virt, prot, refid, ambiguityscope, scope, name) + + supermod.memberRefType.subclass = memberRefTypeSub # end class memberRefTypeSub @@ -64,6 +69,8 @@ def __init__(self, virt=None, prot=None, refid=None, ambiguityscope=None, scope= class compoundRefTypeSub(supermod.compoundRefType): def __init__(self, virt=None, prot=None, refid=None, valueOf_='', mixedclass_=None, content_=None): supermod.compoundRefType.__init__(self, mixedclass_, content_) + + supermod.compoundRefType.subclass = compoundRefTypeSub # end class compoundRefTypeSub @@ -71,6 +78,8 @@ def __init__(self, virt=None, prot=None, refid=None, valueOf_='', mixedclass_=No class reimplementTypeSub(supermod.reimplementType): def __init__(self, refid=None, valueOf_='', mixedclass_=None, content_=None): supermod.reimplementType.__init__(self, mixedclass_, content_) + + supermod.reimplementType.subclass = reimplementTypeSub # end class reimplementTypeSub @@ -78,6 +87,8 @@ def __init__(self, refid=None, valueOf_='', mixedclass_=None, content_=None): class incTypeSub(supermod.incType): def __init__(self, local=None, refid=None, valueOf_='', mixedclass_=None, content_=None): supermod.incType.__init__(self, mixedclass_, content_) + + supermod.incType.subclass = incTypeSub # end class incTypeSub @@ -85,23 +96,26 @@ def __init__(self, local=None, refid=None, valueOf_='', mixedclass_=None, conten class refTypeSub(supermod.refType): def __init__(self, prot=None, refid=None, valueOf_='', mixedclass_=None, content_=None): supermod.refType.__init__(self, mixedclass_, content_) + + supermod.refType.subclass = refTypeSub # end class refTypeSub - class refTextTypeSub(supermod.refTextType): def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedclass_=None, content_=None): supermod.refTextType.__init__(self, mixedclass_, content_) + supermod.refTextType.subclass = refTextTypeSub # end class refTextTypeSub -class sectiondefTypeSub(supermod.sectiondefType): +class sectiondefTypeSub(supermod.sectiondefType): def __init__(self, kind=None, header='', description=None, memberdef=None): - supermod.sectiondefType.__init__(self, kind, header, description, memberdef) + supermod.sectiondefType.__init__( + self, kind, header, description, memberdef) def find(self, details): @@ -118,7 +132,10 @@ def find(self, details): class memberdefTypeSub(supermod.memberdefType): def __init__(self, initonly=None, kind=None, volatile=None, const=None, raise_=None, virt=None, readable=None, prot=None, explicit=None, new=None, final=None, writable=None, add=None, static=None, remove=None, sealed=None, mutable=None, gettable=None, inline=None, settable=None, id=None, templateparamlist=None, type_=None, definition='', argsstring='', name='', read='', write='', bitfield='', reimplements=None, reimplementedby=None, param=None, enumvalue=None, initializer=None, exceptions=None, briefdescription=None, detaileddescription=None, inbodydescription=None, location=None, references=None, referencedby=None): - supermod.memberdefType.__init__(self, initonly, kind, volatile, const, raise_, virt, readable, prot, explicit, new, final, writable, add, static, remove, sealed, mutable, gettable, inline, settable, id, templateparamlist, type_, definition, argsstring, name, read, write, bitfield, reimplements, reimplementedby, param, enumvalue, initializer, exceptions, briefdescription, detaileddescription, inbodydescription, location, references, referencedby) + supermod.memberdefType.__init__(self, initonly, kind, volatile, const, raise_, virt, readable, prot, explicit, new, final, writable, add, static, remove, sealed, mutable, gettable, inline, settable, id, templateparamlist, type_, + definition, argsstring, name, read, write, bitfield, reimplements, reimplementedby, param, enumvalue, initializer, exceptions, briefdescription, detaileddescription, inbodydescription, location, references, referencedby) + + supermod.memberdefType.subclass = memberdefTypeSub # end class memberdefTypeSub @@ -126,6 +143,8 @@ def __init__(self, initonly=None, kind=None, volatile=None, const=None, raise_=N class descriptionTypeSub(supermod.descriptionType): def __init__(self, title='', para=None, sect1=None, internal=None, mixedclass_=None, content_=None): supermod.descriptionType.__init__(self, mixedclass_, content_) + + supermod.descriptionType.subclass = descriptionTypeSub # end class descriptionTypeSub @@ -133,6 +152,8 @@ def __init__(self, title='', para=None, sect1=None, internal=None, mixedclass_=N class enumvalueTypeSub(supermod.enumvalueType): def __init__(self, prot=None, id=None, name='', initializer=None, briefdescription=None, detaileddescription=None, mixedclass_=None, content_=None): supermod.enumvalueType.__init__(self, mixedclass_, content_) + + supermod.enumvalueType.subclass = enumvalueTypeSub # end class enumvalueTypeSub @@ -140,13 +161,18 @@ def __init__(self, prot=None, id=None, name='', initializer=None, briefdescripti class templateparamlistTypeSub(supermod.templateparamlistType): def __init__(self, param=None): supermod.templateparamlistType.__init__(self, param) + + supermod.templateparamlistType.subclass = templateparamlistTypeSub # end class templateparamlistTypeSub class paramTypeSub(supermod.paramType): def __init__(self, type_=None, declname='', defname='', array='', defval=None, briefdescription=None): - supermod.paramType.__init__(self, type_, declname, defname, array, defval, briefdescription) + supermod.paramType.__init__( + self, type_, declname, defname, array, defval, briefdescription) + + supermod.paramType.subclass = paramTypeSub # end class paramTypeSub @@ -154,6 +180,8 @@ def __init__(self, type_=None, declname='', defname='', array='', defval=None, b class linkedTextTypeSub(supermod.linkedTextType): def __init__(self, ref=None, mixedclass_=None, content_=None): supermod.linkedTextType.__init__(self, mixedclass_, content_) + + supermod.linkedTextType.subclass = linkedTextTypeSub # end class linkedTextTypeSub @@ -161,6 +189,8 @@ def __init__(self, ref=None, mixedclass_=None, content_=None): class graphTypeSub(supermod.graphType): def __init__(self, node=None): supermod.graphType.__init__(self, node) + + supermod.graphType.subclass = graphTypeSub # end class graphTypeSub @@ -168,6 +198,8 @@ def __init__(self, node=None): class nodeTypeSub(supermod.nodeType): def __init__(self, id=None, label='', link=None, childnode=None): supermod.nodeType.__init__(self, id, label, link, childnode) + + supermod.nodeType.subclass = nodeTypeSub # end class nodeTypeSub @@ -175,6 +207,8 @@ def __init__(self, id=None, label='', link=None, childnode=None): class childnodeTypeSub(supermod.childnodeType): def __init__(self, relation=None, refid=None, edgelabel=None): supermod.childnodeType.__init__(self, relation, refid, edgelabel) + + supermod.childnodeType.subclass = childnodeTypeSub # end class childnodeTypeSub @@ -182,6 +216,8 @@ def __init__(self, relation=None, refid=None, edgelabel=None): class linkTypeSub(supermod.linkType): def __init__(self, refid=None, external=None, valueOf_=''): supermod.linkType.__init__(self, refid, external) + + supermod.linkType.subclass = linkTypeSub # end class linkTypeSub @@ -189,13 +225,18 @@ def __init__(self, refid=None, external=None, valueOf_=''): class listingTypeSub(supermod.listingType): def __init__(self, codeline=None): supermod.listingType.__init__(self, codeline) + + supermod.listingType.subclass = listingTypeSub # end class listingTypeSub class codelineTypeSub(supermod.codelineType): def __init__(self, external=None, lineno=None, refkind=None, refid=None, highlight=None): - supermod.codelineType.__init__(self, external, lineno, refkind, refid, highlight) + supermod.codelineType.__init__( + self, external, lineno, refkind, refid, highlight) + + supermod.codelineType.subclass = codelineTypeSub # end class codelineTypeSub @@ -203,6 +244,8 @@ def __init__(self, external=None, lineno=None, refkind=None, refid=None, highlig class highlightTypeSub(supermod.highlightType): def __init__(self, class_=None, sp=None, ref=None, mixedclass_=None, content_=None): supermod.highlightType.__init__(self, mixedclass_, content_) + + supermod.highlightType.subclass = highlightTypeSub # end class highlightTypeSub @@ -210,13 +253,18 @@ def __init__(self, class_=None, sp=None, ref=None, mixedclass_=None, content_=No class referenceTypeSub(supermod.referenceType): def __init__(self, endline=None, startline=None, refid=None, compoundref=None, valueOf_='', mixedclass_=None, content_=None): supermod.referenceType.__init__(self, mixedclass_, content_) + + supermod.referenceType.subclass = referenceTypeSub # end class referenceTypeSub class locationTypeSub(supermod.locationType): def __init__(self, bodystart=None, line=None, bodyend=None, bodyfile=None, file=None, valueOf_=''): - supermod.locationType.__init__(self, bodystart, line, bodyend, bodyfile, file) + supermod.locationType.__init__( + self, bodystart, line, bodyend, bodyfile, file) + + supermod.locationType.subclass = locationTypeSub # end class locationTypeSub @@ -224,6 +272,8 @@ def __init__(self, bodystart=None, line=None, bodyend=None, bodyfile=None, file= class docSect1TypeSub(supermod.docSect1Type): def __init__(self, id=None, title='', para=None, sect2=None, internal=None, mixedclass_=None, content_=None): supermod.docSect1Type.__init__(self, mixedclass_, content_) + + supermod.docSect1Type.subclass = docSect1TypeSub # end class docSect1TypeSub @@ -231,6 +281,8 @@ def __init__(self, id=None, title='', para=None, sect2=None, internal=None, mixe class docSect2TypeSub(supermod.docSect2Type): def __init__(self, id=None, title='', para=None, sect3=None, internal=None, mixedclass_=None, content_=None): supermod.docSect2Type.__init__(self, mixedclass_, content_) + + supermod.docSect2Type.subclass = docSect2TypeSub # end class docSect2TypeSub @@ -238,6 +290,8 @@ def __init__(self, id=None, title='', para=None, sect3=None, internal=None, mixe class docSect3TypeSub(supermod.docSect3Type): def __init__(self, id=None, title='', para=None, sect4=None, internal=None, mixedclass_=None, content_=None): supermod.docSect3Type.__init__(self, mixedclass_, content_) + + supermod.docSect3Type.subclass = docSect3TypeSub # end class docSect3TypeSub @@ -245,6 +299,8 @@ def __init__(self, id=None, title='', para=None, sect4=None, internal=None, mixe class docSect4TypeSub(supermod.docSect4Type): def __init__(self, id=None, title='', para=None, internal=None, mixedclass_=None, content_=None): supermod.docSect4Type.__init__(self, mixedclass_, content_) + + supermod.docSect4Type.subclass = docSect4TypeSub # end class docSect4TypeSub @@ -252,6 +308,8 @@ def __init__(self, id=None, title='', para=None, internal=None, mixedclass_=None class docInternalTypeSub(supermod.docInternalType): def __init__(self, para=None, sect1=None, mixedclass_=None, content_=None): supermod.docInternalType.__init__(self, mixedclass_, content_) + + supermod.docInternalType.subclass = docInternalTypeSub # end class docInternalTypeSub @@ -259,6 +317,8 @@ def __init__(self, para=None, sect1=None, mixedclass_=None, content_=None): class docInternalS1TypeSub(supermod.docInternalS1Type): def __init__(self, para=None, sect2=None, mixedclass_=None, content_=None): supermod.docInternalS1Type.__init__(self, mixedclass_, content_) + + supermod.docInternalS1Type.subclass = docInternalS1TypeSub # end class docInternalS1TypeSub @@ -266,6 +326,8 @@ def __init__(self, para=None, sect2=None, mixedclass_=None, content_=None): class docInternalS2TypeSub(supermod.docInternalS2Type): def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): supermod.docInternalS2Type.__init__(self, mixedclass_, content_) + + supermod.docInternalS2Type.subclass = docInternalS2TypeSub # end class docInternalS2TypeSub @@ -273,6 +335,8 @@ def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): class docInternalS3TypeSub(supermod.docInternalS3Type): def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): supermod.docInternalS3Type.__init__(self, mixedclass_, content_) + + supermod.docInternalS3Type.subclass = docInternalS3TypeSub # end class docInternalS3TypeSub @@ -280,6 +344,8 @@ def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): class docInternalS4TypeSub(supermod.docInternalS4Type): def __init__(self, para=None, mixedclass_=None, content_=None): supermod.docInternalS4Type.__init__(self, mixedclass_, content_) + + supermod.docInternalS4Type.subclass = docInternalS4TypeSub # end class docInternalS4TypeSub @@ -287,6 +353,8 @@ def __init__(self, para=None, mixedclass_=None, content_=None): class docURLLinkSub(supermod.docURLLink): def __init__(self, url=None, valueOf_='', mixedclass_=None, content_=None): supermod.docURLLink.__init__(self, mixedclass_, content_) + + supermod.docURLLink.subclass = docURLLinkSub # end class docURLLinkSub @@ -294,6 +362,8 @@ def __init__(self, url=None, valueOf_='', mixedclass_=None, content_=None): class docAnchorTypeSub(supermod.docAnchorType): def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): supermod.docAnchorType.__init__(self, mixedclass_, content_) + + supermod.docAnchorType.subclass = docAnchorTypeSub # end class docAnchorTypeSub @@ -301,6 +371,8 @@ def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): class docFormulaTypeSub(supermod.docFormulaType): def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): supermod.docFormulaType.__init__(self, mixedclass_, content_) + + supermod.docFormulaType.subclass = docFormulaTypeSub # end class docFormulaTypeSub @@ -308,6 +380,8 @@ def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): class docIndexEntryTypeSub(supermod.docIndexEntryType): def __init__(self, primaryie='', secondaryie=''): supermod.docIndexEntryType.__init__(self, primaryie, secondaryie) + + supermod.docIndexEntryType.subclass = docIndexEntryTypeSub # end class docIndexEntryTypeSub @@ -315,6 +389,8 @@ def __init__(self, primaryie='', secondaryie=''): class docListTypeSub(supermod.docListType): def __init__(self, listitem=None): supermod.docListType.__init__(self, listitem) + + supermod.docListType.subclass = docListTypeSub # end class docListTypeSub @@ -322,6 +398,8 @@ def __init__(self, listitem=None): class docListItemTypeSub(supermod.docListItemType): def __init__(self, para=None): supermod.docListItemType.__init__(self, para) + + supermod.docListItemType.subclass = docListItemTypeSub # end class docListItemTypeSub @@ -329,6 +407,8 @@ def __init__(self, para=None): class docSimpleSectTypeSub(supermod.docSimpleSectType): def __init__(self, kind=None, title=None, para=None): supermod.docSimpleSectType.__init__(self, kind, title, para) + + supermod.docSimpleSectType.subclass = docSimpleSectTypeSub # end class docSimpleSectTypeSub @@ -336,6 +416,8 @@ def __init__(self, kind=None, title=None, para=None): class docVarListEntryTypeSub(supermod.docVarListEntryType): def __init__(self, term=None): supermod.docVarListEntryType.__init__(self, term) + + supermod.docVarListEntryType.subclass = docVarListEntryTypeSub # end class docVarListEntryTypeSub @@ -343,6 +425,8 @@ def __init__(self, term=None): class docRefTextTypeSub(supermod.docRefTextType): def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedclass_=None, content_=None): supermod.docRefTextType.__init__(self, mixedclass_, content_) + + supermod.docRefTextType.subclass = docRefTextTypeSub # end class docRefTextTypeSub @@ -350,6 +434,8 @@ def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedcl class docTableTypeSub(supermod.docTableType): def __init__(self, rows=None, cols=None, row=None, caption=None): supermod.docTableType.__init__(self, rows, cols, row, caption) + + supermod.docTableType.subclass = docTableTypeSub # end class docTableTypeSub @@ -357,6 +443,8 @@ def __init__(self, rows=None, cols=None, row=None, caption=None): class docRowTypeSub(supermod.docRowType): def __init__(self, entry=None): supermod.docRowType.__init__(self, entry) + + supermod.docRowType.subclass = docRowTypeSub # end class docRowTypeSub @@ -364,6 +452,8 @@ def __init__(self, entry=None): class docEntryTypeSub(supermod.docEntryType): def __init__(self, thead=None, para=None): supermod.docEntryType.__init__(self, thead, para) + + supermod.docEntryType.subclass = docEntryTypeSub # end class docEntryTypeSub @@ -371,6 +461,8 @@ def __init__(self, thead=None, para=None): class docHeadingTypeSub(supermod.docHeadingType): def __init__(self, level=None, valueOf_='', mixedclass_=None, content_=None): supermod.docHeadingType.__init__(self, mixedclass_, content_) + + supermod.docHeadingType.subclass = docHeadingTypeSub # end class docHeadingTypeSub @@ -378,6 +470,8 @@ def __init__(self, level=None, valueOf_='', mixedclass_=None, content_=None): class docImageTypeSub(supermod.docImageType): def __init__(self, width=None, type_=None, name=None, height=None, valueOf_='', mixedclass_=None, content_=None): supermod.docImageType.__init__(self, mixedclass_, content_) + + supermod.docImageType.subclass = docImageTypeSub # end class docImageTypeSub @@ -385,6 +479,8 @@ def __init__(self, width=None, type_=None, name=None, height=None, valueOf_='', class docDotFileTypeSub(supermod.docDotFileType): def __init__(self, name=None, valueOf_='', mixedclass_=None, content_=None): supermod.docDotFileType.__init__(self, mixedclass_, content_) + + supermod.docDotFileType.subclass = docDotFileTypeSub # end class docDotFileTypeSub @@ -392,6 +488,8 @@ def __init__(self, name=None, valueOf_='', mixedclass_=None, content_=None): class docTocItemTypeSub(supermod.docTocItemType): def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): supermod.docTocItemType.__init__(self, mixedclass_, content_) + + supermod.docTocItemType.subclass = docTocItemTypeSub # end class docTocItemTypeSub @@ -399,6 +497,8 @@ def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): class docTocListTypeSub(supermod.docTocListType): def __init__(self, tocitem=None): supermod.docTocListType.__init__(self, tocitem) + + supermod.docTocListType.subclass = docTocListTypeSub # end class docTocListTypeSub @@ -406,6 +506,8 @@ def __init__(self, tocitem=None): class docLanguageTypeSub(supermod.docLanguageType): def __init__(self, langid=None, para=None): supermod.docLanguageType.__init__(self, langid, para) + + supermod.docLanguageType.subclass = docLanguageTypeSub # end class docLanguageTypeSub @@ -413,13 +515,18 @@ def __init__(self, langid=None, para=None): class docParamListTypeSub(supermod.docParamListType): def __init__(self, kind=None, parameteritem=None): supermod.docParamListType.__init__(self, kind, parameteritem) + + supermod.docParamListType.subclass = docParamListTypeSub # end class docParamListTypeSub class docParamListItemSub(supermod.docParamListItem): def __init__(self, parameternamelist=None, parameterdescription=None): - supermod.docParamListItem.__init__(self, parameternamelist, parameterdescription) + supermod.docParamListItem.__init__( + self, parameternamelist, parameterdescription) + + supermod.docParamListItem.subclass = docParamListItemSub # end class docParamListItemSub @@ -427,6 +534,8 @@ def __init__(self, parameternamelist=None, parameterdescription=None): class docParamNameListSub(supermod.docParamNameList): def __init__(self, parametername=None): supermod.docParamNameList.__init__(self, parametername) + + supermod.docParamNameList.subclass = docParamNameListSub # end class docParamNameListSub @@ -434,6 +543,8 @@ def __init__(self, parametername=None): class docParamNameSub(supermod.docParamName): def __init__(self, direction=None, ref=None, mixedclass_=None, content_=None): supermod.docParamName.__init__(self, mixedclass_, content_) + + supermod.docParamName.subclass = docParamNameSub # end class docParamNameSub @@ -441,6 +552,8 @@ def __init__(self, direction=None, ref=None, mixedclass_=None, content_=None): class docXRefSectTypeSub(supermod.docXRefSectType): def __init__(self, id=None, xreftitle=None, xrefdescription=None): supermod.docXRefSectType.__init__(self, id, xreftitle, xrefdescription) + + supermod.docXRefSectType.subclass = docXRefSectTypeSub # end class docXRefSectTypeSub @@ -448,6 +561,8 @@ def __init__(self, id=None, xreftitle=None, xrefdescription=None): class docCopyTypeSub(supermod.docCopyType): def __init__(self, link=None, para=None, sect1=None, internal=None): supermod.docCopyType.__init__(self, link, para, sect1, internal) + + supermod.docCopyType.subclass = docCopyTypeSub # end class docCopyTypeSub @@ -455,9 +570,12 @@ def __init__(self, link=None, para=None, sect1=None, internal=None): class docCharTypeSub(supermod.docCharType): def __init__(self, char=None, valueOf_=''): supermod.docCharType.__init__(self, char) + + supermod.docCharType.subclass = docCharTypeSub # end class docCharTypeSub + class docParaTypeSub(supermod.docParaType): def __init__(self, char=None, valueOf_=''): supermod.docParaType.__init__(self, char) @@ -471,7 +589,7 @@ def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ nodeName_ == "ref": @@ -494,12 +612,9 @@ def buildChildren(self, child_, nodeName_): # end class docParaTypeSub - def parse(inFilename): doc = minidom.parse(inFilename) rootNode = doc.documentElement rootObj = supermod.DoxygenType.factory() rootObj.build(rootNode) return rootObj - - diff --git a/docs/doxygen/doxyxml/generated/compoundsuper.py b/docs/doxygen/doxyxml/generated/compoundsuper.py index b68978f1..40f548aa 100644 --- a/docs/doxygen/doxyxml/generated/compoundsuper.py +++ b/docs/doxygen/doxyxml/generated/compoundsuper.py @@ -1,20 +1,15 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Generated Thu Jun 11 18:44:25 2009 by generateDS.py. # -from __future__ import print_function -from __future__ import unicode_literals import sys from xml.dom import minidom from xml.dom import Node -import six - - # # User methods # @@ -29,12 +24,16 @@ class GeneratedsSuper(object): def format_string(self, input_data, input_name=''): return input_data + def format_integer(self, input_data, input_name=''): return '%d' % input_data + def format_float(self, input_data, input_name=''): return '%f' % input_data + def format_double(self, input_data, input_name=''): return '%e' % input_data + def format_boolean(self, input_data, input_name=''): return '%s' % input_data @@ -46,9 +45,9 @@ def format_boolean(self, input_data, input_name=''): ## from IPython.Shell import IPShellEmbed ## args = '' -## ipshell = IPShellEmbed(args, +# ipshell = IPShellEmbed(args, ## banner = 'Dropping into IPython', -## exit_msg = 'Leaving Interpreter, back to program.') +# exit_msg = 'Leaving Interpreter, back to program.') # Then use the following line where and when you want to drop into the # IPython shell: @@ -64,20 +63,23 @@ def format_boolean(self, input_data, input_name=''): # Support/utility functions. # + def showIndent(outfile, level): for idx in range(level): outfile.write(' ') + def quote_xml(inStr): - s1 = (isinstance(inStr, six.string_types) and inStr or + s1 = (isinstance(inStr, str) and inStr or '%s' % inStr) s1 = s1.replace('&', '&') s1 = s1.replace('<', '<') s1 = s1.replace('>', '>') return s1 + def quote_attrib(inStr): - s1 = (isinstance(inStr, six.string_types) and inStr or + s1 = (isinstance(inStr, str) and inStr or '%s' % inStr) s1 = s1.replace('&', '&') s1 = s1.replace('<', '<') @@ -91,6 +93,7 @@ def quote_attrib(inStr): s1 = '"%s"' % s1 return s1 + def quote_python(inStr): s1 = inStr if s1.find("'") == -1: @@ -122,26 +125,33 @@ class MixedContainer(object): TypeDecimal = 5 TypeDouble = 6 TypeBoolean = 7 + def __init__(self, category, content_type, name, value): self.category = category self.content_type = content_type self.name = name self.value = value + def getCategory(self): return self.category + def getContenttype(self, content_type): return self.content_type + def getValue(self): return self.value + def getName(self): return self.name + def export(self, outfile, level, name, namespace): if self.category == MixedContainer.CategoryText: outfile.write(self.value) elif self.category == MixedContainer.CategorySimple: self.exportSimple(outfile, level, name) else: # category == MixedContainer.CategoryComplex - self.value.export(outfile, level, namespace,name) + self.value.export(outfile, level, namespace, name) + def exportSimple(self, outfile, level, name): if self.content_type == MixedContainer.TypeString: outfile.write('<%s>%s' % (self.name, self.value, self.name)) @@ -153,19 +163,20 @@ def exportSimple(self, outfile, level, name): outfile.write('<%s>%f' % (self.name, self.value, self.name)) elif self.content_type == MixedContainer.TypeDouble: outfile.write('<%s>%g' % (self.name, self.value, self.name)) + def exportLiteral(self, outfile, level, name): if self.category == MixedContainer.CategoryText: showIndent(outfile, level) - outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % \ - (self.category, self.content_type, self.name, self.value)) + outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % + (self.category, self.content_type, self.name, self.value)) elif self.category == MixedContainer.CategorySimple: showIndent(outfile, level) - outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % \ - (self.category, self.content_type, self.name, self.value)) + outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % + (self.category, self.content_type, self.name, self.value)) else: # category == MixedContainer.CategoryComplex showIndent(outfile, level) - outfile.write('MixedContainer(%d, %d, "%s",\n' % \ - (self.category, self.content_type, self.name,)) + outfile.write('MixedContainer(%d, %d, "%s",\n' % + (self.category, self.content_type, self.name,)) self.value.exportLiteral(outfile, level + 1) showIndent(outfile, level) outfile.write(')\n') @@ -176,6 +187,7 @@ def __init__(self, name='', data_type='', container=0): self.name = name self.data_type = data_type self.container = container + def set_name(self, name): self.name = name def get_name(self): return self.name def set_data_type(self, data_type): self.data_type = data_type @@ -191,9 +203,11 @@ def get_container(self): return self.container class DoxygenType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, version=None, compounddef=None): self.version = version self.compounddef = compounddef + def factory(*args_, **kwargs_): if DoxygenType.subclass: return DoxygenType.subclass(*args_, **kwargs_) @@ -204,6 +218,7 @@ def get_compounddef(self): return self.compounddef def set_compounddef(self, compounddef): self.compounddef = compounddef def get_version(self): return self.version def set_version(self, version): self.version = version + def export(self, outfile, level, namespace_='', name_='DoxygenType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -215,27 +230,34 @@ def export(self, outfile, level, namespace_='', name_='DoxygenType', namespacede outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='DoxygenType'): outfile.write(' version=%s' % (quote_attrib(self.version), )) + def exportChildren(self, outfile, level, namespace_='', name_='DoxygenType'): if self.compounddef: - self.compounddef.export(outfile, level, namespace_, name_='compounddef') + self.compounddef.export( + outfile, level, namespace_, name_='compounddef') + def hasContent_(self): if ( self.compounddef is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='DoxygenType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.version is not None: showIndent(outfile, level) outfile.write('version = "%s",\n' % (self.version,)) + def exportLiteralChildren(self, outfile, level, name_): if self.compounddef: showIndent(outfile, level) @@ -243,18 +265,21 @@ def exportLiteralChildren(self, outfile, level, name_): self.compounddef.exportLiteral(outfile, level, name_='compounddef') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('version'): self.version = attrs.get('version').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'compounddef': + nodeName_ == 'compounddef': obj_ = compounddefType.factory() obj_.build(child_) self.set_compounddef(obj_) @@ -264,6 +289,7 @@ def buildChildren(self, child_, nodeName_): class compounddefType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, kind=None, prot=None, id=None, compoundname=None, title=None, basecompoundref=None, derivedcompoundref=None, includes=None, includedby=None, incdepgraph=None, invincdepgraph=None, innerdir=None, innerfile=None, innerclass=None, innernamespace=None, innerpage=None, innergroup=None, templateparamlist=None, sectiondef=None, briefdescription=None, detaileddescription=None, inheritancegraph=None, collaborationgraph=None, programlisting=None, location=None, listofallmembers=None): self.kind = kind self.prot = prot @@ -324,6 +350,7 @@ def __init__(self, kind=None, prot=None, id=None, compoundname=None, title=None, self.programlisting = programlisting self.location = location self.listofallmembers = listofallmembers + def factory(*args_, **kwargs_): if compounddefType.subclass: return compounddefType.subclass(*args_, **kwargs_) @@ -335,13 +362,23 @@ def set_compoundname(self, compoundname): self.compoundname = compoundname def get_title(self): return self.title def set_title(self, title): self.title = title def get_basecompoundref(self): return self.basecompoundref - def set_basecompoundref(self, basecompoundref): self.basecompoundref = basecompoundref + def set_basecompoundref( + self, basecompoundref): self.basecompoundref = basecompoundref + def add_basecompoundref(self, value): self.basecompoundref.append(value) - def insert_basecompoundref(self, index, value): self.basecompoundref[index] = value + def insert_basecompoundref( + self, index, value): self.basecompoundref[index] = value + def get_derivedcompoundref(self): return self.derivedcompoundref - def set_derivedcompoundref(self, derivedcompoundref): self.derivedcompoundref = derivedcompoundref - def add_derivedcompoundref(self, value): self.derivedcompoundref.append(value) - def insert_derivedcompoundref(self, index, value): self.derivedcompoundref[index] = value + + def set_derivedcompoundref( + self, derivedcompoundref): self.derivedcompoundref = derivedcompoundref + + def add_derivedcompoundref( + self, value): self.derivedcompoundref.append(value) + def insert_derivedcompoundref( + self, index, value): self.derivedcompoundref[index] = value + def get_includes(self): return self.includes def set_includes(self, includes): self.includes = includes def add_includes(self, value): self.includes.append(value) @@ -353,7 +390,9 @@ def insert_includedby(self, index, value): self.includedby[index] = value def get_incdepgraph(self): return self.incdepgraph def set_incdepgraph(self, incdepgraph): self.incdepgraph = incdepgraph def get_invincdepgraph(self): return self.invincdepgraph - def set_invincdepgraph(self, invincdepgraph): self.invincdepgraph = invincdepgraph + def set_invincdepgraph( + self, invincdepgraph): self.invincdepgraph = invincdepgraph + def get_innerdir(self): return self.innerdir def set_innerdir(self, innerdir): self.innerdir = innerdir def add_innerdir(self, value): self.innerdir.append(value) @@ -367,9 +406,13 @@ def set_innerclass(self, innerclass): self.innerclass = innerclass def add_innerclass(self, value): self.innerclass.append(value) def insert_innerclass(self, index, value): self.innerclass[index] = value def get_innernamespace(self): return self.innernamespace - def set_innernamespace(self, innernamespace): self.innernamespace = innernamespace + def set_innernamespace( + self, innernamespace): self.innernamespace = innernamespace + def add_innernamespace(self, value): self.innernamespace.append(value) - def insert_innernamespace(self, index, value): self.innernamespace[index] = value + def insert_innernamespace( + self, index, value): self.innernamespace[index] = value + def get_innerpage(self): return self.innerpage def set_innerpage(self, innerpage): self.innerpage = innerpage def add_innerpage(self, value): self.innerpage.append(value) @@ -379,35 +422,51 @@ def set_innergroup(self, innergroup): self.innergroup = innergroup def add_innergroup(self, value): self.innergroup.append(value) def insert_innergroup(self, index, value): self.innergroup[index] = value def get_templateparamlist(self): return self.templateparamlist - def set_templateparamlist(self, templateparamlist): self.templateparamlist = templateparamlist + def set_templateparamlist( + self, templateparamlist): self.templateparamlist = templateparamlist + def get_sectiondef(self): return self.sectiondef def set_sectiondef(self, sectiondef): self.sectiondef = sectiondef def add_sectiondef(self, value): self.sectiondef.append(value) def insert_sectiondef(self, index, value): self.sectiondef[index] = value def get_briefdescription(self): return self.briefdescription - def set_briefdescription(self, briefdescription): self.briefdescription = briefdescription + def set_briefdescription( + self, briefdescription): self.briefdescription = briefdescription + def get_detaileddescription(self): return self.detaileddescription - def set_detaileddescription(self, detaileddescription): self.detaileddescription = detaileddescription + def set_detaileddescription( + self, detaileddescription): self.detaileddescription = detaileddescription + def get_inheritancegraph(self): return self.inheritancegraph - def set_inheritancegraph(self, inheritancegraph): self.inheritancegraph = inheritancegraph + def set_inheritancegraph( + self, inheritancegraph): self.inheritancegraph = inheritancegraph + def get_collaborationgraph(self): return self.collaborationgraph - def set_collaborationgraph(self, collaborationgraph): self.collaborationgraph = collaborationgraph + def set_collaborationgraph( + self, collaborationgraph): self.collaborationgraph = collaborationgraph + def get_programlisting(self): return self.programlisting - def set_programlisting(self, programlisting): self.programlisting = programlisting + def set_programlisting( + self, programlisting): self.programlisting = programlisting + def get_location(self): return self.location def set_location(self, location): self.location = location def get_listofallmembers(self): return self.listofallmembers - def set_listofallmembers(self, listofallmembers): self.listofallmembers = listofallmembers + def set_listofallmembers( + self, listofallmembers): self.listofallmembers = listofallmembers + def get_kind(self): return self.kind def set_kind(self, kind): self.kind = kind def get_prot(self): return self.prot def set_prot(self, prot): self.prot = prot def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='compounddefType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='compounddefType') + self.exportAttributes(outfile, level, namespace_, + name_='compounddefType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -415,32 +474,41 @@ def export(self, outfile, level, namespace_='', name_='compounddefType', namespa outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='compounddefType'): if self.kind is not None: outfile.write(' kind=%s' % (quote_attrib(self.kind), )) if self.prot is not None: outfile.write(' prot=%s' % (quote_attrib(self.prot), )) if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='compounddefType'): if self.compoundname is not None: showIndent(outfile, level) - outfile.write('<%scompoundname>%s\n' % (namespace_, self.format_string(quote_xml(self.compoundname).encode(ExternalEncoding), input_name='compoundname'), namespace_)) + outfile.write('<%scompoundname>%s\n' % (namespace_, self.format_string( + quote_xml(self.compoundname).encode(ExternalEncoding), input_name='compoundname'), namespace_)) if self.title is not None: showIndent(outfile, level) - outfile.write('<%stitle>%s\n' % (namespace_, self.format_string(quote_xml(self.title).encode(ExternalEncoding), input_name='title'), namespace_)) + outfile.write('<%stitle>%s\n' % (namespace_, self.format_string( + quote_xml(self.title).encode(ExternalEncoding), input_name='title'), namespace_)) for basecompoundref_ in self.basecompoundref: - basecompoundref_.export(outfile, level, namespace_, name_='basecompoundref') + basecompoundref_.export( + outfile, level, namespace_, name_='basecompoundref') for derivedcompoundref_ in self.derivedcompoundref: - derivedcompoundref_.export(outfile, level, namespace_, name_='derivedcompoundref') + derivedcompoundref_.export( + outfile, level, namespace_, name_='derivedcompoundref') for includes_ in self.includes: includes_.export(outfile, level, namespace_, name_='includes') for includedby_ in self.includedby: includedby_.export(outfile, level, namespace_, name_='includedby') if self.incdepgraph: - self.incdepgraph.export(outfile, level, namespace_, name_='incdepgraph') + self.incdepgraph.export( + outfile, level, namespace_, name_='incdepgraph') if self.invincdepgraph: - self.invincdepgraph.export(outfile, level, namespace_, name_='invincdepgraph') + self.invincdepgraph.export( + outfile, level, namespace_, name_='invincdepgraph') for innerdir_ in self.innerdir: innerdir_.export(outfile, level, namespace_, name_='innerdir') for innerfile_ in self.innerfile: @@ -448,29 +516,38 @@ def exportChildren(self, outfile, level, namespace_='', name_='compounddefType') for innerclass_ in self.innerclass: innerclass_.export(outfile, level, namespace_, name_='innerclass') for innernamespace_ in self.innernamespace: - innernamespace_.export(outfile, level, namespace_, name_='innernamespace') + innernamespace_.export( + outfile, level, namespace_, name_='innernamespace') for innerpage_ in self.innerpage: innerpage_.export(outfile, level, namespace_, name_='innerpage') for innergroup_ in self.innergroup: innergroup_.export(outfile, level, namespace_, name_='innergroup') if self.templateparamlist: - self.templateparamlist.export(outfile, level, namespace_, name_='templateparamlist') + self.templateparamlist.export( + outfile, level, namespace_, name_='templateparamlist') for sectiondef_ in self.sectiondef: sectiondef_.export(outfile, level, namespace_, name_='sectiondef') if self.briefdescription: - self.briefdescription.export(outfile, level, namespace_, name_='briefdescription') + self.briefdescription.export( + outfile, level, namespace_, name_='briefdescription') if self.detaileddescription: - self.detaileddescription.export(outfile, level, namespace_, name_='detaileddescription') + self.detaileddescription.export( + outfile, level, namespace_, name_='detaileddescription') if self.inheritancegraph: - self.inheritancegraph.export(outfile, level, namespace_, name_='inheritancegraph') + self.inheritancegraph.export( + outfile, level, namespace_, name_='inheritancegraph') if self.collaborationgraph: - self.collaborationgraph.export(outfile, level, namespace_, name_='collaborationgraph') + self.collaborationgraph.export( + outfile, level, namespace_, name_='collaborationgraph') if self.programlisting: - self.programlisting.export(outfile, level, namespace_, name_='programlisting') + self.programlisting.export( + outfile, level, namespace_, name_='programlisting') if self.location: self.location.export(outfile, level, namespace_, name_='location') if self.listofallmembers: - self.listofallmembers.export(outfile, level, namespace_, name_='listofallmembers') + self.listofallmembers.export( + outfile, level, namespace_, name_='listofallmembers') + def hasContent_(self): if ( self.compoundname is not None or @@ -496,15 +573,17 @@ def hasContent_(self): self.programlisting is not None or self.location is not None or self.listofallmembers is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='compounddefType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.kind is not None: showIndent(outfile, level) @@ -515,9 +594,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('compoundname=%s,\n' % quote_python(self.compoundname).encode(ExternalEncoding)) + outfile.write('compoundname=%s,\n' % quote_python( + self.compoundname).encode(ExternalEncoding)) if self.title: showIndent(outfile, level) outfile.write('title=model_.xsd_string(\n') @@ -530,7 +611,8 @@ def exportLiteralChildren(self, outfile, level, name_): for basecompoundref in self.basecompoundref: showIndent(outfile, level) outfile.write('model_.basecompoundref(\n') - basecompoundref.exportLiteral(outfile, level, name_='basecompoundref') + basecompoundref.exportLiteral( + outfile, level, name_='basecompoundref') showIndent(outfile, level) outfile.write('),\n') level -= 1 @@ -542,7 +624,8 @@ def exportLiteralChildren(self, outfile, level, name_): for derivedcompoundref in self.derivedcompoundref: showIndent(outfile, level) outfile.write('model_.derivedcompoundref(\n') - derivedcompoundref.exportLiteral(outfile, level, name_='derivedcompoundref') + derivedcompoundref.exportLiteral( + outfile, level, name_='derivedcompoundref') showIndent(outfile, level) outfile.write('),\n') level -= 1 @@ -581,7 +664,8 @@ def exportLiteralChildren(self, outfile, level, name_): if self.invincdepgraph: showIndent(outfile, level) outfile.write('invincdepgraph=model_.graphType(\n') - self.invincdepgraph.exportLiteral(outfile, level, name_='invincdepgraph') + self.invincdepgraph.exportLiteral( + outfile, level, name_='invincdepgraph') showIndent(outfile, level) outfile.write('),\n') showIndent(outfile, level) @@ -626,7 +710,8 @@ def exportLiteralChildren(self, outfile, level, name_): for innernamespace in self.innernamespace: showIndent(outfile, level) outfile.write('model_.innernamespace(\n') - innernamespace.exportLiteral(outfile, level, name_='innernamespace') + innernamespace.exportLiteral( + outfile, level, name_='innernamespace') showIndent(outfile, level) outfile.write('),\n') level -= 1 @@ -659,7 +744,8 @@ def exportLiteralChildren(self, outfile, level, name_): if self.templateparamlist: showIndent(outfile, level) outfile.write('templateparamlist=model_.templateparamlistType(\n') - self.templateparamlist.exportLiteral(outfile, level, name_='templateparamlist') + self.templateparamlist.exportLiteral( + outfile, level, name_='templateparamlist') showIndent(outfile, level) outfile.write('),\n') showIndent(outfile, level) @@ -677,31 +763,36 @@ def exportLiteralChildren(self, outfile, level, name_): if self.briefdescription: showIndent(outfile, level) outfile.write('briefdescription=model_.descriptionType(\n') - self.briefdescription.exportLiteral(outfile, level, name_='briefdescription') + self.briefdescription.exportLiteral( + outfile, level, name_='briefdescription') showIndent(outfile, level) outfile.write('),\n') if self.detaileddescription: showIndent(outfile, level) outfile.write('detaileddescription=model_.descriptionType(\n') - self.detaileddescription.exportLiteral(outfile, level, name_='detaileddescription') + self.detaileddescription.exportLiteral( + outfile, level, name_='detaileddescription') showIndent(outfile, level) outfile.write('),\n') if self.inheritancegraph: showIndent(outfile, level) outfile.write('inheritancegraph=model_.graphType(\n') - self.inheritancegraph.exportLiteral(outfile, level, name_='inheritancegraph') + self.inheritancegraph.exportLiteral( + outfile, level, name_='inheritancegraph') showIndent(outfile, level) outfile.write('),\n') if self.collaborationgraph: showIndent(outfile, level) outfile.write('collaborationgraph=model_.graphType(\n') - self.collaborationgraph.exportLiteral(outfile, level, name_='collaborationgraph') + self.collaborationgraph.exportLiteral( + outfile, level, name_='collaborationgraph') showIndent(outfile, level) outfile.write('),\n') if self.programlisting: showIndent(outfile, level) outfile.write('programlisting=model_.listingType(\n') - self.programlisting.exportLiteral(outfile, level, name_='programlisting') + self.programlisting.exportLiteral( + outfile, level, name_='programlisting') showIndent(outfile, level) outfile.write('),\n') if self.location: @@ -713,15 +804,18 @@ def exportLiteralChildren(self, outfile, level, name_): if self.listofallmembers: showIndent(outfile, level) outfile.write('listofallmembers=model_.listofallmembersType(\n') - self.listofallmembers.exportLiteral(outfile, level, name_='listofallmembers') + self.listofallmembers.exportLiteral( + outfile, level, name_='listofallmembers') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('kind'): self.kind = attrs.get('kind').value @@ -729,120 +823,121 @@ def buildAttributes(self, attrs): self.prot = attrs.get('prot').value if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'compoundname': + nodeName_ == 'compoundname': compoundname_ = '' for text__content_ in child_.childNodes: compoundname_ += text__content_.nodeValue self.compoundname = compoundname_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': obj_ = docTitleType.factory() obj_.build(child_) self.set_title(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'basecompoundref': + nodeName_ == 'basecompoundref': obj_ = compoundRefType.factory() obj_.build(child_) self.basecompoundref.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'derivedcompoundref': + nodeName_ == 'derivedcompoundref': obj_ = compoundRefType.factory() obj_.build(child_) self.derivedcompoundref.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'includes': + nodeName_ == 'includes': obj_ = incType.factory() obj_.build(child_) self.includes.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'includedby': + nodeName_ == 'includedby': obj_ = incType.factory() obj_.build(child_) self.includedby.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'incdepgraph': + nodeName_ == 'incdepgraph': obj_ = graphType.factory() obj_.build(child_) self.set_incdepgraph(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'invincdepgraph': + nodeName_ == 'invincdepgraph': obj_ = graphType.factory() obj_.build(child_) self.set_invincdepgraph(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'innerdir': + nodeName_ == 'innerdir': obj_ = refType.factory() obj_.build(child_) self.innerdir.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'innerfile': + nodeName_ == 'innerfile': obj_ = refType.factory() obj_.build(child_) self.innerfile.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'innerclass': + nodeName_ == 'innerclass': obj_ = refType.factory() obj_.build(child_) self.innerclass.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'innernamespace': + nodeName_ == 'innernamespace': obj_ = refType.factory() obj_.build(child_) self.innernamespace.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'innerpage': + nodeName_ == 'innerpage': obj_ = refType.factory() obj_.build(child_) self.innerpage.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'innergroup': + nodeName_ == 'innergroup': obj_ = refType.factory() obj_.build(child_) self.innergroup.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'templateparamlist': + nodeName_ == 'templateparamlist': obj_ = templateparamlistType.factory() obj_.build(child_) self.set_templateparamlist(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sectiondef': + nodeName_ == 'sectiondef': obj_ = sectiondefType.factory() obj_.build(child_) self.sectiondef.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'briefdescription': + nodeName_ == 'briefdescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_briefdescription(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'detaileddescription': + nodeName_ == 'detaileddescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_detaileddescription(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'inheritancegraph': + nodeName_ == 'inheritancegraph': obj_ = graphType.factory() obj_.build(child_) self.set_inheritancegraph(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'collaborationgraph': + nodeName_ == 'collaborationgraph': obj_ = graphType.factory() obj_.build(child_) self.set_collaborationgraph(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'programlisting': + nodeName_ == 'programlisting': obj_ = listingType.factory() obj_.build(child_) self.set_programlisting(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'location': + nodeName_ == 'location': obj_ = locationType.factory() obj_.build(child_) self.set_location(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'listofallmembers': + nodeName_ == 'listofallmembers': obj_ = listofallmembersType.factory() obj_.build(child_) self.set_listofallmembers(obj_) @@ -852,11 +947,13 @@ def buildChildren(self, child_, nodeName_): class listofallmembersType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, member=None): if member is None: self.member = [] else: self.member = member + def factory(*args_, **kwargs_): if listofallmembersType.subclass: return listofallmembersType.subclass(*args_, **kwargs_) @@ -867,10 +964,12 @@ def get_member(self): return self.member def set_member(self, member): self.member = member def add_member(self, value): self.member.append(value) def insert_member(self, index, value): self.member[index] = value + def export(self, outfile, level, namespace_='', name_='listofallmembersType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='listofallmembersType') + self.exportAttributes(outfile, level, namespace_, + name_='listofallmembersType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -878,25 +977,31 @@ def export(self, outfile, level, namespace_='', name_='listofallmembersType', na outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='listofallmembersType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='listofallmembersType'): for member_ in self.member: member_.export(outfile, level, namespace_, name_='member') + def hasContent_(self): if ( self.member is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='listofallmembersType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('member=[\n') @@ -910,17 +1015,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'member': + nodeName_ == 'member': obj_ = memberRefType.factory() obj_.build(child_) self.member.append(obj_) @@ -930,6 +1038,7 @@ def buildChildren(self, child_, nodeName_): class memberRefType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, virt=None, prot=None, refid=None, ambiguityscope=None, scope=None, name=None): self.virt = virt self.prot = prot @@ -937,6 +1046,7 @@ def __init__(self, virt=None, prot=None, refid=None, ambiguityscope=None, scope= self.ambiguityscope = ambiguityscope self.scope = scope self.name = name + def factory(*args_, **kwargs_): if memberRefType.subclass: return memberRefType.subclass(*args_, **kwargs_) @@ -954,11 +1064,15 @@ def set_prot(self, prot): self.prot = prot def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid def get_ambiguityscope(self): return self.ambiguityscope - def set_ambiguityscope(self, ambiguityscope): self.ambiguityscope = ambiguityscope + + def set_ambiguityscope( + self, ambiguityscope): self.ambiguityscope = ambiguityscope + def export(self, outfile, level, namespace_='', name_='memberRefType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='memberRefType') + self.exportAttributes(outfile, level, namespace_, + name_='memberRefType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -966,35 +1080,44 @@ def export(self, outfile, level, namespace_='', name_='memberRefType', namespace outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='memberRefType'): if self.virt is not None: outfile.write(' virt=%s' % (quote_attrib(self.virt), )) if self.prot is not None: outfile.write(' prot=%s' % (quote_attrib(self.prot), )) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) if self.ambiguityscope is not None: - outfile.write(' ambiguityscope=%s' % (self.format_string(quote_attrib(self.ambiguityscope).encode(ExternalEncoding), input_name='ambiguityscope'), )) + outfile.write(' ambiguityscope=%s' % (self.format_string(quote_attrib( + self.ambiguityscope).encode(ExternalEncoding), input_name='ambiguityscope'), )) + def exportChildren(self, outfile, level, namespace_='', name_='memberRefType'): if self.scope is not None: showIndent(outfile, level) - outfile.write('<%sscope>%s\n' % (namespace_, self.format_string(quote_xml(self.scope).encode(ExternalEncoding), input_name='scope'), namespace_)) + outfile.write('<%sscope>%s\n' % (namespace_, self.format_string( + quote_xml(self.scope).encode(ExternalEncoding), input_name='scope'), namespace_)) if self.name is not None: showIndent(outfile, level) - outfile.write('<%sname>%s\n' % (namespace_, self.format_string(quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) + outfile.write('<%sname>%s\n' % (namespace_, self.format_string( + quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) + def hasContent_(self): if ( self.scope is not None or self.name is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='memberRefType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.virt is not None: showIndent(outfile, level) @@ -1008,17 +1131,22 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.ambiguityscope is not None: showIndent(outfile, level) outfile.write('ambiguityscope = %s,\n' % (self.ambiguityscope,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('scope=%s,\n' % quote_python(self.scope).encode(ExternalEncoding)) + outfile.write('scope=%s,\n' % quote_python( + self.scope).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('name=%s,\n' % quote_python(self.name).encode(ExternalEncoding)) + outfile.write('name=%s,\n' % quote_python( + self.name).encode(ExternalEncoding)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('virt'): self.virt = attrs.get('virt').value @@ -1028,15 +1156,16 @@ def buildAttributes(self, attrs): self.refid = attrs.get('refid').value if attrs.get('ambiguityscope'): self.ambiguityscope = attrs.get('ambiguityscope').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'scope': + nodeName_ == 'scope': scope_ = '' for text__content_ in child_.childNodes: scope_ += text__content_.nodeValue self.scope = scope_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'name': + nodeName_ == 'name': name_ = '' for text__content_ in child_.childNodes: name_ += text__content_.nodeValue @@ -1047,8 +1176,10 @@ def buildChildren(self, child_, nodeName_): class scope(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if scope.subclass: return scope.subclass(*args_, **kwargs_) @@ -1057,6 +1188,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='scope', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -1068,33 +1200,40 @@ def export(self, outfile, level, namespace_='', name_='scope', namespacedef_='') outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='scope'): pass + def exportChildren(self, outfile, level, namespace_='', name_='scope'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='scope'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1102,21 +1241,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class scope class name(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if name.subclass: return name.subclass(*args_, **kwargs_) @@ -1125,6 +1268,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='name', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -1136,33 +1280,40 @@ def export(self, outfile, level, namespace_='', name_='name', namespacedef_=''): outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='name'): pass + def exportChildren(self, outfile, level, namespace_='', name_='name'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='name'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1170,19 +1321,22 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class name class compoundRefType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, virt=None, prot=None, refid=None, valueOf_='', mixedclass_=None, content_=None): self.virt = virt self.prot = prot @@ -1195,6 +1349,7 @@ def __init__(self, virt=None, prot=None, refid=None, valueOf_='', mixedclass_=No self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if compoundRefType.subclass: return compoundRefType.subclass(*args_, **kwargs_) @@ -1209,40 +1364,48 @@ def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='compoundRefType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='compoundRefType') + self.exportAttributes(outfile, level, namespace_, + name_='compoundRefType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='compoundRefType'): if self.virt is not None: outfile.write(' virt=%s' % (quote_attrib(self.virt), )) if self.prot is not None: outfile.write(' prot=%s' % (quote_attrib(self.prot), )) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='compoundRefType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='compoundRefType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.virt is not None: showIndent(outfile, level) @@ -1253,9 +1416,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1263,6 +1428,7 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('virt'): self.virt = attrs.get('virt').value @@ -1270,21 +1436,23 @@ def buildAttributes(self, attrs): self.prot = attrs.get('prot').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class compoundRefType class reimplementType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, refid=None, valueOf_='', mixedclass_=None, content_=None): self.refid = refid if mixedclass_ is None: @@ -1295,6 +1463,7 @@ def __init__(self, refid=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if reimplementType.subclass: return reimplementType.subclass(*args_, **kwargs_) @@ -1305,43 +1474,53 @@ def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='reimplementType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='reimplementType') + self.exportAttributes(outfile, level, namespace_, + name_='reimplementType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='reimplementType'): if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='reimplementType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='reimplementType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1349,24 +1528,27 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class reimplementType class incType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, local=None, refid=None, valueOf_='', mixedclass_=None, content_=None): self.local = local self.refid = refid @@ -1378,6 +1560,7 @@ def __init__(self, local=None, refid=None, valueOf_='', mixedclass_=None, conten self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if incType.subclass: return incType.subclass(*args_, **kwargs_) @@ -1390,6 +1573,7 @@ def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='incType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -1397,31 +1581,37 @@ def export(self, outfile, level, namespace_='', name_='incType', namespacedef_=' outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='incType'): if self.local is not None: outfile.write(' local=%s' % (quote_attrib(self.local), )) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='incType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='incType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.local is not None: showIndent(outfile, level) @@ -1429,9 +1619,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1439,26 +1631,29 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('local'): self.local = attrs.get('local').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class incType class refType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, prot=None, refid=None, valueOf_='', mixedclass_=None, content_=None): self.prot = prot self.refid = refid @@ -1470,6 +1665,7 @@ def __init__(self, prot=None, refid=None, valueOf_='', mixedclass_=None, content self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if refType.subclass: return refType.subclass(*args_, **kwargs_) @@ -1482,6 +1678,7 @@ def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='refType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -1489,31 +1686,37 @@ def export(self, outfile, level, namespace_='', name_='refType', namespacedef_=' outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='refType'): if self.prot is not None: outfile.write(' prot=%s' % (quote_attrib(self.prot), )) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='refType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='refType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.prot is not None: showIndent(outfile, level) @@ -1521,9 +1724,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1531,26 +1736,29 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('prot'): self.prot = attrs.get('prot').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class refType class refTextType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedclass_=None, content_=None): self.refid = refid self.kindref = kindref @@ -1563,6 +1771,7 @@ def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedcl self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if refTextType.subclass: return refTextType.subclass(*args_, **kwargs_) @@ -1577,6 +1786,7 @@ def get_external(self): return self.external def set_external(self, external): self.external = external def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='refTextType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -1584,33 +1794,40 @@ def export(self, outfile, level, namespace_='', name_='refTextType', namespacede outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='refTextType'): if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) if self.kindref is not None: outfile.write(' kindref=%s' % (quote_attrib(self.kindref), )) if self.external is not None: - outfile.write(' external=%s' % (self.format_string(quote_attrib(self.external).encode(ExternalEncoding), input_name='external'), )) + outfile.write(' external=%s' % (self.format_string(quote_attrib( + self.external).encode(ExternalEncoding), input_name='external'), )) + def exportChildren(self, outfile, level, namespace_='', name_='refTextType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='refTextType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) @@ -1621,9 +1838,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.external is not None: showIndent(outfile, level) outfile.write('external = %s,\n' % (self.external,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -1631,6 +1850,7 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('refid'): self.refid = attrs.get('refid').value @@ -1638,21 +1858,23 @@ def buildAttributes(self, attrs): self.kindref = attrs.get('kindref').value if attrs.get('external'): self.external = attrs.get('external').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class refTextType class sectiondefType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, kind=None, header=None, description=None, memberdef=None): self.kind = kind self.header = header @@ -1661,6 +1883,7 @@ def __init__(self, kind=None, header=None, description=None, memberdef=None): self.memberdef = [] else: self.memberdef = memberdef + def factory(*args_, **kwargs_): if sectiondefType.subclass: return sectiondefType.subclass(*args_, **kwargs_) @@ -1677,10 +1900,12 @@ def add_memberdef(self, value): self.memberdef.append(value) def insert_memberdef(self, index, value): self.memberdef[index] = value def get_kind(self): return self.kind def set_kind(self, kind): self.kind = kind + def export(self, outfile, level, namespace_='', name_='sectiondefType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='sectiondefType') + self.exportAttributes(outfile, level, namespace_, + name_='sectiondefType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -1688,38 +1913,47 @@ def export(self, outfile, level, namespace_='', name_='sectiondefType', namespac outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='sectiondefType'): if self.kind is not None: outfile.write(' kind=%s' % (quote_attrib(self.kind), )) + def exportChildren(self, outfile, level, namespace_='', name_='sectiondefType'): if self.header is not None: showIndent(outfile, level) - outfile.write('<%sheader>%s\n' % (namespace_, self.format_string(quote_xml(self.header).encode(ExternalEncoding), input_name='header'), namespace_)) + outfile.write('<%sheader>%s\n' % (namespace_, self.format_string( + quote_xml(self.header).encode(ExternalEncoding), input_name='header'), namespace_)) if self.description: - self.description.export(outfile, level, namespace_, name_='description') + self.description.export( + outfile, level, namespace_, name_='description') for memberdef_ in self.memberdef: memberdef_.export(outfile, level, namespace_, name_='memberdef') + def hasContent_(self): if ( self.header is not None or self.description is not None or self.memberdef is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='sectiondefType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.kind is not None: showIndent(outfile, level) outfile.write('kind = "%s",\n' % (self.kind,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('header=%s,\n' % quote_python(self.header).encode(ExternalEncoding)) + outfile.write('header=%s,\n' % quote_python( + self.header).encode(ExternalEncoding)) if self.description: showIndent(outfile, level) outfile.write('description=model_.descriptionType(\n') @@ -1738,29 +1972,32 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('kind'): self.kind = attrs.get('kind').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'header': + nodeName_ == 'header': header_ = '' for text__content_ in child_.childNodes: header_ += text__content_.nodeValue self.header = header_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'description': + nodeName_ == 'description': obj_ = descriptionType.factory() obj_.build(child_) self.set_description(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'memberdef': + nodeName_ == 'memberdef': obj_ = memberdefType.factory() obj_.build(child_) self.memberdef.append(obj_) @@ -1770,6 +2007,7 @@ def buildChildren(self, child_, nodeName_): class memberdefType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, initonly=None, kind=None, volatile=None, const=None, raisexx=None, virt=None, readable=None, prot=None, explicit=None, new=None, final=None, writable=None, add=None, static=None, remove=None, sealed=None, mutable=None, gettable=None, inline=None, settable=None, id=None, templateparamlist=None, type_=None, definition=None, argsstring=None, name=None, read=None, write=None, bitfield=None, reimplements=None, reimplementedby=None, param=None, enumvalue=None, initializer=None, exceptions=None, briefdescription=None, detaileddescription=None, inbodydescription=None, location=None, references=None, referencedby=None): self.initonly = initonly self.kind = kind @@ -1830,6 +2068,7 @@ def __init__(self, initonly=None, kind=None, volatile=None, const=None, raisexx= self.referencedby = [] else: self.referencedby = referencedby + def factory(*args_, **kwargs_): if memberdefType.subclass: return memberdefType.subclass(*args_, **kwargs_) @@ -1837,7 +2076,9 @@ def factory(*args_, **kwargs_): return memberdefType(*args_, **kwargs_) factory = staticmethod(factory) def get_templateparamlist(self): return self.templateparamlist - def set_templateparamlist(self, templateparamlist): self.templateparamlist = templateparamlist + def set_templateparamlist( + self, templateparamlist): self.templateparamlist = templateparamlist + def get_type(self): return self.type_ def set_type(self, type_): self.type_ = type_ def get_definition(self): return self.definition @@ -1855,11 +2096,17 @@ def set_bitfield(self, bitfield): self.bitfield = bitfield def get_reimplements(self): return self.reimplements def set_reimplements(self, reimplements): self.reimplements = reimplements def add_reimplements(self, value): self.reimplements.append(value) - def insert_reimplements(self, index, value): self.reimplements[index] = value + def insert_reimplements( + self, index, value): self.reimplements[index] = value + def get_reimplementedby(self): return self.reimplementedby - def set_reimplementedby(self, reimplementedby): self.reimplementedby = reimplementedby + def set_reimplementedby( + self, reimplementedby): self.reimplementedby = reimplementedby + def add_reimplementedby(self, value): self.reimplementedby.append(value) - def insert_reimplementedby(self, index, value): self.reimplementedby[index] = value + def insert_reimplementedby( + self, index, value): self.reimplementedby[index] = value + def get_param(self): return self.param def set_param(self, param): self.param = param def add_param(self, value): self.param.append(value) @@ -1873,11 +2120,17 @@ def set_initializer(self, initializer): self.initializer = initializer def get_exceptions(self): return self.exceptions def set_exceptions(self, exceptions): self.exceptions = exceptions def get_briefdescription(self): return self.briefdescription - def set_briefdescription(self, briefdescription): self.briefdescription = briefdescription + def set_briefdescription( + self, briefdescription): self.briefdescription = briefdescription + def get_detaileddescription(self): return self.detaileddescription - def set_detaileddescription(self, detaileddescription): self.detaileddescription = detaileddescription + def set_detaileddescription( + self, detaileddescription): self.detaileddescription = detaileddescription + def get_inbodydescription(self): return self.inbodydescription - def set_inbodydescription(self, inbodydescription): self.inbodydescription = inbodydescription + def set_inbodydescription( + self, inbodydescription): self.inbodydescription = inbodydescription + def get_location(self): return self.location def set_location(self, location): self.location = location def get_references(self): return self.references @@ -1887,7 +2140,9 @@ def insert_references(self, index, value): self.references[index] = value def get_referencedby(self): return self.referencedby def set_referencedby(self, referencedby): self.referencedby = referencedby def add_referencedby(self, value): self.referencedby.append(value) - def insert_referencedby(self, index, value): self.referencedby[index] = value + def insert_referencedby( + self, index, value): self.referencedby[index] = value + def get_initonly(self): return self.initonly def set_initonly(self, initonly): self.initonly = initonly def get_kind(self): return self.kind @@ -1930,10 +2185,12 @@ def get_settable(self): return self.settable def set_settable(self, settable): self.settable = settable def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='memberdefType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='memberdefType') + self.exportAttributes(outfile, level, namespace_, + name_='memberdefType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -1941,6 +2198,7 @@ def export(self, outfile, level, namespace_='', name_='memberdefType', namespace outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='memberdefType'): if self.initonly is not None: outfile.write(' initonly=%s' % (quote_attrib(self.initonly), )) @@ -1983,54 +2241,73 @@ def exportAttributes(self, outfile, level, namespace_='', name_='memberdefType') if self.settable is not None: outfile.write(' settable=%s' % (quote_attrib(self.settable), )) if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='memberdefType'): if self.templateparamlist: - self.templateparamlist.export(outfile, level, namespace_, name_='templateparamlist') + self.templateparamlist.export( + outfile, level, namespace_, name_='templateparamlist') if self.type_: self.type_.export(outfile, level, namespace_, name_='type') if self.definition is not None: showIndent(outfile, level) - outfile.write('<%sdefinition>%s\n' % (namespace_, self.format_string(quote_xml(self.definition).encode(ExternalEncoding), input_name='definition'), namespace_)) + outfile.write('<%sdefinition>%s\n' % (namespace_, self.format_string( + quote_xml(self.definition).encode(ExternalEncoding), input_name='definition'), namespace_)) if self.argsstring is not None: showIndent(outfile, level) - outfile.write('<%sargsstring>%s\n' % (namespace_, self.format_string(quote_xml(self.argsstring).encode(ExternalEncoding), input_name='argsstring'), namespace_)) + outfile.write('<%sargsstring>%s\n' % (namespace_, self.format_string( + quote_xml(self.argsstring).encode(ExternalEncoding), input_name='argsstring'), namespace_)) if self.name is not None: showIndent(outfile, level) - outfile.write('<%sname>%s\n' % (namespace_, self.format_string(quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) + outfile.write('<%sname>%s\n' % (namespace_, self.format_string( + quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) if self.read is not None: showIndent(outfile, level) - outfile.write('<%sread>%s\n' % (namespace_, self.format_string(quote_xml(self.read).encode(ExternalEncoding), input_name='read'), namespace_)) + outfile.write('<%sread>%s\n' % (namespace_, self.format_string( + quote_xml(self.read).encode(ExternalEncoding), input_name='read'), namespace_)) if self.write is not None: showIndent(outfile, level) - outfile.write('<%swrite>%s\n' % (namespace_, self.format_string(quote_xml(self.write).encode(ExternalEncoding), input_name='write'), namespace_)) + outfile.write('<%swrite>%s\n' % (namespace_, self.format_string( + quote_xml(self.write).encode(ExternalEncoding), input_name='write'), namespace_)) if self.bitfield is not None: showIndent(outfile, level) - outfile.write('<%sbitfield>%s\n' % (namespace_, self.format_string(quote_xml(self.bitfield).encode(ExternalEncoding), input_name='bitfield'), namespace_)) + outfile.write('<%sbitfield>%s\n' % (namespace_, self.format_string( + quote_xml(self.bitfield).encode(ExternalEncoding), input_name='bitfield'), namespace_)) for reimplements_ in self.reimplements: - reimplements_.export(outfile, level, namespace_, name_='reimplements') + reimplements_.export( + outfile, level, namespace_, name_='reimplements') for reimplementedby_ in self.reimplementedby: - reimplementedby_.export(outfile, level, namespace_, name_='reimplementedby') + reimplementedby_.export( + outfile, level, namespace_, name_='reimplementedby') for param_ in self.param: param_.export(outfile, level, namespace_, name_='param') for enumvalue_ in self.enumvalue: enumvalue_.export(outfile, level, namespace_, name_='enumvalue') if self.initializer: - self.initializer.export(outfile, level, namespace_, name_='initializer') + self.initializer.export( + outfile, level, namespace_, name_='initializer') if self.exceptions: - self.exceptions.export(outfile, level, namespace_, name_='exceptions') + self.exceptions.export( + outfile, level, namespace_, name_='exceptions') if self.briefdescription: - self.briefdescription.export(outfile, level, namespace_, name_='briefdescription') + self.briefdescription.export( + outfile, level, namespace_, name_='briefdescription') if self.detaileddescription: - self.detaileddescription.export(outfile, level, namespace_, name_='detaileddescription') + self.detaileddescription.export( + outfile, level, namespace_, name_='detaileddescription') if self.inbodydescription: - self.inbodydescription.export(outfile, level, namespace_, name_='inbodydescription') + self.inbodydescription.export( + outfile, level, namespace_, name_='inbodydescription') if self.location: - self.location.export(outfile, level, namespace_, name_='location', ) + self.location.export( + outfile, level, namespace_, name_='location', ) for references_ in self.references: references_.export(outfile, level, namespace_, name_='references') for referencedby_ in self.referencedby: - referencedby_.export(outfile, level, namespace_, name_='referencedby') + referencedby_.export( + outfile, level, namespace_, name_='referencedby') + def hasContent_(self): if ( self.templateparamlist is not None or @@ -2053,15 +2330,17 @@ def hasContent_(self): self.location is not None or self.references is not None or self.referencedby is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='memberdefType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.initonly is not None: showIndent(outfile, level) @@ -2126,11 +2405,13 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): if self.templateparamlist: showIndent(outfile, level) outfile.write('templateparamlist=model_.templateparamlistType(\n') - self.templateparamlist.exportLiteral(outfile, level, name_='templateparamlist') + self.templateparamlist.exportLiteral( + outfile, level, name_='templateparamlist') showIndent(outfile, level) outfile.write('),\n') if self.type_: @@ -2140,17 +2421,23 @@ def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('),\n') showIndent(outfile, level) - outfile.write('definition=%s,\n' % quote_python(self.definition).encode(ExternalEncoding)) + outfile.write('definition=%s,\n' % quote_python( + self.definition).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('argsstring=%s,\n' % quote_python(self.argsstring).encode(ExternalEncoding)) + outfile.write('argsstring=%s,\n' % quote_python( + self.argsstring).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('name=%s,\n' % quote_python(self.name).encode(ExternalEncoding)) + outfile.write('name=%s,\n' % quote_python( + self.name).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('read=%s,\n' % quote_python(self.read).encode(ExternalEncoding)) + outfile.write('read=%s,\n' % quote_python( + self.read).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('write=%s,\n' % quote_python(self.write).encode(ExternalEncoding)) + outfile.write('write=%s,\n' % quote_python( + self.write).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('bitfield=%s,\n' % quote_python(self.bitfield).encode(ExternalEncoding)) + outfile.write('bitfield=%s,\n' % quote_python( + self.bitfield).encode(ExternalEncoding)) showIndent(outfile, level) outfile.write('reimplements=[\n') level += 1 @@ -2169,7 +2456,8 @@ def exportLiteralChildren(self, outfile, level, name_): for reimplementedby in self.reimplementedby: showIndent(outfile, level) outfile.write('model_.reimplementedby(\n') - reimplementedby.exportLiteral(outfile, level, name_='reimplementedby') + reimplementedby.exportLiteral( + outfile, level, name_='reimplementedby') showIndent(outfile, level) outfile.write('),\n') level -= 1 @@ -2214,19 +2502,22 @@ def exportLiteralChildren(self, outfile, level, name_): if self.briefdescription: showIndent(outfile, level) outfile.write('briefdescription=model_.descriptionType(\n') - self.briefdescription.exportLiteral(outfile, level, name_='briefdescription') + self.briefdescription.exportLiteral( + outfile, level, name_='briefdescription') showIndent(outfile, level) outfile.write('),\n') if self.detaileddescription: showIndent(outfile, level) outfile.write('detaileddescription=model_.descriptionType(\n') - self.detaileddescription.exportLiteral(outfile, level, name_='detaileddescription') + self.detaileddescription.exportLiteral( + outfile, level, name_='detaileddescription') showIndent(outfile, level) outfile.write('),\n') if self.inbodydescription: showIndent(outfile, level) outfile.write('inbodydescription=model_.descriptionType(\n') - self.inbodydescription.exportLiteral(outfile, level, name_='inbodydescription') + self.inbodydescription.exportLiteral( + outfile, level, name_='inbodydescription') showIndent(outfile, level) outfile.write('),\n') if self.location: @@ -2259,12 +2550,14 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('initonly'): self.initonly = attrs.get('initonly').value @@ -2308,110 +2601,111 @@ def buildAttributes(self, attrs): self.settable = attrs.get('settable').value if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'templateparamlist': + nodeName_ == 'templateparamlist': obj_ = templateparamlistType.factory() obj_.build(child_) self.set_templateparamlist(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'type': + nodeName_ == 'type': obj_ = linkedTextType.factory() obj_.build(child_) self.set_type(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'definition': + nodeName_ == 'definition': definition_ = '' for text__content_ in child_.childNodes: definition_ += text__content_.nodeValue self.definition = definition_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'argsstring': + nodeName_ == 'argsstring': argsstring_ = '' for text__content_ in child_.childNodes: argsstring_ += text__content_.nodeValue self.argsstring = argsstring_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'name': + nodeName_ == 'name': name_ = '' for text__content_ in child_.childNodes: name_ += text__content_.nodeValue self.name = name_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'read': + nodeName_ == 'read': read_ = '' for text__content_ in child_.childNodes: read_ += text__content_.nodeValue self.read = read_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'write': + nodeName_ == 'write': write_ = '' for text__content_ in child_.childNodes: write_ += text__content_.nodeValue self.write = write_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'bitfield': + nodeName_ == 'bitfield': bitfield_ = '' for text__content_ in child_.childNodes: bitfield_ += text__content_.nodeValue self.bitfield = bitfield_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'reimplements': + nodeName_ == 'reimplements': obj_ = reimplementType.factory() obj_.build(child_) self.reimplements.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'reimplementedby': + nodeName_ == 'reimplementedby': obj_ = reimplementType.factory() obj_.build(child_) self.reimplementedby.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'param': + nodeName_ == 'param': obj_ = paramType.factory() obj_.build(child_) self.param.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'enumvalue': + nodeName_ == 'enumvalue': obj_ = enumvalueType.factory() obj_.build(child_) self.enumvalue.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'initializer': + nodeName_ == 'initializer': obj_ = linkedTextType.factory() obj_.build(child_) self.set_initializer(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'exceptions': + nodeName_ == 'exceptions': obj_ = linkedTextType.factory() obj_.build(child_) self.set_exceptions(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'briefdescription': + nodeName_ == 'briefdescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_briefdescription(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'detaileddescription': + nodeName_ == 'detaileddescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_detaileddescription(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'inbodydescription': + nodeName_ == 'inbodydescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_inbodydescription(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'location': + nodeName_ == 'location': obj_ = locationType.factory() obj_.build(child_) self.set_location(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'references': + nodeName_ == 'references': obj_ = referenceType.factory() obj_.build(child_) self.references.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'referencedby': + nodeName_ == 'referencedby': obj_ = referenceType.factory() obj_.build(child_) self.referencedby.append(obj_) @@ -2421,8 +2715,10 @@ def buildChildren(self, child_, nodeName_): class definition(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if definition.subclass: return definition.subclass(*args_, **kwargs_) @@ -2431,6 +2727,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='definition', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -2442,33 +2739,40 @@ def export(self, outfile, level, namespace_='', name_='definition', namespacedef outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='definition'): pass + def exportChildren(self, outfile, level, namespace_='', name_='definition'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='definition'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -2476,21 +2780,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class definition class argsstring(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if argsstring.subclass: return argsstring.subclass(*args_, **kwargs_) @@ -2499,6 +2807,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='argsstring', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -2510,33 +2819,40 @@ def export(self, outfile, level, namespace_='', name_='argsstring', namespacedef outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='argsstring'): pass + def exportChildren(self, outfile, level, namespace_='', name_='argsstring'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='argsstring'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -2544,21 +2860,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class argsstring class read(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if read.subclass: return read.subclass(*args_, **kwargs_) @@ -2567,6 +2887,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='read', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -2578,33 +2899,40 @@ def export(self, outfile, level, namespace_='', name_='read', namespacedef_=''): outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='read'): pass + def exportChildren(self, outfile, level, namespace_='', name_='read'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='read'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -2612,21 +2940,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class read class write(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if write.subclass: return write.subclass(*args_, **kwargs_) @@ -2635,6 +2967,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='write', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -2646,33 +2979,40 @@ def export(self, outfile, level, namespace_='', name_='write', namespacedef_='') outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='write'): pass + def exportChildren(self, outfile, level, namespace_='', name_='write'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='write'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -2680,21 +3020,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class write class bitfield(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if bitfield.subclass: return bitfield.subclass(*args_, **kwargs_) @@ -2703,6 +3047,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='bitfield', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -2714,33 +3059,40 @@ def export(self, outfile, level, namespace_='', name_='bitfield', namespacedef_= outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='bitfield'): pass + def exportChildren(self, outfile, level, namespace_='', name_='bitfield'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='bitfield'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -2748,19 +3100,22 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class bitfield class descriptionType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, title=None, para=None, sect1=None, internal=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -2770,6 +3125,7 @@ def __init__(self, title=None, para=None, sect1=None, internal=None, mixedclass_ self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if descriptionType.subclass: return descriptionType.subclass(*args_, **kwargs_) @@ -2788,35 +3144,43 @@ def add_sect1(self, value): self.sect1.append(value) def insert_sect1(self, index, value): self.sect1[index] = value def get_internal(self): return self.internal def set_internal(self, internal): self.internal = internal + def export(self, outfile, level, namespace_='', name_='descriptionType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='descriptionType') + self.exportAttributes(outfile, level, namespace_, + name_='descriptionType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='descriptionType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='descriptionType'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.title is not None or self.para is not None or self.sect1 is not None or self.internal is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='descriptionType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -2842,46 +3206,49 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': childobj_ = docTitleType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'title', childobj_) + MixedContainer.TypeNone, 'title', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect1': + nodeName_ == 'sect1': childobj_ = docSect1Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect1', childobj_) + MixedContainer.TypeNone, 'sect1', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'internal': + nodeName_ == 'internal': childobj_ = docInternalType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'internal', childobj_) + MixedContainer.TypeNone, 'internal', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class descriptionType @@ -2889,6 +3256,7 @@ def buildChildren(self, child_, nodeName_): class enumvalueType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, prot=None, id=None, name=None, initializer=None, briefdescription=None, detaileddescription=None, mixedclass_=None, content_=None): self.prot = prot self.id = id @@ -2900,6 +3268,7 @@ def __init__(self, prot=None, id=None, name=None, initializer=None, briefdescrip self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if enumvalueType.subclass: return enumvalueType.subclass(*args_, **kwargs_) @@ -2911,43 +3280,55 @@ def set_name(self, name): self.name = name def get_initializer(self): return self.initializer def set_initializer(self, initializer): self.initializer = initializer def get_briefdescription(self): return self.briefdescription - def set_briefdescription(self, briefdescription): self.briefdescription = briefdescription + def set_briefdescription( + self, briefdescription): self.briefdescription = briefdescription + def get_detaileddescription(self): return self.detaileddescription - def set_detaileddescription(self, detaileddescription): self.detaileddescription = detaileddescription + def set_detaileddescription( + self, detaileddescription): self.detaileddescription = detaileddescription + def get_prot(self): return self.prot def set_prot(self, prot): self.prot = prot def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='enumvalueType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='enumvalueType') + self.exportAttributes(outfile, level, namespace_, + name_='enumvalueType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='enumvalueType'): if self.prot is not None: outfile.write(' prot=%s' % (quote_attrib(self.prot), )) if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='enumvalueType'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.name is not None or self.initializer is not None or self.briefdescription is not None or self.detaileddescription is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='enumvalueType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.prot is not None: showIndent(outfile, level) @@ -2955,6 +3336,7 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -2980,51 +3362,54 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('prot'): self.prot = attrs.get('prot').value if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'name': + nodeName_ == 'name': value_ = [] for text_ in child_.childNodes: value_.append(text_.nodeValue) valuestr_ = ''.join(value_) obj_ = self.mixedclass_(MixedContainer.CategorySimple, - MixedContainer.TypeString, 'name', valuestr_) + MixedContainer.TypeString, 'name', valuestr_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'initializer': + nodeName_ == 'initializer': childobj_ = linkedTextType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'initializer', childobj_) + MixedContainer.TypeNone, 'initializer', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'briefdescription': + nodeName_ == 'briefdescription': childobj_ = descriptionType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'briefdescription', childobj_) + MixedContainer.TypeNone, 'briefdescription', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'detaileddescription': + nodeName_ == 'detaileddescription': childobj_ = descriptionType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'detaileddescription', childobj_) + MixedContainer.TypeNone, 'detaileddescription', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class enumvalueType @@ -3032,11 +3417,13 @@ def buildChildren(self, child_, nodeName_): class templateparamlistType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, param=None): if param is None: self.param = [] else: self.param = param + def factory(*args_, **kwargs_): if templateparamlistType.subclass: return templateparamlistType.subclass(*args_, **kwargs_) @@ -3047,10 +3434,12 @@ def get_param(self): return self.param def set_param(self, param): self.param = param def add_param(self, value): self.param.append(value) def insert_param(self, index, value): self.param[index] = value + def export(self, outfile, level, namespace_='', name_='templateparamlistType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='templateparamlistType') + self.exportAttributes(outfile, level, namespace_, + name_='templateparamlistType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -3058,25 +3447,31 @@ def export(self, outfile, level, namespace_='', name_='templateparamlistType', n outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='templateparamlistType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='templateparamlistType'): for param_ in self.param: param_.export(outfile, level, namespace_, name_='param') + def hasContent_(self): if ( self.param is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='templateparamlistType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('param=[\n') @@ -3090,17 +3485,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'param': + nodeName_ == 'param': obj_ = paramType.factory() obj_.build(child_) self.param.append(obj_) @@ -3110,6 +3508,7 @@ def buildChildren(self, child_, nodeName_): class paramType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, type_=None, declname=None, defname=None, array=None, defval=None, briefdescription=None): self.type_ = type_ self.declname = declname @@ -3117,6 +3516,7 @@ def __init__(self, type_=None, declname=None, defname=None, array=None, defval=N self.array = array self.defval = defval self.briefdescription = briefdescription + def factory(*args_, **kwargs_): if paramType.subclass: return paramType.subclass(*args_, **kwargs_) @@ -3134,7 +3534,10 @@ def set_array(self, array): self.array = array def get_defval(self): return self.defval def set_defval(self, defval): self.defval = defval def get_briefdescription(self): return self.briefdescription - def set_briefdescription(self, briefdescription): self.briefdescription = briefdescription + + def set_briefdescription( + self, briefdescription): self.briefdescription = briefdescription + def export(self, outfile, level, namespace_='', name_='paramType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3146,24 +3549,31 @@ def export(self, outfile, level, namespace_='', name_='paramType', namespacedef_ outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='paramType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='paramType'): if self.type_: self.type_.export(outfile, level, namespace_, name_='type') if self.declname is not None: showIndent(outfile, level) - outfile.write('<%sdeclname>%s\n' % (namespace_, self.format_string(quote_xml(self.declname).encode(ExternalEncoding), input_name='declname'), namespace_)) + outfile.write('<%sdeclname>%s\n' % (namespace_, self.format_string( + quote_xml(self.declname).encode(ExternalEncoding), input_name='declname'), namespace_)) if self.defname is not None: showIndent(outfile, level) - outfile.write('<%sdefname>%s\n' % (namespace_, self.format_string(quote_xml(self.defname).encode(ExternalEncoding), input_name='defname'), namespace_)) + outfile.write('<%sdefname>%s\n' % (namespace_, self.format_string( + quote_xml(self.defname).encode(ExternalEncoding), input_name='defname'), namespace_)) if self.array is not None: showIndent(outfile, level) - outfile.write('<%sarray>%s\n' % (namespace_, self.format_string(quote_xml(self.array).encode(ExternalEncoding), input_name='array'), namespace_)) + outfile.write('<%sarray>%s\n' % (namespace_, self.format_string( + quote_xml(self.array).encode(ExternalEncoding), input_name='array'), namespace_)) if self.defval: self.defval.export(outfile, level, namespace_, name_='defval') if self.briefdescription: - self.briefdescription.export(outfile, level, namespace_, name_='briefdescription') + self.briefdescription.export( + outfile, level, namespace_, name_='briefdescription') + def hasContent_(self): if ( self.type_ is not None or @@ -3172,17 +3582,20 @@ def hasContent_(self): self.array is not None or self.defval is not None or self.briefdescription is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='paramType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): if self.type_: showIndent(outfile, level) @@ -3191,11 +3604,14 @@ def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('),\n') showIndent(outfile, level) - outfile.write('declname=%s,\n' % quote_python(self.declname).encode(ExternalEncoding)) + outfile.write('declname=%s,\n' % quote_python( + self.declname).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('defname=%s,\n' % quote_python(self.defname).encode(ExternalEncoding)) + outfile.write('defname=%s,\n' % quote_python( + self.defname).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('array=%s,\n' % quote_python(self.array).encode(ExternalEncoding)) + outfile.write('array=%s,\n' % quote_python( + self.array).encode(ExternalEncoding)) if self.defval: showIndent(outfile, level) outfile.write('defval=model_.linkedTextType(\n') @@ -3205,48 +3621,52 @@ def exportLiteralChildren(self, outfile, level, name_): if self.briefdescription: showIndent(outfile, level) outfile.write('briefdescription=model_.descriptionType(\n') - self.briefdescription.exportLiteral(outfile, level, name_='briefdescription') + self.briefdescription.exportLiteral( + outfile, level, name_='briefdescription') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'type': + nodeName_ == 'type': obj_ = linkedTextType.factory() obj_.build(child_) self.set_type(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'declname': + nodeName_ == 'declname': declname_ = '' for text__content_ in child_.childNodes: declname_ += text__content_.nodeValue self.declname = declname_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'defname': + nodeName_ == 'defname': defname_ = '' for text__content_ in child_.childNodes: defname_ += text__content_.nodeValue self.defname = defname_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'array': + nodeName_ == 'array': array_ = '' for text__content_ in child_.childNodes: array_ += text__content_.nodeValue self.array = array_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'defval': + nodeName_ == 'defval': obj_ = linkedTextType.factory() obj_.build(child_) self.set_defval(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'briefdescription': + nodeName_ == 'briefdescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_briefdescription(obj_) @@ -3256,8 +3676,10 @@ def buildChildren(self, child_, nodeName_): class declname(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if declname.subclass: return declname.subclass(*args_, **kwargs_) @@ -3266,6 +3688,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='declname', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3277,33 +3700,40 @@ def export(self, outfile, level, namespace_='', name_='declname', namespacedef_= outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='declname'): pass + def exportChildren(self, outfile, level, namespace_='', name_='declname'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='declname'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -3311,21 +3741,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class declname class defname(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if defname.subclass: return defname.subclass(*args_, **kwargs_) @@ -3334,6 +3768,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='defname', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3345,33 +3780,40 @@ def export(self, outfile, level, namespace_='', name_='defname', namespacedef_=' outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='defname'): pass + def exportChildren(self, outfile, level, namespace_='', name_='defname'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='defname'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -3379,21 +3821,25 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class defname class array(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if array.subclass: return array.subclass(*args_, **kwargs_) @@ -3402,6 +3848,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='array', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3413,33 +3860,40 @@ def export(self, outfile, level, namespace_='', name_='array', namespacedef_='') outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='array'): pass + def exportChildren(self, outfile, level, namespace_='', name_='array'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='array'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -3447,19 +3901,22 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class array class linkedTextType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, ref=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -3469,6 +3926,7 @@ def __init__(self, ref=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if linkedTextType.subclass: return linkedTextType.subclass(*args_, **kwargs_) @@ -3479,32 +3937,40 @@ def get_ref(self): return self.ref def set_ref(self, ref): self.ref = ref def add_ref(self, value): self.ref.append(value) def insert_ref(self, index, value): self.ref[index] = value + def export(self, outfile, level, namespace_='', name_='linkedTextType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='linkedTextType') + self.exportAttributes(outfile, level, namespace_, + name_='linkedTextType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='linkedTextType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='linkedTextType'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.ref is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='linkedTextType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -3512,25 +3978,28 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'ref': + nodeName_ == 'ref': childobj_ = docRefTextType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'ref', childobj_) + MixedContainer.TypeNone, 'ref', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class linkedTextType @@ -3538,11 +4007,13 @@ def buildChildren(self, child_, nodeName_): class graphType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, node=None): if node is None: self.node = [] else: self.node = node + def factory(*args_, **kwargs_): if graphType.subclass: return graphType.subclass(*args_, **kwargs_) @@ -3553,6 +4024,7 @@ def get_node(self): return self.node def set_node(self, node): self.node = node def add_node(self, value): self.node.append(value) def insert_node(self, index, value): self.node[index] = value + def export(self, outfile, level, namespace_='', name_='graphType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3564,25 +4036,31 @@ def export(self, outfile, level, namespace_='', name_='graphType', namespacedef_ outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='graphType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='graphType'): for node_ in self.node: node_.export(outfile, level, namespace_, name_='node') + def hasContent_(self): if ( self.node is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='graphType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('node=[\n') @@ -3596,17 +4074,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'node': + nodeName_ == 'node': obj_ = nodeType.factory() obj_.build(child_) self.node.append(obj_) @@ -3616,6 +4097,7 @@ def buildChildren(self, child_, nodeName_): class nodeType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, label=None, link=None, childnode=None): self.id = id self.label = label @@ -3624,6 +4106,7 @@ def __init__(self, id=None, label=None, link=None, childnode=None): self.childnode = [] else: self.childnode = childnode + def factory(*args_, **kwargs_): if nodeType.subclass: return nodeType.subclass(*args_, **kwargs_) @@ -3640,6 +4123,7 @@ def add_childnode(self, value): self.childnode.append(value) def insert_childnode(self, index, value): self.childnode[index] = value def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='nodeType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3651,38 +4135,47 @@ def export(self, outfile, level, namespace_='', name_='nodeType', namespacedef_= outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='nodeType'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='nodeType'): if self.label is not None: showIndent(outfile, level) - outfile.write('<%slabel>%s\n' % (namespace_, self.format_string(quote_xml(self.label).encode(ExternalEncoding), input_name='label'), namespace_)) + outfile.write('<%slabel>%s\n' % (namespace_, self.format_string( + quote_xml(self.label).encode(ExternalEncoding), input_name='label'), namespace_)) if self.link: self.link.export(outfile, level, namespace_, name_='link') for childnode_ in self.childnode: childnode_.export(outfile, level, namespace_, name_='childnode') + def hasContent_(self): if ( self.label is not None or self.link is not None or self.childnode is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='nodeType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('label=%s,\n' % quote_python(self.label).encode(ExternalEncoding)) + outfile.write('label=%s,\n' % quote_python( + self.label).encode(ExternalEncoding)) if self.link: showIndent(outfile, level) outfile.write('link=model_.linkType(\n') @@ -3701,29 +4194,32 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'label': + nodeName_ == 'label': label_ = '' for text__content_ in child_.childNodes: label_ += text__content_.nodeValue self.label = label_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'link': + nodeName_ == 'link': obj_ = linkType.factory() obj_.build(child_) self.set_link(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'childnode': + nodeName_ == 'childnode': obj_ = childnodeType.factory() obj_.build(child_) self.childnode.append(obj_) @@ -3733,8 +4229,10 @@ def buildChildren(self, child_, nodeName_): class label(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if label.subclass: return label.subclass(*args_, **kwargs_) @@ -3743,6 +4241,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='label', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3754,33 +4253,40 @@ def export(self, outfile, level, namespace_='', name_='label', namespacedef_='') outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='label'): pass + def exportChildren(self, outfile, level, namespace_='', name_='label'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='label'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -3788,19 +4294,22 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class label class childnodeType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, relation=None, refid=None, edgelabel=None): self.relation = relation self.refid = refid @@ -3808,6 +4317,7 @@ def __init__(self, relation=None, refid=None, edgelabel=None): self.edgelabel = [] else: self.edgelabel = edgelabel + def factory(*args_, **kwargs_): if childnodeType.subclass: return childnodeType.subclass(*args_, **kwargs_) @@ -3822,10 +4332,12 @@ def get_relation(self): return self.relation def set_relation(self, relation): self.relation = relation def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid + def export(self, outfile, level, namespace_='', name_='childnodeType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='childnodeType') + self.exportAttributes(outfile, level, namespace_, + name_='childnodeType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -3833,27 +4345,34 @@ def export(self, outfile, level, namespace_='', name_='childnodeType', namespace outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='childnodeType'): if self.relation is not None: outfile.write(' relation=%s' % (quote_attrib(self.relation), )) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='childnodeType'): for edgelabel_ in self.edgelabel: showIndent(outfile, level) - outfile.write('<%sedgelabel>%s\n' % (namespace_, self.format_string(quote_xml(edgelabel_).encode(ExternalEncoding), input_name='edgelabel'), namespace_)) + outfile.write('<%sedgelabel>%s\n' % (namespace_, self.format_string( + quote_xml(edgelabel_).encode(ExternalEncoding), input_name='edgelabel'), namespace_)) + def hasContent_(self): if ( self.edgelabel is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='childnodeType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.relation is not None: showIndent(outfile, level) @@ -3861,30 +4380,35 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('edgelabel=[\n') level += 1 for edgelabel in self.edgelabel: showIndent(outfile, level) - outfile.write('%s,\n' % quote_python(edgelabel).encode(ExternalEncoding)) + outfile.write('%s,\n' % quote_python( + edgelabel).encode(ExternalEncoding)) level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('relation'): self.relation = attrs.get('relation').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'edgelabel': + nodeName_ == 'edgelabel': edgelabel_ = '' for text__content_ in child_.childNodes: edgelabel_ += text__content_.nodeValue @@ -3895,8 +4419,10 @@ def buildChildren(self, child_, nodeName_): class edgelabel(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if edgelabel.subclass: return edgelabel.subclass(*args_, **kwargs_) @@ -3905,6 +4431,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='edgelabel', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3916,33 +4443,40 @@ def export(self, outfile, level, namespace_='', name_='edgelabel', namespacedef_ outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='edgelabel'): pass + def exportChildren(self, outfile, level, namespace_='', name_='edgelabel'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='edgelabel'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -3950,23 +4484,27 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class edgelabel class linkType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, refid=None, external=None, valueOf_=''): self.refid = refid self.external = external self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if linkType.subclass: return linkType.subclass(*args_, **kwargs_) @@ -3979,6 +4517,7 @@ def get_external(self): return self.external def set_external(self, external): self.external = external def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='linkType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -3990,31 +4529,38 @@ def export(self, outfile, level, namespace_='', name_='linkType', namespacedef_= outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='linkType'): if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) if self.external is not None: - outfile.write(' external=%s' % (self.format_string(quote_attrib(self.external).encode(ExternalEncoding), input_name='external'), )) + outfile.write(' external=%s' % (self.format_string(quote_attrib( + self.external).encode(ExternalEncoding), input_name='external'), )) + def exportChildren(self, outfile, level, namespace_='', name_='linkType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='linkType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) @@ -4022,9 +4568,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.external is not None: showIndent(outfile, level) outfile.write('external = %s,\n' % (self.external,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -4032,27 +4580,31 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('refid'): self.refid = attrs.get('refid').value if attrs.get('external'): self.external = attrs.get('external').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class linkType class listingType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, codeline=None): if codeline is None: self.codeline = [] else: self.codeline = codeline + def factory(*args_, **kwargs_): if listingType.subclass: return listingType.subclass(*args_, **kwargs_) @@ -4063,6 +4615,7 @@ def get_codeline(self): return self.codeline def set_codeline(self, codeline): self.codeline = codeline def add_codeline(self, value): self.codeline.append(value) def insert_codeline(self, index, value): self.codeline[index] = value + def export(self, outfile, level, namespace_='', name_='listingType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4074,25 +4627,31 @@ def export(self, outfile, level, namespace_='', name_='listingType', namespacede outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='listingType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='listingType'): for codeline_ in self.codeline: codeline_.export(outfile, level, namespace_, name_='codeline') + def hasContent_(self): if ( self.codeline is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='listingType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('codeline=[\n') @@ -4106,17 +4665,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'codeline': + nodeName_ == 'codeline': obj_ = codelineType.factory() obj_.build(child_) self.codeline.append(obj_) @@ -4126,6 +4688,7 @@ def buildChildren(self, child_, nodeName_): class codelineType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, external=None, lineno=None, refkind=None, refid=None, highlight=None): self.external = external self.lineno = lineno @@ -4135,6 +4698,7 @@ def __init__(self, external=None, lineno=None, refkind=None, refid=None, highlig self.highlight = [] else: self.highlight = highlight + def factory(*args_, **kwargs_): if codelineType.subclass: return codelineType.subclass(*args_, **kwargs_) @@ -4153,6 +4717,7 @@ def get_refkind(self): return self.refkind def set_refkind(self, refkind): self.refkind = refkind def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid + def export(self, outfile, level, namespace_='', name_='codelineType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4164,30 +4729,37 @@ def export(self, outfile, level, namespace_='', name_='codelineType', namespaced outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='codelineType'): if self.external is not None: outfile.write(' external=%s' % (quote_attrib(self.external), )) if self.lineno is not None: - outfile.write(' lineno="%s"' % self.format_integer(self.lineno, input_name='lineno')) + outfile.write(' lineno="%s"' % self.format_integer( + self.lineno, input_name='lineno')) if self.refkind is not None: outfile.write(' refkind=%s' % (quote_attrib(self.refkind), )) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='codelineType'): for highlight_ in self.highlight: highlight_.export(outfile, level, namespace_, name_='highlight') + def hasContent_(self): if ( self.highlight is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='codelineType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.external is not None: showIndent(outfile, level) @@ -4201,6 +4773,7 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('highlight=[\n') @@ -4214,12 +4787,14 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('external'): self.external = attrs.get('external').value @@ -4232,9 +4807,10 @@ def buildAttributes(self, attrs): self.refkind = attrs.get('refkind').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'highlight': + nodeName_ == 'highlight': obj_ = highlightType.factory() obj_.build(child_) self.highlight.append(obj_) @@ -4244,6 +4820,7 @@ def buildChildren(self, child_, nodeName_): class highlightType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, classxx=None, sp=None, ref=None, mixedclass_=None, content_=None): self.classxx = classxx if mixedclass_ is None: @@ -4254,6 +4831,7 @@ def __init__(self, classxx=None, sp=None, ref=None, mixedclass_=None, content_=N self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if highlightType.subclass: return highlightType.subclass(*args_, **kwargs_) @@ -4270,36 +4848,44 @@ def add_ref(self, value): self.ref.append(value) def insert_ref(self, index, value): self.ref[index] = value def get_class(self): return self.classxx def set_class(self, classxx): self.classxx = classxx + def export(self, outfile, level, namespace_='', name_='highlightType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='highlightType') + self.exportAttributes(outfile, level, namespace_, + name_='highlightType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='highlightType'): if self.classxx is not None: outfile.write(' class=%s' % (quote_attrib(self.classxx), )) + def exportChildren(self, outfile, level, namespace_='', name_='highlightType'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.sp is not None or self.ref is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='highlightType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.classxx is not None: showIndent(outfile, level) outfile.write('classxx = "%s",\n' % (self.classxx,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -4313,35 +4899,38 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('class'): self.classxx = attrs.get('class').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sp': + nodeName_ == 'sp': value_ = [] for text_ in child_.childNodes: value_.append(text_.nodeValue) valuestr_ = ''.join(value_) obj_ = self.mixedclass_(MixedContainer.CategorySimple, - MixedContainer.TypeString, 'sp', valuestr_) + MixedContainer.TypeString, 'sp', valuestr_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'ref': + nodeName_ == 'ref': childobj_ = docRefTextType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'ref', childobj_) + MixedContainer.TypeNone, 'ref', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class highlightType @@ -4349,8 +4938,10 @@ def buildChildren(self, child_, nodeName_): class sp(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if sp.subclass: return sp.subclass(*args_, **kwargs_) @@ -4359,6 +4950,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='sp', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4370,33 +4962,40 @@ def export(self, outfile, level, namespace_='', name_='sp', namespacedef_=''): outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='sp'): pass + def exportChildren(self, outfile, level, namespace_='', name_='sp'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='sp'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -4404,19 +5003,22 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class sp class referenceType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, endline=None, startline=None, refid=None, compoundref=None, valueOf_='', mixedclass_=None, content_=None): self.endline = endline self.startline = startline @@ -4430,6 +5032,7 @@ def __init__(self, endline=None, startline=None, refid=None, compoundref=None, v self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if referenceType.subclass: return referenceType.subclass(*args_, **kwargs_) @@ -4446,42 +5049,53 @@ def get_compoundref(self): return self.compoundref def set_compoundref(self, compoundref): self.compoundref = compoundref def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='referenceType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='referenceType') + self.exportAttributes(outfile, level, namespace_, + name_='referenceType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='referenceType'): if self.endline is not None: - outfile.write(' endline="%s"' % self.format_integer(self.endline, input_name='endline')) + outfile.write(' endline="%s"' % self.format_integer( + self.endline, input_name='endline')) if self.startline is not None: - outfile.write(' startline="%s"' % self.format_integer(self.startline, input_name='startline')) + outfile.write(' startline="%s"' % self.format_integer( + self.startline, input_name='startline')) if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) if self.compoundref is not None: - outfile.write(' compoundref=%s' % (self.format_string(quote_attrib(self.compoundref).encode(ExternalEncoding), input_name='compoundref'), )) + outfile.write(' compoundref=%s' % (self.format_string(quote_attrib( + self.compoundref).encode(ExternalEncoding), input_name='compoundref'), )) + def exportChildren(self, outfile, level, namespace_='', name_='referenceType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='referenceType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.endline is not None: showIndent(outfile, level) @@ -4495,9 +5109,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.compoundref is not None: showIndent(outfile, level) outfile.write('compoundref = %s,\n' % (self.compoundref,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -4505,6 +5121,7 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('endline'): try: @@ -4520,21 +5137,23 @@ def buildAttributes(self, attrs): self.refid = attrs.get('refid').value if attrs.get('compoundref'): self.compoundref = attrs.get('compoundref').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class referenceType class locationType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, bodystart=None, line=None, bodyend=None, bodyfile=None, file=None, valueOf_=''): self.bodystart = bodystart self.line = line @@ -4542,6 +5161,7 @@ def __init__(self, bodystart=None, line=None, bodyend=None, bodyfile=None, file= self.bodyfile = bodyfile self.file = file self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if locationType.subclass: return locationType.subclass(*args_, **kwargs_) @@ -4560,6 +5180,7 @@ def get_file(self): return self.file def set_file(self, file): self.file = file def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='locationType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4571,37 +5192,47 @@ def export(self, outfile, level, namespace_='', name_='locationType', namespaced outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='locationType'): if self.bodystart is not None: - outfile.write(' bodystart="%s"' % self.format_integer(self.bodystart, input_name='bodystart')) + outfile.write(' bodystart="%s"' % self.format_integer( + self.bodystart, input_name='bodystart')) if self.line is not None: - outfile.write(' line="%s"' % self.format_integer(self.line, input_name='line')) + outfile.write(' line="%s"' % self.format_integer( + self.line, input_name='line')) if self.bodyend is not None: - outfile.write(' bodyend="%s"' % self.format_integer(self.bodyend, input_name='bodyend')) + outfile.write(' bodyend="%s"' % self.format_integer( + self.bodyend, input_name='bodyend')) if self.bodyfile is not None: - outfile.write(' bodyfile=%s' % (self.format_string(quote_attrib(self.bodyfile).encode(ExternalEncoding), input_name='bodyfile'), )) + outfile.write(' bodyfile=%s' % (self.format_string(quote_attrib( + self.bodyfile).encode(ExternalEncoding), input_name='bodyfile'), )) if self.file is not None: - outfile.write(' file=%s' % (self.format_string(quote_attrib(self.file).encode(ExternalEncoding), input_name='file'), )) + outfile.write(' file=%s' % (self.format_string(quote_attrib( + self.file).encode(ExternalEncoding), input_name='file'), )) + def exportChildren(self, outfile, level, namespace_='', name_='locationType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='locationType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.bodystart is not None: showIndent(outfile, level) @@ -4618,9 +5249,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.file is not None: showIndent(outfile, level) outfile.write('file = %s,\n' % (self.file,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -4628,6 +5261,7 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('bodystart'): try: @@ -4648,17 +5282,19 @@ def buildAttributes(self, attrs): self.bodyfile = attrs.get('bodyfile').value if attrs.get('file'): self.file = attrs.get('file').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class locationType class docSect1Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, title=None, para=None, sect2=None, internal=None, mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -4669,6 +5305,7 @@ def __init__(self, id=None, title=None, para=None, sect2=None, internal=None, mi self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docSect1Type.subclass: return docSect1Type.subclass(*args_, **kwargs_) @@ -4689,6 +5326,7 @@ def get_internal(self): return self.internal def set_internal(self, internal): self.internal = internal def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='docSect1Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4696,31 +5334,38 @@ def export(self, outfile, level, namespace_='', name_='docSect1Type', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docSect1Type'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docSect1Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.title is not None or self.para is not None or self.sect2 is not None or self.internal is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docSect1Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -4746,47 +5391,50 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': childobj_ = docTitleType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'title', childobj_) + MixedContainer.TypeNone, 'title', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect2': + nodeName_ == 'sect2': childobj_ = docSect2Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect2', childobj_) + MixedContainer.TypeNone, 'sect2', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'internal': + nodeName_ == 'internal': childobj_ = docInternalS1Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'internal', childobj_) + MixedContainer.TypeNone, 'internal', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docSect1Type @@ -4794,6 +5442,7 @@ def buildChildren(self, child_, nodeName_): class docSect2Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, title=None, para=None, sect3=None, internal=None, mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -4804,6 +5453,7 @@ def __init__(self, id=None, title=None, para=None, sect3=None, internal=None, mi self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docSect2Type.subclass: return docSect2Type.subclass(*args_, **kwargs_) @@ -4824,6 +5474,7 @@ def get_internal(self): return self.internal def set_internal(self, internal): self.internal = internal def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='docSect2Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4831,31 +5482,38 @@ def export(self, outfile, level, namespace_='', name_='docSect2Type', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docSect2Type'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docSect2Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.title is not None or self.para is not None or self.sect3 is not None or self.internal is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docSect2Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -4881,47 +5539,50 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': childobj_ = docTitleType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'title', childobj_) + MixedContainer.TypeNone, 'title', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect3': + nodeName_ == 'sect3': childobj_ = docSect3Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect3', childobj_) + MixedContainer.TypeNone, 'sect3', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'internal': + nodeName_ == 'internal': childobj_ = docInternalS2Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'internal', childobj_) + MixedContainer.TypeNone, 'internal', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docSect2Type @@ -4929,6 +5590,7 @@ def buildChildren(self, child_, nodeName_): class docSect3Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, title=None, para=None, sect4=None, internal=None, mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -4939,6 +5601,7 @@ def __init__(self, id=None, title=None, para=None, sect4=None, internal=None, mi self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docSect3Type.subclass: return docSect3Type.subclass(*args_, **kwargs_) @@ -4959,6 +5622,7 @@ def get_internal(self): return self.internal def set_internal(self, internal): self.internal = internal def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='docSect3Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -4966,31 +5630,38 @@ def export(self, outfile, level, namespace_='', name_='docSect3Type', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docSect3Type'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docSect3Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.title is not None or self.para is not None or self.sect4 is not None or self.internal is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docSect3Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5016,47 +5687,50 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': childobj_ = docTitleType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'title', childobj_) + MixedContainer.TypeNone, 'title', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect4': + nodeName_ == 'sect4': childobj_ = docSect4Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect4', childobj_) + MixedContainer.TypeNone, 'sect4', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'internal': + nodeName_ == 'internal': childobj_ = docInternalS3Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'internal', childobj_) + MixedContainer.TypeNone, 'internal', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docSect3Type @@ -5064,6 +5738,7 @@ def buildChildren(self, child_, nodeName_): class docSect4Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, title=None, para=None, internal=None, mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -5074,6 +5749,7 @@ def __init__(self, id=None, title=None, para=None, internal=None, mixedclass_=No self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docSect4Type.subclass: return docSect4Type.subclass(*args_, **kwargs_) @@ -5090,6 +5766,7 @@ def get_internal(self): return self.internal def set_internal(self, internal): self.internal = internal def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='docSect4Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -5097,30 +5774,37 @@ def export(self, outfile, level, namespace_='', name_='docSect4Type', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docSect4Type'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docSect4Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.title is not None or self.para is not None or self.internal is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docSect4Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5140,40 +5824,43 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': childobj_ = docTitleType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'title', childobj_) + MixedContainer.TypeNone, 'title', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'internal': + nodeName_ == 'internal': childobj_ = docInternalS4Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'internal', childobj_) + MixedContainer.TypeNone, 'internal', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docSect4Type @@ -5181,6 +5868,7 @@ def buildChildren(self, child_, nodeName_): class docInternalType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, para=None, sect1=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5190,6 +5878,7 @@ def __init__(self, para=None, sect1=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docInternalType.subclass: return docInternalType.subclass(*args_, **kwargs_) @@ -5204,33 +5893,41 @@ def get_sect1(self): return self.sect1 def set_sect1(self, sect1): self.sect1 = sect1 def add_sect1(self, value): self.sect1.append(value) def insert_sect1(self, index, value): self.sect1[index] = value + def export(self, outfile, level, namespace_='', name_='docInternalType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docInternalType') + self.exportAttributes(outfile, level, namespace_, + name_='docInternalType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docInternalType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docInternalType'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.para is not None or self.sect1 is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docInternalType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5244,32 +5941,35 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect1': + nodeName_ == 'sect1': childobj_ = docSect1Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect1', childobj_) + MixedContainer.TypeNone, 'sect1', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docInternalType @@ -5277,6 +5977,7 @@ def buildChildren(self, child_, nodeName_): class docInternalS1Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, para=None, sect2=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5286,6 +5987,7 @@ def __init__(self, para=None, sect2=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docInternalS1Type.subclass: return docInternalS1Type.subclass(*args_, **kwargs_) @@ -5300,33 +6002,41 @@ def get_sect2(self): return self.sect2 def set_sect2(self, sect2): self.sect2 = sect2 def add_sect2(self, value): self.sect2.append(value) def insert_sect2(self, index, value): self.sect2[index] = value + def export(self, outfile, level, namespace_='', name_='docInternalS1Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docInternalS1Type') + self.exportAttributes(outfile, level, namespace_, + name_='docInternalS1Type') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docInternalS1Type'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docInternalS1Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.para is not None or self.sect2 is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docInternalS1Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5340,32 +6050,35 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect2': + nodeName_ == 'sect2': childobj_ = docSect2Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect2', childobj_) + MixedContainer.TypeNone, 'sect2', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docInternalS1Type @@ -5373,6 +6086,7 @@ def buildChildren(self, child_, nodeName_): class docInternalS2Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5382,6 +6096,7 @@ def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docInternalS2Type.subclass: return docInternalS2Type.subclass(*args_, **kwargs_) @@ -5396,33 +6111,41 @@ def get_sect3(self): return self.sect3 def set_sect3(self, sect3): self.sect3 = sect3 def add_sect3(self, value): self.sect3.append(value) def insert_sect3(self, index, value): self.sect3[index] = value + def export(self, outfile, level, namespace_='', name_='docInternalS2Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docInternalS2Type') + self.exportAttributes(outfile, level, namespace_, + name_='docInternalS2Type') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docInternalS2Type'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docInternalS2Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.para is not None or self.sect3 is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docInternalS2Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5436,32 +6159,35 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect3': + nodeName_ == 'sect3': childobj_ = docSect3Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect3', childobj_) + MixedContainer.TypeNone, 'sect3', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docInternalS2Type @@ -5469,6 +6195,7 @@ def buildChildren(self, child_, nodeName_): class docInternalS3Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5478,6 +6205,7 @@ def __init__(self, para=None, sect3=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docInternalS3Type.subclass: return docInternalS3Type.subclass(*args_, **kwargs_) @@ -5492,33 +6220,41 @@ def get_sect3(self): return self.sect3 def set_sect3(self, sect3): self.sect3 = sect3 def add_sect3(self, value): self.sect3.append(value) def insert_sect3(self, index, value): self.sect3[index] = value + def export(self, outfile, level, namespace_='', name_='docInternalS3Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docInternalS3Type') + self.exportAttributes(outfile, level, namespace_, + name_='docInternalS3Type') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docInternalS3Type'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docInternalS3Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.para is not None or self.sect3 is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docInternalS3Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5532,32 +6268,35 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect3': + nodeName_ == 'sect3': childobj_ = docSect4Type.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'sect3', childobj_) + MixedContainer.TypeNone, 'sect3', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docInternalS3Type @@ -5565,6 +6304,7 @@ def buildChildren(self, child_, nodeName_): class docInternalS4Type(GeneratedsSuper): subclass = None superclass = None + def __init__(self, para=None, mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5574,6 +6314,7 @@ def __init__(self, para=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docInternalS4Type.subclass: return docInternalS4Type.subclass(*args_, **kwargs_) @@ -5584,32 +6325,40 @@ def get_para(self): return self.para def set_para(self, para): self.para = para def add_para(self, value): self.para.append(value) def insert_para(self, index, value): self.para[index] = value + def export(self, outfile, level, namespace_='', name_='docInternalS4Type', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docInternalS4Type') + self.exportAttributes(outfile, level, namespace_, + name_='docInternalS4Type') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docInternalS4Type'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docInternalS4Type'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.para is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docInternalS4Type'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -5617,25 +6366,28 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': childobj_ = docParaType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'para', childobj_) + MixedContainer.TypeNone, 'para', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docInternalS4Type @@ -5643,6 +6395,7 @@ def buildChildren(self, child_, nodeName_): class docTitleType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_='', mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5652,6 +6405,7 @@ def __init__(self, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docTitleType.subclass: return docTitleType.subclass(*args_, **kwargs_) @@ -5660,6 +6414,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docTitleType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -5667,33 +6422,40 @@ def export(self, outfile, level, namespace_='', name_='docTitleType', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docTitleType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docTitleType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docTitleType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -5701,23 +6463,26 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docTitleType class docParaType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_='', mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5727,6 +6492,7 @@ def __init__(self, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docParaType.subclass: return docParaType.subclass(*args_, **kwargs_) @@ -5735,6 +6501,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docParaType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -5742,33 +6509,40 @@ def export(self, outfile, level, namespace_='', name_='docParaType', namespacede outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docParaType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docParaType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docParaType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -5776,23 +6550,26 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docParaType class docMarkupType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_='', mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -5802,6 +6579,7 @@ def __init__(self, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docMarkupType.subclass: return docMarkupType.subclass(*args_, **kwargs_) @@ -5810,40 +6588,49 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docMarkupType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docMarkupType') + self.exportAttributes(outfile, level, namespace_, + name_='docMarkupType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docMarkupType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docMarkupType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docMarkupType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -5851,23 +6638,26 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docMarkupType class docURLLink(GeneratedsSuper): subclass = None superclass = None + def __init__(self, url=None, valueOf_='', mixedclass_=None, content_=None): self.url = url if mixedclass_ is None: @@ -5878,6 +6668,7 @@ def __init__(self, url=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docURLLink.subclass: return docURLLink.subclass(*args_, **kwargs_) @@ -5888,6 +6679,7 @@ def get_url(self): return self.url def set_url(self, url): self.url = url def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docURLLink', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -5895,36 +6687,44 @@ def export(self, outfile, level, namespace_='', name_='docURLLink', namespacedef outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docURLLink'): if self.url is not None: - outfile.write(' url=%s' % (self.format_string(quote_attrib(self.url).encode(ExternalEncoding), input_name='url'), )) + outfile.write(' url=%s' % (self.format_string(quote_attrib( + self.url).encode(ExternalEncoding), input_name='url'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docURLLink'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docURLLink'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.url is not None: showIndent(outfile, level) outfile.write('url = %s,\n' % (self.url,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -5932,24 +6732,27 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('url'): self.url = attrs.get('url').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docURLLink class docAnchorType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -5960,6 +6763,7 @@ def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docAnchorType.subclass: return docAnchorType.subclass(*args_, **kwargs_) @@ -5970,43 +6774,53 @@ def get_id(self): return self.id def set_id(self, id): self.id = id def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docAnchorType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docAnchorType') + self.exportAttributes(outfile, level, namespace_, + name_='docAnchorType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docAnchorType'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docAnchorType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docAnchorType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -6014,24 +6828,27 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docAnchorType class docFormulaType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -6042,6 +6859,7 @@ def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docFormulaType.subclass: return docFormulaType.subclass(*args_, **kwargs_) @@ -6052,43 +6870,53 @@ def get_id(self): return self.id def set_id(self, id): self.id = id def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docFormulaType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docFormulaType') + self.exportAttributes(outfile, level, namespace_, + name_='docFormulaType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docFormulaType'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docFormulaType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docFormulaType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -6096,27 +6924,31 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docFormulaType class docIndexEntryType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, primaryie=None, secondaryie=None): self.primaryie = primaryie self.secondaryie = secondaryie + def factory(*args_, **kwargs_): if docIndexEntryType.subclass: return docIndexEntryType.subclass(*args_, **kwargs_) @@ -6127,10 +6959,12 @@ def get_primaryie(self): return self.primaryie def set_primaryie(self, primaryie): self.primaryie = primaryie def get_secondaryie(self): return self.secondaryie def set_secondaryie(self, secondaryie): self.secondaryie = secondaryie + def export(self, outfile, level, namespace_='', name_='docIndexEntryType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docIndexEntryType') + self.exportAttributes(outfile, level, namespace_, + name_='docIndexEntryType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -6138,52 +6972,65 @@ def export(self, outfile, level, namespace_='', name_='docIndexEntryType', names outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docIndexEntryType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docIndexEntryType'): if self.primaryie is not None: showIndent(outfile, level) - outfile.write('<%sprimaryie>%s\n' % (namespace_, self.format_string(quote_xml(self.primaryie).encode(ExternalEncoding), input_name='primaryie'), namespace_)) + outfile.write('<%sprimaryie>%s\n' % (namespace_, self.format_string( + quote_xml(self.primaryie).encode(ExternalEncoding), input_name='primaryie'), namespace_)) if self.secondaryie is not None: showIndent(outfile, level) - outfile.write('<%ssecondaryie>%s\n' % (namespace_, self.format_string(quote_xml(self.secondaryie).encode(ExternalEncoding), input_name='secondaryie'), namespace_)) + outfile.write('<%ssecondaryie>%s\n' % (namespace_, self.format_string( + quote_xml(self.secondaryie).encode(ExternalEncoding), input_name='secondaryie'), namespace_)) + def hasContent_(self): if ( self.primaryie is not None or self.secondaryie is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docIndexEntryType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('primaryie=%s,\n' % quote_python(self.primaryie).encode(ExternalEncoding)) + outfile.write('primaryie=%s,\n' % quote_python( + self.primaryie).encode(ExternalEncoding)) showIndent(outfile, level) - outfile.write('secondaryie=%s,\n' % quote_python(self.secondaryie).encode(ExternalEncoding)) + outfile.write('secondaryie=%s,\n' % quote_python( + self.secondaryie).encode(ExternalEncoding)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'primaryie': + nodeName_ == 'primaryie': primaryie_ = '' for text__content_ in child_.childNodes: primaryie_ += text__content_.nodeValue self.primaryie = primaryie_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'secondaryie': + nodeName_ == 'secondaryie': secondaryie_ = '' for text__content_ in child_.childNodes: secondaryie_ += text__content_.nodeValue @@ -6194,11 +7041,13 @@ def buildChildren(self, child_, nodeName_): class docListType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, listitem=None): if listitem is None: self.listitem = [] else: self.listitem = listitem + def factory(*args_, **kwargs_): if docListType.subclass: return docListType.subclass(*args_, **kwargs_) @@ -6209,6 +7058,7 @@ def get_listitem(self): return self.listitem def set_listitem(self, listitem): self.listitem = listitem def add_listitem(self, value): self.listitem.append(value) def insert_listitem(self, index, value): self.listitem[index] = value + def export(self, outfile, level, namespace_='', name_='docListType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -6220,25 +7070,31 @@ def export(self, outfile, level, namespace_='', name_='docListType', namespacede outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docListType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docListType'): for listitem_ in self.listitem: listitem_.export(outfile, level, namespace_, name_='listitem') + def hasContent_(self): if ( self.listitem is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docListType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('listitem=[\n') @@ -6252,17 +7108,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'listitem': + nodeName_ == 'listitem': obj_ = docListItemType.factory() obj_.build(child_) self.listitem.append(obj_) @@ -6272,11 +7131,13 @@ def buildChildren(self, child_, nodeName_): class docListItemType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, para=None): if para is None: self.para = [] else: self.para = para + def factory(*args_, **kwargs_): if docListItemType.subclass: return docListItemType.subclass(*args_, **kwargs_) @@ -6287,10 +7148,12 @@ def get_para(self): return self.para def set_para(self, para): self.para = para def add_para(self, value): self.para.append(value) def insert_para(self, index, value): self.para[index] = value + def export(self, outfile, level, namespace_='', name_='docListItemType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docListItemType') + self.exportAttributes(outfile, level, namespace_, + name_='docListItemType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -6298,25 +7161,31 @@ def export(self, outfile, level, namespace_='', name_='docListItemType', namespa outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docListItemType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docListItemType'): for para_ in self.para: para_.export(outfile, level, namespace_, name_='para') + def hasContent_(self): if ( self.para is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docListItemType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('para=[\n') @@ -6330,17 +7199,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': obj_ = docParaType.factory() obj_.build(child_) self.para.append(obj_) @@ -6350,6 +7222,7 @@ def buildChildren(self, child_, nodeName_): class docSimpleSectType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, kind=None, title=None, para=None): self.kind = kind self.title = title @@ -6357,6 +7230,7 @@ def __init__(self, kind=None, title=None, para=None): self.para = [] else: self.para = para + def factory(*args_, **kwargs_): if docSimpleSectType.subclass: return docSimpleSectType.subclass(*args_, **kwargs_) @@ -6371,10 +7245,12 @@ def add_para(self, value): self.para.append(value) def insert_para(self, index, value): self.para[index] = value def get_kind(self): return self.kind def set_kind(self, kind): self.kind = kind + def export(self, outfile, level, namespace_='', name_='docSimpleSectType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docSimpleSectType') + self.exportAttributes(outfile, level, namespace_, + name_='docSimpleSectType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -6382,31 +7258,37 @@ def export(self, outfile, level, namespace_='', name_='docSimpleSectType', names outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docSimpleSectType'): if self.kind is not None: outfile.write(' kind=%s' % (quote_attrib(self.kind), )) + def exportChildren(self, outfile, level, namespace_='', name_='docSimpleSectType'): if self.title: self.title.export(outfile, level, namespace_, name_='title') for para_ in self.para: para_.export(outfile, level, namespace_, name_='para') + def hasContent_(self): if ( self.title is not None or self.para is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docSimpleSectType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.kind is not None: showIndent(outfile, level) outfile.write('kind = "%s",\n' % (self.kind,)) + def exportLiteralChildren(self, outfile, level, name_): if self.title: showIndent(outfile, level) @@ -6426,23 +7308,26 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('kind'): self.kind = attrs.get('kind').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'title': + nodeName_ == 'title': obj_ = docTitleType.factory() obj_.build(child_) self.set_title(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': obj_ = docParaType.factory() obj_.build(child_) self.para.append(obj_) @@ -6452,8 +7337,10 @@ def buildChildren(self, child_, nodeName_): class docVarListEntryType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, term=None): self.term = term + def factory(*args_, **kwargs_): if docVarListEntryType.subclass: return docVarListEntryType.subclass(*args_, **kwargs_) @@ -6462,10 +7349,12 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def get_term(self): return self.term def set_term(self, term): self.term = term + def export(self, outfile, level, namespace_='', name_='docVarListEntryType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docVarListEntryType') + self.exportAttributes(outfile, level, namespace_, + name_='docVarListEntryType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -6473,25 +7362,31 @@ def export(self, outfile, level, namespace_='', name_='docVarListEntryType', nam outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docVarListEntryType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docVarListEntryType'): if self.term: self.term.export(outfile, level, namespace_, name_='term', ) + def hasContent_(self): if ( self.term is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docVarListEntryType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): if self.term: showIndent(outfile, level) @@ -6499,17 +7394,20 @@ def exportLiteralChildren(self, outfile, level, name_): self.term.exportLiteral(outfile, level, name_='term') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'term': + nodeName_ == 'term': obj_ = docTitleType.factory() obj_.build(child_) self.set_term(obj_) @@ -6519,8 +7417,10 @@ def buildChildren(self, child_, nodeName_): class docVariableListType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if docVariableListType.subclass: return docVariableListType.subclass(*args_, **kwargs_) @@ -6529,10 +7429,12 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docVariableListType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docVariableListType') + self.exportAttributes(outfile, level, namespace_, + name_='docVariableListType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -6540,33 +7442,40 @@ def export(self, outfile, level, namespace_='', name_='docVariableListType', nam outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docVariableListType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docVariableListType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docVariableListType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -6574,19 +7483,22 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docVariableListType class docRefTextType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedclass_=None, content_=None): self.refid = refid self.kindref = kindref @@ -6599,6 +7511,7 @@ def __init__(self, refid=None, kindref=None, external=None, valueOf_='', mixedcl self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docRefTextType.subclass: return docRefTextType.subclass(*args_, **kwargs_) @@ -6613,40 +7526,49 @@ def get_external(self): return self.external def set_external(self, external): self.external = external def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docRefTextType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docRefTextType') + self.exportAttributes(outfile, level, namespace_, + name_='docRefTextType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docRefTextType'): if self.refid is not None: - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) if self.kindref is not None: outfile.write(' kindref=%s' % (quote_attrib(self.kindref), )) if self.external is not None: - outfile.write(' external=%s' % (self.format_string(quote_attrib(self.external).encode(ExternalEncoding), input_name='external'), )) + outfile.write(' external=%s' % (self.format_string(quote_attrib( + self.external).encode(ExternalEncoding), input_name='external'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docRefTextType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docRefTextType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) @@ -6657,9 +7579,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.external is not None: showIndent(outfile, level) outfile.write('external = %s,\n' % (self.external,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -6667,6 +7591,7 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('refid'): self.refid = attrs.get('refid').value @@ -6674,21 +7599,23 @@ def buildAttributes(self, attrs): self.kindref = attrs.get('kindref').value if attrs.get('external'): self.external = attrs.get('external').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docRefTextType class docTableType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, rows=None, cols=None, row=None, caption=None): self.rows = rows self.cols = cols @@ -6697,6 +7624,7 @@ def __init__(self, rows=None, cols=None, row=None, caption=None): else: self.row = row self.caption = caption + def factory(*args_, **kwargs_): if docTableType.subclass: return docTableType.subclass(*args_, **kwargs_) @@ -6713,6 +7641,7 @@ def get_rows(self): return self.rows def set_rows(self, rows): self.rows = rows def get_cols(self): return self.cols def set_cols(self, cols): self.cols = cols + def export(self, outfile, level, namespace_='', name_='docTableType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -6724,29 +7653,36 @@ def export(self, outfile, level, namespace_='', name_='docTableType', namespaced outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docTableType'): if self.rows is not None: - outfile.write(' rows="%s"' % self.format_integer(self.rows, input_name='rows')) + outfile.write(' rows="%s"' % self.format_integer( + self.rows, input_name='rows')) if self.cols is not None: - outfile.write(' cols="%s"' % self.format_integer(self.cols, input_name='cols')) + outfile.write(' cols="%s"' % self.format_integer( + self.cols, input_name='cols')) + def exportChildren(self, outfile, level, namespace_='', name_='docTableType'): for row_ in self.row: row_.export(outfile, level, namespace_, name_='row') if self.caption: self.caption.export(outfile, level, namespace_, name_='caption') + def hasContent_(self): if ( self.row is not None or self.caption is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docTableType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.rows is not None: showIndent(outfile, level) @@ -6754,6 +7690,7 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.cols is not None: showIndent(outfile, level) outfile.write('cols = %s,\n' % (self.cols,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('row=[\n') @@ -6773,12 +7710,14 @@ def exportLiteralChildren(self, outfile, level, name_): self.caption.exportLiteral(outfile, level, name_='caption') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('rows'): try: @@ -6790,14 +7729,15 @@ def buildAttributes(self, attrs): self.cols = int(attrs.get('cols').value) except ValueError as exp: raise ValueError('Bad integer attribute (cols): %s' % exp) + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'row': + nodeName_ == 'row': obj_ = docRowType.factory() obj_.build(child_) self.row.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'caption': + nodeName_ == 'caption': obj_ = docCaptionType.factory() obj_.build(child_) self.set_caption(obj_) @@ -6807,11 +7747,13 @@ def buildChildren(self, child_, nodeName_): class docRowType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, entry=None): if entry is None: self.entry = [] else: self.entry = entry + def factory(*args_, **kwargs_): if docRowType.subclass: return docRowType.subclass(*args_, **kwargs_) @@ -6822,6 +7764,7 @@ def get_entry(self): return self.entry def set_entry(self, entry): self.entry = entry def add_entry(self, value): self.entry.append(value) def insert_entry(self, index, value): self.entry[index] = value + def export(self, outfile, level, namespace_='', name_='docRowType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -6833,25 +7776,31 @@ def export(self, outfile, level, namespace_='', name_='docRowType', namespacedef outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docRowType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docRowType'): for entry_ in self.entry: entry_.export(outfile, level, namespace_, name_='entry') + def hasContent_(self): if ( self.entry is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docRowType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('entry=[\n') @@ -6865,17 +7814,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'entry': + nodeName_ == 'entry': obj_ = docEntryType.factory() obj_.build(child_) self.entry.append(obj_) @@ -6885,12 +7837,14 @@ def buildChildren(self, child_, nodeName_): class docEntryType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, thead=None, para=None): self.thead = thead if para is None: self.para = [] else: self.para = para + def factory(*args_, **kwargs_): if docEntryType.subclass: return docEntryType.subclass(*args_, **kwargs_) @@ -6903,6 +7857,7 @@ def add_para(self, value): self.para.append(value) def insert_para(self, index, value): self.para[index] = value def get_thead(self): return self.thead def set_thead(self, thead): self.thead = thead + def export(self, outfile, level, namespace_='', name_='docEntryType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -6914,28 +7869,34 @@ def export(self, outfile, level, namespace_='', name_='docEntryType', namespaced outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docEntryType'): if self.thead is not None: outfile.write(' thead=%s' % (quote_attrib(self.thead), )) + def exportChildren(self, outfile, level, namespace_='', name_='docEntryType'): for para_ in self.para: para_.export(outfile, level, namespace_, name_='para') + def hasContent_(self): if ( self.para is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docEntryType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.thead is not None: showIndent(outfile, level) outfile.write('thead = "%s",\n' % (self.thead,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('para=[\n') @@ -6949,18 +7910,21 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('thead'): self.thead = attrs.get('thead').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': obj_ = docParaType.factory() obj_.build(child_) self.para.append(obj_) @@ -6970,6 +7934,7 @@ def buildChildren(self, child_, nodeName_): class docCaptionType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_='', mixedclass_=None, content_=None): if mixedclass_ is None: self.mixedclass_ = MixedContainer @@ -6979,6 +7944,7 @@ def __init__(self, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docCaptionType.subclass: return docCaptionType.subclass(*args_, **kwargs_) @@ -6987,40 +7953,49 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docCaptionType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docCaptionType') + self.exportAttributes(outfile, level, namespace_, + name_='docCaptionType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docCaptionType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docCaptionType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docCaptionType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -7028,23 +8003,26 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docCaptionType class docHeadingType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, level=None, valueOf_='', mixedclass_=None, content_=None): self.level = level if mixedclass_ is None: @@ -7055,6 +8033,7 @@ def __init__(self, level=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docHeadingType.subclass: return docHeadingType.subclass(*args_, **kwargs_) @@ -7065,43 +8044,53 @@ def get_level(self): return self.level def set_level(self, level): self.level = level def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docHeadingType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docHeadingType') + self.exportAttributes(outfile, level, namespace_, + name_='docHeadingType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docHeadingType'): if self.level is not None: - outfile.write(' level="%s"' % self.format_integer(self.level, input_name='level')) + outfile.write(' level="%s"' % self.format_integer( + self.level, input_name='level')) + def exportChildren(self, outfile, level, namespace_='', name_='docHeadingType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docHeadingType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.level is not None: showIndent(outfile, level) outfile.write('level = %s,\n' % (self.level,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -7109,27 +8098,30 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('level'): try: self.level = int(attrs.get('level').value) except ValueError as exp: raise ValueError('Bad integer attribute (level): %s' % exp) + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docHeadingType class docImageType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, width=None, type_=None, name=None, height=None, valueOf_='', mixedclass_=None, content_=None): self.width = width self.type_ = type_ @@ -7143,6 +8135,7 @@ def __init__(self, width=None, type_=None, name=None, height=None, valueOf_='', self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docImageType.subclass: return docImageType.subclass(*args_, **kwargs_) @@ -7159,6 +8152,7 @@ def get_height(self): return self.height def set_height(self, height): self.height = height def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docImageType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -7166,35 +8160,43 @@ def export(self, outfile, level, namespace_='', name_='docImageType', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docImageType'): if self.width is not None: - outfile.write(' width=%s' % (self.format_string(quote_attrib(self.width).encode(ExternalEncoding), input_name='width'), )) + outfile.write(' width=%s' % (self.format_string(quote_attrib( + self.width).encode(ExternalEncoding), input_name='width'), )) if self.type_ is not None: outfile.write(' type=%s' % (quote_attrib(self.type_), )) if self.name is not None: - outfile.write(' name=%s' % (self.format_string(quote_attrib(self.name).encode(ExternalEncoding), input_name='name'), )) + outfile.write(' name=%s' % (self.format_string(quote_attrib( + self.name).encode(ExternalEncoding), input_name='name'), )) if self.height is not None: - outfile.write(' height=%s' % (self.format_string(quote_attrib(self.height).encode(ExternalEncoding), input_name='height'), )) + outfile.write(' height=%s' % (self.format_string(quote_attrib( + self.height).encode(ExternalEncoding), input_name='height'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docImageType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docImageType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.width is not None: showIndent(outfile, level) @@ -7208,9 +8210,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.height is not None: showIndent(outfile, level) outfile.write('height = %s,\n' % (self.height,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -7218,6 +8222,7 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('width'): self.width = attrs.get('width').value @@ -7227,21 +8232,23 @@ def buildAttributes(self, attrs): self.name = attrs.get('name').value if attrs.get('height'): self.height = attrs.get('height').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docImageType class docDotFileType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, name=None, valueOf_='', mixedclass_=None, content_=None): self.name = name if mixedclass_ is None: @@ -7252,6 +8259,7 @@ def __init__(self, name=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docDotFileType.subclass: return docDotFileType.subclass(*args_, **kwargs_) @@ -7262,43 +8270,53 @@ def get_name(self): return self.name def set_name(self, name): self.name = name def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docDotFileType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docDotFileType') + self.exportAttributes(outfile, level, namespace_, + name_='docDotFileType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docDotFileType'): if self.name is not None: - outfile.write(' name=%s' % (self.format_string(quote_attrib(self.name).encode(ExternalEncoding), input_name='name'), )) + outfile.write(' name=%s' % (self.format_string(quote_attrib( + self.name).encode(ExternalEncoding), input_name='name'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docDotFileType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docDotFileType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.name is not None: showIndent(outfile, level) outfile.write('name = %s,\n' % (self.name,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -7306,24 +8324,27 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('name'): self.name = attrs.get('name').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docDotFileType class docTocItemType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): self.id = id if mixedclass_ is None: @@ -7334,6 +8355,7 @@ def __init__(self, id=None, valueOf_='', mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docTocItemType.subclass: return docTocItemType.subclass(*args_, **kwargs_) @@ -7344,43 +8366,53 @@ def get_id(self): return self.id def set_id(self, id): self.id = id def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docTocItemType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docTocItemType') + self.exportAttributes(outfile, level, namespace_, + name_='docTocItemType') outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docTocItemType'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docTocItemType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docTocItemType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -7388,29 +8420,33 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docTocItemType class docTocListType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, tocitem=None): if tocitem is None: self.tocitem = [] else: self.tocitem = tocitem + def factory(*args_, **kwargs_): if docTocListType.subclass: return docTocListType.subclass(*args_, **kwargs_) @@ -7421,10 +8457,12 @@ def get_tocitem(self): return self.tocitem def set_tocitem(self, tocitem): self.tocitem = tocitem def add_tocitem(self, value): self.tocitem.append(value) def insert_tocitem(self, index, value): self.tocitem[index] = value + def export(self, outfile, level, namespace_='', name_='docTocListType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docTocListType') + self.exportAttributes(outfile, level, namespace_, + name_='docTocListType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -7432,25 +8470,31 @@ def export(self, outfile, level, namespace_='', name_='docTocListType', namespac outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docTocListType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docTocListType'): for tocitem_ in self.tocitem: tocitem_.export(outfile, level, namespace_, name_='tocitem') + def hasContent_(self): if ( self.tocitem is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docTocListType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('tocitem=[\n') @@ -7464,17 +8508,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'tocitem': + nodeName_ == 'tocitem': obj_ = docTocItemType.factory() obj_.build(child_) self.tocitem.append(obj_) @@ -7484,12 +8531,14 @@ def buildChildren(self, child_, nodeName_): class docLanguageType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, langid=None, para=None): self.langid = langid if para is None: self.para = [] else: self.para = para + def factory(*args_, **kwargs_): if docLanguageType.subclass: return docLanguageType.subclass(*args_, **kwargs_) @@ -7502,10 +8551,12 @@ def add_para(self, value): self.para.append(value) def insert_para(self, index, value): self.para[index] = value def get_langid(self): return self.langid def set_langid(self, langid): self.langid = langid + def export(self, outfile, level, namespace_='', name_='docLanguageType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docLanguageType') + self.exportAttributes(outfile, level, namespace_, + name_='docLanguageType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -7513,28 +8564,35 @@ def export(self, outfile, level, namespace_='', name_='docLanguageType', namespa outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docLanguageType'): if self.langid is not None: - outfile.write(' langid=%s' % (self.format_string(quote_attrib(self.langid).encode(ExternalEncoding), input_name='langid'), )) + outfile.write(' langid=%s' % (self.format_string(quote_attrib( + self.langid).encode(ExternalEncoding), input_name='langid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docLanguageType'): for para_ in self.para: para_.export(outfile, level, namespace_, name_='para') + def hasContent_(self): if ( self.para is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docLanguageType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.langid is not None: showIndent(outfile, level) outfile.write('langid = %s,\n' % (self.langid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('para=[\n') @@ -7548,18 +8606,21 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('langid'): self.langid = attrs.get('langid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': obj_ = docParaType.factory() obj_.build(child_) self.para.append(obj_) @@ -7569,12 +8630,14 @@ def buildChildren(self, child_, nodeName_): class docParamListType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, kind=None, parameteritem=None): self.kind = kind if parameteritem is None: self.parameteritem = [] else: self.parameteritem = parameteritem + def factory(*args_, **kwargs_): if docParamListType.subclass: return docParamListType.subclass(*args_, **kwargs_) @@ -7582,15 +8645,21 @@ def factory(*args_, **kwargs_): return docParamListType(*args_, **kwargs_) factory = staticmethod(factory) def get_parameteritem(self): return self.parameteritem - def set_parameteritem(self, parameteritem): self.parameteritem = parameteritem + def set_parameteritem( + self, parameteritem): self.parameteritem = parameteritem + def add_parameteritem(self, value): self.parameteritem.append(value) - def insert_parameteritem(self, index, value): self.parameteritem[index] = value + def insert_parameteritem( + self, index, value): self.parameteritem[index] = value + def get_kind(self): return self.kind def set_kind(self, kind): self.kind = kind + def export(self, outfile, level, namespace_='', name_='docParamListType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docParamListType') + self.exportAttributes(outfile, level, namespace_, + name_='docParamListType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -7598,28 +8667,35 @@ def export(self, outfile, level, namespace_='', name_='docParamListType', namesp outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docParamListType'): if self.kind is not None: outfile.write(' kind=%s' % (quote_attrib(self.kind), )) + def exportChildren(self, outfile, level, namespace_='', name_='docParamListType'): for parameteritem_ in self.parameteritem: - parameteritem_.export(outfile, level, namespace_, name_='parameteritem') + parameteritem_.export( + outfile, level, namespace_, name_='parameteritem') + def hasContent_(self): if ( self.parameteritem is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docParamListType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.kind is not None: showIndent(outfile, level) outfile.write('kind = "%s",\n' % (self.kind,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('parameteritem=[\n') @@ -7633,18 +8709,21 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('kind'): self.kind = attrs.get('kind').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'parameteritem': + nodeName_ == 'parameteritem': obj_ = docParamListItem.factory() obj_.build(child_) self.parameteritem.append(obj_) @@ -7654,12 +8733,14 @@ def buildChildren(self, child_, nodeName_): class docParamListItem(GeneratedsSuper): subclass = None superclass = None + def __init__(self, parameternamelist=None, parameterdescription=None): if parameternamelist is None: self.parameternamelist = [] else: self.parameternamelist = parameternamelist self.parameterdescription = parameterdescription + def factory(*args_, **kwargs_): if docParamListItem.subclass: return docParamListItem.subclass(*args_, **kwargs_) @@ -7667,15 +8748,25 @@ def factory(*args_, **kwargs_): return docParamListItem(*args_, **kwargs_) factory = staticmethod(factory) def get_parameternamelist(self): return self.parameternamelist - def set_parameternamelist(self, parameternamelist): self.parameternamelist = parameternamelist - def add_parameternamelist(self, value): self.parameternamelist.append(value) - def insert_parameternamelist(self, index, value): self.parameternamelist[index] = value + + def set_parameternamelist( + self, parameternamelist): self.parameternamelist = parameternamelist + + def add_parameternamelist( + self, value): self.parameternamelist.append(value) + def insert_parameternamelist( + self, index, value): self.parameternamelist[index] = value + def get_parameterdescription(self): return self.parameterdescription - def set_parameterdescription(self, parameterdescription): self.parameterdescription = parameterdescription + + def set_parameterdescription( + self, parameterdescription): self.parameterdescription = parameterdescription + def export(self, outfile, level, namespace_='', name_='docParamListItem', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docParamListItem') + self.exportAttributes(outfile, level, namespace_, + name_='docParamListItem') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -7683,28 +8774,36 @@ def export(self, outfile, level, namespace_='', name_='docParamListItem', namesp outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docParamListItem'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docParamListItem'): for parameternamelist_ in self.parameternamelist: - parameternamelist_.export(outfile, level, namespace_, name_='parameternamelist') + parameternamelist_.export( + outfile, level, namespace_, name_='parameternamelist') if self.parameterdescription: - self.parameterdescription.export(outfile, level, namespace_, name_='parameterdescription', ) + self.parameterdescription.export( + outfile, level, namespace_, name_='parameterdescription', ) + def hasContent_(self): if ( self.parameternamelist is not None or self.parameterdescription is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docParamListItem'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('parameternamelist=[\n') @@ -7712,7 +8811,8 @@ def exportLiteralChildren(self, outfile, level, name_): for parameternamelist in self.parameternamelist: showIndent(outfile, level) outfile.write('model_.parameternamelist(\n') - parameternamelist.exportLiteral(outfile, level, name_='parameternamelist') + parameternamelist.exportLiteral( + outfile, level, name_='parameternamelist') showIndent(outfile, level) outfile.write('),\n') level -= 1 @@ -7721,25 +8821,29 @@ def exportLiteralChildren(self, outfile, level, name_): if self.parameterdescription: showIndent(outfile, level) outfile.write('parameterdescription=model_.descriptionType(\n') - self.parameterdescription.exportLiteral(outfile, level, name_='parameterdescription') + self.parameterdescription.exportLiteral( + outfile, level, name_='parameterdescription') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'parameternamelist': + nodeName_ == 'parameternamelist': obj_ = docParamNameList.factory() obj_.build(child_) self.parameternamelist.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'parameterdescription': + nodeName_ == 'parameterdescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_parameterdescription(obj_) @@ -7749,11 +8853,13 @@ def buildChildren(self, child_, nodeName_): class docParamNameList(GeneratedsSuper): subclass = None superclass = None + def __init__(self, parametername=None): if parametername is None: self.parametername = [] else: self.parametername = parametername + def factory(*args_, **kwargs_): if docParamNameList.subclass: return docParamNameList.subclass(*args_, **kwargs_) @@ -7761,13 +8867,19 @@ def factory(*args_, **kwargs_): return docParamNameList(*args_, **kwargs_) factory = staticmethod(factory) def get_parametername(self): return self.parametername - def set_parametername(self, parametername): self.parametername = parametername + def set_parametername( + self, parametername): self.parametername = parametername + def add_parametername(self, value): self.parametername.append(value) - def insert_parametername(self, index, value): self.parametername[index] = value + + def insert_parametername( + self, index, value): self.parametername[index] = value + def export(self, outfile, level, namespace_='', name_='docParamNameList', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docParamNameList') + self.exportAttributes(outfile, level, namespace_, + name_='docParamNameList') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -7775,25 +8887,32 @@ def export(self, outfile, level, namespace_='', name_='docParamNameList', namesp outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docParamNameList'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docParamNameList'): for parametername_ in self.parametername: - parametername_.export(outfile, level, namespace_, name_='parametername') + parametername_.export( + outfile, level, namespace_, name_='parametername') + def hasContent_(self): if ( self.parametername is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docParamNameList'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('parametername=[\n') @@ -7807,17 +8926,20 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'parametername': + nodeName_ == 'parametername': obj_ = docParamName.factory() obj_.build(child_) self.parametername.append(obj_) @@ -7827,6 +8949,7 @@ def buildChildren(self, child_, nodeName_): class docParamName(GeneratedsSuper): subclass = None superclass = None + def __init__(self, direction=None, ref=None, mixedclass_=None, content_=None): self.direction = direction if mixedclass_ is None: @@ -7837,6 +8960,7 @@ def __init__(self, direction=None, ref=None, mixedclass_=None, content_=None): self.content_ = [] else: self.content_ = content_ + def factory(*args_, **kwargs_): if docParamName.subclass: return docParamName.subclass(*args_, **kwargs_) @@ -7847,6 +8971,7 @@ def get_ref(self): return self.ref def set_ref(self, ref): self.ref = ref def get_direction(self): return self.direction def set_direction(self, direction): self.direction = direction + def export(self, outfile, level, namespace_='', name_='docParamName', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -7854,28 +8979,34 @@ def export(self, outfile, level, namespace_='', name_='docParamName', namespaced outfile.write('>') self.exportChildren(outfile, level + 1, namespace_, name_) outfile.write('\n' % (namespace_, name_)) + def exportAttributes(self, outfile, level, namespace_='', name_='docParamName'): if self.direction is not None: outfile.write(' direction=%s' % (quote_attrib(self.direction), )) + def exportChildren(self, outfile, level, namespace_='', name_='docParamName'): for item_ in self.content_: item_.export(outfile, level, item_.name, namespace_) + def hasContent_(self): if ( self.ref is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docParamName'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.direction is not None: showIndent(outfile, level) outfile.write('direction = "%s",\n' % (self.direction,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('content_ = [\n') @@ -7883,26 +9014,29 @@ def exportLiteralChildren(self, outfile, level, name_): item_.exportLiteral(outfile, level, name_) showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('direction'): self.direction = attrs.get('direction').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'ref': + nodeName_ == 'ref': childobj_ = docRefTextType.factory() childobj_.build(child_) obj_ = self.mixedclass_(MixedContainer.CategoryComplex, - MixedContainer.TypeNone, 'ref', childobj_) + MixedContainer.TypeNone, 'ref', childobj_) self.content_.append(obj_) elif child_.nodeType == Node.TEXT_NODE: obj_ = self.mixedclass_(MixedContainer.CategoryText, - MixedContainer.TypeNone, '', child_.nodeValue) + MixedContainer.TypeNone, '', child_.nodeValue) self.content_.append(obj_) # end class docParamName @@ -7910,6 +9044,7 @@ def buildChildren(self, child_, nodeName_): class docXRefSectType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, id=None, xreftitle=None, xrefdescription=None): self.id = id if xreftitle is None: @@ -7917,6 +9052,7 @@ def __init__(self, id=None, xreftitle=None, xrefdescription=None): else: self.xreftitle = xreftitle self.xrefdescription = xrefdescription + def factory(*args_, **kwargs_): if docXRefSectType.subclass: return docXRefSectType.subclass(*args_, **kwargs_) @@ -7928,13 +9064,17 @@ def set_xreftitle(self, xreftitle): self.xreftitle = xreftitle def add_xreftitle(self, value): self.xreftitle.append(value) def insert_xreftitle(self, index, value): self.xreftitle[index] = value def get_xrefdescription(self): return self.xrefdescription - def set_xrefdescription(self, xrefdescription): self.xrefdescription = xrefdescription + def set_xrefdescription( + self, xrefdescription): self.xrefdescription = xrefdescription + def get_id(self): return self.id def set_id(self, id): self.id = id + def export(self, outfile, level, namespace_='', name_='docXRefSectType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) - self.exportAttributes(outfile, level, namespace_, name_='docXRefSectType') + self.exportAttributes(outfile, level, namespace_, + name_='docXRefSectType') if self.hasContent_(): outfile.write('>\n') self.exportChildren(outfile, level + 1, namespace_, name_) @@ -7942,66 +9082,80 @@ def export(self, outfile, level, namespace_='', name_='docXRefSectType', namespa outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docXRefSectType'): if self.id is not None: - outfile.write(' id=%s' % (self.format_string(quote_attrib(self.id).encode(ExternalEncoding), input_name='id'), )) + outfile.write(' id=%s' % (self.format_string(quote_attrib( + self.id).encode(ExternalEncoding), input_name='id'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docXRefSectType'): for xreftitle_ in self.xreftitle: showIndent(outfile, level) - outfile.write('<%sxreftitle>%s\n' % (namespace_, self.format_string(quote_xml(xreftitle_).encode(ExternalEncoding), input_name='xreftitle'), namespace_)) + outfile.write('<%sxreftitle>%s\n' % (namespace_, self.format_string( + quote_xml(xreftitle_).encode(ExternalEncoding), input_name='xreftitle'), namespace_)) if self.xrefdescription: - self.xrefdescription.export(outfile, level, namespace_, name_='xrefdescription', ) + self.xrefdescription.export( + outfile, level, namespace_, name_='xrefdescription', ) + def hasContent_(self): if ( self.xreftitle is not None or self.xrefdescription is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docXRefSectType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.id is not None: showIndent(outfile, level) outfile.write('id = %s,\n' % (self.id,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('xreftitle=[\n') level += 1 for xreftitle in self.xreftitle: showIndent(outfile, level) - outfile.write('%s,\n' % quote_python(xreftitle).encode(ExternalEncoding)) + outfile.write('%s,\n' % quote_python( + xreftitle).encode(ExternalEncoding)) level -= 1 showIndent(outfile, level) outfile.write('],\n') if self.xrefdescription: showIndent(outfile, level) outfile.write('xrefdescription=model_.descriptionType(\n') - self.xrefdescription.exportLiteral(outfile, level, name_='xrefdescription') + self.xrefdescription.exportLiteral( + outfile, level, name_='xrefdescription') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('id'): self.id = attrs.get('id').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'xreftitle': + nodeName_ == 'xreftitle': xreftitle_ = '' for text__content_ in child_.childNodes: xreftitle_ += text__content_.nodeValue self.xreftitle.append(xreftitle_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'xrefdescription': + nodeName_ == 'xrefdescription': obj_ = descriptionType.factory() obj_.build(child_) self.set_xrefdescription(obj_) @@ -8011,6 +9165,7 @@ def buildChildren(self, child_, nodeName_): class docCopyType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, link=None, para=None, sect1=None, internal=None): self.link = link if para is None: @@ -8022,6 +9177,7 @@ def __init__(self, link=None, para=None, sect1=None, internal=None): else: self.sect1 = sect1 self.internal = internal + def factory(*args_, **kwargs_): if docCopyType.subclass: return docCopyType.subclass(*args_, **kwargs_) @@ -8040,6 +9196,7 @@ def get_internal(self): return self.internal def set_internal(self, internal): self.internal = internal def get_link(self): return self.link def set_link(self, link): self.link = link + def export(self, outfile, level, namespace_='', name_='docCopyType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -8051,9 +9208,12 @@ def export(self, outfile, level, namespace_='', name_='docCopyType', namespacede outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docCopyType'): if self.link is not None: - outfile.write(' link=%s' % (self.format_string(quote_attrib(self.link).encode(ExternalEncoding), input_name='link'), )) + outfile.write(' link=%s' % (self.format_string(quote_attrib( + self.link).encode(ExternalEncoding), input_name='link'), )) + def exportChildren(self, outfile, level, namespace_='', name_='docCopyType'): for para_ in self.para: para_.export(outfile, level, namespace_, name_='para') @@ -8061,24 +9221,28 @@ def exportChildren(self, outfile, level, namespace_='', name_='docCopyType'): sect1_.export(outfile, level, namespace_, name_='sect1') if self.internal: self.internal.export(outfile, level, namespace_, name_='internal') + def hasContent_(self): if ( self.para is not None or self.sect1 is not None or self.internal is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docCopyType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.link is not None: showIndent(outfile, level) outfile.write('link = %s,\n' % (self.link,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('para=[\n') @@ -8110,28 +9274,31 @@ def exportLiteralChildren(self, outfile, level, name_): self.internal.exportLiteral(outfile, level, name_='internal') showIndent(outfile, level) outfile.write('),\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('link'): self.link = attrs.get('link').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'para': + nodeName_ == 'para': obj_ = docParaType.factory() obj_.build(child_) self.para.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'sect1': + nodeName_ == 'sect1': obj_ = docSect1Type.factory() obj_.build(child_) self.sect1.append(obj_) elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'internal': + nodeName_ == 'internal': obj_ = docInternalType.factory() obj_.build(child_) self.set_internal(obj_) @@ -8141,9 +9308,11 @@ def buildChildren(self, child_, nodeName_): class docCharType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, char=None, valueOf_=''): self.char = char self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if docCharType.subclass: return docCharType.subclass(*args_, **kwargs_) @@ -8154,6 +9323,7 @@ def get_char(self): return self.char def set_char(self, char): self.char = char def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docCharType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -8165,36 +9335,43 @@ def export(self, outfile, level, namespace_='', name_='docCharType', namespacede outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docCharType'): if self.char is not None: outfile.write(' char=%s' % (quote_attrib(self.char), )) + def exportChildren(self, outfile, level, namespace_='', name_='docCharType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docCharType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.char is not None: showIndent(outfile, level) outfile.write('char = "%s",\n' % (self.char,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -8202,22 +9379,26 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('char'): self.char = attrs.get('char').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docCharType class docEmptyType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, valueOf_=''): self.valueOf_ = valueOf_ + def factory(*args_, **kwargs_): if docEmptyType.subclass: return docEmptyType.subclass(*args_, **kwargs_) @@ -8226,6 +9407,7 @@ def factory(*args_, **kwargs_): factory = staticmethod(factory) def getValueOf_(self): return self.valueOf_ def setValueOf_(self, valueOf_): self.valueOf_ = valueOf_ + def export(self, outfile, level, namespace_='', name_='docEmptyType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -8237,33 +9419,40 @@ def export(self, outfile, level, namespace_='', name_='docEmptyType', namespaced outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='docEmptyType'): pass + def exportChildren(self, outfile, level, namespace_='', name_='docEmptyType'): - if self.valueOf_.find('![CDATA')>-1: - value=quote_xml('%s' % self.valueOf_) - value=value.replace('![CDATA','') + if self.valueOf_.find('![CDATA') > -1: + value = quote_xml('%s' % self.valueOf_) + value = value.replace('![CDATA', '') outfile.write(value) else: outfile.write(quote_xml('%s' % self.valueOf_)) + def hasContent_(self): if ( self.valueOf_ is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='docEmptyType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): pass + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('valueOf_ = "%s",\n' % (self.valueOf_,)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) @@ -8271,13 +9460,15 @@ def build(self, node_): for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): pass + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.TEXT_NODE: self.valueOf_ += child_.nodeValue elif child_.nodeType == Node.CDATA_SECTION_NODE: - self.valueOf_ += '![CDATA['+child_.nodeValue+']]' + self.valueOf_ += '![CDATA[' + child_.nodeValue + ']]' # end class docEmptyType @@ -8287,6 +9478,7 @@ def buildChildren(self, child_, nodeName_): -s Use the SAX parser, not the minidom parser. """ + def usage(): print(USAGE_TEXT) sys.exit(1) @@ -8301,7 +9493,7 @@ def parse(inFileName): doc = None sys.stdout.write('\n') rootObj.export(sys.stdout, 0, name_="doxygen", - namespacedef_='') + namespacedef_='') return rootObj @@ -8314,7 +9506,7 @@ def parseString(inString): doc = None sys.stdout.write('\n') rootObj.export(sys.stdout, 0, name_="doxygen", - namespacedef_='') + namespacedef_='') return rootObj @@ -8343,4 +9535,4 @@ def main(): if __name__ == '__main__': main() #import pdb - #pdb.run('main()') + # pdb.run('main()') diff --git a/docs/doxygen/doxyxml/generated/index.py b/docs/doxygen/doxyxml/generated/index.py index 5b54c664..7ffbdf19 100644 --- a/docs/doxygen/doxyxml/generated/index.py +++ b/docs/doxygen/doxyxml/generated/index.py @@ -1,10 +1,8 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python """ Generated Mon Feb 9 19:08:05 2009 by generateDS.py. """ -from __future__ import absolute_import -from __future__ import unicode_literals from xml.dom import minidom @@ -14,6 +12,7 @@ from . import indexsuper as supermod + class DoxygenTypeSub(supermod.DoxygenType): def __init__(self, version=None, compound=None): supermod.DoxygenType.__init__(self, version, compound) @@ -34,6 +33,7 @@ def find_compounds_and_members(self, details): return results + supermod.DoxygenType.subclass = DoxygenTypeSub # end class DoxygenTypeSub @@ -55,6 +55,7 @@ def find_members(self, details): return results + supermod.CompoundType.subclass = CompoundTypeSub # end class CompoundTypeSub @@ -64,6 +65,7 @@ class MemberTypeSub(supermod.MemberType): def __init__(self, kind=None, refid=None, name=''): supermod.MemberType.__init__(self, kind, refid, name) + supermod.MemberType.subclass = MemberTypeSub # end class MemberTypeSub @@ -76,4 +78,3 @@ def parse(inFilename): rootObj.build(rootNode) return rootObj - diff --git a/docs/doxygen/doxyxml/generated/indexsuper.py b/docs/doxygen/doxyxml/generated/indexsuper.py index 2400d813..b30e062a 100644 --- a/docs/doxygen/doxyxml/generated/indexsuper.py +++ b/docs/doxygen/doxyxml/generated/indexsuper.py @@ -1,19 +1,15 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python # # Generated Thu Jun 11 18:43:54 2009 by generateDS.py. # -from __future__ import print_function -from __future__ import unicode_literals import sys from xml.dom import minidom from xml.dom import Node -import six - # # User methods # @@ -28,12 +24,16 @@ class GeneratedsSuper(object): def format_string(self, input_data, input_name=''): return input_data + def format_integer(self, input_data, input_name=''): return '%d' % input_data + def format_float(self, input_data, input_name=''): return '%f' % input_data + def format_double(self, input_data, input_name=''): return '%e' % input_data + def format_boolean(self, input_data, input_name=''): return '%s' % input_data @@ -45,9 +45,9 @@ def format_boolean(self, input_data, input_name=''): ## from IPython.Shell import IPShellEmbed ## args = '' -## ipshell = IPShellEmbed(args, +# ipshell = IPShellEmbed(args, ## banner = 'Dropping into IPython', -## exit_msg = 'Leaving Interpreter, back to program.') +# exit_msg = 'Leaving Interpreter, back to program.') # Then use the following line where and when you want to drop into the # IPython shell: @@ -63,20 +63,23 @@ def format_boolean(self, input_data, input_name=''): # Support/utility functions. # + def showIndent(outfile, level): for idx in range(level): outfile.write(' ') + def quote_xml(inStr): - s1 = (isinstance(inStr, six.string_types) and inStr or + s1 = (isinstance(inStr, str) and inStr or '%s' % inStr) s1 = s1.replace('&', '&') s1 = s1.replace('<', '<') s1 = s1.replace('>', '>') return s1 + def quote_attrib(inStr): - s1 = (isinstance(inStr, six.string_types) and inStr or + s1 = (isinstance(inStr, str) and inStr or '%s' % inStr) s1 = s1.replace('&', '&') s1 = s1.replace('<', '<') @@ -90,6 +93,7 @@ def quote_attrib(inStr): s1 = '"%s"' % s1 return s1 + def quote_python(inStr): s1 = inStr if s1.find("'") == -1: @@ -121,26 +125,33 @@ class MixedContainer(object): TypeDecimal = 5 TypeDouble = 6 TypeBoolean = 7 + def __init__(self, category, content_type, name, value): self.category = category self.content_type = content_type self.name = name self.value = value + def getCategory(self): return self.category + def getContenttype(self, content_type): return self.content_type + def getValue(self): return self.value + def getName(self): return self.name + def export(self, outfile, level, name, namespace): if self.category == MixedContainer.CategoryText: outfile.write(self.value) elif self.category == MixedContainer.CategorySimple: self.exportSimple(outfile, level, name) else: # category == MixedContainer.CategoryComplex - self.value.export(outfile, level, namespace,name) + self.value.export(outfile, level, namespace, name) + def exportSimple(self, outfile, level, name): if self.content_type == MixedContainer.TypeString: outfile.write('<%s>%s' % (self.name, self.value, self.name)) @@ -152,19 +163,20 @@ def exportSimple(self, outfile, level, name): outfile.write('<%s>%f' % (self.name, self.value, self.name)) elif self.content_type == MixedContainer.TypeDouble: outfile.write('<%s>%g' % (self.name, self.value, self.name)) + def exportLiteral(self, outfile, level, name): if self.category == MixedContainer.CategoryText: showIndent(outfile, level) - outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % \ - (self.category, self.content_type, self.name, self.value)) + outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % + (self.category, self.content_type, self.name, self.value)) elif self.category == MixedContainer.CategorySimple: showIndent(outfile, level) - outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % \ - (self.category, self.content_type, self.name, self.value)) + outfile.write('MixedContainer(%d, %d, "%s", "%s"),\n' % + (self.category, self.content_type, self.name, self.value)) else: # category == MixedContainer.CategoryComplex showIndent(outfile, level) - outfile.write('MixedContainer(%d, %d, "%s",\n' % \ - (self.category, self.content_type, self.name,)) + outfile.write('MixedContainer(%d, %d, "%s",\n' % + (self.category, self.content_type, self.name,)) self.value.exportLiteral(outfile, level + 1) showIndent(outfile, level) outfile.write(')\n') @@ -175,6 +187,7 @@ def __init__(self, name='', data_type='', container=0): self.name = name self.data_type = data_type self.container = container + def set_name(self, name): self.name = name def get_name(self): return self.name def set_data_type(self, data_type): self.data_type = data_type @@ -190,12 +203,14 @@ def get_container(self): return self.container class DoxygenType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, version=None, compound=None): self.version = version if compound is None: self.compound = [] else: self.compound = compound + def factory(*args_, **kwargs_): if DoxygenType.subclass: return DoxygenType.subclass(*args_, **kwargs_) @@ -208,6 +223,7 @@ def add_compound(self, value): self.compound.append(value) def insert_compound(self, index, value): self.compound[index] = value def get_version(self): return self.version def set_version(self, version): self.version = version + def export(self, outfile, level, namespace_='', name_='DoxygenType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -219,27 +235,34 @@ def export(self, outfile, level, namespace_='', name_='DoxygenType', namespacede outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='DoxygenType'): - outfile.write(' version=%s' % (self.format_string(quote_attrib(self.version).encode(ExternalEncoding), input_name='version'), )) + outfile.write(' version=%s' % (self.format_string(quote_attrib( + self.version).encode(ExternalEncoding), input_name='version'), )) + def exportChildren(self, outfile, level, namespace_='', name_='DoxygenType'): for compound_ in self.compound: compound_.export(outfile, level, namespace_, name_='compound') + def hasContent_(self): if ( self.compound is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='DoxygenType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.version is not None: showIndent(outfile, level) outfile.write('version = %s,\n' % (self.version,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) outfile.write('compound=[\n') @@ -253,18 +276,21 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('version'): self.version = attrs.get('version').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'compound': + nodeName_ == 'compound': obj_ = CompoundType.factory() obj_.build(child_) self.compound.append(obj_) @@ -274,6 +300,7 @@ def buildChildren(self, child_, nodeName_): class CompoundType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, kind=None, refid=None, name=None, member=None): self.kind = kind self.refid = refid @@ -282,6 +309,7 @@ def __init__(self, kind=None, refid=None, name=None, member=None): self.member = [] else: self.member = member + def factory(*args_, **kwargs_): if CompoundType.subclass: return CompoundType.subclass(*args_, **kwargs_) @@ -298,6 +326,7 @@ def get_kind(self): return self.kind def set_kind(self, kind): self.kind = kind def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid + def export(self, outfile, level, namespace_='', name_='CompoundType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -309,28 +338,35 @@ def export(self, outfile, level, namespace_='', name_='CompoundType', namespaced outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='CompoundType'): outfile.write(' kind=%s' % (quote_attrib(self.kind), )) - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='CompoundType'): if self.name is not None: showIndent(outfile, level) - outfile.write('<%sname>%s\n' % (namespace_, self.format_string(quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) + outfile.write('<%sname>%s\n' % (namespace_, self.format_string( + quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) for member_ in self.member: member_.export(outfile, level, namespace_, name_='member') + def hasContent_(self): if ( self.name is not None or self.member is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='CompoundType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.kind is not None: showIndent(outfile, level) @@ -338,9 +374,11 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('name=%s,\n' % quote_python(self.name).encode(ExternalEncoding)) + outfile.write('name=%s,\n' % quote_python( + self.name).encode(ExternalEncoding)) showIndent(outfile, level) outfile.write('member=[\n') level += 1 @@ -353,26 +391,29 @@ def exportLiteralChildren(self, outfile, level, name_): level -= 1 showIndent(outfile, level) outfile.write('],\n') + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('kind'): self.kind = attrs.get('kind').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'name': + nodeName_ == 'name': name_ = '' for text__content_ in child_.childNodes: name_ += text__content_.nodeValue self.name = name_ elif child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'member': + nodeName_ == 'member': obj_ = MemberType.factory() obj_.build(child_) self.member.append(obj_) @@ -382,10 +423,12 @@ def buildChildren(self, child_, nodeName_): class MemberType(GeneratedsSuper): subclass = None superclass = None + def __init__(self, kind=None, refid=None, name=None): self.kind = kind self.refid = refid self.name = name + def factory(*args_, **kwargs_): if MemberType.subclass: return MemberType.subclass(*args_, **kwargs_) @@ -398,6 +441,7 @@ def get_kind(self): return self.kind def set_kind(self, kind): self.kind = kind def get_refid(self): return self.refid def set_refid(self, refid): self.refid = refid + def export(self, outfile, level, namespace_='', name_='MemberType', namespacedef_=''): showIndent(outfile, level) outfile.write('<%s%s %s' % (namespace_, name_, namespacedef_, )) @@ -409,25 +453,32 @@ def export(self, outfile, level, namespace_='', name_='MemberType', namespacedef outfile.write('\n' % (namespace_, name_)) else: outfile.write(' />\n') + def exportAttributes(self, outfile, level, namespace_='', name_='MemberType'): outfile.write(' kind=%s' % (quote_attrib(self.kind), )) - outfile.write(' refid=%s' % (self.format_string(quote_attrib(self.refid).encode(ExternalEncoding), input_name='refid'), )) + outfile.write(' refid=%s' % (self.format_string(quote_attrib( + self.refid).encode(ExternalEncoding), input_name='refid'), )) + def exportChildren(self, outfile, level, namespace_='', name_='MemberType'): if self.name is not None: showIndent(outfile, level) - outfile.write('<%sname>%s\n' % (namespace_, self.format_string(quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) + outfile.write('<%sname>%s\n' % (namespace_, self.format_string( + quote_xml(self.name).encode(ExternalEncoding), input_name='name'), namespace_)) + def hasContent_(self): if ( self.name is not None - ): + ): return True else: return False + def exportLiteral(self, outfile, level, name_='MemberType'): level += 1 self.exportLiteralAttributes(outfile, level, name_) if self.hasContent_(): self.exportLiteralChildren(outfile, level, name_) + def exportLiteralAttributes(self, outfile, level, name_): if self.kind is not None: showIndent(outfile, level) @@ -435,23 +486,28 @@ def exportLiteralAttributes(self, outfile, level, name_): if self.refid is not None: showIndent(outfile, level) outfile.write('refid = %s,\n' % (self.refid,)) + def exportLiteralChildren(self, outfile, level, name_): showIndent(outfile, level) - outfile.write('name=%s,\n' % quote_python(self.name).encode(ExternalEncoding)) + outfile.write('name=%s,\n' % quote_python( + self.name).encode(ExternalEncoding)) + def build(self, node_): attrs = node_.attributes self.buildAttributes(attrs) for child_ in node_.childNodes: nodeName_ = child_.nodeName.split(':')[-1] self.buildChildren(child_, nodeName_) + def buildAttributes(self, attrs): if attrs.get('kind'): self.kind = attrs.get('kind').value if attrs.get('refid'): self.refid = attrs.get('refid').value + def buildChildren(self, child_, nodeName_): if child_.nodeType == Node.ELEMENT_NODE and \ - nodeName_ == 'name': + nodeName_ == 'name': name_ = '' for text__content_ in child_.childNodes: name_ += text__content_.nodeValue @@ -465,6 +521,7 @@ def buildChildren(self, child_, nodeName_): -s Use the SAX parser, not the minidom parser. """ + def usage(): print(USAGE_TEXT) sys.exit(1) @@ -479,7 +536,7 @@ def parse(inFileName): doc = None sys.stdout.write('\n') rootObj.export(sys.stdout, 0, name_="doxygenindex", - namespacedef_='') + namespacedef_='') return rootObj @@ -492,7 +549,7 @@ def parseString(inString): doc = None sys.stdout.write('\n') rootObj.export(sys.stdout, 0, name_="doxygenindex", - namespacedef_='') + namespacedef_='') return rootObj @@ -518,9 +575,7 @@ def main(): usage() - - if __name__ == '__main__': main() #import pdb - #pdb.run('main()') + # pdb.run('main()') diff --git a/docs/doxygen/doxyxml/text.py b/docs/doxygen/doxyxml/text.py index 9cb7b4d5..297b841c 100644 --- a/docs/doxygen/doxyxml/text.py +++ b/docs/doxygen/doxyxml/text.py @@ -4,25 +4,13 @@ # This file was generated by gr_modtool, a tool from the GNU Radio framework # This file is a part of gr-gsm # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. # """ Utilities for extracting text from generated classes. """ -from __future__ import unicode_literals + def is_string(txt): if isinstance(txt, str): @@ -34,11 +22,13 @@ def is_string(txt): pass return False + def description(obj): if obj is None: return None return description_bit(obj).strip() + def description_bit(obj): if hasattr(obj, 'content'): contents = [description_bit(item) for item in obj.content] @@ -51,7 +41,8 @@ def description_bit(obj): elif is_string(obj): return obj else: - raise Exception('Expecting a string or something with content, content_ or value attribute') + raise Exception( + 'Expecting a string or something with content, content_ or value attribute') # If this bit is a paragraph then add one some line breaks. if hasattr(obj, 'name') and obj.name == 'para': result += "\n\n" diff --git a/docs/doxygen/other/doxypy.py b/docs/doxygen/other/doxypy.py new file mode 100644 index 00000000..28b16644 --- /dev/null +++ b/docs/doxygen/other/doxypy.py @@ -0,0 +1,446 @@ +#!/usr/bin/env python + + +__applicationName__ = "doxypy" +__blurb__ = """ +doxypy is an input filter for Doxygen. It preprocesses python +files so that docstrings of classes and functions are reformatted +into Doxygen-conform documentation blocks. +""" + +__doc__ = __blurb__ + \ + """ +In order to make Doxygen preprocess files through doxypy, simply +add the following lines to your Doxyfile: + FILTER_SOURCE_FILES = YES + INPUT_FILTER = "python /path/to/doxypy.py" +""" + +__version__ = "0.4.2" +__date__ = "5th December 2008" +__website__ = "http://code.foosel.org/doxypy" + +__author__ = ( + "Philippe 'demod' Neumann (doxypy at demod dot org)", + "Gina 'foosel' Haeussge (gina at foosel dot net)" +) + +__licenseName__ = "GPL v2" +__license__ = """This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +""" + +import sys +import re + +from argparse import ArgumentParser + + +class FSM(object): + """Implements a finite state machine. + + Transitions are given as 4-tuples, consisting of an origin state, a target + state, a condition for the transition (given as a reference to a function + which gets called with a given piece of input) and a pointer to a function + to be called upon the execution of the given transition. + """ + + """ + @var transitions holds the transitions + @var current_state holds the current state + @var current_input holds the current input + @var current_transition hold the currently active transition + """ + + def __init__(self, start_state=None, transitions=[]): + self.transitions = transitions + self.current_state = start_state + self.current_input = None + self.current_transition = None + + def setStartState(self, state): + self.current_state = state + + def addTransition(self, from_state, to_state, condition, callback): + self.transitions.append([from_state, to_state, condition, callback]) + + def makeTransition(self, input): + """ Makes a transition based on the given input. + + @param input input to parse by the FSM + """ + for transition in self.transitions: + [from_state, to_state, condition, callback] = transition + if from_state == self.current_state: + match = condition(input) + if match: + self.current_state = to_state + self.current_input = input + self.current_transition = transition + if args.debug: + print("# FSM: executing (%s -> %s) for line '%s'" % + (from_state, to_state, input), file=sys.stderr) + callback(match) + return + + +class Doxypy(object): + def __init__(self): + string_prefixes = "[uU]?[rR]?" + + self.start_single_comment_re = re.compile( + r"^\s*%s(''')" % string_prefixes) + self.end_single_comment_re = re.compile(r"(''')\s*$") + + self.start_double_comment_re = re.compile( + r'^\s*%s(""")' % string_prefixes) + self.end_double_comment_re = re.compile(r'(""")\s*$') + + self.single_comment_re = re.compile( + r"^\s*%s(''').*(''')\s*$" % string_prefixes) + self.double_comment_re = re.compile( + r'^\s*%s(""").*(""")\s*$' % string_prefixes) + + self.defclass_re = re.compile(r"^(\s*)(def .+:|class .+:)") + self.empty_re = re.compile(r"^\s*$") + self.hashline_re = re.compile(r"^\s*#.*$") + self.importline_re = re.compile(r"^\s*(import |from .+ import)") + + self.multiline_defclass_start_re = re.compile( + r"^(\s*)(def|class)(\s.*)?$") + self.multiline_defclass_end_re = re.compile(r":\s*$") + + # Transition list format + # ["FROM", "TO", condition, action] + transitions = [ + # FILEHEAD + + # single line comments + ["FILEHEAD", "FILEHEAD", self.single_comment_re.search, + self.appendCommentLine], + ["FILEHEAD", "FILEHEAD", self.double_comment_re.search, + self.appendCommentLine], + + # multiline comments + ["FILEHEAD", "FILEHEAD_COMMENT_SINGLE", + self.start_single_comment_re.search, self.appendCommentLine], + ["FILEHEAD_COMMENT_SINGLE", "FILEHEAD", + self.end_single_comment_re.search, self.appendCommentLine], + ["FILEHEAD_COMMENT_SINGLE", "FILEHEAD_COMMENT_SINGLE", + self.catchall, self.appendCommentLine], + ["FILEHEAD", "FILEHEAD_COMMENT_DOUBLE", + self.start_double_comment_re.search, self.appendCommentLine], + ["FILEHEAD_COMMENT_DOUBLE", "FILEHEAD", + self.end_double_comment_re.search, self.appendCommentLine], + ["FILEHEAD_COMMENT_DOUBLE", "FILEHEAD_COMMENT_DOUBLE", + self.catchall, self.appendCommentLine], + + # other lines + ["FILEHEAD", "FILEHEAD", self.empty_re.search, self.appendFileheadLine], + ["FILEHEAD", "FILEHEAD", self.hashline_re.search, self.appendFileheadLine], + ["FILEHEAD", "FILEHEAD", self.importline_re.search, + self.appendFileheadLine], + ["FILEHEAD", "DEFCLASS", self.defclass_re.search, self.resetCommentSearch], + ["FILEHEAD", "DEFCLASS_MULTI", + self.multiline_defclass_start_re.search, self.resetCommentSearch], + ["FILEHEAD", "DEFCLASS_BODY", self.catchall, self.appendFileheadLine], + + # DEFCLASS + + # single line comments + ["DEFCLASS", "DEFCLASS_BODY", + self.single_comment_re.search, self.appendCommentLine], + ["DEFCLASS", "DEFCLASS_BODY", + self.double_comment_re.search, self.appendCommentLine], + + # multiline comments + ["DEFCLASS", "COMMENT_SINGLE", + self.start_single_comment_re.search, self.appendCommentLine], + ["COMMENT_SINGLE", "DEFCLASS_BODY", + self.end_single_comment_re.search, self.appendCommentLine], + ["COMMENT_SINGLE", "COMMENT_SINGLE", + self.catchall, self.appendCommentLine], + ["DEFCLASS", "COMMENT_DOUBLE", + self.start_double_comment_re.search, self.appendCommentLine], + ["COMMENT_DOUBLE", "DEFCLASS_BODY", + self.end_double_comment_re.search, self.appendCommentLine], + ["COMMENT_DOUBLE", "COMMENT_DOUBLE", + self.catchall, self.appendCommentLine], + + # other lines + ["DEFCLASS", "DEFCLASS", self.empty_re.search, self.appendDefclassLine], + ["DEFCLASS", "DEFCLASS", self.defclass_re.search, self.resetCommentSearch], + ["DEFCLASS", "DEFCLASS_MULTI", + self.multiline_defclass_start_re.search, self.resetCommentSearch], + ["DEFCLASS", "DEFCLASS_BODY", self.catchall, self.stopCommentSearch], + + # DEFCLASS_BODY + + ["DEFCLASS_BODY", "DEFCLASS", + self.defclass_re.search, self.startCommentSearch], + ["DEFCLASS_BODY", "DEFCLASS_MULTI", + self.multiline_defclass_start_re.search, self.startCommentSearch], + ["DEFCLASS_BODY", "DEFCLASS_BODY", self.catchall, self.appendNormalLine], + + # DEFCLASS_MULTI + ["DEFCLASS_MULTI", "DEFCLASS", + self.multiline_defclass_end_re.search, self.appendDefclassLine], + ["DEFCLASS_MULTI", "DEFCLASS_MULTI", + self.catchall, self.appendDefclassLine], + ] + + self.fsm = FSM("FILEHEAD", transitions) + self.outstream = sys.stdout + + self.output = [] + self.comment = [] + self.filehead = [] + self.defclass = [] + self.indent = "" + + def __closeComment(self): + """Appends any open comment block and triggering block to the output.""" + + if args.autobrief: + if len(self.comment) == 1 \ + or (len(self.comment) > 2 and self.comment[1].strip() == ''): + self.comment[0] = self.__docstringSummaryToBrief( + self.comment[0]) + + if self.comment: + block = self.makeCommentBlock() + self.output.extend(block) + + if self.defclass: + self.output.extend(self.defclass) + + def __docstringSummaryToBrief(self, line): + """Adds \\brief to the docstrings summary line. + + A \\brief is prepended, provided no other doxygen command is at the + start of the line. + """ + stripped = line.strip() + if stripped and not stripped[0] in ('@', '\\'): + return "\\brief " + line + else: + return line + + def __flushBuffer(self): + """Flushes the current outputbuffer to the outstream.""" + if self.output: + try: + if args.debug: + print("# OUTPUT: ", self.output, file=sys.stderr) + print("\n".join(self.output), file=self.outstream) + self.outstream.flush() + except IOError: + # Fix for FS#33. Catches "broken pipe" when doxygen closes + # stdout prematurely upon usage of INPUT_FILTER, INLINE_SOURCES + # and FILTER_SOURCE_FILES. + pass + self.output = [] + + def catchall(self, input): + """The catchall-condition, always returns true.""" + return True + + def resetCommentSearch(self, match): + """Restarts a new comment search for a different triggering line. + + Closes the current commentblock and starts a new comment search. + """ + if args.debug: + print("# CALLBACK: resetCommentSearch", file=sys.stderr) + self.__closeComment() + self.startCommentSearch(match) + + def startCommentSearch(self, match): + """Starts a new comment search. + + Saves the triggering line, resets the current comment and saves + the current indentation. + """ + if args.debug: + print("# CALLBACK: startCommentSearch", file=sys.stderr) + self.defclass = [self.fsm.current_input] + self.comment = [] + self.indent = match.group(1) + + def stopCommentSearch(self, match): + """Stops a comment search. + + Closes the current commentblock, resets the triggering line and + appends the current line to the output. + """ + if args.debug: + print("# CALLBACK: stopCommentSearch", file=sys.stderr) + self.__closeComment() + + self.defclass = [] + self.output.append(self.fsm.current_input) + + def appendFileheadLine(self, match): + """Appends a line in the FILEHEAD state. + + Closes the open comment block, resets it and appends the current line. + """ + if args.debug: + print("# CALLBACK: appendFileheadLine", file=sys.stderr) + self.__closeComment() + self.comment = [] + self.output.append(self.fsm.current_input) + + def appendCommentLine(self, match): + """Appends a comment line. + + The comment delimiter is removed from multiline start and ends as + well as singleline comments. + """ + if args.debug: + print("# CALLBACK: appendCommentLine", file=sys.stderr) + (from_state, to_state, condition, callback) = self.fsm.current_transition + + # single line comment + if (from_state == "DEFCLASS" and to_state == "DEFCLASS_BODY") \ + or (from_state == "FILEHEAD" and to_state == "FILEHEAD"): + # remove comment delimiter from begin and end of the line + activeCommentDelim = match.group(1) + line = self.fsm.current_input + self.comment.append(line[line.find( + activeCommentDelim) + len(activeCommentDelim):line.rfind(activeCommentDelim)]) + + if (to_state == "DEFCLASS_BODY"): + self.__closeComment() + self.defclass = [] + # multiline start + elif from_state == "DEFCLASS" or from_state == "FILEHEAD": + # remove comment delimiter from begin of the line + activeCommentDelim = match.group(1) + line = self.fsm.current_input + self.comment.append( + line[line.find(activeCommentDelim) + len(activeCommentDelim):]) + # multiline end + elif to_state == "DEFCLASS_BODY" or to_state == "FILEHEAD": + # remove comment delimiter from end of the line + activeCommentDelim = match.group(1) + line = self.fsm.current_input + self.comment.append(line[0:line.rfind(activeCommentDelim)]) + if (to_state == "DEFCLASS_BODY"): + self.__closeComment() + self.defclass = [] + # in multiline comment + else: + # just append the comment line + self.comment.append(self.fsm.current_input) + + def appendNormalLine(self, match): + """Appends a line to the output.""" + if args.debug: + print("# CALLBACK: appendNormalLine", file=sys.stderr) + self.output.append(self.fsm.current_input) + + def appendDefclassLine(self, match): + """Appends a line to the triggering block.""" + if args.debug: + print("# CALLBACK: appendDefclassLine", file=sys.stderr) + self.defclass.append(self.fsm.current_input) + + def makeCommentBlock(self): + """Indents the current comment block with respect to the current + indentation level. + + @returns a list of indented comment lines + """ + doxyStart = "##" + commentLines = self.comment + + commentLines = ["%s# %s" % (self.indent, x) for x in commentLines] + l = [self.indent + doxyStart] + l.extend(commentLines) + + return l + + def parse(self, input): + """Parses a python file given as input string and returns the doxygen- + compatible representation. + + @param input the python code to parse + @returns the modified python code + """ + lines = input.split("\n") + + for line in lines: + self.fsm.makeTransition(line) + + if self.fsm.current_state == "DEFCLASS": + self.__closeComment() + + return "\n".join(self.output) + + def parseFile(self, filename): + """Parses a python file given as input string and returns the doxygen- + compatible representation. + + @param input the python code to parse + @returns the modified python code + """ + f = open(filename, 'r') + + for line in f: + self.parseLine(line.rstrip('\r\n')) + if self.fsm.current_state == "DEFCLASS": + self.__closeComment() + self.__flushBuffer() + f.close() + + def parseLine(self, line): + """Parse one line of python and flush the resulting output to the + outstream. + + @param line the python code line to parse + """ + self.fsm.makeTransition(line) + self.__flushBuffer() + + +def argParse(): + """Parses commandline args.""" + parser = ArgumentParser(prog=__applicationName__) + + parser.add_argument("--version", action="version", + version="%(prog)s " + __version__ + ) + parser.add_argument("--autobrief", action="store_true", + help="use the docstring summary line as \\brief description" + ) + parser.add_argument("--debug", action="store_true", + help="enable debug output on stderr" + ) + parser.add_argument("filename", metavar="FILENAME") + + return parser.parse_args() + + +def main(): + """Starts the parser on the file given by the filename as the first + argument on the commandline. + """ + global args + args = argParse() + fsm = Doxypy() + fsm.parseFile(args.filename) + + +if __name__ == "__main__": + main() diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index 82d6243f..9ae9db49 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -4,4 +4,3 @@ * module are listed here or in the subcategories below. * */ - diff --git a/docs/doxygen/pydoc_macros.h b/docs/doxygen/pydoc_macros.h new file mode 100644 index 00000000..fb3954bc --- /dev/null +++ b/docs/doxygen/pydoc_macros.h @@ -0,0 +1,19 @@ +#ifndef PYDOC_MACROS_H +#define PYDOC_MACROS_H + +#define __EXPAND(x) x +#define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT +#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1)) +#define __CAT1(a, b) a##b +#define __CAT2(a, b) __CAT1(a, b) +#define __DOC1(n1) __doc_##n1 +#define __DOC2(n1, n2) __doc_##n1##_##n2 +#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3 +#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4 +#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5 +#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6 +#define __DOC7(n1, n2, n3, n4, n5, n6, n7) \ + __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7 +#define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__)) + +#endif // PYDOC_MACROS_H diff --git a/docs/doxygen/swig_doc.py b/docs/doxygen/update_pydoc.py similarity index 52% rename from docs/doxygen/swig_doc.py rename to docs/doxygen/update_pydoc.py index b9f4e6e2..b65e168a 100644 --- a/docs/doxygen/swig_doc.py +++ b/docs/doxygen/update_pydoc.py @@ -2,42 +2,37 @@ # Copyright 2010-2012 Free Software Foundation, Inc. # # This file was generated by gr_modtool, a tool from the GNU Radio framework -# This file is a part of gr-gsm +# This file is a part of gnuradio # -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-3.0-or-later # -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. # """ -Creates the swig_doc.i SWIG interface file. -Execute using: python swig_doc.py xml_path outputfilename +Updates the *pydoc_h files for a module +Execute using: python update_pydoc.py xml_path outputfilename -The file instructs SWIG to transfer the doxygen comments into the +The file instructs Pybind11 to transfer the doxygen comments into the python docstrings. """ -from __future__ import unicode_literals -import sys, time +import os +import sys +import time +import glob +import re +import json +from argparse import ArgumentParser from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile from doxyxml import DoxyOther, base + def py_name(name): bits = name.split('_') return '_'.join(bits[1:]) + def make_name(name): bits = name.split('_') return bits[0] + '_make_' + '_'.join(bits[1:]) @@ -62,6 +57,7 @@ def includes(cls, item): is_a_block = di.has_member(friendname, DoxyFunction) return is_a_block + class Block2(object): """ Checks if doxyxml produced objects correspond to a new style @@ -75,7 +71,8 @@ def includes(cls, item): # Check for a parsing error. if item.error(): return False - is_a_block2 = item.has_member('make', DoxyFunction) and item.has_member('sptr', DoxyOther) + is_a_block2 = item.has_member( + 'make', DoxyFunction) and item.has_member('sptr', DoxyOther) return is_a_block2 @@ -87,6 +84,7 @@ def utoascii(text): return '' out = text.encode('ascii', 'replace') # swig will require us to replace blackslash with 4 backslashes + # TODO: evaluate what this should be for pybind11 out = out.replace(b'\\', b'\\\\\\\\') out = out.replace(b'"', b'\\"').decode('ascii') return str(out) @@ -105,6 +103,7 @@ def combine_descriptions(obj): description.append(dd) return utoascii('\n\n'.join(description)).strip() + def format_params(parameteritems): output = ['Args:'] template = ' {0} : {1}' @@ -112,10 +111,13 @@ def format_params(parameteritems): output.append(template.format(pi.name, pi.description)) return '\n'.join(output) + entry_templ = '%feature("docstring") {name} "{docstring}"' + + def make_entry(obj, name=None, templ="{description}", description=None, params=[]): """ - Create a docstring entry for a swig interface file. + Create a docstring key/value pair, where the key is the object name. obj - a doxyxml object from which documentation will be extracted. name - the name of the C object (defaults to obj.name()) @@ -125,7 +127,9 @@ def make_entry(obj, name=None, templ="{description}", description=None, params=[ used as the description instead of extracting it from obj. """ if name is None: - name=obj.name() + name = obj.name() + if hasattr(obj, '_parse_data') and hasattr(obj._parse_data, 'definition'): + name = obj._parse_data.definition.split(' ')[-1] if "operator " in name: return '' if description is None: @@ -134,56 +138,28 @@ def make_entry(obj, name=None, templ="{description}", description=None, params=[ description += '\n\n' description += utoascii(format_params(params)) docstring = templ.format(description=description) - if not docstring: - return '' - return entry_templ.format( - name=name, - docstring=docstring, - ) - - -def make_func_entry(func, name=None, description=None, params=None): - """ - Create a function docstring entry for a swig interface file. - func - a doxyxml object from which documentation will be extracted. - name - the name of the C object (defaults to func.name()) - description - if this optional variable is set then it's value is - used as the description instead of extracting it from func. - params - a parameter list that overrides using func.params. - """ - #if params is None: - # params = func.params - #params = [prm.declname for prm in params] - #if params: - # sig = "Params: (%s)" % ", ".join(params) - #else: - # sig = "Params: (NONE)" - #templ = "{description}\n\n" + sig - #return make_entry(func, name=name, templ=utoascii(templ), - # description=description) - return make_entry(func, name=name, description=description, params=params) + return {name: docstring} def make_class_entry(klass, description=None, ignored_methods=[], params=None): """ - Create a class docstring for a swig interface file. + Create a class docstring key/value pair. """ if params is None: params = klass.params - output = [] - output.append(make_entry(klass, description=description, params=params)) + output = {} + output.update(make_entry(klass, description=description, params=params)) for func in klass.in_category(DoxyFunction): if func.name() not in ignored_methods: name = klass.name() + '::' + func.name() - output.append(make_func_entry(func, name=name)) - return "\n\n".join(output) + output.update(make_entry(func, name=name)) + return output def make_block_entry(di, block): """ - Create class and function docstrings of a gnuradio block for a - swig interface file. + Create class and function docstrings of a gnuradio block """ descriptions = [] # Get the documentation associated with the class. @@ -208,48 +184,42 @@ def make_block_entry(di, block): super_description = "\n\n".join(descriptions) # Associate the combined description with the class and # the make function. - output = [] - output.append(make_class_entry(block, description=super_description)) - output.append(make_func_entry(make_func, description=super_description, - params=block.params)) - return "\n\n".join(output) + output = {} + output.update(make_class_entry(block, description=super_description)) + output.update(make_entry(make_func, description=super_description, + params=block.params)) + return output + def make_block2_entry(di, block): """ - Create class and function docstrings of a new style gnuradio block for a - swig interface file. + Create class and function docstrings of a new style gnuradio block """ - descriptions = [] # For new style blocks all the relevant documentation should be # associated with the 'make' method. class_description = combine_descriptions(block) make_func = block.get_member('make', DoxyFunction) make_description = combine_descriptions(make_func) - description = class_description + "\n\nConstructor Specific Documentation:\n\n" + make_description + description = class_description + \ + "\n\nConstructor Specific Documentation:\n\n" + make_description # Associate the combined description with the class and # the make function. - output = [] - output.append(make_class_entry( - block, description=description, - ignored_methods=['make'], params=make_func.params)) + output = {} + output.update(make_class_entry( + block, description=description, + ignored_methods=['make'], params=make_func.params)) makename = block.name() + '::make' - output.append(make_func_entry( - make_func, name=makename, description=description, - params=make_func.params)) - return "\n\n".join(output) + output.update(make_entry( + make_func, name=makename, description=description, + params=make_func.params)) + return output -def make_swig_interface_file(di, swigdocfilename, custom_output=None): - output = [""" -/* - * This file was automatically generated using swig_doc.py. - * - * Any changes to it will be lost next time it is regenerated. - */ -"""] +def get_docstrings_dict(di, custom_output=None): - if custom_output is not None: - output.append(custom_output) + output = {} + if custom_output: + output.update(custom_output) # Create docstrings for the blocks. blocks = di.in_category(Block) @@ -262,21 +232,23 @@ def make_swig_interface_file(di, swigdocfilename, custom_output=None): # Don't want to risk writing to output twice. if make_func.name() not in make_funcs: make_funcs.add(make_func.name()) - output.append(make_block_entry(di, block)) + output.update(make_block_entry(di, block)) except block.ParsingError: - sys.stderr.write('Parsing error for block {0}\n'.format(block.name())) + sys.stderr.write( + 'Parsing error for block {0}\n'.format(block.name())) raise for block in blocks2: try: make_func = block.get_member('make', DoxyFunction) - make_func_name = block.name() +'::make' + make_func_name = block.name() + '::make' # Don't want to risk writing to output twice. if make_func_name not in make_funcs: make_funcs.add(make_func_name) - output.append(make_block2_entry(di, block)) + output.update(make_block2_entry(di, block)) except block.ParsingError: - sys.stderr.write('Parsing error for block {0}\n'.format(block.name())) + sys.stderr.write( + 'Parsing error for block {0}\n'.format(block.name())) raise # Create docstrings for functions @@ -285,9 +257,10 @@ def make_swig_interface_file(di, swigdocfilename, custom_output=None): if f.name() not in make_funcs and not f.name().startswith('std::')] for f in funcs: try: - output.append(make_func_entry(f)) + output.update(make_entry(f)) except f.ParsingError: - sys.stderr.write('Parsing error for function {0}\n'.format(f.name())) + sys.stderr.write( + 'Parsing error for function {0}\n'.format(f.name())) # Create docstrings for classes block_names = [block.name() for block in blocks] @@ -296,37 +269,104 @@ def make_swig_interface_file(di, swigdocfilename, custom_output=None): if k.name() not in block_names and not k.name().startswith('std::')] for k in klasses: try: - output.append(make_class_entry(k)) + output.update(make_class_entry(k)) except k.ParsingError: sys.stderr.write('Parsing error for class {0}\n'.format(k.name())) # Docstrings are not created for anything that is not a function or a class. # If this excludes anything important please add it here. - output = "\n\n".join(output) + return output + + +def sub_docstring_in_pydoc_h(pydoc_files, docstrings_dict, output_dir, filter_str=None): + if filter_str: + docstrings_dict = { + k: v for k, v in docstrings_dict.items() if k.startswith(filter_str)} + + with open(os.path.join(output_dir, 'docstring_status'), 'w') as status_file: + + for pydoc_file in pydoc_files: + if filter_str: + filter_str2 = "::".join((filter_str, os.path.split( + pydoc_file)[-1].split('_pydoc_template.h')[0])) + docstrings_dict2 = { + k: v for k, v in docstrings_dict.items() if k.startswith(filter_str2)} + else: + docstrings_dict2 = docstrings_dict + + file_in = open(pydoc_file, 'r').read() + for key, value in docstrings_dict2.items(): + file_in_tmp = file_in + try: + doc_key = key.split("::") + # if 'gr' in doc_key: + # doc_key.remove('gr') + doc_key = '_'.join(doc_key) + regexp = r'(__doc_{} =\sR\"doc\()[^)]*(\)doc\")'.format( + doc_key) + regexp = re.compile(regexp, re.MULTILINE) + + (file_in, nsubs) = regexp.subn( + r'\1' + value + r'\2', file_in, count=1) + if nsubs == 1: + status_file.write("PASS: " + pydoc_file + "\n") + except KeyboardInterrupt: + raise KeyboardInterrupt + except: # be permissive, TODO log, but just leave the docstring blank + status_file.write("FAIL: " + pydoc_file + "\n") + file_in = file_in_tmp + + output_pathname = os.path.join(output_dir, os.path.basename( + pydoc_file).replace('_template.h', '.h')) + with open(output_pathname, 'w') as file_out: + file_out.write(file_in) + + +def copy_docstring_templates(pydoc_files, output_dir): + with open(os.path.join(output_dir, 'docstring_status'), 'w') as status_file: + for pydoc_file in pydoc_files: + file_in = open(pydoc_file, 'r').read() + output_pathname = os.path.join(output_dir, os.path.basename( + pydoc_file).replace('_template.h', '.h')) + with open(output_pathname, 'w') as file_out: + file_out.write(file_in) + status_file.write("DONE") + + +def argParse(): + """Parses commandline args.""" + desc = 'Scrape the doxygen generated xml for docstrings to insert into python bindings' + parser = ArgumentParser(description=desc) + + parser.add_argument("function", help="Operation to perform on docstrings", choices=[ + "scrape", "sub", "copy"]) + + parser.add_argument("--xml_path") + parser.add_argument("--bindings_dir") + parser.add_argument("--output_dir") + parser.add_argument("--json_path") + parser.add_argument("--filter", default=None) + + return parser.parse_args() - swig_doc = open(swigdocfilename, 'w') - swig_doc.write(output) - swig_doc.close() if __name__ == "__main__": # Parse command line options and set up doxyxml. - err_msg = "Execute using: python swig_doc.py xml_path outputfilename" - if len(sys.argv) != 3: - raise Exception(err_msg) - xml_path = sys.argv[1] - swigdocfilename = sys.argv[2] - di = DoxyIndex(xml_path) - - # gnuradio.gr.msq_queue.insert_tail and delete_head create errors unless docstrings are defined! - # This is presumably a bug in SWIG. - #msg_q = di.get_member(u'gr_msg_queue', DoxyClass) - #insert_tail = msg_q.get_member(u'insert_tail', DoxyFunction) - #delete_head = msg_q.get_member(u'delete_head', DoxyFunction) - output = [] - #output.append(make_func_entry(insert_tail, name='gr_py_msg_queue__insert_tail')) - #output.append(make_func_entry(delete_head, name='gr_py_msg_queue__delete_head')) - custom_output = "\n\n".join(output) - - # Generate the docstrings interface file. - make_swig_interface_file(di, swigdocfilename, custom_output=custom_output) + args = argParse() + if args.function.lower() == 'scrape': + di = DoxyIndex(args.xml_path) + docstrings_dict = get_docstrings_dict(di) + with open(args.json_path, 'w') as fp: + json.dump(docstrings_dict, fp) + elif args.function.lower() == 'sub': + with open(args.json_path, 'r') as fp: + docstrings_dict = json.load(fp) + pydoc_files = glob.glob(os.path.join( + args.bindings_dir, '*_pydoc_template.h')) + sub_docstring_in_pydoc_h( + pydoc_files, docstrings_dict, args.output_dir, args.filter) + elif args.function.lower() == 'copy': + pydoc_files = glob.glob(os.path.join( + args.bindings_dir, '*_pydoc_template.h')) + copy_docstring_templates(pydoc_files, args.output_dir) diff --git a/grc/MANIFEST.md b/grc/MANIFEST.md new file mode 100644 index 00000000..24a03d4f --- /dev/null +++ b/grc/MANIFEST.md @@ -0,0 +1,22 @@ +title: gr-bluetooth +brief: A Bluetooth baseband layer for GNU Radio +tags: + - Bluetooth + - IEEE 802.15.1 +author: + - Dominic Spill + - Michael Ossmann +copyright_owner: + - Dominic Spill + - Michael Ossmann +dependencies: + - gnuradio +repo: https://github.com/greatscottgadgets/gr-bluetooth +stable_release: HEAD +icon: +--- + +gr-bluetooth is an implementation of the Bluetooth baseband layer for GNU Radio for experimentation and teaching students about Software Defined Radio, it should not be used for Bluetooth communications as it is not a complete software stack. + +The gr-bluetooth web site is: http://gr-bluetooth.sourceforge.net + diff --git a/grc/README.md b/grc/README.md new file mode 100644 index 00000000..a97be5f1 --- /dev/null +++ b/grc/README.md @@ -0,0 +1,44 @@ +GR-Bluetooth +============ +Welcome to gr-bluetooth! + +gr-bluetooth is an implementation of the Bluetooth baseband layer for GNU Radio +for experimentation and teaching students about Software Defined Radio, it +should not be used for Bluetooth communications as it is not a complete +software stack. + +The gr-bluetooth web site is: http://gr-bluetooth.sourceforge.net + +Building +-------- +gr-bluetooth currently requires gnuradio 3.7.0 or later. + +To build gr-bluetooth: +``` + mkdir build + cd build + cmake .. + make + sudo make install +``` + +License +------- +Copyright 2008 - 2013 Dominic Spill, Michael Ossmann + +This file is part of gr-bluetooth + +gr-bluetooth is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +gr-bluetooth is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with gr-bluetooth; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, +Boston, MA 02110-1301, USA. diff --git a/grc/decoding/gsm_control_channels_decoder.block.yml b/grc/decoding/gsm_control_channels_decoder.block.yml index df287a31..6489c76e 100644 --- a/grc/decoding/gsm_control_channels_decoder.block.yml +++ b/grc/decoding/gsm_control_channels_decoder.block.yml @@ -13,7 +13,7 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.control_channels_decoder() + imports: from gnuradio import gsm + make: gsm.control_channels_decoder() file_format: 1 diff --git a/grc/decoding/gsm_tch_f_decoder.block.yml b/grc/decoding/gsm_tch_f_decoder.block.yml index 1205448e..7cff10e9 100644 --- a/grc/decoding/gsm_tch_f_decoder.block.yml +++ b/grc/decoding/gsm_tch_f_decoder.block.yml @@ -7,8 +7,8 @@ parameters: - id: mode label: TCH coding mode dtype: enum - options: [grgsm.TCH_FS, grgsm.TCH_EFR, grgsm.TCH_AFS12_2, grgsm.TCH_AFS10_2, grgsm.TCH_AFS7_95, - grgsm.TCH_AFS7_4, grgsm.TCH_AFS6_7, grgsm.TCH_AFS5_9, grgsm.TCH_AFS5_15, grgsm.TCH_AFS4_75] + options: [gsm.TCH_FS, gsm.TCH_EFR, gsm.TCH_AFS12_2, gsm.TCH_AFS10_2, gsm.TCH_AFS7_95, + gsm.TCH_AFS7_4, gsm.TCH_AFS6_7, gsm.TCH_AFS5_9, gsm.TCH_AFS5_15, gsm.TCH_AFS4_75] option_labels: [GSM-FR, GSM-EFR, GSM-AMR 12.2, GSM-AMR 10.2, GSM-AMR 7.95, GSM-AMR 7.4, GSM-AMR 6.7, GSM-AMR 5.9, GSM-AMR 5.15, GSM-AMR 4.75] - id: boundary_check @@ -30,8 +30,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.tch_f_decoder(${mode}, ${boundary_check}) + imports: from gnuradio import gsm + make: gsm.tch_f_decoder(${mode}, ${boundary_check}) documentation: "If \"Voice boundary detection\" is enabled, then only bursts are decoded\ \ as voice where\n\n- the framenumber is greater then the framenumber of a received\ diff --git a/grc/decoding/gsm_tch_h_decoder.block.yml b/grc/decoding/gsm_tch_h_decoder.block.yml index 8d26a0b9..6141f3f4 100644 --- a/grc/decoding/gsm_tch_h_decoder.block.yml +++ b/grc/decoding/gsm_tch_h_decoder.block.yml @@ -34,8 +34,8 @@ asserts: - ${ sub_channel > -1 and sub_channel < 2 } templates: - imports: import grgsm - make: grgsm.tch_h_decoder(${sub_channel}, ${multi_rate}, ${boundary_check}) + imports: from gnuradio import gsm + make: gsm.tch_h_decoder(${sub_channel}, ${multi_rate}, ${boundary_check}) documentation: |- The MultiRate configuration string should contains the hex string from the diff --git a/grc/decryption/gsm_decryption.block.yml b/grc/decryption/gsm_decryption.block.yml index 82609076..02ac8393 100644 --- a/grc/decryption/gsm_decryption.block.yml +++ b/grc/decryption/gsm_decryption.block.yml @@ -25,7 +25,7 @@ asserts: - ${ a5_version < 5 } templates: - imports: import grgsm - make: grgsm.decryption(${k_c}, ${a5_version}) + imports: from gnuradio import gsm + make: gsm.decryption(${k_c}, ${a5_version}) file_format: 1 diff --git a/grc/demapping/gsm_bcch_ccch_demapper.block.yml b/grc/demapping/gsm_bcch_ccch_demapper.block.yml index 21e87d85..ece5f7ca 100644 --- a/grc/demapping/gsm_bcch_ccch_demapper.block.yml +++ b/grc/demapping/gsm_bcch_ccch_demapper.block.yml @@ -20,9 +20,9 @@ outputs: optional: true templates: - imports: import grgsm + imports: from gnuradio import gsm make: |- - grgsm.gsm_bcch_ccch_demapper( + gsm.gsm_bcch_ccch_demapper( timeslot_nr=${timeslot_nr}, ) callbacks: diff --git a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.block.yml b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.block.yml index d40a4e15..5f54a63f 100644 --- a/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.block.yml +++ b/grc/demapping/gsm_bcch_ccch_sdcch4_demapper.block.yml @@ -20,9 +20,9 @@ outputs: optional: true templates: - imports: import grgsm + imports: from gnuradio import gsm make: |- - grgsm.gsm_bcch_ccch_sdcch4_demapper( + gsm.gsm_bcch_ccch_sdcch4_demapper( timeslot_nr=${timeslot_nr}, ) callbacks: diff --git a/grc/demapping/gsm_sdcch8_demapper.block.yml b/grc/demapping/gsm_sdcch8_demapper.block.yml index 66a50c0d..c5dcb662 100644 --- a/grc/demapping/gsm_sdcch8_demapper.block.yml +++ b/grc/demapping/gsm_sdcch8_demapper.block.yml @@ -20,9 +20,9 @@ outputs: optional: true templates: - imports: import grgsm + imports: from gnuradio import gsm make: |- - grgsm.gsm_sdcch8_demapper( + gsm.gsm_sdcch8_demapper( timeslot_nr=${timeslot_nr}, ) callbacks: diff --git a/grc/demapping/gsm_tch_f_chans_demapper.block.yml b/grc/demapping/gsm_tch_f_chans_demapper.block.yml index 8d10c1d6..c111aea4 100644 --- a/grc/demapping/gsm_tch_f_chans_demapper.block.yml +++ b/grc/demapping/gsm_tch_f_chans_demapper.block.yml @@ -24,7 +24,7 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.tch_f_chans_demapper(${timeslot_nr}) + imports: from gnuradio import gsm + make: gsm.tch_f_chans_demapper(${timeslot_nr}) file_format: 1 diff --git a/grc/demapping/gsm_tch_h_chans_demapper.block.yml b/grc/demapping/gsm_tch_h_chans_demapper.block.yml index 4c8610e1..1a0fff11 100644 --- a/grc/demapping/gsm_tch_h_chans_demapper.block.yml +++ b/grc/demapping/gsm_tch_h_chans_demapper.block.yml @@ -31,7 +31,7 @@ asserts: - ${ tch_h_channel > -1 and tch_h_channel < 2 } templates: - imports: import grgsm - make: grgsm.tch_h_chans_demapper(${timeslot_nr}, ${tch_h_channel}) + imports: from gnuradio import gsm + make: gsm.tch_h_chans_demapper(${timeslot_nr}, ${tch_h_channel}) file_format: 1 diff --git a/grc/demapping/gsm_universal_ctrl_chans_demapper.block.yml b/grc/demapping/gsm_universal_ctrl_chans_demapper.block.yml index 469384eb..e4a57be6 100644 --- a/grc/demapping/gsm_universal_ctrl_chans_demapper.block.yml +++ b/grc/demapping/gsm_universal_ctrl_chans_demapper.block.yml @@ -49,8 +49,8 @@ outputs: id: bursts templates: - imports: import grgsm - make: grgsm.universal_ctrl_chans_demapper(${timeslot_nr}, ${downlink_starts_fn_mod51}, + imports: from gnuradio import gsm + make: gsm.universal_ctrl_chans_demapper(${timeslot_nr}, ${downlink_starts_fn_mod51}, ${downlink_channel_types}, ${downlink_subslots}, ${uplink_starts_fn_mod51}, ${uplink_channel_types}, ${uplink_subslots}) diff --git a/grc/flow_control/gsm_burst_fnr_filter.block.yml b/grc/flow_control/gsm_burst_fnr_filter.block.yml index 8dc9adca..cdb2434b 100644 --- a/grc/flow_control/gsm_burst_fnr_filter.block.yml +++ b/grc/flow_control/gsm_burst_fnr_filter.block.yml @@ -7,7 +7,7 @@ parameters: - id: mode label: Mode dtype: enum - options: [grgsm.FILTER_LESS_OR_EQUAL, grgsm.FILTER_GREATER_OR_EQUAL] + options: [gsm.FILTER_LESS_OR_EQUAL, gsm.FILTER_GREATER_OR_EQUAL] option_labels: [Less or equal, Greater or equal] - id: fnr label: Framenumber @@ -24,8 +24,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.burst_fnr_filter(${mode}, ${fnr}) + imports: from gnuradio import gsm + make: gsm.burst_fnr_filter(${mode}, ${fnr}) documentation: |- Burst framenumber filter forwards only blocks with a framenumber satisfying the configured mode, i.e. if mode is "Less or equal", then only bursts with a smaller or equal framenumber are forwarded. diff --git a/grc/flow_control/gsm_burst_sdcch_subslot_filter.block.yml b/grc/flow_control/gsm_burst_sdcch_subslot_filter.block.yml index 66039f68..d4864818 100644 --- a/grc/flow_control/gsm_burst_sdcch_subslot_filter.block.yml +++ b/grc/flow_control/gsm_burst_sdcch_subslot_filter.block.yml @@ -7,7 +7,7 @@ parameters: - id: mode label: Mode dtype: enum - options: [grgsm.SS_FILTER_SDCCH8, grgsm.SS_FILTER_SDCCH4] + options: [gsm.SS_FILTER_SDCCH8, gsm.SS_FILTER_SDCCH4] option_labels: [SDCCH/8, SDCCH/4] - id: subslot label: Subslot @@ -25,8 +25,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.burst_sdcch_subslot_filter(${mode}, ${subslot}) + imports: from gnuradio import gsm + make: gsm.burst_sdcch_subslot_filter(${mode}, ${subslot}) documentation: |- This block forwards only bursts in the subslot given by the parameter diff --git a/grc/flow_control/gsm_burst_sdcch_subslot_splitter.block.yml b/grc/flow_control/gsm_burst_sdcch_subslot_splitter.block.yml index a409dd24..1340a182 100644 --- a/grc/flow_control/gsm_burst_sdcch_subslot_splitter.block.yml +++ b/grc/flow_control/gsm_burst_sdcch_subslot_splitter.block.yml @@ -22,13 +22,13 @@ outputs: optional: true templates: - imports: import grgsm + imports: from gnuradio import gsm make: |- - grgsm.burst_sdcch_subslot_splitter( + gsm.burst_sdcch_subslot_splitter( % if int(ports)==4: - grgsm.SPLITTER_SDCCH4 + gsm.SPLITTER_SDCCH4 % else: - grgsm.SPLITTER_SDCCH8 + gsm.SPLITTER_SDCCH8 % endif ) diff --git a/grc/flow_control/gsm_burst_timeslot_filter.block.yml b/grc/flow_control/gsm_burst_timeslot_filter.block.yml index afc0c2b9..7e888ed1 100644 --- a/grc/flow_control/gsm_burst_timeslot_filter.block.yml +++ b/grc/flow_control/gsm_burst_timeslot_filter.block.yml @@ -20,8 +20,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.burst_timeslot_filter(${timeslot}) + imports: from gnuradio import gsm + make: gsm.burst_timeslot_filter(${timeslot}) documentation: |- This block forwards only bursts in the timeslot given by the parameter diff --git a/grc/flow_control/gsm_burst_timeslot_splitter.block.yml b/grc/flow_control/gsm_burst_timeslot_splitter.block.yml index 2d8faee0..c04e8a2d 100644 --- a/grc/flow_control/gsm_burst_timeslot_splitter.block.yml +++ b/grc/flow_control/gsm_burst_timeslot_splitter.block.yml @@ -14,8 +14,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.burst_timeslot_splitter() + imports: from gnuradio import gsm + make: gsm.burst_timeslot_splitter() documentation: "Burst timeslot splitter distributes bursts to eight different output\ \ ports depending on the timeslots of the bursts. \nThis means timeslot 0 bursts\ diff --git a/grc/flow_control/gsm_burst_type_filter.block.yml b/grc/flow_control/gsm_burst_type_filter.block.yml index 21222ae3..a9da51e3 100644 --- a/grc/flow_control/gsm_burst_type_filter.block.yml +++ b/grc/flow_control/gsm_burst_type_filter.block.yml @@ -20,8 +20,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.burst_type_filter(${selected_burst_types}) + imports: from gnuradio import gsm + make: gsm.burst_type_filter(${selected_burst_types}) documentation: |- This block filters bursts based on their type. diff --git a/grc/flow_control/gsm_dummy_burst_filter.block.yml b/grc/flow_control/gsm_dummy_burst_filter.block.yml index f0f690c1..a732916f 100644 --- a/grc/flow_control/gsm_dummy_burst_filter.block.yml +++ b/grc/flow_control/gsm_dummy_burst_filter.block.yml @@ -13,8 +13,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.dummy_burst_filter() + imports: from gnuradio import gsm + make: gsm.dummy_burst_filter() documentation: "This block filters dummy bursts. \n\nFor more information on dummy\ \ bursts, see GSM 05.02." diff --git a/grc/flow_control/gsm_uplink_downlink_splitter.block.yml b/grc/flow_control/gsm_uplink_downlink_splitter.block.yml index 12d141d5..8a3c283c 100644 --- a/grc/flow_control/gsm_uplink_downlink_splitter.block.yml +++ b/grc/flow_control/gsm_uplink_downlink_splitter.block.yml @@ -17,7 +17,7 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.uplink_downlink_splitter() + imports: from gnuradio import gsm + make: gsm.uplink_downlink_splitter() file_format: 1 diff --git a/grc/misc_utils/gsm_burst_file_sink.block.yml b/grc/misc_utils/gsm_burst_file_sink.block.yml index 00afadc5..98e69035 100644 --- a/grc/misc_utils/gsm_burst_file_sink.block.yml +++ b/grc/misc_utils/gsm_burst_file_sink.block.yml @@ -14,7 +14,7 @@ inputs: id: in templates: - imports: import grgsm - make: grgsm.burst_file_sink(${filename}) + imports: from gnuradio import gsm + make: gsm.burst_file_sink(${filename}) file_format: 1 diff --git a/grc/misc_utils/gsm_burst_file_source.block.yml b/grc/misc_utils/gsm_burst_file_source.block.yml index f75bf555..7d9a3243 100644 --- a/grc/misc_utils/gsm_burst_file_source.block.yml +++ b/grc/misc_utils/gsm_burst_file_source.block.yml @@ -14,7 +14,7 @@ outputs: id: out templates: - imports: import grgsm - make: grgsm.burst_file_source(${filename}) + imports: from gnuradio import gsm + make: gsm.burst_file_source(${filename}) file_format: 1 diff --git a/grc/misc_utils/gsm_burst_to_fn_time.block.yml b/grc/misc_utils/gsm_burst_to_fn_time.block.yml index f4c687cb..258fecc8 100644 --- a/grc/misc_utils/gsm_burst_to_fn_time.block.yml +++ b/grc/misc_utils/gsm_burst_to_fn_time.block.yml @@ -14,7 +14,7 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.burst_to_fn_time() + imports: from gnuradio import gsm + make: gsm.burst_to_fn_time() file_format: 1 diff --git a/grc/misc_utils/gsm_bursts_printer.block.yml b/grc/misc_utils/gsm_bursts_printer.block.yml index 0f997896..94f00a09 100644 --- a/grc/misc_utils/gsm_bursts_printer.block.yml +++ b/grc/misc_utils/gsm_bursts_printer.block.yml @@ -35,10 +35,10 @@ inputs: templates: imports: |- - import grgsm + from gnuradio import gsm import pmt make: |- - grgsm.bursts_printer(pmt.intern(${prepend_string}), ${prepend_fnr}, + gsm.bursts_printer(pmt.intern(${prepend_string}), ${prepend_fnr}, ${prepend_frame_count}, ${print_payload_only}, ${ignore_dummy_bursts}) documentation: |- diff --git a/grc/misc_utils/gsm_clock_offset_corrector_tagged.block.yml b/grc/misc_utils/gsm_clock_offset_corrector_tagged.block.yml index 6daa18c4..b3dd1c89 100644 --- a/grc/misc_utils/gsm_clock_offset_corrector_tagged.block.yml +++ b/grc/misc_utils/gsm_clock_offset_corrector_tagged.block.yml @@ -35,9 +35,9 @@ outputs: vlen: 1 templates: - imports: import grgsm + imports: from gnuradio import gsm make: |- - grgsm.clock_offset_corrector_tagged( + gsm.clock_offset_corrector_tagged( fc=${fc}, samp_rate_in=${samp_rate_in}, ppm=${ppm}, diff --git a/grc/misc_utils/gsm_collect_system_info.block.yml b/grc/misc_utils/gsm_collect_system_info.block.yml index f7d5d857..d9729ad6 100644 --- a/grc/misc_utils/gsm_collect_system_info.block.yml +++ b/grc/misc_utils/gsm_collect_system_info.block.yml @@ -8,8 +8,8 @@ inputs: id: msgs templates: - imports: import grgsm - make: grgsm.collect_system_info() + imports: from gnuradio import gsm + make: gsm.collect_system_info() documentation: |- This blocks collect System Information Messages, which can be retrieved using the following methods: diff --git a/grc/misc_utils/gsm_controlled_fractional_resampler_cc.block.yml b/grc/misc_utils/gsm_controlled_fractional_resampler_cc.block.yml index 4e945167..7b03e003 100644 --- a/grc/misc_utils/gsm_controlled_fractional_resampler_cc.block.yml +++ b/grc/misc_utils/gsm_controlled_fractional_resampler_cc.block.yml @@ -20,8 +20,8 @@ outputs: dtype: complex templates: - imports: import grgsm - make: grgsm.controlled_fractional_resampler_cc(${phase_shift}, ${resamp_ratio}) + imports: from gnuradio import gsm + make: gsm.controlled_fractional_resampler_cc(${phase_shift}, ${resamp_ratio}) callbacks: - set_resamp_ratio(${resamp_ratio}) diff --git a/grc/misc_utils/gsm_controlled_rotator_cc.block.yml b/grc/misc_utils/gsm_controlled_rotator_cc.block.yml index b26af92b..fcb7495b 100644 --- a/grc/misc_utils/gsm_controlled_rotator_cc.block.yml +++ b/grc/misc_utils/gsm_controlled_rotator_cc.block.yml @@ -18,8 +18,8 @@ outputs: dtype: complex templates: - imports: import grgsm - make: grgsm.controlled_rotator_cc(${phase_inc}) + imports: from gnuradio import gsm + make: gsm.controlled_rotator_cc(${phase_inc}) callbacks: - set_phase_inc(${phase_inc}) diff --git a/grc/misc_utils/gsm_extract_assignment_cmd.block.yml b/grc/misc_utils/gsm_extract_assignment_cmd.block.yml index 1ce258d3..59e7ed80 100644 --- a/grc/misc_utils/gsm_extract_assignment_cmd.block.yml +++ b/grc/misc_utils/gsm_extract_assignment_cmd.block.yml @@ -8,8 +8,8 @@ inputs: id: msgs templates: - imports: import grgsm - make: grgsm.extract_assignment_cmd() + imports: from gnuradio import gsm + make: gsm.extract_assignment_cmd() documentation: |- Extracts Assignemnt Commands. diff --git a/grc/misc_utils/gsm_extract_cmc.block.yml b/grc/misc_utils/gsm_extract_cmc.block.yml index 3c98ab39..60277ad4 100644 --- a/grc/misc_utils/gsm_extract_cmc.block.yml +++ b/grc/misc_utils/gsm_extract_cmc.block.yml @@ -8,8 +8,8 @@ inputs: id: msgs templates: - imports: import grgsm - make: grgsm.extract_cmc() + imports: from gnuradio import gsm + make: gsm.extract_cmc() documentation: |- Extracts the framenumber and the assigned encryption algorithm from Cipher Mode Commands. diff --git a/grc/misc_utils/gsm_extract_immediate_assignment.block.yml b/grc/misc_utils/gsm_extract_immediate_assignment.block.yml index 432a6a1b..cd8ebe39 100644 --- a/grc/misc_utils/gsm_extract_immediate_assignment.block.yml +++ b/grc/misc_utils/gsm_extract_immediate_assignment.block.yml @@ -25,8 +25,8 @@ inputs: id: msgs templates: - imports: import grgsm - make: grgsm.extract_immediate_assignment(${print_immediate_assignments}, ${ignore_gprs}, + imports: from gnuradio import gsm + make: gsm.extract_immediate_assignment(${print_immediate_assignments}, ${ignore_gprs}, ${unique_references}) documentation: |- diff --git a/grc/misc_utils/gsm_extract_system_info.block.yml b/grc/misc_utils/gsm_extract_system_info.block.yml index 48e23221..87ea125a 100644 --- a/grc/misc_utils/gsm_extract_system_info.block.yml +++ b/grc/misc_utils/gsm_extract_system_info.block.yml @@ -10,7 +10,7 @@ inputs: id: bursts templates: - imports: import grgsm - make: grgsm.extract_system_info() + imports: from gnuradio import gsm + make: gsm.extract_system_info() file_format: 1 diff --git a/grc/misc_utils/gsm_message_file_sink.block.yml b/grc/misc_utils/gsm_message_file_sink.block.yml index e83669a2..c75fa9b8 100644 --- a/grc/misc_utils/gsm_message_file_sink.block.yml +++ b/grc/misc_utils/gsm_message_file_sink.block.yml @@ -14,8 +14,8 @@ inputs: id: in templates: - imports: import grgsm - make: grgsm.message_file_sink(${filename}) + imports: from gnuradio import gsm + make: gsm.message_file_sink(${filename}) documentation: |- This block stores incoming gsm messages to a file. diff --git a/grc/misc_utils/gsm_message_file_source.block.yml b/grc/misc_utils/gsm_message_file_source.block.yml index 047ea288..44a2d3de 100644 --- a/grc/misc_utils/gsm_message_file_source.block.yml +++ b/grc/misc_utils/gsm_message_file_source.block.yml @@ -14,8 +14,8 @@ outputs: id: out templates: - imports: import grgsm - make: grgsm.message_file_source(${filename}) + imports: from gnuradio import gsm + make: gsm.message_file_source(${filename}) documentation: |- This block outputs gsm messages stored in a file. diff --git a/grc/misc_utils/gsm_message_printer.block.yml b/grc/misc_utils/gsm_message_printer.block.yml index beb91891..18a8d191 100644 --- a/grc/misc_utils/gsm_message_printer.block.yml +++ b/grc/misc_utils/gsm_message_printer.block.yml @@ -30,10 +30,10 @@ inputs: templates: imports: |- - import grgsm + from gnuradio import gsm import pmt make: |- - grgsm.message_printer(pmt.intern(${prepend_string}), ${prepend_fnr}, + gsm.message_printer(pmt.intern(${prepend_string}), ${prepend_fnr}, ${prepend_frame_count}, ${print_gsmtap_header}) file_format: 1 diff --git a/grc/misc_utils/gsm_msg_to_tag.block.yml b/grc/misc_utils/gsm_msg_to_tag.block.yml index 1fe894b5..25c96646 100644 --- a/grc/misc_utils/gsm_msg_to_tag.block.yml +++ b/grc/misc_utils/gsm_msg_to_tag.block.yml @@ -15,7 +15,7 @@ outputs: dtype: complex templates: - imports: import grgsm - make: grgsm.msg_to_tag() + imports: from gnuradio import gsm + make: gsm.msg_to_tag() file_format: 1 diff --git a/grc/misc_utils/gsm_tmsi_dumper.block.yml b/grc/misc_utils/gsm_tmsi_dumper.block.yml index 21670a28..f57d6b16 100644 --- a/grc/misc_utils/gsm_tmsi_dumper.block.yml +++ b/grc/misc_utils/gsm_tmsi_dumper.block.yml @@ -9,8 +9,8 @@ inputs: templates: imports: |- - import grgsm + from gnuradio import gsm import pmt - make: grgsm.tmsi_dumper() + make: gsm.tmsi_dumper() file_format: 1 diff --git a/grc/qa_utils/gsm_burst_sink.block.yml b/grc/qa_utils/gsm_burst_sink.block.yml index fdcfa292..f64cd383 100644 --- a/grc/qa_utils/gsm_burst_sink.block.yml +++ b/grc/qa_utils/gsm_burst_sink.block.yml @@ -8,7 +8,7 @@ inputs: id: in templates: - imports: import grgsm - make: grgsm.burst_sink() + imports: from gnuradio import gsm + make: gsm.burst_sink() file_format: 1 diff --git a/grc/qa_utils/gsm_burst_source.block.yml b/grc/qa_utils/gsm_burst_source.block.yml index 81e56f52..9b89d251 100644 --- a/grc/qa_utils/gsm_burst_source.block.yml +++ b/grc/qa_utils/gsm_burst_source.block.yml @@ -24,7 +24,7 @@ outputs: id: out templates: - imports: import grgsm - make: grgsm.burst_source(${framenumbers}, ${timeslots}, ${bursts}) + imports: from gnuradio import gsm + make: gsm.burst_source(${framenumbers}, ${timeslots}, ${bursts}) file_format: 1 diff --git a/grc/qa_utils/gsm_message_sink.block.yml b/grc/qa_utils/gsm_message_sink.block.yml index bde7f52c..741e5b64 100644 --- a/grc/qa_utils/gsm_message_sink.block.yml +++ b/grc/qa_utils/gsm_message_sink.block.yml @@ -8,8 +8,8 @@ inputs: id: in templates: - imports: import grgsm - make: grgsm.message_sink() + imports: from gnuradio import gsm + make: gsm.message_sink() documentation: |- This block is a message sink for testing purposes. diff --git a/grc/qa_utils/gsm_message_source.block.yml b/grc/qa_utils/gsm_message_source.block.yml index abb18008..ee6cdaaf 100644 --- a/grc/qa_utils/gsm_message_source.block.yml +++ b/grc/qa_utils/gsm_message_source.block.yml @@ -25,8 +25,8 @@ outputs: id: msgs templates: - imports: import grgsm - make: grgsm.message_source(${messages}) + imports: from gnuradio import gsm + make: gsm.message_source(${messages}) documentation: |- This block is a basic message source for testing purposes. diff --git a/grc/receiver/gsm_clock_offset_control.block.yml b/grc/receiver/gsm_clock_offset_control.block.yml index abb52bcd..5f9beda5 100644 --- a/grc/receiver/gsm_clock_offset_control.block.yml +++ b/grc/receiver/gsm_clock_offset_control.block.yml @@ -27,8 +27,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.clock_offset_control(${fc}, ${samp_rate}, ${osr}) + imports: from gnuradio import gsm + make: gsm.clock_offset_control(${fc}, ${samp_rate}, ${osr}) callbacks: - set_fc(${fc}) diff --git a/grc/receiver/gsm_cx_channel_hopper.block.yml b/grc/receiver/gsm_cx_channel_hopper.block.yml index edee1fb6..13f8f535 100644 --- a/grc/receiver/gsm_cx_channel_hopper.block.yml +++ b/grc/receiver/gsm_cx_channel_hopper.block.yml @@ -24,7 +24,7 @@ outputs: id: bursts templates: - imports: import grgsm - make: grgsm.cx_channel_hopper(${ma}, ${maio}, ${hsn}) + imports: from gnuradio import gsm + make: gsm.cx_channel_hopper(${ma}, ${maio}, ${hsn}) file_format: 1 diff --git a/grc/receiver/gsm_fcch_burst_tagger.block.yml b/grc/receiver/gsm_fcch_burst_tagger.block.yml index c5d1de85..8f99358c 100644 --- a/grc/receiver/gsm_fcch_burst_tagger.block.yml +++ b/grc/receiver/gsm_fcch_burst_tagger.block.yml @@ -20,7 +20,7 @@ outputs: dtype: complex templates: - imports: import grgsm - make: grgsm.fcch_burst_tagger(${OSR}) + imports: from gnuradio import gsm + make: gsm.fcch_burst_tagger(${OSR}) file_format: 1 diff --git a/grc/receiver/gsm_fcch_detector.block.yml b/grc/receiver/gsm_fcch_detector.block.yml index 70a8fa55..09e195e8 100644 --- a/grc/receiver/gsm_fcch_detector.block.yml +++ b/grc/receiver/gsm_fcch_detector.block.yml @@ -20,8 +20,8 @@ outputs: vlen: 1 templates: - imports: import grgsm - make: grgsm.fcch_detector(${OSR}) + imports: from gnuradio import gsm + make: gsm.fcch_detector(${OSR}) callbacks: - set_OSR(${OSR}) diff --git a/grc/receiver/gsm_input.block.yml b/grc/receiver/gsm_input.block.yml index 5489b004..a5a6804e 100644 --- a/grc/receiver/gsm_input.block.yml +++ b/grc/receiver/gsm_input.block.yml @@ -39,9 +39,9 @@ outputs: vlen: 1 templates: - imports: import grgsm + imports: from gnuradio import gsm make: |- - grgsm.gsm_input( + gsm.gsm_input( ppm=${ppm}, osr=${osr}, fc=${fc}, diff --git a/grc/receiver/gsm_receiver.block.yml b/grc/receiver/gsm_receiver.block.yml index 9897bec1..7e0b5190 100644 --- a/grc/receiver/gsm_receiver.block.yml +++ b/grc/receiver/gsm_receiver.block.yml @@ -43,7 +43,7 @@ asserts: - ${ num_streams >= 0 } templates: - imports: import grgsm - make: grgsm.receiver(${osr}, ${cell_allocation}, ${tseq_nums}, False) + imports: from gnuradio import gsm + make: gsm.receiver(${osr}, ${cell_allocation}, ${tseq_nums}, False) file_format: 1 diff --git a/grc/receiver/gsm_receiver_with_uplink.block.yml b/grc/receiver/gsm_receiver_with_uplink.block.yml index d0b63021..3a8c646a 100644 --- a/grc/receiver/gsm_receiver_with_uplink.block.yml +++ b/grc/receiver/gsm_receiver_with_uplink.block.yml @@ -48,7 +48,7 @@ asserts: - ${ num_streams >= 0 } templates: - imports: import grgsm - make: grgsm.receiver(${osr}, ${cell_allocation}, ${tseq_nums}, True) + imports: from gnuradio import gsm + make: gsm.receiver(${osr}, ${cell_allocation}, ${tseq_nums}, True) file_format: 1 diff --git a/grc/receiver/gsm_sch_detector.block.yml b/grc/receiver/gsm_sch_detector.block.yml index 33d45431..3cc514a0 100644 --- a/grc/receiver/gsm_sch_detector.block.yml +++ b/grc/receiver/gsm_sch_detector.block.yml @@ -18,8 +18,8 @@ outputs: dtype: complex templates: - imports: import grgsm - make: grgsm.sch_detector(${OSR}) + imports: from gnuradio import gsm + make: gsm.sch_detector(${OSR}) callbacks: - set_OSR(${OSR}) diff --git a/grc/transmitter/gsm_gen_test_ab.block.yml b/grc/transmitter/gsm_gen_test_ab.block.yml index ec57b8e4..fc76543a 100644 --- a/grc/transmitter/gsm_gen_test_ab.block.yml +++ b/grc/transmitter/gsm_gen_test_ab.block.yml @@ -14,7 +14,7 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.gen_test_ab() + imports: from gnuradio import gsm + make: gsm.gen_test_ab() file_format: 1 diff --git a/grc/transmitter/gsm_gmsk_mod.block.yml b/grc/transmitter/gsm_gmsk_mod.block.yml index e45e303b..ba60acba 100644 --- a/grc/transmitter/gsm_gmsk_mod.block.yml +++ b/grc/transmitter/gsm_gmsk_mod.block.yml @@ -30,7 +30,7 @@ outputs: optional: true templates: - imports: from grgsm import gsm_gmsk_mod + imports: from gnuradio.gsm import gsm_gmsk_mod make: |- gsm_gmsk_mod( BT=${BT}, diff --git a/grc/transmitter/gsm_preprocess_tx_burst.block.yml b/grc/transmitter/gsm_preprocess_tx_burst.block.yml index 09cc030d..d57db321 100644 --- a/grc/transmitter/gsm_preprocess_tx_burst.block.yml +++ b/grc/transmitter/gsm_preprocess_tx_burst.block.yml @@ -14,7 +14,7 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.preprocess_tx_burst() + imports: from gnuradio import gsm + make: gsm.preprocess_tx_burst() file_format: 1 diff --git a/grc/transmitter/gsm_txtime_bursts_tagger.block.yml b/grc/transmitter/gsm_txtime_bursts_tagger.block.yml index 323d0846..9ce16b8b 100644 --- a/grc/transmitter/gsm_txtime_bursts_tagger.block.yml +++ b/grc/transmitter/gsm_txtime_bursts_tagger.block.yml @@ -44,8 +44,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.txtime_bursts_tagger(${init_fn}, ${init_time}, ${time_hint}, ${timing_advance}, + imports: from gnuradio import gsm + make: gsm.txtime_bursts_tagger(${init_fn}, ${init_time}, ${time_hint}, ${timing_advance}, ${delay_correction}) callbacks: - set_fn_time_reference(${init_fn}, ${init_time}) diff --git a/grc/transmitter/gsm_txtime_setter.block.yml b/grc/transmitter/gsm_txtime_setter.block.yml index 76a3f37e..6564a20d 100644 --- a/grc/transmitter/gsm_txtime_setter.block.yml +++ b/grc/transmitter/gsm_txtime_setter.block.yml @@ -54,8 +54,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.txtime_setter(${init_fn} if (${init_fn} is not None) else 0xffffffff, + imports: from gnuradio import gsm + make: gsm.txtime_setter(${init_fn} if (${init_fn} is not None) else 0xffffffff, ${init_time_secs}, ${init_time_fracs}, ${time_hint_secs}, ${time_hint_fracs}, ${timing_advance}, ${delay_correction}) callbacks: diff --git a/grc/trx/gsm_trx_burst_if.block.yml b/grc/trx/gsm_trx_burst_if.block.yml index 3f08e0c7..538b8802 100644 --- a/grc/trx/gsm_trx_burst_if.block.yml +++ b/grc/trx/gsm_trx_burst_if.block.yml @@ -28,8 +28,8 @@ outputs: optional: true templates: - imports: import grgsm - make: grgsm.trx_burst_if(${bind_addr}, ${remote_addr}, ${base_port}) + imports: from gnuradio import gsm + make: gsm.trx_burst_if(${bind_addr}, ${remote_addr}, ${base_port}) documentation: |- OsmoTRX like UDP burst interface for external applications. diff --git a/hier_blocks/compile_demappers b/hier_blocks/compile_demappers index d492620a..70167719 100755 --- a/hier_blocks/compile_demappers +++ b/hier_blocks/compile_demappers @@ -17,8 +17,8 @@ mv ~/.grc_gnuradio/gsm_* . for file in *.py.block.yml do echo $file - cat $file | sed "s/ imports: .*\(#.*\)/ imports: \\'import grgsm\\' \1/" \ - | sed 's/make: "/make: "grgsm./' \ + cat $file | sed "s/ imports: .*\(#.*\)/ imports: \\'from gnuradio import gsm\\' \1/" \ + | sed 's/make: "/make: "gsm./' \ | sed "s/.*.py//" \ | sed 's/grc_source:.*hier_blocks/grc_source: gr-gsm\/hier_blocks/' \ > ${file}2 @@ -31,7 +31,7 @@ done for py in *.py do - cat $py |sed 's/gr.hier_block2/grgsm.hier_block/' > ${py}2 + cat $py |sed 's/gr.hier_block2/gsm.hier_block/' > ${py}2 mv ${py}2 $py done diff --git a/hier_blocks/receiver/gsm_input.grc b/hier_blocks/receiver/gsm_input.grc index 3aa032b7..6c7cb89e 100644 --- a/hier_blocks/receiver/gsm_input.grc +++ b/hier_blocks/receiver/gsm_input.grc @@ -1,656 +1,260 @@ - - - - Thu Nov 6 14:41:06 2014 - - options - - author - Piotr Krysik - - - window_size - 1280, 1024 - - - category - - - - comment - - - - description - Adaptor of input stream for the GSM receiver. Contains frequency ofset corrector doing also resampling to integer multiplies of GSM sample rate and LP filter filtering GSM channel. - - - _enabled - True - - - _coordinate - (10, 10) - - - _rotation - 0 - - - generate_options - hb - - - hier_block_src_path - .: - - - id - gsm_input - - - max_nouts - 0 - - - qt_qss_theme - - - - realtime_scheduling - - - - run_command - {python} -u {filename} - - - run_options - prompt - - - run - True - - - thread_safe_setters - - - - title - GSM input adaptor - - - - variable - - comment - - - - _enabled - True - - - _coordinate - (752, 21) - - - _rotation - 0 - - - id - gsm_symb_rate - - - value - 1625000.0/6.0 - - - - variable - - comment - - - - _enabled - True - - - _coordinate - (632, 19) - - - _rotation - 0 - - - id - samp_rate_out - - - value - gsm_symb_rate*osr - - - - pad_source - - comment - - - - _enabled - True - - - _coordinate - (56, 188) - - - _rotation - 0 - - - id - ctrl_in - - - label - ctrl_in - - - num_streams - 1 - - - optional - True - - - type - message - - - vlen - 1 - - - - parameter - - alias - - - - comment - - - - _enabled - True - - - _coordinate - (231, 22) - - - _rotation - 0 - - - id - fc - - - label - fc - - - short_id - - - - type - eng_float - - - value - 940e6 - - - - fractional_resampler_xx - - alias - - - - comment - - - - affinity - - - - _enabled - 0 - - - _coordinate - (488, 281) - - - _rotation - 0 - - - id - fractional_resampler_xx_0 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - phase_shift - 0 - - - resamp_ratio - samp_rate_in/samp_rate_out - - - type - complex - - - - gsm_clock_offset_corrector_tagged - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (232, 199) - - - _rotation - 0 - - - id - gsm_clock_offset_corrector_tagged_0 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - osr - osr - - - fc - fc - - - ppm - ppm - - - samp_rate_in - samp_rate_in - - - - low_pass_filter - - beta - 6.76 - - - alias - - - - comment - - - - affinity - - - - cutoff_freq - 125e3 - - - decim - 1 - - - _enabled - True - - - type - fir_filter_ccf - - - _coordinate - (712, 178) - - - _rotation - 0 - - - gain - 1 - - - id - low_pass_filter_0_0 - - - interp - 1 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - samp_rate - samp_rate_out - - - width - 5e3 - - - win - firdes.WIN_HAMMING - - - - parameter - - alias - - - - comment - - - - _enabled - True - - - _coordinate - (541, 23) - - - _rotation - 0 - - - id - osr - - - label - OSR - - - short_id - - - - type - intx - - - value - 4 - - - - pad_sink - - comment - - - - _enabled - True - - - _coordinate - (904, 220) - - - _rotation - 0 - - - id - pad_sink_0 - - - type - complex - - - label - out - - - num_streams - 1 - - - optional - False - - - vlen - 1 - - - - pad_source - - comment - - - - _enabled - True - - - _coordinate - (56, 236) - - - _rotation - 0 - - - id - pad_source_0 - - - label - in - - - num_streams - 1 - - - optional - False - - - type - complex - - - vlen - 1 - - - - parameter - - alias - - - - comment - - - - _enabled - True - - - _coordinate - (453, 22) - - - _rotation - 0 - - - id - ppm - - - label - ppm - - - short_id - - - - type - eng_float - - - value - 0 - - - - parameter - - alias - - - - comment - - - - _enabled - True - - - _coordinate - (328, 22) - - - _rotation - 0 - - - id - samp_rate_in - - - label - samp_rate_in - - - short_id - - - - type - eng_float - - - value - 1e6 - - - - ctrl_in - gsm_clock_offset_corrector_tagged_0 - out - ctrl - - - fractional_resampler_xx_0 - low_pass_filter_0_0 - 0 - 0 - - - gsm_clock_offset_corrector_tagged_0 - fractional_resampler_xx_0 - 0 - 0 - - - gsm_clock_offset_corrector_tagged_0 - low_pass_filter_0_0 - 0 - 0 - - - low_pass_filter_0_0 - pad_sink_0 - 0 - 0 - - - pad_source_0 - gsm_clock_offset_corrector_tagged_0 - 0 - 0 - - +options: + parameters: + author: Piotr Krysik + catch_exceptions: 'True' + category: '' + cmake_opt: '' + comment: '' + copyright: '' + description: Adaptor of input stream for the GSM receiver. Contains frequency + ofset corrector doing also resampling to integer multiplies of GSM sample rate + and LP filter filtering GSM channel. + gen_cmake: 'On' + gen_linking: dynamic + generate_options: hb + hier_block_src_path: '.:' + id: gsm_input + max_nouts: '0' + output_language: python + placement: (0,0) + qt_qss_theme: '' + realtime_scheduling: '' + run: 'True' + run_command: '{python} -u {filename}' + run_options: prompt + sizing_mode: fixed + thread_safe_setters: '' + title: GSM input adaptor + window_size: 1280, 1024 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [10, 10] + rotation: 0 + state: enabled + +blocks: +- name: gsm_symb_rate + id: variable + parameters: + comment: '' + value: 1625000.0/6.0 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [752, 21] + rotation: 0 + state: enabled +- name: samp_rate_out + id: variable + parameters: + comment: '' + value: gsm_symb_rate*osr + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [632, 19] + rotation: 0 + state: enabled +- name: ctrl_in + id: pad_source + parameters: + affinity: '' + alias: '' + comment: '' + label: ctrl_in + maxoutbuf: '0' + minoutbuf: '0' + num_streams: '1' + optional: 'True' + type: message + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [56, 188] + rotation: 0 + state: enabled +- name: fc + id: parameter + parameters: + alias: '' + comment: '' + hide: none + label: fc + short_id: '' + type: eng_float + value: 940e6 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [231, 22] + rotation: 0 + state: enabled +- name: gsm_clock_offset_corrector_tagged_0 + id: gsm_clock_offset_corrector_tagged + parameters: + affinity: '' + alias: '' + comment: '' + fc: fc + maxoutbuf: '0' + minoutbuf: '0' + osr: osr + ppm: ppm + samp_rate_in: samp_rate_in + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [232, 199] + rotation: 0 + state: enabled +- name: low_pass_filter_0_0 + id: low_pass_filter + parameters: + affinity: '' + alias: '' + beta: '6.76' + comment: '' + cutoff_freq: 125e3 + decim: '1' + gain: '1' + interp: '1' + maxoutbuf: '0' + minoutbuf: '0' + samp_rate: samp_rate_out + type: fir_filter_ccf + width: 5e3 + win: window.WIN_HAMMING + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [712, 178] + rotation: 0 + state: enabled +- name: mmse_resampler_xx_0 + id: mmse_resampler_xx + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + phase_shift: '0' + resamp_ratio: samp_rate_in/samp_rate_out + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [496, 304.0] + rotation: 0 + state: disabled +- name: osr + id: parameter + parameters: + alias: '' + comment: '' + hide: none + label: OSR + short_id: '' + type: intx + value: '4' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [541, 23] + rotation: 0 + state: enabled +- name: pad_sink_0 + id: pad_sink + parameters: + affinity: '' + alias: '' + comment: '' + label: out + num_streams: '1' + optional: 'False' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [904, 220] + rotation: 0 + state: enabled +- name: pad_source_0 + id: pad_source + parameters: + affinity: '' + alias: '' + comment: '' + label: in + maxoutbuf: '0' + minoutbuf: '0' + num_streams: '1' + optional: 'False' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [56, 236] + rotation: 0 + state: enabled +- name: ppm + id: parameter + parameters: + alias: '' + comment: '' + hide: none + label: ppm + short_id: '' + type: eng_float + value: '0' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [453, 22] + rotation: 0 + state: enabled +- name: samp_rate_in + id: parameter + parameters: + alias: '' + comment: '' + hide: none + label: samp_rate_in + short_id: '' + type: eng_float + value: 1e6 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [328, 22] + rotation: 0 + state: enabled + +connections: +- [ctrl_in, out, gsm_clock_offset_corrector_tagged_0, ctrl] +- [gsm_clock_offset_corrector_tagged_0, '0', low_pass_filter_0_0, '0'] +- [gsm_clock_offset_corrector_tagged_0, '0', mmse_resampler_xx_0, '0'] +- [low_pass_filter_0_0, '0', pad_sink_0, '0'] +- [mmse_resampler_xx_0, '0', low_pass_filter_0_0, '0'] +- [pad_source_0, '0', gsm_clock_offset_corrector_tagged_0, '0'] + +metadata: + file_format: 1 + grc_version: v3.11.0.0git-55-g8526e6f8 diff --git a/include/grgsm/api.h b/include/grgsm/api.h deleted file mode 100644 index cfe13b1c..00000000 --- a/include/grgsm/api.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- c++ -*- */ -/* - * @file - * @author (C) 2014 by Piotr Krysik - * @section LICENSE - * - * Gr-gsm is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * Gr-gsm is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with gr-gsm; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_GRGSM_API_H -#define INCLUDED_GRGSM_API_H - -#include - -#ifdef grgsm_EXPORTS -# define GRGSM_API __GR_ATTR_EXPORT -#else -# define GRGSM_API __GR_ATTR_IMPORT -#endif - -#endif /* INCLUDED_GRGSM_API_H */ diff --git a/include/grgsm/CMakeLists.txt b/include/gsm/CMakeLists.txt similarity index 96% rename from include/grgsm/CMakeLists.txt rename to include/gsm/CMakeLists.txt index 2f64ff4b..2f4c9764 100644 --- a/include/grgsm/CMakeLists.txt +++ b/include/gsm/CMakeLists.txt @@ -22,12 +22,12 @@ ######################################################################## install( FILES - plotting.hpp + plotting.h api.h gsmtap.h constants.h gsm_constants.h - DESTINATION include/grgsm + DESTINATION include/gsm ) add_subdirectory(decoding) diff --git a/include/gsm/api.h b/include/gsm/api.h new file mode 100644 index 00000000..db00c068 --- /dev/null +++ b/include/gsm/api.h @@ -0,0 +1,22 @@ +/* + * Copyright 2011 Free Software Foundation, Inc. + * + * This file was generated by gr_modtool, a tool from the GNU Radio framework + * This file is a part of gr-gsm + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#ifndef INCLUDED_GSM_API_H +#define INCLUDED_GSM_API_H + +#include + +#ifdef gnuradio_gsm_EXPORTS +#define GSM_API __GR_ATTR_EXPORT +#else +#define GSM_API __GR_ATTR_IMPORT +#endif + +#endif /* INCLUDED_GSM_API_H */ diff --git a/include/grgsm/constants.h b/include/gsm/constants.h similarity index 77% rename from include/grgsm/constants.h rename to include/gsm/constants.h index 9b663808..6539cf4d 100644 --- a/include/grgsm/constants.h +++ b/include/gsm/constants.h @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GRGSM_CONSTANTS_H -#define INCLUDED_GRGSM_CONSTANTS_H +#ifndef INCLUDED_GSM_CONSTANTS_H +#define INCLUDED_GSM_CONSTANTS_H -#include +#include #include namespace gr { @@ -31,33 +31,33 @@ namespace gr { /*! * \brief return date/time of build, as set when 'cmake' is run */ - GRGSM_API const std::string build_date(); + GSM_API const std::string build_date(); /*! * \brief return version string defined by cmake (GrVersion.cmake) */ - GRGSM_API const std::string version(); + GSM_API const std::string version(); /*! * \brief return just the major version defined by cmake */ - GRGSM_API const std::string major_version(); + GSM_API const std::string major_version(); /*! * \brief return just the api version defined by cmake */ - GRGSM_API const std::string api_version(); + GSM_API const std::string api_version(); /*! * \brief return just the minor version defined by cmake */ - GRGSM_API const std::string minor_version(); + GSM_API const std::string minor_version(); /*! * \brief return just the maint version defined by cmake */ - GRGSM_API const std::string maint_version(); + GSM_API const std::string maint_version(); } /* namespace gsm */ } /* namespace gr */ -#endif /* INCLUDED_GRGSM_CONSTANTS_H */ +#endif /* INCLUDED_GSM_CONSTANTS_H */ diff --git a/include/grgsm/decoding/CMakeLists.txt b/include/gsm/decoding/CMakeLists.txt similarity index 96% rename from include/grgsm/decoding/CMakeLists.txt rename to include/gsm/decoding/CMakeLists.txt index 6210dad0..de4e8606 100644 --- a/include/grgsm/decoding/CMakeLists.txt +++ b/include/gsm/decoding/CMakeLists.txt @@ -25,5 +25,5 @@ install( control_channels_decoder.h tch_f_decoder.h tch_h_decoder.h - DESTINATION include/grgsm/decoding + DESTINATION include/gsm/decoding ) diff --git a/include/grgsm/decoding/control_channels_decoder.h b/include/gsm/decoding/control_channels_decoder.h similarity index 90% rename from include/grgsm/decoding/control_channels_decoder.h rename to include/gsm/decoding/control_channels_decoder.h index 0bb35632..7b012543 100644 --- a/include/grgsm/decoding/control_channels_decoder.h +++ b/include/gsm/decoding/control_channels_decoder.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_H #define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API control_channels_decoder : virtual public gr::block + class GSM_API control_channels_decoder : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::control_channels_decoder. diff --git a/include/grgsm/decoding/tch_f_decoder.h b/include/gsm/decoding/tch_f_decoder.h similarity index 92% rename from include/grgsm/decoding/tch_f_decoder.h rename to include/gsm/decoding/tch_f_decoder.h index ae65f064..da77898b 100644 --- a/include/grgsm/decoding/tch_f_decoder.h +++ b/include/gsm/decoding/tch_f_decoder.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_TCH_F_DECODER_H #define INCLUDED_GSM_TCH_F_DECODER_H -#include +#include #include namespace gr { @@ -50,10 +50,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API tch_f_decoder : virtual public gr::block + class GSM_API tch_f_decoder : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::tch_f_decoder. diff --git a/include/grgsm/decoding/tch_h_decoder.h b/include/gsm/decoding/tch_h_decoder.h similarity index 92% rename from include/grgsm/decoding/tch_h_decoder.h rename to include/gsm/decoding/tch_h_decoder.h index 5ea97140..3d0b053c 100644 --- a/include/grgsm/decoding/tch_h_decoder.h +++ b/include/gsm/decoding/tch_h_decoder.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_TCH_H_DECODER_H #define INCLUDED_GSM_TCH_H_DECODER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API tch_h_decoder : virtual public gr::block + class GSM_API tch_h_decoder : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::tch_h_decoder. diff --git a/include/grgsm/decryption/CMakeLists.txt b/include/gsm/decryption/CMakeLists.txt similarity index 96% rename from include/grgsm/decryption/CMakeLists.txt rename to include/gsm/decryption/CMakeLists.txt index f267201b..db506941 100644 --- a/include/grgsm/decryption/CMakeLists.txt +++ b/include/gsm/decryption/CMakeLists.txt @@ -23,5 +23,5 @@ install( FILES decryption.h - DESTINATION include/grgsm/decoding + DESTINATION include/gsm/decoding ) diff --git a/include/grgsm/decryption/decryption.h b/include/gsm/decryption/decryption.h similarity index 92% rename from include/grgsm/decryption/decryption.h rename to include/gsm/decryption/decryption.h index e30e567d..8d9c3d62 100644 --- a/include/grgsm/decryption/decryption.h +++ b/include/gsm/decryption/decryption.h @@ -25,7 +25,7 @@ #ifndef INCLUDED_GSM_DECRYPTION_H #define INCLUDED_GSM_DECRYPTION_H -#include +#include #include #include @@ -37,10 +37,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API decryption : virtual public gr::block + class GSM_API decryption : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::decryption. diff --git a/include/grgsm/demapping/CMakeLists.txt b/include/gsm/demapping/CMakeLists.txt similarity index 96% rename from include/grgsm/demapping/CMakeLists.txt rename to include/gsm/demapping/CMakeLists.txt index 25462fb0..365308a3 100644 --- a/include/grgsm/demapping/CMakeLists.txt +++ b/include/gsm/demapping/CMakeLists.txt @@ -25,5 +25,5 @@ install( universal_ctrl_chans_demapper.h tch_f_chans_demapper.h tch_h_chans_demapper.h - DESTINATION include/grgsm/demapping + DESTINATION include/gsm/demapping ) diff --git a/include/grgsm/demapping/tch_f_chans_demapper.h b/include/gsm/demapping/tch_f_chans_demapper.h similarity index 91% rename from include/grgsm/demapping/tch_f_chans_demapper.h rename to include/gsm/demapping/tch_f_chans_demapper.h index c04c7495..ebafb3af 100644 --- a/include/grgsm/demapping/tch_f_chans_demapper.h +++ b/include/gsm/demapping/tch_f_chans_demapper.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_TCH_F_CHANS_DEMAPPER_H #define INCLUDED_GSM_TCH_F_CHANS_DEMAPPER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API tch_f_chans_demapper : virtual public gr::block + class GSM_API tch_f_chans_demapper : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::tch_f_chans_demapper. diff --git a/include/grgsm/demapping/tch_h_chans_demapper.h b/include/gsm/demapping/tch_h_chans_demapper.h similarity index 91% rename from include/grgsm/demapping/tch_h_chans_demapper.h rename to include/gsm/demapping/tch_h_chans_demapper.h index 15a7f2cf..fc1f3ba0 100644 --- a/include/grgsm/demapping/tch_h_chans_demapper.h +++ b/include/gsm/demapping/tch_h_chans_demapper.h @@ -25,7 +25,7 @@ #ifndef INCLUDED_GSM_TCH_H_CHANS_DEMAPPER_H #define INCLUDED_GSM_TCH_H_CHANS_DEMAPPER_H -#include +#include #include namespace gr { @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API tch_h_chans_demapper : virtual public gr::block + class GSM_API tch_h_chans_demapper : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::tch_h_chans_demapper. diff --git a/include/grgsm/demapping/universal_ctrl_chans_demapper.h b/include/gsm/demapping/universal_ctrl_chans_demapper.h similarity index 92% rename from include/grgsm/demapping/universal_ctrl_chans_demapper.h rename to include/gsm/demapping/universal_ctrl_chans_demapper.h index 0e614d4b..ad136dbb 100644 --- a/include/grgsm/demapping/universal_ctrl_chans_demapper.h +++ b/include/gsm/demapping/universal_ctrl_chans_demapper.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_H #define INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_H -#include +#include #include #include @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API universal_ctrl_chans_demapper : virtual public gr::block + class GSM_API universal_ctrl_chans_demapper : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::universal_ctrl_chans_demapper. diff --git a/include/grgsm/endian.h b/include/gsm/endian.h similarity index 100% rename from include/grgsm/endian.h rename to include/gsm/endian.h diff --git a/include/grgsm/flow_control/CMakeLists.txt b/include/gsm/flow_control/CMakeLists.txt similarity index 96% rename from include/grgsm/flow_control/CMakeLists.txt rename to include/gsm/flow_control/CMakeLists.txt index 6feee61c..dc7f7a31 100644 --- a/include/grgsm/flow_control/CMakeLists.txt +++ b/include/gsm/flow_control/CMakeLists.txt @@ -31,5 +31,5 @@ install( burst_type_filter.h dummy_burst_filter.h uplink_downlink_splitter.h - DESTINATION include/grgsm/flow_control + DESTINATION include/gsm/flow_control ) diff --git a/include/grgsm/flow_control/burst_fnr_filter.h b/include/gsm/flow_control/burst_fnr_filter.h similarity index 91% rename from include/grgsm/flow_control/burst_fnr_filter.h rename to include/gsm/flow_control/burst_fnr_filter.h index c1c62877..5c36de75 100644 --- a/include/grgsm/flow_control/burst_fnr_filter.h +++ b/include/gsm/flow_control/burst_fnr_filter.h @@ -24,9 +24,9 @@ #ifndef INCLUDED_GSM_BURST_FNR_FILTER_H #define INCLUDED_GSM_BURST_FNR_FILTER_H -#include +#include #include -#include +#include namespace gr { namespace gsm { @@ -42,10 +42,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_fnr_filter : virtual public gr::block + class GSM_API burst_fnr_filter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::burst_fnr_filter. diff --git a/include/grgsm/flow_control/burst_sdcch_subslot_filter.h b/include/gsm/flow_control/burst_sdcch_subslot_filter.h similarity index 91% rename from include/grgsm/flow_control/burst_sdcch_subslot_filter.h rename to include/gsm/flow_control/burst_sdcch_subslot_filter.h index a0a23bc4..c259bd18 100644 --- a/include/grgsm/flow_control/burst_sdcch_subslot_filter.h +++ b/include/gsm/flow_control/burst_sdcch_subslot_filter.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_BURST_SDCCH_SUBSLOT_FILTER_H #define INCLUDED_GSM_BURST_SDCCH_SUBSLOT_FILTER_H -#include +#include #include -#include +#include namespace gr { namespace gsm { @@ -41,10 +41,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_sdcch_subslot_filter : virtual public gr::block + class GSM_API burst_sdcch_subslot_filter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_sdcch_subslot_filter. diff --git a/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h b/include/gsm/flow_control/burst_sdcch_subslot_splitter.h similarity index 91% rename from include/grgsm/flow_control/burst_sdcch_subslot_splitter.h rename to include/gsm/flow_control/burst_sdcch_subslot_splitter.h index d8941280..e626f34f 100644 --- a/include/grgsm/flow_control/burst_sdcch_subslot_splitter.h +++ b/include/gsm/flow_control/burst_sdcch_subslot_splitter.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_H #define INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_H -#include +#include #include namespace gr { @@ -40,10 +40,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_sdcch_subslot_splitter : virtual public gr::block + class GSM_API burst_sdcch_subslot_splitter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_sdcch_subslot_splitter. diff --git a/include/grgsm/flow_control/burst_timeslot_filter.h b/include/gsm/flow_control/burst_timeslot_filter.h similarity index 90% rename from include/grgsm/flow_control/burst_timeslot_filter.h rename to include/gsm/flow_control/burst_timeslot_filter.h index 45df8f45..1938feef 100644 --- a/include/grgsm/flow_control/burst_timeslot_filter.h +++ b/include/gsm/flow_control/burst_timeslot_filter.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_BURST_TIMESLOT_FILTER_H #define INCLUDED_GSM_BURST_TIMESLOT_FILTER_H -#include +#include #include -#include +#include namespace gr { namespace gsm { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_timeslot_filter : virtual public gr::block + class GSM_API burst_timeslot_filter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_timeslot_filter. diff --git a/include/grgsm/flow_control/burst_timeslot_splitter.h b/include/gsm/flow_control/burst_timeslot_splitter.h similarity index 90% rename from include/grgsm/flow_control/burst_timeslot_splitter.h rename to include/gsm/flow_control/burst_timeslot_splitter.h index f4abcae0..19832cdf 100644 --- a/include/grgsm/flow_control/burst_timeslot_splitter.h +++ b/include/gsm/flow_control/burst_timeslot_splitter.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_H #define INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_timeslot_splitter : virtual public gr::block + class GSM_API burst_timeslot_splitter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_timeslot_splitter. diff --git a/include/grgsm/flow_control/burst_type_filter.h b/include/gsm/flow_control/burst_type_filter.h similarity index 90% rename from include/grgsm/flow_control/burst_type_filter.h rename to include/gsm/flow_control/burst_type_filter.h index 6430039b..ff712d84 100644 --- a/include/grgsm/flow_control/burst_type_filter.h +++ b/include/gsm/flow_control/burst_type_filter.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_BURST_TYPE_FILTER_H #define INCLUDED_GSM_BURST_TYPE_FILTER_H -#include +#include #include -#include +#include namespace gr { namespace gsm { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_type_filter : virtual public gr::block + class GSM_API burst_type_filter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_type_filter. diff --git a/include/grgsm/flow_control/common.h b/include/gsm/flow_control/common.h similarity index 100% rename from include/grgsm/flow_control/common.h rename to include/gsm/flow_control/common.h diff --git a/include/grgsm/flow_control/dummy_burst_filter.h b/include/gsm/flow_control/dummy_burst_filter.h similarity index 90% rename from include/grgsm/flow_control/dummy_burst_filter.h rename to include/gsm/flow_control/dummy_burst_filter.h index 993b418f..49e9a79a 100644 --- a/include/grgsm/flow_control/dummy_burst_filter.h +++ b/include/gsm/flow_control/dummy_burst_filter.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_DUMMY_BURST_FILTER_H #define INCLUDED_GSM_DUMMY_BURST_FILTER_H -#include +#include #include -#include +#include namespace gr { namespace gsm { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API dummy_burst_filter : virtual public gr::block + class GSM_API dummy_burst_filter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::dummy_burst_filter. diff --git a/include/grgsm/flow_control/uplink_downlink_splitter.h b/include/gsm/flow_control/uplink_downlink_splitter.h similarity index 82% rename from include/grgsm/flow_control/uplink_downlink_splitter.h rename to include/gsm/flow_control/uplink_downlink_splitter.h index 874c0b68..b87a95aa 100644 --- a/include/grgsm/flow_control/uplink_downlink_splitter.h +++ b/include/gsm/flow_control/uplink_downlink_splitter.h @@ -21,10 +21,10 @@ */ -#ifndef INCLUDED_GRGSM_UPLINK_DOWNLINK_SPLITTER_H -#define INCLUDED_GRGSM_UPLINK_DOWNLINK_SPLITTER_H +#ifndef INCLUDED_GSM_UPLINK_DOWNLINK_SPLITTER_H +#define INCLUDED_GSM_UPLINK_DOWNLINK_SPLITTER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup grgsm * */ - class GRGSM_API uplink_downlink_splitter : virtual public gr::block + class GSM_API uplink_downlink_splitter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::uplink_downlink_splitter. @@ -54,5 +54,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_UPLINK_DOWNLINK_SPLITTER_H */ +#endif /* INCLUDED_GSM_UPLINK_DOWNLINK_SPLITTER_H */ diff --git a/include/grgsm/gsm_constants.h b/include/gsm/gsm_constants.h similarity index 100% rename from include/grgsm/gsm_constants.h rename to include/gsm/gsm_constants.h diff --git a/include/grgsm/gsmtap.h b/include/gsm/gsmtap.h similarity index 100% rename from include/grgsm/gsmtap.h rename to include/gsm/gsmtap.h diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/gsm/misc_utils/CMakeLists.txt similarity index 97% rename from include/grgsm/misc_utils/CMakeLists.txt rename to include/gsm/misc_utils/CMakeLists.txt index b151527a..5f16623e 100644 --- a/include/grgsm/misc_utils/CMakeLists.txt +++ b/include/gsm/misc_utils/CMakeLists.txt @@ -40,5 +40,5 @@ install( controlled_fractional_resampler_cc.h time_spec.h fn_time.h - DESTINATION include/grgsm/misc_utils + DESTINATION include/gsm/misc_utils ) diff --git a/include/grgsm/misc_utils/burst_file_sink.h b/include/gsm/misc_utils/burst_file_sink.h similarity index 91% rename from include/grgsm/misc_utils/burst_file_sink.h rename to include/gsm/misc_utils/burst_file_sink.h index 3f80ca39..c726c7ec 100644 --- a/include/grgsm/misc_utils/burst_file_sink.h +++ b/include/gsm/misc_utils/burst_file_sink.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_FILE_SINK_H #define INCLUDED_GSM_BURST_FILE_SINK_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_file_sink : virtual public gr::block + class GSM_API burst_file_sink : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_file_sink. diff --git a/include/grgsm/misc_utils/burst_file_source.h b/include/gsm/misc_utils/burst_file_source.h similarity index 91% rename from include/grgsm/misc_utils/burst_file_source.h rename to include/gsm/misc_utils/burst_file_source.h index 0095d5d8..6e9bb95f 100644 --- a/include/grgsm/misc_utils/burst_file_source.h +++ b/include/gsm/misc_utils/burst_file_source.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_FILE_SOURCE_H #define INCLUDED_GSM_BURST_FILE_SOURCE_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_file_source : virtual public gr::block + class GSM_API burst_file_source : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_file_source. diff --git a/include/grgsm/misc_utils/burst_to_fn_time.h b/include/gsm/misc_utils/burst_to_fn_time.h similarity index 83% rename from include/grgsm/misc_utils/burst_to_fn_time.h rename to include/gsm/misc_utils/burst_to_fn_time.h index 870bd83e..862a6f10 100644 --- a/include/grgsm/misc_utils/burst_to_fn_time.h +++ b/include/gsm/misc_utils/burst_to_fn_time.h @@ -21,10 +21,10 @@ * */ -#ifndef INCLUDED_GRGSM_BURST_TO_FN_TIME_H -#define INCLUDED_GRGSM_BURST_TO_FN_TIME_H +#ifndef INCLUDED_GSM_BURST_TO_FN_TIME_H +#define INCLUDED_GSM_BURST_TO_FN_TIME_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_to_fn_time : virtual public gr::block + class GSM_API burst_to_fn_time : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_to_fn_time. @@ -54,4 +54,4 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_BURST_TO_FN_TIME_H */ +#endif /* INCLUDED_GSM_BURST_TO_FN_TIME_H */ diff --git a/include/grgsm/misc_utils/bursts_printer.h b/include/gsm/misc_utils/bursts_printer.h similarity index 92% rename from include/grgsm/misc_utils/bursts_printer.h rename to include/gsm/misc_utils/bursts_printer.h index e7052141..9458b99b 100644 --- a/include/grgsm/misc_utils/bursts_printer.h +++ b/include/gsm/misc_utils/bursts_printer.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_BURSTS_PRINTER_H #define INCLUDED_GSM_BURSTS_PRINTER_H -#include +#include #include #include #include @@ -37,10 +37,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API bursts_printer : virtual public gr::block + class GSM_API bursts_printer : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::bursts_printer. diff --git a/include/grgsm/misc_utils/collect_system_info.h b/include/gsm/misc_utils/collect_system_info.h similarity index 92% rename from include/grgsm/misc_utils/collect_system_info.h rename to include/gsm/misc_utils/collect_system_info.h index e9f45cbd..f86a0f1f 100644 --- a/include/grgsm/misc_utils/collect_system_info.h +++ b/include/gsm/misc_utils/collect_system_info.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_COLLECT_SYSTEM_INFO_H #define INCLUDED_GSM_COLLECT_SYSTEM_INFO_H -#include +#include #include #include @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API collect_system_info : virtual public gr::block + class GSM_API collect_system_info : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::collect_system_info. diff --git a/include/grgsm/misc_utils/controlled_fractional_resampler_cc.h b/include/gsm/misc_utils/controlled_fractional_resampler_cc.h similarity index 82% rename from include/grgsm/misc_utils/controlled_fractional_resampler_cc.h rename to include/gsm/misc_utils/controlled_fractional_resampler_cc.h index 9dae6b89..4427fafd 100644 --- a/include/grgsm/misc_utils/controlled_fractional_resampler_cc.h +++ b/include/gsm/misc_utils/controlled_fractional_resampler_cc.h @@ -21,10 +21,10 @@ */ -#ifndef INCLUDED_GRGSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_H -#define INCLUDED_GRGSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_H +#ifndef INCLUDED_GSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_H +#define INCLUDED_GSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_H -#include +#include #include //#include @@ -36,10 +36,10 @@ namespace gr { * \ingroup grgsm * */ - class GRGSM_API controlled_fractional_resampler_cc : virtual public block + class GSM_API controlled_fractional_resampler_cc : virtual public block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::controlled_fractional_resampler_cc. @@ -60,5 +60,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_H */ +#endif /* INCLUDED_GSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_H */ diff --git a/include/grgsm/misc_utils/controlled_rotator_cc.h b/include/gsm/misc_utils/controlled_rotator_cc.h similarity index 91% rename from include/grgsm/misc_utils/controlled_rotator_cc.h rename to include/gsm/misc_utils/controlled_rotator_cc.h index 249af138..f44231a0 100644 --- a/include/grgsm/misc_utils/controlled_rotator_cc.h +++ b/include/gsm/misc_utils/controlled_rotator_cc.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_H #define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API controlled_rotator_cc : virtual public sync_block + class GSM_API controlled_rotator_cc : virtual public sync_block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::controlled_rotator_cc. diff --git a/include/grgsm/misc_utils/extract_assignment_cmd.h b/include/gsm/misc_utils/extract_assignment_cmd.h similarity index 91% rename from include/grgsm/misc_utils/extract_assignment_cmd.h rename to include/gsm/misc_utils/extract_assignment_cmd.h index 59803fd2..1bc10a0e 100644 --- a/include/grgsm/misc_utils/extract_assignment_cmd.h +++ b/include/gsm/misc_utils/extract_assignment_cmd.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_H #define INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_H -#include +#include #include #include @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API extract_assignment_cmd : virtual public gr::block + class GSM_API extract_assignment_cmd : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::extract_assignment_cmd. diff --git a/include/grgsm/misc_utils/extract_cmc.h b/include/gsm/misc_utils/extract_cmc.h similarity index 92% rename from include/grgsm/misc_utils/extract_cmc.h rename to include/gsm/misc_utils/extract_cmc.h index 2b07bbea..1f0b0118 100644 --- a/include/grgsm/misc_utils/extract_cmc.h +++ b/include/gsm/misc_utils/extract_cmc.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_EXTRACT_CMC_H #define INCLUDED_GSM_EXTRACT_CMC_H -#include +#include #include #include @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API extract_cmc : virtual public gr::block + class GSM_API extract_cmc : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::extract_cmc. diff --git a/include/grgsm/misc_utils/extract_immediate_assignment.h b/include/gsm/misc_utils/extract_immediate_assignment.h similarity index 93% rename from include/grgsm/misc_utils/extract_immediate_assignment.h rename to include/gsm/misc_utils/extract_immediate_assignment.h index 31fd7d94..e143fa3a 100644 --- a/include/grgsm/misc_utils/extract_immediate_assignment.h +++ b/include/gsm/misc_utils/extract_immediate_assignment.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_EXTRACT_IMMEDIATE_ASSIGNMENT_H #define INCLUDED_GSM_EXTRACT_IMMEDIATE_ASSIGNMENT_H -#include +#include #include #include @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API extract_immediate_assignment : virtual public gr::block + class GSM_API extract_immediate_assignment : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::extract_immediate_assignment. diff --git a/include/grgsm/misc_utils/extract_system_info.h b/include/gsm/misc_utils/extract_system_info.h similarity index 93% rename from include/grgsm/misc_utils/extract_system_info.h rename to include/gsm/misc_utils/extract_system_info.h index 9bf56b38..1feb5808 100644 --- a/include/grgsm/misc_utils/extract_system_info.h +++ b/include/gsm/misc_utils/extract_system_info.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_H #define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_H -#include +#include #include #include @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API extract_system_info : virtual public gr::block + class GSM_API extract_system_info : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::extract_system_info. diff --git a/include/grgsm/misc_utils/fn_time.h b/include/gsm/misc_utils/fn_time.h similarity index 88% rename from include/grgsm/misc_utils/fn_time.h rename to include/gsm/misc_utils/fn_time.h index b26c21b1..dbef2f64 100644 --- a/include/grgsm/misc_utils/fn_time.h +++ b/include/gsm/misc_utils/fn_time.h @@ -22,10 +22,10 @@ */ -#ifndef INCLUDED_GRGSM_FN_TIME_H -#define INCLUDED_GRGSM_FN_TIME_H +#ifndef INCLUDED_GSM_FN_TIME_H +#define INCLUDED_GSM_FN_TIME_H -#include +#include #include #include @@ -45,11 +45,11 @@ namespace gr { */ typedef std::pair time_format; - GRGSM_API time_format fn_time_delta_cpp(uint32_t fn_ref, time_format time_ref, uint32_t fn_x, + GSM_API time_format fn_time_delta_cpp(uint32_t fn_ref, time_format time_ref, uint32_t fn_x, time_format time_hint, uint32_t ts_num, uint32_t ts_ref); } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_FN_TIME_H */ +#endif /* INCLUDED_GSM_FN_TIME_H */ diff --git a/include/grgsm/misc_utils/message_file_sink.h b/include/gsm/misc_utils/message_file_sink.h similarity index 91% rename from include/grgsm/misc_utils/message_file_sink.h rename to include/gsm/misc_utils/message_file_sink.h index 46cb0964..5d7b5a95 100644 --- a/include/grgsm/misc_utils/message_file_sink.h +++ b/include/gsm/misc_utils/message_file_sink.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_FILE_SINK_H #define INCLUDED_GSM_MESSAGE_FILE_SINK_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API message_file_sink : virtual public gr::block + class GSM_API message_file_sink : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::message_file_sink. diff --git a/include/grgsm/misc_utils/message_file_source.h b/include/gsm/misc_utils/message_file_source.h similarity index 91% rename from include/grgsm/misc_utils/message_file_source.h rename to include/gsm/misc_utils/message_file_source.h index 33f9e252..3b9ed4a2 100644 --- a/include/grgsm/misc_utils/message_file_source.h +++ b/include/gsm/misc_utils/message_file_source.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_FILE_SOURCE_H #define INCLUDED_GSM_MESSAGE_FILE_SOURCE_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API message_file_source : virtual public gr::block + class GSM_API message_file_source : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::message_file_source. diff --git a/include/grgsm/misc_utils/message_printer.h b/include/gsm/misc_utils/message_printer.h similarity index 92% rename from include/grgsm/misc_utils/message_printer.h rename to include/gsm/misc_utils/message_printer.h index c81fd870..7d9d10fd 100644 --- a/include/grgsm/misc_utils/message_printer.h +++ b/include/gsm/misc_utils/message_printer.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_MESSAGE_PRINTER_H #define INCLUDED_GSM_MESSAGE_PRINTER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API message_printer : virtual public gr::block + class GSM_API message_printer : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::message_printer. diff --git a/include/grgsm/misc_utils/msg_to_tag.h b/include/gsm/misc_utils/msg_to_tag.h similarity index 84% rename from include/grgsm/misc_utils/msg_to_tag.h rename to include/gsm/misc_utils/msg_to_tag.h index c7b4e101..c6c23530 100644 --- a/include/grgsm/misc_utils/msg_to_tag.h +++ b/include/gsm/misc_utils/msg_to_tag.h @@ -21,10 +21,10 @@ */ -#ifndef INCLUDED_GRGSM_MSG_TO_TAG_H -#define INCLUDED_GRGSM_MSG_TO_TAG_H +#ifndef INCLUDED_GSM_MSG_TO_TAG_H +#define INCLUDED_GSM_MSG_TO_TAG_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup grgsm * */ - class GRGSM_API msg_to_tag : virtual public gr::sync_block + class GSM_API msg_to_tag : virtual public gr::sync_block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::msg_to_tag. * @@ -53,5 +53,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_MSG_TO_TAG_H */ +#endif /* INCLUDED_GSM_MSG_TO_TAG_H */ diff --git a/include/grgsm/misc_utils/time_spec.h b/include/gsm/misc_utils/time_spec.h similarity index 97% rename from include/grgsm/misc_utils/time_spec.h rename to include/gsm/misc_utils/time_spec.h index 6ae5963b..49dcf9f6 100644 --- a/include/grgsm/misc_utils/time_spec.h +++ b/include/gsm/misc_utils/time_spec.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_TYPES_TIME_SPEC_HPP #define INCLUDED_TYPES_TIME_SPEC_HPP -#include +#include #include #include @@ -37,7 +37,7 @@ namespace gr { * This gives the fractional seconds enough precision to unambiguously * specify a clock-tick/sample-count up to rates of several petahertz. */ - class GRGSM_API time_spec_t : boost::additive, boost::totally_ordered{ + class GSM_API time_spec_t : boost::additive, boost::totally_ordered{ public: /*! diff --git a/include/grgsm/misc_utils/tmsi_dumper.h b/include/gsm/misc_utils/tmsi_dumper.h similarity index 91% rename from include/grgsm/misc_utils/tmsi_dumper.h rename to include/gsm/misc_utils/tmsi_dumper.h index 10add7c4..08acfc46 100644 --- a/include/grgsm/misc_utils/tmsi_dumper.h +++ b/include/gsm/misc_utils/tmsi_dumper.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_TMSI_DUMPER_H #define INCLUDED_GSM_TMSI_DUMPER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API tmsi_dumper : virtual public gr::block + class GSM_API tmsi_dumper : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::tmsi_dumper. diff --git a/include/grgsm/misc_utils/udp_socket.h b/include/gsm/misc_utils/udp_socket.h similarity index 90% rename from include/grgsm/misc_utils/udp_socket.h rename to include/gsm/misc_utils/udp_socket.h index d048f007..8373953b 100644 --- a/include/grgsm/misc_utils/udp_socket.h +++ b/include/gsm/misc_utils/udp_socket.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GRGSM_TRX_UDP_SOCKET_H -#define INCLUDED_GRGSM_TRX_UDP_SOCKET_H +#ifndef INCLUDED_GSM_TRX_UDP_SOCKET_H +#define INCLUDED_GSM_TRX_UDP_SOCKET_H #include @@ -44,7 +44,7 @@ namespace gr { boost::asio::ip::udp::endpoint d_udp_endpoint_rx; boost::asio::ip::udp::endpoint d_udp_endpoint_tx; - boost::shared_ptr d_udp_socket; + std::shared_ptr d_udp_socket; void handle_udp_read(const boost::system::error_code& error, size_t bytes_transferred); @@ -66,4 +66,4 @@ namespace gr { } /* namespace gsm */ } /* namespace gr */ -#endif /* INCLUDED_GRGSM_TRX_UDP_SOCKET_H */ +#endif /* INCLUDED_GSM_TRX_UDP_SOCKET_H */ diff --git a/include/grgsm/plotting.hpp b/include/gsm/plotting.h similarity index 98% rename from include/grgsm/plotting.hpp rename to include/gsm/plotting.h index d4e69333..bd88673d 100644 --- a/include/grgsm/plotting.hpp +++ b/include/gsm/plotting.h @@ -29,7 +29,7 @@ #include "gnuplot-iostream.h" -boost::shared_ptr current_figure; +std::shared_ptr current_figure; void imagesc(const arma::mat & x){ Gnuplot gp; diff --git a/include/grgsm/qa_utils/CMakeLists.txt b/include/gsm/qa_utils/CMakeLists.txt similarity index 96% rename from include/grgsm/qa_utils/CMakeLists.txt rename to include/gsm/qa_utils/CMakeLists.txt index a74a358e..faaee3b6 100644 --- a/include/grgsm/qa_utils/CMakeLists.txt +++ b/include/gsm/qa_utils/CMakeLists.txt @@ -26,5 +26,5 @@ install( burst_source.h message_source.h message_sink.h - DESTINATION include/grgsm/qa_utils + DESTINATION include/gsm/qa_utils ) diff --git a/include/grgsm/qa_utils/burst_sink.h b/include/gsm/qa_utils/burst_sink.h similarity index 93% rename from include/grgsm/qa_utils/burst_sink.h rename to include/gsm/qa_utils/burst_sink.h index ed811ed2..e489065a 100644 --- a/include/grgsm/qa_utils/burst_sink.h +++ b/include/gsm/qa_utils/burst_sink.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_SINK_H #define INCLUDED_GSM_BURST_SINK_H -#include +#include #include #include @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_sink : virtual public gr::block + class GSM_API burst_sink : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_sink. diff --git a/include/grgsm/qa_utils/burst_source.h b/include/gsm/qa_utils/burst_source.h similarity index 93% rename from include/grgsm/qa_utils/burst_source.h rename to include/gsm/qa_utils/burst_source.h index 2f249ada..74af8a14 100644 --- a/include/grgsm/qa_utils/burst_source.h +++ b/include/gsm/qa_utils/burst_source.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_SOURCE_H #define INCLUDED_GSM_BURST_SOURCE_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API burst_source : virtual public gr::block + class GSM_API burst_source : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::burst_source. diff --git a/include/grgsm/qa_utils/message_sink.h b/include/gsm/qa_utils/message_sink.h similarity index 92% rename from include/grgsm/qa_utils/message_sink.h rename to include/gsm/qa_utils/message_sink.h index d4a8e6b9..12147d00 100644 --- a/include/grgsm/qa_utils/message_sink.h +++ b/include/gsm/qa_utils/message_sink.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_MESSAGE_SINK_H #define INCLUDED_GSM_MESSAGE_SINK_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API message_sink : virtual public gr::block + class GSM_API message_sink : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::message_sink. diff --git a/include/grgsm/qa_utils/message_source.h b/include/gsm/qa_utils/message_source.h similarity index 92% rename from include/grgsm/qa_utils/message_source.h rename to include/gsm/qa_utils/message_source.h index 0d34ec1c..6d816a76 100644 --- a/include/grgsm/qa_utils/message_source.h +++ b/include/gsm/qa_utils/message_source.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_MESSAGE_SOURCE_H #define INCLUDED_GSM_MESSAGE_SOURCE_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API message_source : virtual public gr::block + class GSM_API message_source : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::message_source. diff --git a/include/grgsm/receiver/CMakeLists.txt b/include/gsm/receiver/CMakeLists.txt similarity index 96% rename from include/grgsm/receiver/CMakeLists.txt rename to include/gsm/receiver/CMakeLists.txt index 8bf6370b..02752578 100644 --- a/include/grgsm/receiver/CMakeLists.txt +++ b/include/gsm/receiver/CMakeLists.txt @@ -25,5 +25,5 @@ install( clock_offset_control.h cx_channel_hopper.h receiver.h - DESTINATION include/grgsm/receiver + DESTINATION include/gsm/receiver ) diff --git a/include/grgsm/receiver/clock_offset_control.h b/include/gsm/receiver/clock_offset_control.h similarity index 92% rename from include/grgsm/receiver/clock_offset_control.h rename to include/gsm/receiver/clock_offset_control.h index 00756cb6..d3c90976 100644 --- a/include/grgsm/receiver/clock_offset_control.h +++ b/include/gsm/receiver/clock_offset_control.h @@ -25,7 +25,7 @@ #ifndef INCLUDED_GSM_CLOCK_OFFSET_CONTROL_H #define INCLUDED_GSM_CLOCK_OFFSET_CONTROL_H -#include +#include #include namespace gr { @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API clock_offset_control : virtual public gr::block + class GSM_API clock_offset_control : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::clock_offset_control. diff --git a/include/grgsm/receiver/cx_channel_hopper.h b/include/gsm/receiver/cx_channel_hopper.h similarity index 91% rename from include/grgsm/receiver/cx_channel_hopper.h rename to include/gsm/receiver/cx_channel_hopper.h index 03527176..53508422 100644 --- a/include/grgsm/receiver/cx_channel_hopper.h +++ b/include/gsm/receiver/cx_channel_hopper.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_CX_CHANNEL_HOPPER_H #define INCLUDED_GSM_CX_CHANNEL_HOPPER_H -#include +#include #include #include @@ -36,10 +36,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API cx_channel_hopper : virtual public gr::block + class GSM_API cx_channel_hopper : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::cx_channel_hopper. diff --git a/include/grgsm/receiver/receiver.h b/include/gsm/receiver/receiver.h similarity index 93% rename from include/grgsm/receiver/receiver.h rename to include/gsm/receiver/receiver.h index dbbe327c..24083883 100644 --- a/include/grgsm/receiver/receiver.h +++ b/include/gsm/receiver/receiver.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_RECEIVER_H #define INCLUDED_GSM_RECEIVER_H -#include +#include #include #include #include @@ -37,10 +37,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API receiver : virtual public sync_block + class GSM_API receiver : virtual public sync_block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::receiver. diff --git a/include/grgsm/transmitter/CMakeLists.txt b/include/gsm/transmitter/CMakeLists.txt similarity index 96% rename from include/grgsm/transmitter/CMakeLists.txt rename to include/gsm/transmitter/CMakeLists.txt index cdd140df..afbf55cb 100644 --- a/include/grgsm/transmitter/CMakeLists.txt +++ b/include/gsm/transmitter/CMakeLists.txt @@ -25,5 +25,5 @@ install( txtime_setter.h preprocess_tx_burst.h gen_test_ab.h - DESTINATION include/grgsm/transmitter + DESTINATION include/gsm/transmitter ) diff --git a/include/grgsm/transmitter/gen_test_ab.h b/include/gsm/transmitter/gen_test_ab.h similarity index 92% rename from include/grgsm/transmitter/gen_test_ab.h rename to include/gsm/transmitter/gen_test_ab.h index d2756f19..a744fb52 100644 --- a/include/grgsm/transmitter/gen_test_ab.h +++ b/include/gsm/transmitter/gen_test_ab.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_GEN_TEST_AB_H #define INCLUDED_GSM_GEN_TEST_AB_H -#include +#include #include namespace gr { @@ -37,10 +37,10 @@ namespace gr { * Currently it removes GSMTAP header from a burst and puts it in first part of PDU * pair and removes tailing zeros from Access Bursts coming from TRX interface. */ - class GRGSM_API gen_test_ab : virtual public gr::block + class GSM_API gen_test_ab : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::gen_test_ab. diff --git a/include/grgsm/transmitter/preprocess_tx_burst.h b/include/gsm/transmitter/preprocess_tx_burst.h similarity index 92% rename from include/grgsm/transmitter/preprocess_tx_burst.h rename to include/gsm/transmitter/preprocess_tx_burst.h index 2a07dd5c..68b4d75c 100644 --- a/include/grgsm/transmitter/preprocess_tx_burst.h +++ b/include/gsm/transmitter/preprocess_tx_burst.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_PREPROCESS_TX_BURST_H #define INCLUDED_GSM_PREPROCESS_TX_BURST_H -#include +#include #include namespace gr { @@ -37,10 +37,10 @@ namespace gr { * Currently it removes GSMTAP header from a burst and puts it in first part of PDU * pair and removes tailing zeros from Access Bursts coming from TRX interface. */ - class GRGSM_API preprocess_tx_burst : virtual public gr::block + class GSM_API preprocess_tx_burst : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::preprocess_tx_burst. diff --git a/include/grgsm/transmitter/txtime_setter.h b/include/gsm/transmitter/txtime_setter.h similarity index 93% rename from include/grgsm/transmitter/txtime_setter.h rename to include/gsm/transmitter/txtime_setter.h index 0bf0b03f..d2c54608 100644 --- a/include/grgsm/transmitter/txtime_setter.h +++ b/include/gsm/transmitter/txtime_setter.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_TXTIME_SETTER_H #define INCLUDED_GSM_TXTIME_SETTER_H -#include +#include #include namespace gr { @@ -35,10 +35,10 @@ namespace gr { * \ingroup gsm * */ - class GRGSM_API txtime_setter : virtual public gr::block + class GSM_API txtime_setter : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of gsm::txtime_setter. diff --git a/include/grgsm/trx/CMakeLists.txt b/include/gsm/trx/CMakeLists.txt similarity index 96% rename from include/grgsm/trx/CMakeLists.txt rename to include/gsm/trx/CMakeLists.txt index 08697013..c2092e99 100644 --- a/include/grgsm/trx/CMakeLists.txt +++ b/include/gsm/trx/CMakeLists.txt @@ -23,5 +23,5 @@ install( FILES trx_burst_if.h - DESTINATION include/grgsm/trx + DESTINATION include/gsm/trx ) diff --git a/include/grgsm/trx/trx_burst_if.h b/include/gsm/trx/trx_burst_if.h similarity index 85% rename from include/grgsm/trx/trx_burst_if.h rename to include/gsm/trx/trx_burst_if.h index 9277dc5c..91aa6c53 100644 --- a/include/grgsm/trx/trx_burst_if.h +++ b/include/gsm/trx/trx_burst_if.h @@ -20,10 +20,10 @@ * */ -#ifndef INCLUDED_GRGSM_TRX_BURST_IF_H -#define INCLUDED_GRGSM_TRX_BURST_IF_H +#ifndef INCLUDED_GSM_TRX_BURST_IF_H +#define INCLUDED_GSM_TRX_BURST_IF_H -#include +#include #include namespace gr { @@ -34,10 +34,10 @@ namespace gr { * \ingroup grgsm * */ - class GRGSM_API trx_burst_if : virtual public gr::block + class GSM_API trx_burst_if : virtual public gr::block { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * \brief Return a shared_ptr to a new instance of grgsm::trx_burst_if. @@ -56,5 +56,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_TRX_BURST_IF_H */ +#endif /* INCLUDED_GSM_TRX_BURST_IF_H */ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6892effa..1989724f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -26,20 +26,20 @@ include(GrPlatform) #define LIB_SUFFIX ######################################################################## # Add sources macro ######################################################################## -set(grgsm_sources "") +set(gsm_sources "") macro (add_sources) file (RELATIVE_PATH _relPath "${PROJECT_SOURCE_DIR}/lib" "${CMAKE_CURRENT_SOURCE_DIR}") foreach (_src ${ARGN}) if (_relPath) - list (APPEND grgsm_sources "${_relPath}/${_src}") + list (APPEND gsm_sources "${_relPath}/${_src}") else() - list (APPEND grgsm_sources "${_src}") + list (APPEND gsm_sources "${_src}") endif() endforeach() if (_relPath) - # propagate grgsm_sources to parent directory - set (grgsm_sources ${grgsm_sources} PARENT_SCOPE) + # propagate gsm_sources to parent directory + set (gsm_sources ${gsm_sources} PARENT_SCOPE) endif() endmacro() @@ -47,7 +47,7 @@ endmacro() # Handle the generated constants ######################################################################## execute_process(COMMAND ${PYTHON_EXECUTABLE} -c - "import time;print(time.strftime('%a, %d %b %Y %H:%M:%S', time.gmtime()))" + "import os,time,datetime; print(datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).strftime('%a, %d %b %Y %H:%M:%S'))" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE ) message(STATUS "Loading build date ${BUILD_DATE} into constants...") @@ -62,7 +62,7 @@ configure_file( ESCAPE_QUOTES @ONLY) -list(APPEND grgsm_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc) +list(APPEND gsm_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc) ######################################################################### # Subdirecories ######################################################################### @@ -76,21 +76,21 @@ add_subdirectory(receiver) add_subdirectory(transmitter) add_subdirectory(trx) -list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCODEC_LIBRARY} ${LIBOSMOGSM_LIBRARY} ${LIBOSMOCODING_LIBRARY}) +list (APPEND gsm_link_libraries ${LIBOSMOCORE_LIBRARY} ${LIBOSMOCODEC_LIBRARY} ${LIBOSMOGSM_LIBRARY} ${LIBOSMOCODING_LIBRARY}) -add_library(grgsm SHARED ${grgsm_sources}) -target_link_libraries(grgsm gnuradio::gnuradio-runtime gnuradio::gnuradio-filter volk ${grgsm_link_libraries}) -target_include_directories(grgsm +add_library(gnuradio-gsm SHARED ${gsm_sources}) +target_link_libraries(gnuradio-gsm gnuradio::gnuradio-runtime gnuradio-network gnuradio-pdu gnuradio-filter volk ${gsm_link_libraries}) +target_include_directories(gnuradio-gsm PUBLIC $ PUBLIC $ PUBLIC $ PUBLIC $ PUBLIC $ ) -set_target_properties(grgsm PROPERTIES DEFINE_SYMBOL "grgsm_EXPORTS") +set_target_properties(gnuradio-gsm PROPERTIES DEFINE_SYMBOL "gnuradio_gsm_EXPORTS") if(APPLE) - set_target_properties(grgsm PROPERTIES + set_target_properties(gnuradio-gsm PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" ) endif(APPLE) @@ -99,7 +99,7 @@ endif(APPLE) # Install built library files ######################################################################## include(GrMiscUtils) -GR_LIBRARY_FOO(grgsm) +GR_LIBRARY_FOO(gnuradio-gsm) ######################################################################## # Print summary @@ -107,7 +107,7 @@ GR_LIBRARY_FOO(grgsm) message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}") message(STATUS "Building for version: ${VERSION} / ${LIBVER}") -set (grgsm_sources ${grgsm_sources} PARENT_SCOPE) +set (gsm_sources ${gsm_sources} PARENT_SCOPE) ######################################################################## # Build and register unit test @@ -117,18 +117,18 @@ include(GrTest) # If your unit tests require special include paths, add them here #include_directories() # List all files that contain Boost.UTF unit tests here -list(APPEND test_grgsm_sources +list(APPEND test_gsm_sources ) # Anything we need to link to for the unit tests go here -list(APPEND GR_TEST_TARGET_DEPS grgsm) +list(APPEND GR_TEST_TARGET_DEPS gnuradio-gsm) -if(NOT test_grgsm_sources) +if(NOT test_gsm_sources) MESSAGE(STATUS "No C++ unit tests... skipping") return() -endif(NOT test_grgsm_sources) +endif(NOT test_gsm_sources) -foreach(qa_file ${test_grgsm_sources}) - GR_ADD_CPP_TEST("grgsm_${qa_file}" +foreach(qa_file ${test_gsm_sources}) + GR_ADD_CPP_TEST("gsm_${qa_file}" ${CMAKE_CURRENT_SOURCE_DIR}/${qa_file} ) endforeach(qa_file) diff --git a/lib/constants.cc.in b/lib/constants.cc.in index e6d5a51a..d15e3779 100644 --- a/lib/constants.cc.in +++ b/lib/constants.cc.in @@ -25,7 +25,7 @@ #endif #include -#include +#include namespace gr { namespace gsm{ diff --git a/lib/decoding/control_channels_decoder_impl.cc b/lib/decoding/control_channels_decoder_impl.cc index b49582f9..5865c338 100644 --- a/lib/decoding/control_channels_decoder_impl.cc +++ b/lib/decoding/control_channels_decoder_impl.cc @@ -25,7 +25,7 @@ #endif #include -#include +#include #include "control_channels_decoder_impl.h" #define DATA_BYTES 23 diff --git a/lib/decoding/control_channels_decoder_impl.h b/lib/decoding/control_channels_decoder_impl.h index 3464324e..65d5049e 100644 --- a/lib/decoding/control_channels_decoder_impl.h +++ b/lib/decoding/control_channels_decoder_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H #define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H -#include +#include extern "C" { #include "osmocom/coding/gsm0503_coding.h" } diff --git a/lib/decoding/sch.c b/lib/decoding/sch.c index fff82ea1..95deb0af 100644 --- a/lib/decoding/sch.c +++ b/lib/decoding/sch.c @@ -21,7 +21,7 @@ */ #include -#include +#include #include #include diff --git a/lib/decoding/tch_f_decoder_impl.cc b/lib/decoding/tch_f_decoder_impl.cc index 03e8fc80..bf77a758 100644 --- a/lib/decoding/tch_f_decoder_impl.cc +++ b/lib/decoding/tch_f_decoder_impl.cc @@ -26,7 +26,7 @@ #endif #include -#include +#include #include "stdio.h" #include "tch_f_decoder_impl.h" diff --git a/lib/decoding/tch_f_decoder_impl.h b/lib/decoding/tch_f_decoder_impl.h index cac245a5..51cbe987 100644 --- a/lib/decoding/tch_f_decoder_impl.h +++ b/lib/decoding/tch_f_decoder_impl.h @@ -29,7 +29,7 @@ #include "openbts/GSM610Tables.h" #include "openbts/GSM660Tables.h" #include "openbts/ViterbiR204.h" -#include +#include #define DATA_BLOCK_SIZE 184 diff --git a/lib/decoding/tch_h_decoder_impl.cc b/lib/decoding/tch_h_decoder_impl.cc index f1ba5ba3..c7db0bf0 100644 --- a/lib/decoding/tch_h_decoder_impl.cc +++ b/lib/decoding/tch_h_decoder_impl.cc @@ -24,10 +24,10 @@ #include "config.h" #endif -#include -#include +#include +#include #include "tch_h_decoder_impl.h" - +#include extern "C" { #include "osmocom/gsm/protocol/gsm_04_08.h" #include "osmocom/coding/gsm0503_coding.h" diff --git a/lib/decoding/tch_h_decoder_impl.h b/lib/decoding/tch_h_decoder_impl.h index 902b2161..96f458be 100644 --- a/lib/decoding/tch_h_decoder_impl.h +++ b/lib/decoding/tch_h_decoder_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_TCH_H_DECODER_IMPL_H #define INCLUDED_GSM_TCH_H_DECODER_IMPL_H -#include +#include #include "tch_f_decoder_impl.h" namespace gr { diff --git a/lib/decryption/decryption_impl.cc b/lib/decryption/decryption_impl.cc index d1895967..31a171c0 100644 --- a/lib/decryption/decryption_impl.cc +++ b/lib/decryption/decryption_impl.cc @@ -26,8 +26,8 @@ #endif #include -#include -#include +#include +#include #include #include "decryption_impl.h" diff --git a/lib/decryption/decryption_impl.h b/lib/decryption/decryption_impl.h index aa6e5ac5..813a397e 100644 --- a/lib/decryption/decryption_impl.h +++ b/lib/decryption/decryption_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_DECRYPTION_IMPL_H #define INCLUDED_GSM_DECRYPTION_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/demapping/tch_f_chans_demapper_impl.cc b/lib/demapping/tch_f_chans_demapper_impl.cc index ee0c05c6..32c5f4b7 100644 --- a/lib/demapping/tch_f_chans_demapper_impl.cc +++ b/lib/demapping/tch_f_chans_demapper_impl.cc @@ -26,8 +26,8 @@ #include #include "tch_f_chans_demapper_impl.h" -#include -#include +#include +#include #define BURST_SIZE 148 diff --git a/lib/demapping/tch_f_chans_demapper_impl.h b/lib/demapping/tch_f_chans_demapper_impl.h index bef018db..c8a99986 100644 --- a/lib/demapping/tch_f_chans_demapper_impl.h +++ b/lib/demapping/tch_f_chans_demapper_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_UNIVERSAL_TCH_CHANS_DEMAPPER_IMPL_H #define INCLUDED_GSM_UNIVERSAL_TCH_CHANS_DEMAPPER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/demapping/tch_h_chans_demapper_impl.cc b/lib/demapping/tch_h_chans_demapper_impl.cc index 101110ce..de07b0e8 100644 --- a/lib/demapping/tch_h_chans_demapper_impl.cc +++ b/lib/demapping/tch_h_chans_demapper_impl.cc @@ -27,8 +27,8 @@ #include #include "tch_h_chans_demapper_impl.h" -#include -#include +#include +#include #define BURST_SIZE 148 diff --git a/lib/demapping/tch_h_chans_demapper_impl.h b/lib/demapping/tch_h_chans_demapper_impl.h index ab0efd15..989979ac 100644 --- a/lib/demapping/tch_h_chans_demapper_impl.h +++ b/lib/demapping/tch_h_chans_demapper_impl.h @@ -24,7 +24,7 @@ #ifndef INCLUDED_GSM_TCH_H_CHANS_DEMAPPER_IMPL_H #define INCLUDED_GSM_TCH_H_CHANS_DEMAPPER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.cc b/lib/demapping/universal_ctrl_chans_demapper_impl.cc index c78f8b38..bb13590c 100644 --- a/lib/demapping/universal_ctrl_chans_demapper_impl.cc +++ b/lib/demapping/universal_ctrl_chans_demapper_impl.cc @@ -26,8 +26,8 @@ #include #include "universal_ctrl_chans_demapper_impl.h" -#include -#include +#include +#include #include #define BURST_SIZE 148 diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.h b/lib/demapping/universal_ctrl_chans_demapper_impl.h index 6ba49736..52761638 100644 --- a/lib/demapping/universal_ctrl_chans_demapper_impl.h +++ b/lib/demapping/universal_ctrl_chans_demapper_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_IMPL_H #define INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/flow_control/burst_fnr_filter_impl.cc b/lib/flow_control/burst_fnr_filter_impl.cc index ae129eec..38bb93ec 100644 --- a/lib/flow_control/burst_fnr_filter_impl.cc +++ b/lib/flow_control/burst_fnr_filter_impl.cc @@ -27,8 +27,8 @@ #include #include "burst_fnr_filter_impl.h" #include -#include -#include +#include +#include namespace gr { diff --git a/lib/flow_control/burst_fnr_filter_impl.h b/lib/flow_control/burst_fnr_filter_impl.h index 5abd1c2b..7015631d 100644 --- a/lib/flow_control/burst_fnr_filter_impl.h +++ b/lib/flow_control/burst_fnr_filter_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_FNR_FILTER_IMPL_H #define INCLUDED_GSM_BURST_FNR_FILTER_IMPL_H -#include +#include #define GSM_SUPERFRAME (26 * 51) #define GSM_HYPERFRAME (2048 * GSM_SUPERFRAME) diff --git a/lib/flow_control/burst_sdcch_subslot_filter_impl.cc b/lib/flow_control/burst_sdcch_subslot_filter_impl.cc index beb3f587..30125134 100644 --- a/lib/flow_control/burst_sdcch_subslot_filter_impl.cc +++ b/lib/flow_control/burst_sdcch_subslot_filter_impl.cc @@ -27,8 +27,8 @@ #include #include "burst_sdcch_subslot_filter_impl.h" #include -#include -#include +#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/burst_sdcch_subslot_filter_impl.h b/lib/flow_control/burst_sdcch_subslot_filter_impl.h index b5ac5aee..e76ff2c7 100644 --- a/lib/flow_control/burst_sdcch_subslot_filter_impl.h +++ b/lib/flow_control/burst_sdcch_subslot_filter_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_SDCCH_SUBSLOT_FILTER_IMPL_H #define INCLUDED_GSM_BURST_SDCCH_SUBSLOT_FILTER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc b/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc index ff86296c..b71dadc3 100644 --- a/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc +++ b/lib/flow_control/burst_sdcch_subslot_splitter_impl.cc @@ -27,8 +27,8 @@ #include #include "burst_sdcch_subslot_splitter_impl.h" #include -#include -#include +#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/burst_sdcch_subslot_splitter_impl.h b/lib/flow_control/burst_sdcch_subslot_splitter_impl.h index 9eac0701..0576c6db 100644 --- a/lib/flow_control/burst_sdcch_subslot_splitter_impl.h +++ b/lib/flow_control/burst_sdcch_subslot_splitter_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_IMPL_H #define INCLUDED_GSM_BURST_SDCCH_SUBSLOT_SPLITTER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/burst_timeslot_filter_impl.cc b/lib/flow_control/burst_timeslot_filter_impl.cc index e69c60d5..38c646c6 100644 --- a/lib/flow_control/burst_timeslot_filter_impl.cc +++ b/lib/flow_control/burst_timeslot_filter_impl.cc @@ -27,8 +27,8 @@ #include #include "burst_timeslot_filter_impl.h" #include -#include -#include +#include +#include namespace gr { diff --git a/lib/flow_control/burst_timeslot_filter_impl.h b/lib/flow_control/burst_timeslot_filter_impl.h index eb1953c8..2008549a 100644 --- a/lib/flow_control/burst_timeslot_filter_impl.h +++ b/lib/flow_control/burst_timeslot_filter_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_TIMESLOT_FILTER_IMPL_H #define INCLUDED_GSM_BURST_TIMESLOT_FILTER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/burst_timeslot_splitter_impl.cc b/lib/flow_control/burst_timeslot_splitter_impl.cc index d0cea4e7..24a25cd6 100644 --- a/lib/flow_control/burst_timeslot_splitter_impl.cc +++ b/lib/flow_control/burst_timeslot_splitter_impl.cc @@ -27,8 +27,8 @@ #include #include "burst_timeslot_splitter_impl.h" #include -#include -#include +#include +#include namespace gr { diff --git a/lib/flow_control/burst_timeslot_splitter_impl.h b/lib/flow_control/burst_timeslot_splitter_impl.h index 6abcb004..5129c7fd 100644 --- a/lib/flow_control/burst_timeslot_splitter_impl.h +++ b/lib/flow_control/burst_timeslot_splitter_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_IMPL_H #define INCLUDED_GSM_BURST_TIMESLOT_SPLITTER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/burst_type_filter_impl.cc b/lib/flow_control/burst_type_filter_impl.cc index 113a4a68..a5f9adcd 100644 --- a/lib/flow_control/burst_type_filter_impl.cc +++ b/lib/flow_control/burst_type_filter_impl.cc @@ -27,8 +27,8 @@ #include #include "burst_type_filter_impl.h" #include -#include -#include +#include +#include namespace gr { diff --git a/lib/flow_control/burst_type_filter_impl.h b/lib/flow_control/burst_type_filter_impl.h index 5c6ad14e..6f26bd5c 100644 --- a/lib/flow_control/burst_type_filter_impl.h +++ b/lib/flow_control/burst_type_filter_impl.h @@ -25,7 +25,7 @@ #define BURST_TYPE_LEN 148 -#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/dummy_burst_filter_impl.cc b/lib/flow_control/dummy_burst_filter_impl.cc index 7e31990e..17c0310b 100644 --- a/lib/flow_control/dummy_burst_filter_impl.cc +++ b/lib/flow_control/dummy_burst_filter_impl.cc @@ -27,8 +27,8 @@ #include #include "dummy_burst_filter_impl.h" #include -#include -#include +#include +#include namespace gr { diff --git a/lib/flow_control/dummy_burst_filter_impl.h b/lib/flow_control/dummy_burst_filter_impl.h index 3433313c..e1b9c160 100644 --- a/lib/flow_control/dummy_burst_filter_impl.h +++ b/lib/flow_control/dummy_burst_filter_impl.h @@ -25,7 +25,7 @@ #define DUMMY_BURST_LEN 148 -#include +#include namespace gr { namespace gsm { diff --git a/lib/flow_control/uplink_downlink_splitter_impl.cc b/lib/flow_control/uplink_downlink_splitter_impl.cc index 424d025e..d85c4112 100644 --- a/lib/flow_control/uplink_downlink_splitter_impl.cc +++ b/lib/flow_control/uplink_downlink_splitter_impl.cc @@ -26,8 +26,8 @@ #include #include "uplink_downlink_splitter_impl.h" -#include -#include +#include +#include #define BURST_SIZE 148 namespace gr { namespace gsm { diff --git a/lib/flow_control/uplink_downlink_splitter_impl.h b/lib/flow_control/uplink_downlink_splitter_impl.h index 5edfe5a8..c1b7d1df 100644 --- a/lib/flow_control/uplink_downlink_splitter_impl.h +++ b/lib/flow_control/uplink_downlink_splitter_impl.h @@ -20,10 +20,10 @@ * */ -#ifndef INCLUDED_GRGSM_UPLINK_DOWNLINK_SPLITTER_IMPL_H -#define INCLUDED_GRGSM_UPLINK_DOWNLINK_SPLITTER_IMPL_H +#ifndef INCLUDED_GSM_UPLINK_DOWNLINK_SPLITTER_IMPL_H +#define INCLUDED_GSM_UPLINK_DOWNLINK_SPLITTER_IMPL_H -#include +#include namespace gr { namespace gsm { @@ -39,5 +39,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_UPLINK_DOWNLINK_SPLITTER_IMPL_H */ +#endif /* INCLUDED_GSM_UPLINK_DOWNLINK_SPLITTER_IMPL_H */ diff --git a/lib/misc_utils/burst_file_sink_impl.h b/lib/misc_utils/burst_file_sink_impl.h index 3d8dbe44..5b928672 100644 --- a/lib/misc_utils/burst_file_sink_impl.h +++ b/lib/misc_utils/burst_file_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_FILE_SINK_IMPL_H #define INCLUDED_GSM_BURST_FILE_SINK_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/misc_utils/burst_file_source_impl.cc b/lib/misc_utils/burst_file_source_impl.cc index 85d5ad9d..6b4d2f99 100644 --- a/lib/misc_utils/burst_file_source_impl.cc +++ b/lib/misc_utils/burst_file_source_impl.cc @@ -64,7 +64,7 @@ namespace gr { bool burst_file_source_impl::start() { d_finished = false; - d_thread = boost::shared_ptr + d_thread = std::shared_ptr (new gr::thread::thread(boost::bind(&burst_file_source_impl::run, this))); return block::start(); } diff --git a/lib/misc_utils/burst_file_source_impl.h b/lib/misc_utils/burst_file_source_impl.h index 88565203..523ea89f 100644 --- a/lib/misc_utils/burst_file_source_impl.h +++ b/lib/misc_utils/burst_file_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_FILE_SOURCE_IMPL_H #define INCLUDED_GSM_BURST_FILE_SOURCE_IMPL_H -#include +#include #include namespace gr { @@ -32,7 +32,7 @@ namespace gr { class burst_file_source_impl : public burst_file_source { private: - boost::shared_ptr d_thread; + std::shared_ptr d_thread; std::ifstream d_input_file; bool d_finished; void run(); diff --git a/lib/misc_utils/burst_to_fn_time_impl.h b/lib/misc_utils/burst_to_fn_time_impl.h index e96c2bb4..45d49dff 100644 --- a/lib/misc_utils/burst_to_fn_time_impl.h +++ b/lib/misc_utils/burst_to_fn_time_impl.h @@ -21,10 +21,10 @@ * */ -#ifndef INCLUDED_GRGSM_BURST_TO_FN_TIME_IMPL_H -#define INCLUDED_GRGSM_BURST_TO_FN_TIME_IMPL_H +#ifndef INCLUDED_GSM_BURST_TO_FN_TIME_IMPL_H +#define INCLUDED_GSM_BURST_TO_FN_TIME_IMPL_H -#include +#include namespace gr { namespace gsm { @@ -42,4 +42,4 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_BURST_TO_FN_TIME_IMPL_H */ +#endif /* INCLUDED_GSM_BURST_TO_FN_TIME_IMPL_H */ diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc index fbd9bd32..aeee0fce 100644 --- a/lib/misc_utils/bursts_printer_impl.cc +++ b/lib/misc_utils/bursts_printer_impl.cc @@ -25,10 +25,11 @@ #endif #include -#include -#include +#include +#include #include #include +#include #include "bursts_printer_impl.h" //#include #include diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h index e475b0f2..efa5837c 100644 --- a/lib/misc_utils/bursts_printer_impl.h +++ b/lib/misc_utils/bursts_printer_impl.h @@ -25,7 +25,7 @@ #define DUMMY_BURST_LEN 148 -#include +#include #include namespace gr { diff --git a/lib/misc_utils/collect_system_info_impl.cc b/lib/misc_utils/collect_system_info_impl.cc index 6ab982e1..aa2804f1 100644 --- a/lib/misc_utils/collect_system_info_impl.cc +++ b/lib/misc_utils/collect_system_info_impl.cc @@ -25,10 +25,10 @@ #endif #include -#include +#include //#include -#include - +#include +#include #include "collect_system_info_impl.h" namespace gr { diff --git a/lib/misc_utils/collect_system_info_impl.h b/lib/misc_utils/collect_system_info_impl.h index b320b5e7..282a2bd1 100644 --- a/lib/misc_utils/collect_system_info_impl.h +++ b/lib/misc_utils/collect_system_info_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_COLLECT_SYSTEM_INFO_IMPL_H #define INCLUDED_GSM_COLLECT_SYSTEM_INFO_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/misc_utils/controlled_fractional_resampler_cc_impl.h b/lib/misc_utils/controlled_fractional_resampler_cc_impl.h index 1ca8082e..0980011a 100644 --- a/lib/misc_utils/controlled_fractional_resampler_cc_impl.h +++ b/lib/misc_utils/controlled_fractional_resampler_cc_impl.h @@ -20,10 +20,10 @@ * */ -#ifndef INCLUDED_GRGSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_IMPL_H -#define INCLUDED_GRGSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_IMPL_H +#ifndef INCLUDED_GSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_IMPL_H +#define INCLUDED_GSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_IMPL_H -#include +#include #include using namespace gr::filter; @@ -67,5 +67,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_IMPL_H */ +#endif /* INCLUDED_GSM_CONTROLLED_FRACTIONAL_RESAMPLER_CC_IMPL_H */ diff --git a/lib/misc_utils/controlled_rotator_cc_impl.h b/lib/misc_utils/controlled_rotator_cc_impl.h index 13bc6fc6..0a2d324a 100644 --- a/lib/misc_utils/controlled_rotator_cc_impl.h +++ b/lib/misc_utils/controlled_rotator_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H #define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/misc_utils/extract_assignment_cmd_impl.cc b/lib/misc_utils/extract_assignment_cmd_impl.cc index fe75f21b..df094c80 100644 --- a/lib/misc_utils/extract_assignment_cmd_impl.cc +++ b/lib/misc_utils/extract_assignment_cmd_impl.cc @@ -25,9 +25,9 @@ #endif #include -#include +#include //#include -#include +#include #include "extract_assignment_cmd_impl.h" diff --git a/lib/misc_utils/extract_assignment_cmd_impl.h b/lib/misc_utils/extract_assignment_cmd_impl.h index 8f24b00d..b3d3eff9 100644 --- a/lib/misc_utils/extract_assignment_cmd_impl.h +++ b/lib/misc_utils/extract_assignment_cmd_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_IMPL_H #define INCLUDED_GSM_EXTRACT_ASSIGNMENT_CMD_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/misc_utils/extract_cmc_impl.cc b/lib/misc_utils/extract_cmc_impl.cc index c313b585..7ab2a774 100644 --- a/lib/misc_utils/extract_cmc_impl.cc +++ b/lib/misc_utils/extract_cmc_impl.cc @@ -25,9 +25,9 @@ #endif #include -#include +#include //#include -#include +#include #include "extract_cmc_impl.h" diff --git a/lib/misc_utils/extract_cmc_impl.h b/lib/misc_utils/extract_cmc_impl.h index b62cadc9..1f513a31 100644 --- a/lib/misc_utils/extract_cmc_impl.h +++ b/lib/misc_utils/extract_cmc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_EXTRACT_CMC_IMPL_H #define INCLUDED_GSM_EXTRACT_CMC_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/misc_utils/extract_immediate_assignment_impl.cc b/lib/misc_utils/extract_immediate_assignment_impl.cc index 579fe617..ae5fc6d4 100644 --- a/lib/misc_utils/extract_immediate_assignment_impl.cc +++ b/lib/misc_utils/extract_immediate_assignment_impl.cc @@ -25,10 +25,10 @@ #endif #include -#include +#include //#include #include -#include +#include #include #include "extract_immediate_assignment_impl.h" diff --git a/lib/misc_utils/extract_immediate_assignment_impl.h b/lib/misc_utils/extract_immediate_assignment_impl.h index 44a3830b..99373e7a 100644 --- a/lib/misc_utils/extract_immediate_assignment_impl.h +++ b/lib/misc_utils/extract_immediate_assignment_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_EXTRACT_IMMEDIATE_ASSIGNMENT_IMPL_H #define INCLUDED_GSM_EXTRACT_IMMEDIATE_ASSIGNMENT_IMPL_H -#include +#include #include #include diff --git a/lib/misc_utils/extract_system_info_impl.cc b/lib/misc_utils/extract_system_info_impl.cc index 3fef7d3e..bb3d209e 100644 --- a/lib/misc_utils/extract_system_info_impl.cc +++ b/lib/misc_utils/extract_system_info_impl.cc @@ -25,13 +25,13 @@ #endif #include -#include +#include //#include #include #include #include #include -#include +#include #include extern "C" { #include diff --git a/lib/misc_utils/extract_system_info_impl.h b/lib/misc_utils/extract_system_info_impl.h index 2ddc84da..a9886aca 100644 --- a/lib/misc_utils/extract_system_info_impl.h +++ b/lib/misc_utils/extract_system_info_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H #define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H -#include +#include #include #include #include diff --git a/lib/misc_utils/fn_time.cc b/lib/misc_utils/fn_time.cc index 2773f33f..5c711d81 100644 --- a/lib/misc_utils/fn_time.cc +++ b/lib/misc_utils/fn_time.cc @@ -21,8 +21,8 @@ * */ -#include -#include +#include +#include #include #define GSM_HYPER_FRAME (26 * 51 * 2048) diff --git a/lib/misc_utils/message_file_sink_impl.h b/lib/misc_utils/message_file_sink_impl.h index 9f05a0b6..e73d386d 100644 --- a/lib/misc_utils/message_file_sink_impl.h +++ b/lib/misc_utils/message_file_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_FILE_SINK_IMPL_H #define INCLUDED_GSM_MESSAGE_FILE_SINK_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/misc_utils/message_file_source_impl.cc b/lib/misc_utils/message_file_source_impl.cc index 8164f928..f6cf8214 100644 --- a/lib/misc_utils/message_file_source_impl.cc +++ b/lib/misc_utils/message_file_source_impl.cc @@ -66,7 +66,7 @@ namespace gr { bool message_file_source_impl::start() { d_finished = false; - d_thread = boost::shared_ptr + d_thread = std::shared_ptr (new gr::thread::thread(boost::bind(&message_file_source_impl::run, this))); return block::start(); } diff --git a/lib/misc_utils/message_file_source_impl.h b/lib/misc_utils/message_file_source_impl.h index 312174df..7992150e 100644 --- a/lib/misc_utils/message_file_source_impl.h +++ b/lib/misc_utils/message_file_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_FILE_SOURCE_IMPL_H #define INCLUDED_GSM_MESSAGE_FILE_SOURCE_IMPL_H -#include +#include #include namespace gr { @@ -32,7 +32,7 @@ namespace gr { class message_file_source_impl : public message_file_source { private: - boost::shared_ptr d_thread; + std::shared_ptr d_thread; std::ifstream d_input_file; bool d_finished; void run(); diff --git a/lib/misc_utils/message_printer_impl.cc b/lib/misc_utils/message_printer_impl.cc index 200888a2..aef5cae9 100644 --- a/lib/misc_utils/message_printer_impl.cc +++ b/lib/misc_utils/message_printer_impl.cc @@ -27,9 +27,9 @@ #include #include #include "message_printer_impl.h" -#include "grgsm/gsmtap.h" -#include - +#include "gsm/gsmtap.h" +#include +#include extern "C" { #include diff --git a/lib/misc_utils/message_printer_impl.h b/lib/misc_utils/message_printer_impl.h index 8fdcdfda..3a17d1ae 100644 --- a/lib/misc_utils/message_printer_impl.h +++ b/lib/misc_utils/message_printer_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H #define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/misc_utils/msg_to_tag_impl.h b/lib/misc_utils/msg_to_tag_impl.h index 55e1faef..c915b7a3 100644 --- a/lib/misc_utils/msg_to_tag_impl.h +++ b/lib/misc_utils/msg_to_tag_impl.h @@ -20,10 +20,10 @@ * */ -#ifndef INCLUDED_GRGSM_MSG_TO_TAG_IMPL_H -#define INCLUDED_GRGSM_MSG_TO_TAG_IMPL_H +#ifndef INCLUDED_GSM_MSG_TO_TAG_IMPL_H +#define INCLUDED_GSM_MSG_TO_TAG_IMPL_H -#include +#include namespace gr { namespace gsm { @@ -47,5 +47,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_MSG_TO_TAG_IMPL_H */ +#endif /* INCLUDED_GSM_MSG_TO_TAG_IMPL_H */ diff --git a/lib/misc_utils/time_spec.cc b/lib/misc_utils/time_spec.cc index 5293da26..b6785373 100644 --- a/lib/misc_utils/time_spec.cc +++ b/lib/misc_utils/time_spec.cc @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include +#include namespace gr { namespace gsm { diff --git a/lib/misc_utils/tmsi_dumper_impl.cc b/lib/misc_utils/tmsi_dumper_impl.cc index 3809eee2..b610d47f 100644 --- a/lib/misc_utils/tmsi_dumper_impl.cc +++ b/lib/misc_utils/tmsi_dumper_impl.cc @@ -26,7 +26,7 @@ #include #include "tmsi_dumper_impl.h" -#include "grgsm/gsmtap.h" +#include "gsm/gsmtap.h" #include #include diff --git a/lib/misc_utils/tmsi_dumper_impl.h b/lib/misc_utils/tmsi_dumper_impl.h index 30195870..84a9e3c5 100644 --- a/lib/misc_utils/tmsi_dumper_impl.h +++ b/lib/misc_utils/tmsi_dumper_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_TMSI_DUMPER_IMPL_H #define INCLUDED_GSM_TMSI_DUMPER_IMPL_H -#include +#include #include #include diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc index c43f1833..fa03b0fc 100644 --- a/lib/misc_utils/udp_socket.cc +++ b/lib/misc_utils/udp_socket.cc @@ -26,11 +26,10 @@ #include #include -#include #include #include -#include "grgsm/misc_utils/udp_socket.h" +#include "gsm/misc_utils/udp_socket.h" using boost::asio::ip::udp; diff --git a/lib/qa_utils/burst_sink_impl.cc b/lib/qa_utils/burst_sink_impl.cc index f5854344..ccdfbc4b 100644 --- a/lib/qa_utils/burst_sink_impl.cc +++ b/lib/qa_utils/burst_sink_impl.cc @@ -28,8 +28,8 @@ #include "burst_sink_impl.h" #include #include -#include -#include +#include +#include namespace gr { namespace gsm { diff --git a/lib/qa_utils/burst_sink_impl.h b/lib/qa_utils/burst_sink_impl.h index 15e3bcfb..a4762b00 100644 --- a/lib/qa_utils/burst_sink_impl.h +++ b/lib/qa_utils/burst_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_BURST_SINK_IMPL_H #define INCLUDED_GSM_BURST_SINK_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/qa_utils/burst_source_impl.cc b/lib/qa_utils/burst_source_impl.cc index 276ed0e8..2c7ff704 100644 --- a/lib/qa_utils/burst_source_impl.cc +++ b/lib/qa_utils/burst_source_impl.cc @@ -28,8 +28,8 @@ #include "burst_source_impl.h" #include "stdio.h" #include -#include -#include +#include +#include namespace gr { namespace gsm { @@ -94,7 +94,7 @@ namespace gr { bool burst_source_impl::start() { d_finished = false; - d_thread = boost::shared_ptr + d_thread = std::shared_ptr (new gr::thread::thread(boost::bind(&burst_source_impl::run, this))); return block::start(); } diff --git a/lib/qa_utils/burst_source_impl.h b/lib/qa_utils/burst_source_impl.h index bbcfd98f..78de6271 100644 --- a/lib/qa_utils/burst_source_impl.h +++ b/lib/qa_utils/burst_source_impl.h @@ -25,7 +25,7 @@ #define BURST_SIZE 148 -#include +#include #include @@ -35,7 +35,7 @@ namespace gr { class burst_source_impl : public burst_source { private: - boost::shared_ptr d_thread; + std::shared_ptr d_thread; std::vector d_framenumbers; std::vector d_timeslots; std::vector d_burst_data; diff --git a/lib/qa_utils/message_sink_impl.cc b/lib/qa_utils/message_sink_impl.cc index 773bd114..dc1cffce 100644 --- a/lib/qa_utils/message_sink_impl.cc +++ b/lib/qa_utils/message_sink_impl.cc @@ -28,6 +28,7 @@ #include "message_sink_impl.h" #include #include +#include namespace gr { namespace gsm { diff --git a/lib/qa_utils/message_sink_impl.h b/lib/qa_utils/message_sink_impl.h index b7458af3..8f22e302 100644 --- a/lib/qa_utils/message_sink_impl.h +++ b/lib/qa_utils/message_sink_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_SINK_IMPL_H #define INCLUDED_GSM_MESSAGE_SINK_IMPL_H -#include +#include namespace gr { namespace gsm { diff --git a/lib/qa_utils/message_source_impl.cc b/lib/qa_utils/message_source_impl.cc index a2f28d15..3111d9c4 100644 --- a/lib/qa_utils/message_source_impl.cc +++ b/lib/qa_utils/message_source_impl.cc @@ -27,8 +27,8 @@ #include #include "message_source_impl.h" #include -#include -#include +#include +#include #include #include #include @@ -97,7 +97,7 @@ namespace gr { bool message_source_impl::start() { d_finished = false; - d_thread = boost::shared_ptr + d_thread = std::shared_ptr (new gr::thread::thread(boost::bind(&message_source_impl::run, this))); return block::start(); } diff --git a/lib/qa_utils/message_source_impl.h b/lib/qa_utils/message_source_impl.h index b5ffdcbb..b5ad5449 100644 --- a/lib/qa_utils/message_source_impl.h +++ b/lib/qa_utils/message_source_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_MESSAGE_SOURCE_IMPL_H #define INCLUDED_GSM_MESSAGE_SOURCE_IMPL_H -#include +#include namespace gr { namespace gsm { @@ -31,7 +31,7 @@ namespace gr { class message_source_impl : public message_source { private: - boost::shared_ptr d_thread; + std::shared_ptr d_thread; std::vector > d_msgs; bool d_finished; void run(); diff --git a/lib/receiver/clock_offset_control_impl.cc b/lib/receiver/clock_offset_control_impl.cc index c733346c..6197549f 100644 --- a/lib/receiver/clock_offset_control_impl.cc +++ b/lib/receiver/clock_offset_control_impl.cc @@ -25,7 +25,7 @@ #endif #include -#include +#include #include "clock_offset_control_impl.h" namespace gr diff --git a/lib/receiver/clock_offset_control_impl.h b/lib/receiver/clock_offset_control_impl.h index fc90f458..f7e70e4f 100644 --- a/lib/receiver/clock_offset_control_impl.h +++ b/lib/receiver/clock_offset_control_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_CLOCK_OFFSET_CONTROL_IMPL_H #define INCLUDED_GSM_CLOCK_OFFSET_CONTROL_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/receiver/cx_channel_hopper_impl.cc b/lib/receiver/cx_channel_hopper_impl.cc index 4d198189..86204c10 100644 --- a/lib/receiver/cx_channel_hopper_impl.cc +++ b/lib/receiver/cx_channel_hopper_impl.cc @@ -25,8 +25,8 @@ #endif #include -#include -#include +#include +#include #include #include "cx_channel_hopper_impl.h" diff --git a/lib/receiver/cx_channel_hopper_impl.h b/lib/receiver/cx_channel_hopper_impl.h index 7ac9bf4b..64830e6a 100644 --- a/lib/receiver/cx_channel_hopper_impl.h +++ b/lib/receiver/cx_channel_hopper_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GSM_CX_CHANNEL_HOPPER_IMPL_H #define INCLUDED_GSM_CX_CHANNEL_HOPPER_IMPL_H -#include +#include #include namespace gr { diff --git a/lib/receiver/receiver_config.h b/lib/receiver/receiver_config.h index b3c0f496..3aa0c34d 100644 --- a/lib/receiver/receiver_config.h +++ b/lib/receiver/receiver_config.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include class multiframe_configuration { diff --git a/lib/receiver/receiver_impl.cc b/lib/receiver/receiver_impl.cc index ffaf9ee3..ef7e30a0 100644 --- a/lib/receiver/receiver_impl.cc +++ b/lib/receiver/receiver_impl.cc @@ -35,7 +35,7 @@ #include #include -#include +#include #include "receiver_impl.h" #include "viterbi_detector.h" diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h index b8808372..9e0f1dbf 100644 --- a/lib/receiver/receiver_impl.h +++ b/lib/receiver/receiver_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_RECEIVER_IMPL_H #define INCLUDED_GSM_RECEIVER_IMPL_H -#include -#include -#include +#include +#include +#include #include #include #include "time_sample_ref.h" diff --git a/lib/receiver/sch.h b/lib/receiver/sch.h index 5eaf554c..a66e47ff 100644 --- a/lib/receiver/sch.h +++ b/lib/receiver/sch.h @@ -23,14 +23,14 @@ #ifndef __SCH_H__ #define __SCH_H__ 1 -#include +#include #ifdef __cplusplus extern "C" { #endif - GRGSM_API int decode_sch(const unsigned char *buf, int * t1_o, int * t2_o, int * t3_o, int * ncc, int * bcc); + GSM_API int decode_sch(const unsigned char *buf, int * t1_o, int * t2_o, int * t3_o, int * ncc, int * bcc); #ifdef __cplusplus } diff --git a/lib/receiver/time_sample_ref.h b/lib/receiver/time_sample_ref.h index 793944dc..66cd66a8 100644 --- a/lib/receiver/time_sample_ref.h +++ b/lib/receiver/time_sample_ref.h @@ -24,7 +24,7 @@ #define INCLUDED_TIME_SAMPLE_REF_IMPL_H #include -#include +#include namespace gr { namespace gsm { diff --git a/lib/receiver/viterbi_detector.cc b/lib/receiver/viterbi_detector.cc index 3dce379a..c3cc2933 100644 --- a/lib/receiver/viterbi_detector.cc +++ b/lib/receiver/viterbi_detector.cc @@ -56,7 +56,7 @@ */ #include -#include +#include #include #define PATHS_NUM (1 << (CHAN_IMP_RESP_LENGTH-1)) diff --git a/lib/transmitter/gen_test_ab_impl.cc b/lib/transmitter/gen_test_ab_impl.cc index dc0fba78..ecec97f7 100644 --- a/lib/transmitter/gen_test_ab_impl.cc +++ b/lib/transmitter/gen_test_ab_impl.cc @@ -25,9 +25,9 @@ #endif #include -#include -#include -#include +#include +#include +#include #include "gen_test_ab_impl.h" namespace gr { diff --git a/lib/transmitter/gen_test_ab_impl.h b/lib/transmitter/gen_test_ab_impl.h index 366481ed..9284749f 100644 --- a/lib/transmitter/gen_test_ab_impl.h +++ b/lib/transmitter/gen_test_ab_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_GEN_TEST_AB_IMPL_H #define INCLUDED_GSM_GEN_TEST_AB_IMPL_H -#include -#include -#include +#include +#include +#include namespace gr { namespace gsm { diff --git a/lib/transmitter/preprocess_tx_burst_impl.cc b/lib/transmitter/preprocess_tx_burst_impl.cc index 2023ee65..5591802d 100644 --- a/lib/transmitter/preprocess_tx_burst_impl.cc +++ b/lib/transmitter/preprocess_tx_burst_impl.cc @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include "preprocess_tx_burst_impl.h" diff --git a/lib/transmitter/preprocess_tx_burst_impl.h b/lib/transmitter/preprocess_tx_burst_impl.h index 27fc508b..86cd1411 100644 --- a/lib/transmitter/preprocess_tx_burst_impl.h +++ b/lib/transmitter/preprocess_tx_burst_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_PREPROCESS_TX_BURST_IMPL_H #define INCLUDED_GSM_PREPROCESS_TX_BURST_IMPL_H -#include -#include -#include +#include +#include +#include namespace gr { namespace gsm { diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc index 8e6b3cfd..829eef57 100644 --- a/lib/transmitter/txtime_setter_impl.cc +++ b/lib/transmitter/txtime_setter_impl.cc @@ -26,8 +26,8 @@ #endif #include -#include -#include +#include +#include #include "txtime_setter_impl.h" diff --git a/lib/transmitter/txtime_setter_impl.h b/lib/transmitter/txtime_setter_impl.h index 62f500a2..f7f9a572 100644 --- a/lib/transmitter/txtime_setter_impl.h +++ b/lib/transmitter/txtime_setter_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GSM_TXTIME_SETTER_IMPL_H #define INCLUDED_GSM_TXTIME_SETTER_IMPL_H -#include -#include -#include +#include +#include +#include namespace gr { namespace gsm { diff --git a/lib/trx/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc index 70d7d327..14c07409 100644 --- a/lib/trx/trx_burst_if_impl.cc +++ b/lib/trx/trx_burst_if_impl.cc @@ -27,8 +27,8 @@ #include #include -#include "grgsm/endian.h" -#include "grgsm/misc_utils/udp_socket.h" +#include "gsm/endian.h" +#include "gsm/misc_utils/udp_socket.h" #include "trx_burst_if_impl.h" #define BURST_SIZE 148 diff --git a/lib/trx/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h index fdb49f22..65b08e41 100644 --- a/lib/trx/trx_burst_if_impl.h +++ b/lib/trx/trx_burst_if_impl.h @@ -20,13 +20,13 @@ * */ -#ifndef INCLUDED_GRGSM_TRX_BURST_IF_IMPL_H -#define INCLUDED_GRGSM_TRX_BURST_IF_IMPL_H +#ifndef INCLUDED_GSM_TRX_BURST_IF_IMPL_H +#define INCLUDED_GSM_TRX_BURST_IF_IMPL_H #include -#include -#include +#include +#include namespace gr { namespace gsm { @@ -51,5 +51,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GRGSM_TRX_BURST_IF_IMPL_H */ +#endif /* INCLUDED_GSM_TRX_BURST_IF_IMPL_H */ diff --git a/python/.gitignore b/python/.gitignore new file mode 100644 index 00000000..85c92e8d --- /dev/null +++ b/python/.gitignore @@ -0,0 +1,5 @@ +*~ +*.pyc +*.pyo +build*/ +examples/grc/*.py diff --git a/python/grgsm b/python/grgsm deleted file mode 120000 index 945c9b46..00000000 --- a/python/grgsm +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/python/CMakeLists.txt b/python/gsm/CMakeLists.txt similarity index 91% rename from python/CMakeLists.txt rename to python/gsm/CMakeLists.txt index 31efedbc..61dae182 100644 --- a/python/CMakeLists.txt +++ b/python/gsm/CMakeLists.txt @@ -29,6 +29,7 @@ endif() ######################################################################## # Install python sources ######################################################################## +add_subdirectory(bindings) add_subdirectory(misc_utils) add_subdirectory(receiver) add_subdirectory(demapping) @@ -38,7 +39,7 @@ add_subdirectory(trx) GR_PYTHON_INSTALL( FILES __init__.py - DESTINATION ${GR_PYTHON_DIR}/grgsm + DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm ) ######################################################################## @@ -46,8 +47,15 @@ GR_PYTHON_INSTALL( ######################################################################## include(GrTest) -set(GR_TEST_TARGET_DEPS gr-gsm) -set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig) +# Create a package directory that tests can import. It includes everything +# from `python/`. +add_custom_target( + copy_module_for_tests ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/test_modules/gnuradio/gsm/ +) + +set(GR_TEST_TARGET_DEPS gnuradio-gsm) set(GR_TEST_ENVIRONS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}") GR_ADD_TEST(qa_arfcn ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_arfcn.py) GR_ADD_TEST(qa_decryption ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_decryption.py) diff --git a/python/__init__.py b/python/gsm/__init__.py similarity index 90% rename from python/__init__.py rename to python/gsm/__init__.py index b68df4a3..ef3da15e 100644 --- a/python/__init__.py +++ b/python/gsm/__init__.py @@ -33,9 +33,6 @@ # not able to load the modules using the relative import syntax and grcc compilation and # some unit tests fail. __path__ += [ - # Load the local (not yet installed) grgsm_swig from the ../swig subdirectory. - os.path.join(os.environ.get("CMAKE_BINARY_DIR"), "swig"), - # Load the local (not yet installed) python modules from the local subdirectories os.path.join(dirname, "misc_utils"), os.path.join(dirname, "receiver"), @@ -43,10 +40,14 @@ os.path.join(dirname, "transmitter"), os.path.join(dirname, "trx")] +# import pybind11 generated symbols into the gsm namespace try: - # import swig generated symbols into the gsm namespace - from .grgsm_swig import * + # this might fail if the module is python-only + from .gsm_python import * +except ModuleNotFoundError: + pass +try: # import any pure python here #from fcch_burst_tagger import fcch_burst_tagger diff --git a/python/gsm/bindings/CMakeLists.txt b/python/gsm/bindings/CMakeLists.txt new file mode 100644 index 00000000..d0ba2880 --- /dev/null +++ b/python/gsm/bindings/CMakeLists.txt @@ -0,0 +1,94 @@ +# Copyright 2020 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# SPDX-License-Identifier: GPL-3.0-or-later +# + +######################################################################## +# Check if there is C++ code at all +######################################################################## +if(NOT gsm_sources) + MESSAGE(STATUS "No C++ sources... skipping python bindings") + return() +endif(NOT gsm_sources) + +######################################################################## +# Check for pygccxml +######################################################################## +GR_PYTHON_CHECK_MODULE_RAW( + "pygccxml" + "import pygccxml" + PYGCCXML_FOUND + ) + +include(GrPybind) + +######################################################################## +# Python Bindings +######################################################################## + +list(APPEND gsm_python_files + burst_file_sink_python.cc + burst_file_source_python.cc + burst_fnr_filter_python.cc + burst_sdcch_subslot_filter_python.cc + burst_sdcch_subslot_splitter_python.cc + burst_sink_python.cc + burst_source_python.cc + burst_timeslot_filter_python.cc + burst_timeslot_splitter_python.cc + burst_to_fn_time_python.cc + burst_type_filter_python.cc + bursts_printer_python.cc + clock_offset_control_python.cc + collect_system_info_python.cc + common_python.cc + constants_python.cc + control_channels_decoder_python.cc + controlled_fractional_resampler_cc_python.cc + controlled_rotator_cc_python.cc + cx_channel_hopper_python.cc + decryption_python.cc + dummy_burst_filter_python.cc + extract_assignment_cmd_python.cc + extract_cmc_python.cc + extract_immediate_assignment_python.cc + extract_system_info_python.cc + fn_time_python.cc + gen_test_ab_python.cc + message_file_sink_python.cc + message_file_source_python.cc + message_printer_python.cc + message_sink_python.cc + message_source_python.cc + msg_to_tag_python.cc + preprocess_tx_burst_python.cc + receiver_python.cc + tch_f_chans_demapper_python.cc + tch_f_decoder_python.cc + tch_h_chans_demapper_python.cc + tch_h_decoder_python.cc + #time_spec_python.cc + tmsi_dumper_python.cc + trx_burst_if_python.cc + txtime_setter_python.cc + #udp_socket_python.cc + universal_ctrl_chans_demapper_python.cc + uplink_downlink_splitter_python.cc + python_bindings.cc) + +GR_PYBIND_MAKE_OOT(gsm + ../../../ + gr::gsm + "${gsm_python_files}") + +# copy in bindings .so file for use in QA test module +add_custom_target( + copy_bindings_for_tests ALL + COMMAND + ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/*.so" + ${CMAKE_BINARY_DIR}/test_modules/gnuradio/gsm/ + DEPENDS gsm_python) + +install(TARGETS gsm_python DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm COMPONENT pythonapi) diff --git a/python/gsm/bindings/README.md b/python/gsm/bindings/README.md new file mode 100644 index 00000000..e69de29b diff --git a/python/gsm/bindings/bind_oot_file.py b/python/gsm/bindings/bind_oot_file.py new file mode 100644 index 00000000..543c6994 --- /dev/null +++ b/python/gsm/bindings/bind_oot_file.py @@ -0,0 +1,54 @@ +import warnings +import argparse +from gnuradio.bindtool import BindingGenerator +import sys +import tempfile + +parser = argparse.ArgumentParser(description='Bind a GR Out of Tree Block') +parser.add_argument('--module', type=str, + help='Name of gr module containing file to bind (e.g. fft digital analog)') + +parser.add_argument('--output_dir', default=tempfile.gettempdir(), + help='Output directory of generated bindings') +parser.add_argument('--prefix', help='Prefix of Installed GNU Radio') + +parser.add_argument( + '--filename', help="File to be parsed") + +parser.add_argument( + '--defines', help='Set additional defines for precompiler', default=(), nargs='*') +parser.add_argument( + '--include', help='Additional Include Dirs, separated', default=(), nargs='*') + +parser.add_argument( + '--status', help='Location of output file for general status (used during cmake)', default=None +) +parser.add_argument( + '--flag_automatic', default='0' +) +parser.add_argument( + '--flag_pygccxml', default='0' +) + +args = parser.parse_args() + +prefix = args.prefix +output_dir = args.output_dir +defines = tuple(','.join(args.defines).split(',')) +includes = ','.join(args.include) +name = args.module + +namespace = ['gr', name] +prefix_include_root = name + + +with warnings.catch_warnings(): + warnings.filterwarnings("ignore", category=DeprecationWarning) + + bg = BindingGenerator(prefix, namespace, + prefix_include_root, output_dir, define_symbols=defines, addl_includes=includes, + catch_exceptions=False, write_json_output=False, status_output=args.status, + flag_automatic=True if args.flag_automatic.lower() in [ + '1', 'true'] else False, + flag_pygccxml=True if args.flag_pygccxml.lower() in ['1', 'true'] else False) + bg.gen_file_binding(args.filename) diff --git a/python/gsm/bindings/burst_file_sink_python.cc b/python/gsm/bindings/burst_file_sink_python.cc new file mode 100644 index 00000000..7275a262 --- /dev/null +++ b/python/gsm/bindings/burst_file_sink_python.cc @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/burst_file_sink.h) */ +/* BINDTOOL_HEADER_FILE_HASH(3f4ce9b0bd6fa347887b4a75de3c2786) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_file_sink(py::module& m) +{ + + using burst_file_sink = ::gr::gsm::burst_file_sink; + + + py::class_>(m, "burst_file_sink", D(burst_file_sink)) + + .def(py::init(&burst_file_sink::make), + py::arg("filename"), + D(burst_file_sink,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_file_source_python.cc b/python/gsm/bindings/burst_file_source_python.cc new file mode 100644 index 00000000..f0530b7a --- /dev/null +++ b/python/gsm/bindings/burst_file_source_python.cc @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/burst_file_source.h) */ +/* BINDTOOL_HEADER_FILE_HASH(bd4e1867e20966f4fea3d73f7453b912) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_file_source(py::module& m) +{ + + using burst_file_source = ::gr::gsm::burst_file_source; + + + py::class_>(m, "burst_file_source", D(burst_file_source)) + + .def(py::init(&burst_file_source::make), + py::arg("filename"), + D(burst_file_source,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_fnr_filter_python.cc b/python/gsm/bindings/burst_fnr_filter_python.cc new file mode 100644 index 00000000..bc0653ac --- /dev/null +++ b/python/gsm/bindings/burst_fnr_filter_python.cc @@ -0,0 +1,107 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/burst_fnr_filter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(60f07b587b57fcc919dc1612b577dc74) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_fnr_filter(py::module& m) +{ + + using burst_fnr_filter = ::gr::gsm::burst_fnr_filter; + + + py::class_>(m, "burst_fnr_filter", D(burst_fnr_filter)) + + .def(py::init(&burst_fnr_filter::make), + py::arg("mode"), + py::arg("fnr"), + D(burst_fnr_filter,make) + ) + + + + + + + .def("get_fn",&burst_fnr_filter::get_fn, + D(burst_fnr_filter,get_fn) + ) + + + + .def("set_fn",&burst_fnr_filter::set_fn, + py::arg("fn"), + D(burst_fnr_filter,set_fn) + ) + + + + .def("get_mode",&burst_fnr_filter::get_mode, + D(burst_fnr_filter,get_mode) + ) + + + + .def("set_mode",&burst_fnr_filter::set_mode, + py::arg("mode"), + D(burst_fnr_filter,set_mode) + ) + + + + .def("get_policy",&burst_fnr_filter::get_policy, + D(burst_fnr_filter,get_policy) + ) + + + + .def("set_policy",&burst_fnr_filter::set_policy, + py::arg("policy"), + D(burst_fnr_filter,set_policy) + ) + + ; + + py::enum_<::gr::gsm::filter_mode>(m,"filter_mode") + .value("FILTER_LESS_OR_EQUAL", ::gr::gsm::filter_mode::FILTER_LESS_OR_EQUAL) // 0 + .value("FILTER_GREATER_OR_EQUAL", ::gr::gsm::filter_mode::FILTER_GREATER_OR_EQUAL) // 1 + .export_values() + ; + + py::implicitly_convertible(); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_sdcch_subslot_filter_python.cc b/python/gsm/bindings/burst_sdcch_subslot_filter_python.cc new file mode 100644 index 00000000..edce32f8 --- /dev/null +++ b/python/gsm/bindings/burst_sdcch_subslot_filter_python.cc @@ -0,0 +1,107 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/burst_sdcch_subslot_filter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(ad140ed91934174a641d0f116d59784d) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_sdcch_subslot_filter(py::module& m) +{ + + using burst_sdcch_subslot_filter = ::gr::gsm::burst_sdcch_subslot_filter; + + + py::class_>(m, "burst_sdcch_subslot_filter", D(burst_sdcch_subslot_filter)) + + .def(py::init(&burst_sdcch_subslot_filter::make), + py::arg("mode"), + py::arg("subslot"), + D(burst_sdcch_subslot_filter,make) + ) + + + + + + + .def("get_ss",&burst_sdcch_subslot_filter::get_ss, + D(burst_sdcch_subslot_filter,get_ss) + ) + + + + .def("set_ss",&burst_sdcch_subslot_filter::set_ss, + py::arg("ss"), + D(burst_sdcch_subslot_filter,set_ss) + ) + + + + .def("get_mode",&burst_sdcch_subslot_filter::get_mode, + D(burst_sdcch_subslot_filter,get_mode) + ) + + + + .def("set_mode",&burst_sdcch_subslot_filter::set_mode, + py::arg("mode"), + D(burst_sdcch_subslot_filter,set_mode) + ) + + + + .def("get_policy",&burst_sdcch_subslot_filter::get_policy, + D(burst_sdcch_subslot_filter,get_policy) + ) + + + + .def("set_policy",&burst_sdcch_subslot_filter::set_policy, + py::arg("policy"), + D(burst_sdcch_subslot_filter,set_policy) + ) + + ; + + py::enum_<::gr::gsm::subslot_filter_mode>(m,"subslot_filter_mode") + .value("SS_FILTER_SDCCH8", ::gr::gsm::subslot_filter_mode::SS_FILTER_SDCCH8) // 0 + .value("SS_FILTER_SDCCH4", ::gr::gsm::subslot_filter_mode::SS_FILTER_SDCCH4) // 1 + .export_values() + ; + + py::implicitly_convertible(); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_sdcch_subslot_splitter_python.cc b/python/gsm/bindings/burst_sdcch_subslot_splitter_python.cc new file mode 100644 index 00000000..639a2521 --- /dev/null +++ b/python/gsm/bindings/burst_sdcch_subslot_splitter_python.cc @@ -0,0 +1,80 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/burst_sdcch_subslot_splitter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(7905eb32ad6a8f99c9f30389a805d137) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_sdcch_subslot_splitter(py::module& m) +{ + + using burst_sdcch_subslot_splitter = ::gr::gsm::burst_sdcch_subslot_splitter; + + + py::class_>(m, "burst_sdcch_subslot_splitter", D(burst_sdcch_subslot_splitter)) + + .def(py::init(&burst_sdcch_subslot_splitter::make), + py::arg("mode"), + D(burst_sdcch_subslot_splitter,make) + ) + + + + + + + .def("get_mode",&burst_sdcch_subslot_splitter::get_mode, + D(burst_sdcch_subslot_splitter,get_mode) + ) + + + + .def("set_mode",&burst_sdcch_subslot_splitter::set_mode, + py::arg("mode"), + D(burst_sdcch_subslot_splitter,set_mode) + ) + + ; + + py::enum_<::gr::gsm::splitter_mode>(m,"splitter_mode") + .value("SPLITTER_SDCCH8", ::gr::gsm::splitter_mode::SPLITTER_SDCCH8) // 0 + .value("SPLITTER_SDCCH4", ::gr::gsm::splitter_mode::SPLITTER_SDCCH4) // 1 + .export_values() + ; + + py::implicitly_convertible(); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_sink_python.cc b/python/gsm/bindings/burst_sink_python.cc new file mode 100644 index 00000000..2d8bea0e --- /dev/null +++ b/python/gsm/bindings/burst_sink_python.cc @@ -0,0 +1,95 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(qa_utils/burst_sink.h) */ +/* BINDTOOL_HEADER_FILE_HASH(a4e452730d052832e8f9e37e641cd1a3) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_sink(py::module& m) +{ + + using burst_sink = ::gr::gsm::burst_sink; + + + py::class_>(m, "burst_sink", D(burst_sink)) + + .def(py::init(&burst_sink::make), + D(burst_sink,make) + ) + + + + + + + .def("get_framenumbers",&burst_sink::get_framenumbers, + D(burst_sink,get_framenumbers) + ) + + + + .def("get_timeslots",&burst_sink::get_timeslots, + D(burst_sink,get_timeslots) + ) + + + + .def("get_burst_data",&burst_sink::get_burst_data, + D(burst_sink,get_burst_data) + ) + + + + .def("get_bursts",&burst_sink::get_bursts, + D(burst_sink,get_bursts) + ) + + + + .def("get_sub_types",&burst_sink::get_sub_types, + D(burst_sink,get_sub_types) + ) + + + + .def("get_sub_slots",&burst_sink::get_sub_slots, + D(burst_sink,get_sub_slots) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_source_python.cc b/python/gsm/bindings/burst_source_python.cc new file mode 100644 index 00000000..b1b98884 --- /dev/null +++ b/python/gsm/bindings/burst_source_python.cc @@ -0,0 +1,90 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(qa_utils/burst_source.h) */ +/* BINDTOOL_HEADER_FILE_HASH(896ecc99bec8f9b3e1aefde16b32c6dd) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_source(py::module& m) +{ + + using burst_source = ::gr::gsm::burst_source; + + + py::class_>(m, "burst_source", D(burst_source)) + + .def(py::init(&burst_source::make), + py::arg("framenumbers"), + py::arg("timeslots"), + py::arg("burst_data"), + D(burst_source,make) + ) + + + + + + + .def("set_framenumbers",&burst_source::set_framenumbers, + py::arg("framenumbers"), + D(burst_source,set_framenumbers) + ) + + + + .def("set_timeslots",&burst_source::set_timeslots, + py::arg("timeslots"), + D(burst_source,set_timeslots) + ) + + + + .def("set_burst_data",&burst_source::set_burst_data, + py::arg("burst_data"), + D(burst_source,set_burst_data) + ) + + + + .def("set_arfcn",&burst_source::set_arfcn, + py::arg("arfcn"), + D(burst_source,set_arfcn) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_timeslot_filter_python.cc b/python/gsm/bindings/burst_timeslot_filter_python.cc new file mode 100644 index 00000000..7d4866d9 --- /dev/null +++ b/python/gsm/bindings/burst_timeslot_filter_python.cc @@ -0,0 +1,86 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/burst_timeslot_filter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(3dae8eb7200d8b209acf38768c33fcf6) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_timeslot_filter(py::module& m) +{ + + using burst_timeslot_filter = ::gr::gsm::burst_timeslot_filter; + + + py::class_>(m, "burst_timeslot_filter", D(burst_timeslot_filter)) + + .def(py::init(&burst_timeslot_filter::make), + py::arg("timeslot"), + D(burst_timeslot_filter,make) + ) + + + + + + + .def("get_tn",&burst_timeslot_filter::get_tn, + D(burst_timeslot_filter,get_tn) + ) + + + + .def("set_tn",&burst_timeslot_filter::set_tn, + py::arg("tn"), + D(burst_timeslot_filter,set_tn) + ) + + + + .def("get_policy",&burst_timeslot_filter::get_policy, + D(burst_timeslot_filter,get_policy) + ) + + + + .def("set_policy",&burst_timeslot_filter::set_policy, + py::arg("policy"), + D(burst_timeslot_filter,set_policy) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_timeslot_splitter_python.cc b/python/gsm/bindings/burst_timeslot_splitter_python.cc new file mode 100644 index 00000000..88494b80 --- /dev/null +++ b/python/gsm/bindings/burst_timeslot_splitter_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/burst_timeslot_splitter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(1cfb084acd59b4e3c9d3bfcec86c9107) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_timeslot_splitter(py::module& m) +{ + + using burst_timeslot_splitter = ::gr::gsm::burst_timeslot_splitter; + + + py::class_>(m, "burst_timeslot_splitter", D(burst_timeslot_splitter)) + + .def(py::init(&burst_timeslot_splitter::make), + D(burst_timeslot_splitter,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_to_fn_time_python.cc b/python/gsm/bindings/burst_to_fn_time_python.cc new file mode 100644 index 00000000..e46733c4 --- /dev/null +++ b/python/gsm/bindings/burst_to_fn_time_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/burst_to_fn_time.h) */ +/* BINDTOOL_HEADER_FILE_HASH(17c8563bb2d6320cce9f9a5ce2ad4100) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_to_fn_time(py::module& m) +{ + + using burst_to_fn_time = ::gr::gsm::burst_to_fn_time; + + + py::class_>(m, "burst_to_fn_time", D(burst_to_fn_time)) + + .def(py::init(&burst_to_fn_time::make), + D(burst_to_fn_time,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/burst_type_filter_python.cc b/python/gsm/bindings/burst_type_filter_python.cc new file mode 100644 index 00000000..8a917729 --- /dev/null +++ b/python/gsm/bindings/burst_type_filter_python.cc @@ -0,0 +1,80 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/burst_type_filter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(f0905cd262a0e1b2dce0281c770c972f) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_burst_type_filter(py::module& m) +{ + + using burst_type_filter = ::gr::gsm::burst_type_filter; + + + py::class_>(m, "burst_type_filter", D(burst_type_filter)) + + .def(py::init(&burst_type_filter::make), + py::arg("selected_burst_types"), + D(burst_type_filter,make) + ) + + + + + + + .def("get_policy",&burst_type_filter::get_policy, + D(burst_type_filter,get_policy) + ) + + + + .def("set_policy",&burst_type_filter::set_policy, + py::arg("policy"), + D(burst_type_filter,set_policy) + ) + + + + .def("set_selected_burst_types",&burst_type_filter::set_selected_burst_types, + py::arg("selected_burst_types"), + D(burst_type_filter,set_selected_burst_types) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/bursts_printer_python.cc b/python/gsm/bindings/bursts_printer_python.cc new file mode 100644 index 00000000..5bfddfcc --- /dev/null +++ b/python/gsm/bindings/bursts_printer_python.cc @@ -0,0 +1,64 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/bursts_printer.h) */ +/* BINDTOOL_HEADER_FILE_HASH(fb1cb7396a0f0e916397fcf689b88a5c) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_bursts_printer(py::module& m) +{ + + using bursts_printer = ::gr::gsm::bursts_printer; + + + py::class_>(m, "bursts_printer", D(bursts_printer)) + + .def(py::init(&bursts_printer::make), + py::arg("prepend_string"), + py::arg("prepend_fnr") = false, + py::arg("prepend_frame_count") = false, + py::arg("print_payload_only") = false, + py::arg("ignore_dummy_bursts") = false, + D(bursts_printer,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/clock_offset_control_python.cc b/python/gsm/bindings/clock_offset_control_python.cc new file mode 100644 index 00000000..610b1770 --- /dev/null +++ b/python/gsm/bindings/clock_offset_control_python.cc @@ -0,0 +1,83 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(receiver/clock_offset_control.h) */ +/* BINDTOOL_HEADER_FILE_HASH(b16817d011cdedc94bc142212ecd57d9) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_clock_offset_control(py::module& m) +{ + + using clock_offset_control = ::gr::gsm::clock_offset_control; + + + py::class_>(m, "clock_offset_control", D(clock_offset_control)) + + .def(py::init(&clock_offset_control::make), + py::arg("fc"), + py::arg("samp_rate"), + py::arg("osr") = 4, + D(clock_offset_control,make) + ) + + + + + + + .def("set_fc",&clock_offset_control::set_fc, + py::arg("fc"), + D(clock_offset_control,set_fc) + ) + + + + .def("set_samp_rate",&clock_offset_control::set_samp_rate, + py::arg("samp_rate"), + D(clock_offset_control,set_samp_rate) + ) + + + + .def("set_osr",&clock_offset_control::set_osr, + py::arg("osr"), + D(clock_offset_control,set_osr) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/collect_system_info_python.cc b/python/gsm/bindings/collect_system_info_python.cc new file mode 100644 index 00000000..23e275c2 --- /dev/null +++ b/python/gsm/bindings/collect_system_info_python.cc @@ -0,0 +1,77 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/collect_system_info.h) */ +/* BINDTOOL_HEADER_FILE_HASH(e73bdf71b433e7bcfc202a40e4399407) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_collect_system_info(py::module& m) +{ + + using collect_system_info = ::gr::gsm::collect_system_info; + + + py::class_>(m, "collect_system_info", D(collect_system_info)) + + .def(py::init(&collect_system_info::make), + D(collect_system_info,make) + ) + + + + + + + .def("get_framenumbers",&collect_system_info::get_framenumbers, + D(collect_system_info,get_framenumbers) + ) + + + + .def("get_system_information_type",&collect_system_info::get_system_information_type, + D(collect_system_info,get_system_information_type) + ) + + + + .def("get_data",&collect_system_info::get_data, + D(collect_system_info,get_data) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/common_python.cc b/python/gsm/bindings/common_python.cc new file mode 100644 index 00000000..662e3691 --- /dev/null +++ b/python/gsm/bindings/common_python.cc @@ -0,0 +1,53 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/common.h) */ +/* BINDTOOL_HEADER_FILE_HASH(8959d83e9eef8a31155e21912e1e8524) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_common(py::module& m) +{ + + + py::enum_<::gr::gsm::filter_policy>(m,"filter_policy") + .value("FILTER_POLICY_DEFAULT", ::gr::gsm::filter_policy::FILTER_POLICY_DEFAULT) // 0 + .value("FILTER_POLICY_PASS_ALL", ::gr::gsm::filter_policy::FILTER_POLICY_PASS_ALL) // 1 + .value("FILTER_POLICY_DROP_ALL", ::gr::gsm::filter_policy::FILTER_POLICY_DROP_ALL) // 2 + .export_values() + ; + + py::implicitly_convertible(); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/constants_python.cc b/python/gsm/bindings/constants_python.cc new file mode 100644 index 00000000..7ce005fd --- /dev/null +++ b/python/gsm/bindings/constants_python.cc @@ -0,0 +1,75 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(constants.h) */ +/* BINDTOOL_HEADER_FILE_HASH(ca96a99a1560d094f946ac5d1e7ba490) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_constants(py::module& m) +{ + + + + + m.def("build_date",&::gr::gsm::build_date, + D(build_date) + ); + + + m.def("version",&::gr::gsm::version, + D(version) + ); + + + m.def("major_version",&::gr::gsm::major_version, + D(major_version) + ); + + + m.def("api_version",&::gr::gsm::api_version, + D(api_version) + ); + + + m.def("minor_version",&::gr::gsm::minor_version, + D(minor_version) + ); + + + m.def("maint_version",&::gr::gsm::maint_version, + D(maint_version) + ); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/control_channels_decoder_python.cc b/python/gsm/bindings/control_channels_decoder_python.cc new file mode 100644 index 00000000..37c1c785 --- /dev/null +++ b/python/gsm/bindings/control_channels_decoder_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(decoding/control_channels_decoder.h) */ +/* BINDTOOL_HEADER_FILE_HASH(27ccac5f7443c012950a9cedefae17d5) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_control_channels_decoder(py::module& m) +{ + + using control_channels_decoder = ::gr::gsm::control_channels_decoder; + + + py::class_>(m, "control_channels_decoder", D(control_channels_decoder)) + + .def(py::init(&control_channels_decoder::make), + D(control_channels_decoder,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/controlled_fractional_resampler_cc_python.cc b/python/gsm/bindings/controlled_fractional_resampler_cc_python.cc new file mode 100644 index 00000000..7dbf393d --- /dev/null +++ b/python/gsm/bindings/controlled_fractional_resampler_cc_python.cc @@ -0,0 +1,87 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/controlled_fractional_resampler_cc.h) */ +/* BINDTOOL_HEADER_FILE_HASH(db125af4112a6ca9b741236edeeb148a) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_controlled_fractional_resampler_cc(py::module& m) +{ + + using controlled_fractional_resampler_cc = ::gr::gsm::controlled_fractional_resampler_cc; + + + py::class_>(m, "controlled_fractional_resampler_cc", D(controlled_fractional_resampler_cc)) + + .def(py::init(&controlled_fractional_resampler_cc::make), + py::arg("phase_shift"), + py::arg("resamp_ratio"), + D(controlled_fractional_resampler_cc,make) + ) + + + + + + + .def("mu",&controlled_fractional_resampler_cc::mu, + D(controlled_fractional_resampler_cc,mu) + ) + + + + .def("resamp_ratio",&controlled_fractional_resampler_cc::resamp_ratio, + D(controlled_fractional_resampler_cc,resamp_ratio) + ) + + + + .def("set_mu",&controlled_fractional_resampler_cc::set_mu, + py::arg("mu"), + D(controlled_fractional_resampler_cc,set_mu) + ) + + + + .def("set_resamp_ratio",&controlled_fractional_resampler_cc::set_resamp_ratio, + py::arg("resamp_ratio"), + D(controlled_fractional_resampler_cc,set_resamp_ratio) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/controlled_rotator_cc_python.cc b/python/gsm/bindings/controlled_rotator_cc_python.cc new file mode 100644 index 00000000..3250ad18 --- /dev/null +++ b/python/gsm/bindings/controlled_rotator_cc_python.cc @@ -0,0 +1,67 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/controlled_rotator_cc.h) */ +/* BINDTOOL_HEADER_FILE_HASH(c9c73fd18cf912c513008be3e7df8a1b) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_controlled_rotator_cc(py::module& m) +{ + + using controlled_rotator_cc = ::gr::gsm::controlled_rotator_cc; + + + py::class_>(m, "controlled_rotator_cc", D(controlled_rotator_cc)) + + .def(py::init(&controlled_rotator_cc::make), + py::arg("phase_inc"), + D(controlled_rotator_cc,make) + ) + + + + + + + .def("set_phase_inc",&controlled_rotator_cc::set_phase_inc, + py::arg("phase_inc"), + D(controlled_rotator_cc,set_phase_inc) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/cx_channel_hopper_python.cc b/python/gsm/bindings/cx_channel_hopper_python.cc new file mode 100644 index 00000000..b2f21b7c --- /dev/null +++ b/python/gsm/bindings/cx_channel_hopper_python.cc @@ -0,0 +1,62 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(receiver/cx_channel_hopper.h) */ +/* BINDTOOL_HEADER_FILE_HASH(08741758b8d211f32570707908ecd75e) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_cx_channel_hopper(py::module& m) +{ + + using cx_channel_hopper = ::gr::gsm::cx_channel_hopper; + + + py::class_>(m, "cx_channel_hopper", D(cx_channel_hopper)) + + .def(py::init(&cx_channel_hopper::make), + py::arg("ma"), + py::arg("maio"), + py::arg("hsn"), + D(cx_channel_hopper,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/decryption_python.cc b/python/gsm/bindings/decryption_python.cc new file mode 100644 index 00000000..223ac3e7 --- /dev/null +++ b/python/gsm/bindings/decryption_python.cc @@ -0,0 +1,75 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(decryption/decryption.h) */ +/* BINDTOOL_HEADER_FILE_HASH(0327803fb3a06810cd7b67f43333a96b) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_decryption(py::module& m) +{ + + using decryption = ::gr::gsm::decryption; + + + py::class_>(m, "decryption", D(decryption)) + + .def(py::init(&decryption::make), + py::arg("k_c"), + py::arg("a5_version"), + D(decryption,make) + ) + + + + + + + .def("set_k_c",&decryption::set_k_c, + py::arg("k_c"), + D(decryption,set_k_c) + ) + + + + .def("set_a5_version",&decryption::set_a5_version, + py::arg("a5_version"), + D(decryption,set_a5_version) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/docstrings/README.md b/python/gsm/bindings/docstrings/README.md new file mode 100644 index 00000000..a506c22a --- /dev/null +++ b/python/gsm/bindings/docstrings/README.md @@ -0,0 +1 @@ +This directory stores templates for docstrings that are scraped from the include header files for each block diff --git a/python/gsm/bindings/docstrings/burst_file_sink_pydoc_template.h b/python/gsm/bindings/docstrings/burst_file_sink_pydoc_template.h new file mode 100644 index 00000000..7a2b0ecb --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_file_sink_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_file_sink = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_file_sink_burst_file_sink = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_file_sink_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_file_source_pydoc_template.h b/python/gsm/bindings/docstrings/burst_file_source_pydoc_template.h new file mode 100644 index 00000000..b797a0da --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_file_source_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_file_source = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_file_source_burst_file_source = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_file_source_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_fnr_filter_pydoc_template.h b/python/gsm/bindings/docstrings/burst_fnr_filter_pydoc_template.h new file mode 100644 index 00000000..fb99921b --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_fnr_filter_pydoc_template.h @@ -0,0 +1,48 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_fnr_filter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_burst_fnr_filter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_burst_fnr_filter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_get_fn = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_set_fn = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_get_mode = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_set_mode = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_get_policy = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_fnr_filter_set_policy = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_sdcch_subslot_filter_pydoc_template.h b/python/gsm/bindings/docstrings/burst_sdcch_subslot_filter_pydoc_template.h new file mode 100644 index 00000000..d06e9074 --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_sdcch_subslot_filter_pydoc_template.h @@ -0,0 +1,48 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_burst_sdcch_subslot_filter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_burst_sdcch_subslot_filter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_get_ss = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_set_ss = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_get_mode = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_set_mode = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_get_policy = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_filter_set_policy = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_sdcch_subslot_splitter_pydoc_template.h b/python/gsm/bindings/docstrings/burst_sdcch_subslot_splitter_pydoc_template.h new file mode 100644 index 00000000..61ae1222 --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_sdcch_subslot_splitter_pydoc_template.h @@ -0,0 +1,36 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_splitter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_splitter_burst_sdcch_subslot_splitter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_splitter_burst_sdcch_subslot_splitter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_splitter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_splitter_get_mode = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sdcch_subslot_splitter_set_mode = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_sink_pydoc_template.h b/python/gsm/bindings/docstrings/burst_sink_pydoc_template.h new file mode 100644 index 00000000..e85b26be --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_sink_pydoc_template.h @@ -0,0 +1,48 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_sink = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_burst_sink_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_burst_sink_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_get_framenumbers = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_get_timeslots = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_get_burst_data = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_get_bursts = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_get_sub_types = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_sink_get_sub_slots = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_source_pydoc_template.h b/python/gsm/bindings/docstrings/burst_source_pydoc_template.h new file mode 100644 index 00000000..f5ce3839 --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_source_pydoc_template.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_source = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_burst_source_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_burst_source_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_set_framenumbers = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_set_timeslots = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_set_burst_data = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_source_set_arfcn = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_timeslot_filter_pydoc_template.h b/python/gsm/bindings/docstrings/burst_timeslot_filter_pydoc_template.h new file mode 100644 index 00000000..ac034a9c --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_timeslot_filter_pydoc_template.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_timeslot_filter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_burst_timeslot_filter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_burst_timeslot_filter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_get_tn = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_set_tn = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_get_policy = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_filter_set_policy = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_timeslot_splitter_pydoc_template.h b/python/gsm/bindings/docstrings/burst_timeslot_splitter_pydoc_template.h new file mode 100644 index 00000000..e50584c8 --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_timeslot_splitter_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_timeslot_splitter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_splitter_burst_timeslot_splitter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_timeslot_splitter_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_to_fn_time_pydoc_template.h b/python/gsm/bindings/docstrings/burst_to_fn_time_pydoc_template.h new file mode 100644 index 00000000..dfea8c99 --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_to_fn_time_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_to_fn_time = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_to_fn_time_burst_to_fn_time = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_to_fn_time_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/burst_type_filter_pydoc_template.h b/python/gsm/bindings/docstrings/burst_type_filter_pydoc_template.h new file mode 100644 index 00000000..6fbaf4e8 --- /dev/null +++ b/python/gsm/bindings/docstrings/burst_type_filter_pydoc_template.h @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_burst_type_filter = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_type_filter_burst_type_filter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_type_filter_burst_type_filter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_type_filter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_type_filter_get_policy = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_type_filter_set_policy = R"doc()doc"; + + + static const char *__doc_gr_gsm_burst_type_filter_set_selected_burst_types = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/bursts_printer_pydoc_template.h b/python/gsm/bindings/docstrings/bursts_printer_pydoc_template.h new file mode 100644 index 00000000..ece7860d --- /dev/null +++ b/python/gsm/bindings/docstrings/bursts_printer_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_bursts_printer = R"doc()doc"; + + + static const char *__doc_gr_gsm_bursts_printer_bursts_printer = R"doc()doc"; + + + static const char *__doc_gr_gsm_bursts_printer_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/clock_offset_control_pydoc_template.h b/python/gsm/bindings/docstrings/clock_offset_control_pydoc_template.h new file mode 100644 index 00000000..188c6fc8 --- /dev/null +++ b/python/gsm/bindings/docstrings/clock_offset_control_pydoc_template.h @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_clock_offset_control = R"doc()doc"; + + + static const char *__doc_gr_gsm_clock_offset_control_clock_offset_control_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_clock_offset_control_clock_offset_control_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_clock_offset_control_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_clock_offset_control_set_fc = R"doc()doc"; + + + static const char *__doc_gr_gsm_clock_offset_control_set_samp_rate = R"doc()doc"; + + + static const char *__doc_gr_gsm_clock_offset_control_set_osr = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/collect_system_info_pydoc_template.h b/python/gsm/bindings/docstrings/collect_system_info_pydoc_template.h new file mode 100644 index 00000000..c9ca633d --- /dev/null +++ b/python/gsm/bindings/docstrings/collect_system_info_pydoc_template.h @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_collect_system_info = R"doc()doc"; + + + static const char *__doc_gr_gsm_collect_system_info_collect_system_info_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_collect_system_info_collect_system_info_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_collect_system_info_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_collect_system_info_get_framenumbers = R"doc()doc"; + + + static const char *__doc_gr_gsm_collect_system_info_get_system_information_type = R"doc()doc"; + + + static const char *__doc_gr_gsm_collect_system_info_get_data = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/common_pydoc_template.h b/python/gsm/bindings/docstrings/common_pydoc_template.h new file mode 100644 index 00000000..1a60ef67 --- /dev/null +++ b/python/gsm/bindings/docstrings/common_pydoc_template.h @@ -0,0 +1,18 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + diff --git a/python/gsm/bindings/docstrings/constants_pydoc_template.h b/python/gsm/bindings/docstrings/constants_pydoc_template.h new file mode 100644 index 00000000..84c3ac9b --- /dev/null +++ b/python/gsm/bindings/docstrings/constants_pydoc_template.h @@ -0,0 +1,36 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_build_date = R"doc()doc"; + + + static const char *__doc_gr_gsm_version = R"doc()doc"; + + + static const char *__doc_gr_gsm_major_version = R"doc()doc"; + + + static const char *__doc_gr_gsm_api_version = R"doc()doc"; + + + static const char *__doc_gr_gsm_minor_version = R"doc()doc"; + + + static const char *__doc_gr_gsm_maint_version = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/control_channels_decoder_pydoc_template.h b/python/gsm/bindings/docstrings/control_channels_decoder_pydoc_template.h new file mode 100644 index 00000000..0bb396bc --- /dev/null +++ b/python/gsm/bindings/docstrings/control_channels_decoder_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_control_channels_decoder = R"doc()doc"; + + + static const char *__doc_gr_gsm_control_channels_decoder_control_channels_decoder = R"doc()doc"; + + + static const char *__doc_gr_gsm_control_channels_decoder_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/controlled_fractional_resampler_cc_pydoc_template.h b/python/gsm/bindings/docstrings/controlled_fractional_resampler_cc_pydoc_template.h new file mode 100644 index 00000000..894211c8 --- /dev/null +++ b/python/gsm/bindings/docstrings/controlled_fractional_resampler_cc_pydoc_template.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_controlled_fractional_resampler_cc_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_controlled_fractional_resampler_cc_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_mu = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_resamp_ratio = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_set_mu = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_fractional_resampler_cc_set_resamp_ratio = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/controlled_rotator_cc_pydoc_template.h b/python/gsm/bindings/docstrings/controlled_rotator_cc_pydoc_template.h new file mode 100644 index 00000000..1c697a1c --- /dev/null +++ b/python/gsm/bindings/docstrings/controlled_rotator_cc_pydoc_template.h @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_controlled_rotator_cc = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_rotator_cc_controlled_rotator_cc_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_rotator_cc_controlled_rotator_cc_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_rotator_cc_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_controlled_rotator_cc_set_phase_inc = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/cx_channel_hopper_pydoc_template.h b/python/gsm/bindings/docstrings/cx_channel_hopper_pydoc_template.h new file mode 100644 index 00000000..d218a2d0 --- /dev/null +++ b/python/gsm/bindings/docstrings/cx_channel_hopper_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_cx_channel_hopper = R"doc()doc"; + + + static const char *__doc_gr_gsm_cx_channel_hopper_cx_channel_hopper = R"doc()doc"; + + + static const char *__doc_gr_gsm_cx_channel_hopper_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/decryption_pydoc_template.h b/python/gsm/bindings/docstrings/decryption_pydoc_template.h new file mode 100644 index 00000000..b72f55bc --- /dev/null +++ b/python/gsm/bindings/docstrings/decryption_pydoc_template.h @@ -0,0 +1,36 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_decryption = R"doc()doc"; + + + static const char *__doc_gr_gsm_decryption_decryption_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_decryption_decryption_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_decryption_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_decryption_set_k_c = R"doc()doc"; + + + static const char *__doc_gr_gsm_decryption_set_a5_version = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/dummy_burst_filter_pydoc_template.h b/python/gsm/bindings/docstrings/dummy_burst_filter_pydoc_template.h new file mode 100644 index 00000000..4b08c090 --- /dev/null +++ b/python/gsm/bindings/docstrings/dummy_burst_filter_pydoc_template.h @@ -0,0 +1,36 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_dummy_burst_filter = R"doc()doc"; + + + static const char *__doc_gr_gsm_dummy_burst_filter_dummy_burst_filter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_dummy_burst_filter_dummy_burst_filter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_dummy_burst_filter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_dummy_burst_filter_get_policy = R"doc()doc"; + + + static const char *__doc_gr_gsm_dummy_burst_filter_set_policy = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/extract_assignment_cmd_pydoc_template.h b/python/gsm/bindings/docstrings/extract_assignment_cmd_pydoc_template.h new file mode 100644 index 00000000..c7b43c07 --- /dev/null +++ b/python/gsm/bindings/docstrings/extract_assignment_cmd_pydoc_template.h @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_extract_assignment_cmd = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_assignment_cmd_extract_assignment_cmd_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_assignment_cmd_extract_assignment_cmd_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_assignment_cmd_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_assignment_cmd_get_assignment_commands = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/extract_cmc_pydoc_template.h b/python/gsm/bindings/docstrings/extract_cmc_pydoc_template.h new file mode 100644 index 00000000..e6e282a2 --- /dev/null +++ b/python/gsm/bindings/docstrings/extract_cmc_pydoc_template.h @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_extract_cmc = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_cmc_extract_cmc_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_cmc_extract_cmc_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_cmc_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_cmc_get_framenumbers = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_cmc_get_a5_versions = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_cmc_get_start_ciphering = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/extract_immediate_assignment_pydoc_template.h b/python/gsm/bindings/docstrings/extract_immediate_assignment_pydoc_template.h new file mode 100644 index 00000000..2de1aaf2 --- /dev/null +++ b/python/gsm/bindings/docstrings/extract_immediate_assignment_pydoc_template.h @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_extract_immediate_assignment = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_extract_immediate_assignment_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_extract_immediate_assignment_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_frame_numbers = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_channel_types = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_timeslots = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_subchannels = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_hopping = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_maios = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_hsns = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_arfcns = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_timing_advances = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_immediate_assignment_get_mobile_allocations = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/extract_system_info_pydoc_template.h b/python/gsm/bindings/docstrings/extract_system_info_pydoc_template.h new file mode 100644 index 00000000..2fa379ad --- /dev/null +++ b/python/gsm/bindings/docstrings/extract_system_info_pydoc_template.h @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_extract_system_info = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_extract_system_info_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_extract_system_info_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_chans = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_pwrs = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_lac = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_cell_id = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_mcc = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_mnc = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_ccch_conf = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_cell_arfcns = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_get_neighbours = R"doc()doc"; + + + static const char *__doc_gr_gsm_extract_system_info_reset = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/fn_time_pydoc_template.h b/python/gsm/bindings/docstrings/fn_time_pydoc_template.h new file mode 100644 index 00000000..e4c17c24 --- /dev/null +++ b/python/gsm/bindings/docstrings/fn_time_pydoc_template.h @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_fn_time_delta_cpp = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/gen_test_ab_pydoc_template.h b/python/gsm/bindings/docstrings/gen_test_ab_pydoc_template.h new file mode 100644 index 00000000..9ee93510 --- /dev/null +++ b/python/gsm/bindings/docstrings/gen_test_ab_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_gen_test_ab = R"doc()doc"; + + + static const char *__doc_gr_gsm_gen_test_ab_gen_test_ab = R"doc()doc"; + + + static const char *__doc_gr_gsm_gen_test_ab_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/message_file_sink_pydoc_template.h b/python/gsm/bindings/docstrings/message_file_sink_pydoc_template.h new file mode 100644 index 00000000..9955bd8c --- /dev/null +++ b/python/gsm/bindings/docstrings/message_file_sink_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_message_file_sink = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_file_sink_message_file_sink = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_file_sink_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/message_file_source_pydoc_template.h b/python/gsm/bindings/docstrings/message_file_source_pydoc_template.h new file mode 100644 index 00000000..59624227 --- /dev/null +++ b/python/gsm/bindings/docstrings/message_file_source_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_message_file_source = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_file_source_message_file_source = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_file_source_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/message_printer_pydoc_template.h b/python/gsm/bindings/docstrings/message_printer_pydoc_template.h new file mode 100644 index 00000000..5748ad0a --- /dev/null +++ b/python/gsm/bindings/docstrings/message_printer_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_message_printer = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_printer_message_printer = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_printer_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/message_sink_pydoc_template.h b/python/gsm/bindings/docstrings/message_sink_pydoc_template.h new file mode 100644 index 00000000..57344f33 --- /dev/null +++ b/python/gsm/bindings/docstrings/message_sink_pydoc_template.h @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_message_sink = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_sink_message_sink_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_sink_message_sink_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_sink_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_sink_get_messages = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/message_source_pydoc_template.h b/python/gsm/bindings/docstrings/message_source_pydoc_template.h new file mode 100644 index 00000000..34737252 --- /dev/null +++ b/python/gsm/bindings/docstrings/message_source_pydoc_template.h @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_message_source = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_source_message_source_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_source_message_source_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_source_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_message_source_set_msg_data = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/msg_to_tag_pydoc_template.h b/python/gsm/bindings/docstrings/msg_to_tag_pydoc_template.h new file mode 100644 index 00000000..6fb23d56 --- /dev/null +++ b/python/gsm/bindings/docstrings/msg_to_tag_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_msg_to_tag = R"doc()doc"; + + + static const char *__doc_gr_gsm_msg_to_tag_msg_to_tag = R"doc()doc"; + + + static const char *__doc_gr_gsm_msg_to_tag_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/preprocess_tx_burst_pydoc_template.h b/python/gsm/bindings/docstrings/preprocess_tx_burst_pydoc_template.h new file mode 100644 index 00000000..7fdf5083 --- /dev/null +++ b/python/gsm/bindings/docstrings/preprocess_tx_burst_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_preprocess_tx_burst = R"doc()doc"; + + + static const char *__doc_gr_gsm_preprocess_tx_burst_preprocess_tx_burst = R"doc()doc"; + + + static const char *__doc_gr_gsm_preprocess_tx_burst_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/receiver_pydoc_template.h b/python/gsm/bindings/docstrings/receiver_pydoc_template.h new file mode 100644 index 00000000..b3b19cd3 --- /dev/null +++ b/python/gsm/bindings/docstrings/receiver_pydoc_template.h @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_receiver = R"doc()doc"; + + + static const char *__doc_gr_gsm_receiver_receiver_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_receiver_receiver_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_receiver_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_receiver_set_cell_allocation = R"doc()doc"; + + + static const char *__doc_gr_gsm_receiver_set_tseq_nums = R"doc()doc"; + + + static const char *__doc_gr_gsm_receiver_reset = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/tch_f_chans_demapper_pydoc_template.h b/python/gsm/bindings/docstrings/tch_f_chans_demapper_pydoc_template.h new file mode 100644 index 00000000..ec5dc632 --- /dev/null +++ b/python/gsm/bindings/docstrings/tch_f_chans_demapper_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_tch_f_chans_demapper = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_f_chans_demapper_tch_f_chans_demapper = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_f_chans_demapper_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/tch_f_decoder_pydoc_template.h b/python/gsm/bindings/docstrings/tch_f_decoder_pydoc_template.h new file mode 100644 index 00000000..18c5f455 --- /dev/null +++ b/python/gsm/bindings/docstrings/tch_f_decoder_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_tch_f_decoder = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_f_decoder_tch_f_decoder = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_f_decoder_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/tch_h_chans_demapper_pydoc_template.h b/python/gsm/bindings/docstrings/tch_h_chans_demapper_pydoc_template.h new file mode 100644 index 00000000..81e10ef1 --- /dev/null +++ b/python/gsm/bindings/docstrings/tch_h_chans_demapper_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_tch_h_chans_demapper = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_h_chans_demapper_tch_h_chans_demapper = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_h_chans_demapper_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/tch_h_decoder_pydoc_template.h b/python/gsm/bindings/docstrings/tch_h_decoder_pydoc_template.h new file mode 100644 index 00000000..4d6690cd --- /dev/null +++ b/python/gsm/bindings/docstrings/tch_h_decoder_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_tch_h_decoder = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_h_decoder_tch_h_decoder = R"doc()doc"; + + + static const char *__doc_gr_gsm_tch_h_decoder_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/time_spec_pydoc_template.h b/python/gsm/bindings/docstrings/time_spec_pydoc_template.h new file mode 100644 index 00000000..eb035e25 --- /dev/null +++ b/python/gsm/bindings/docstrings/time_spec_pydoc_template.h @@ -0,0 +1,51 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_time_spec_t = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_time_spec_t_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_time_spec_t_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_time_spec_t_2 = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_time_spec_t_3 = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_from_ticks = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_get_tick_count = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_to_ticks = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_get_real_secs = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_get_full_secs = R"doc()doc"; + + + static const char *__doc_gr_gsm_time_spec_t_get_frac_secs = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/tmsi_dumper_pydoc_template.h b/python/gsm/bindings/docstrings/tmsi_dumper_pydoc_template.h new file mode 100644 index 00000000..3f77f0ed --- /dev/null +++ b/python/gsm/bindings/docstrings/tmsi_dumper_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_tmsi_dumper = R"doc()doc"; + + + static const char *__doc_gr_gsm_tmsi_dumper_tmsi_dumper = R"doc()doc"; + + + static const char *__doc_gr_gsm_tmsi_dumper_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/trx_burst_if_pydoc_template.h b/python/gsm/bindings/docstrings/trx_burst_if_pydoc_template.h new file mode 100644 index 00000000..047769f5 --- /dev/null +++ b/python/gsm/bindings/docstrings/trx_burst_if_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_trx_burst_if = R"doc()doc"; + + + static const char *__doc_gr_gsm_trx_burst_if_trx_burst_if = R"doc()doc"; + + + static const char *__doc_gr_gsm_trx_burst_if_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/txtime_setter_pydoc_template.h b/python/gsm/bindings/docstrings/txtime_setter_pydoc_template.h new file mode 100644 index 00000000..ce3fbb94 --- /dev/null +++ b/python/gsm/bindings/docstrings/txtime_setter_pydoc_template.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_txtime_setter = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_txtime_setter_0 = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_txtime_setter_1 = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_make = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_set_fn_time_reference = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_set_time_hint = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_set_delay_correction = R"doc()doc"; + + + static const char *__doc_gr_gsm_txtime_setter_set_timing_advance = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/udp_socket_pydoc_template.h b/python/gsm/bindings/docstrings/udp_socket_pydoc_template.h new file mode 100644 index 00000000..6cca5e5f --- /dev/null +++ b/python/gsm/bindings/docstrings/udp_socket_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_udp_socket = R"doc()doc"; + + + static const char *__doc_gr_gsm_udp_socket_udp_socket = R"doc()doc"; + + + static const char *__doc_gr_gsm_udp_socket_udp_send = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/universal_ctrl_chans_demapper_pydoc_template.h b/python/gsm/bindings/docstrings/universal_ctrl_chans_demapper_pydoc_template.h new file mode 100644 index 00000000..c89e2e75 --- /dev/null +++ b/python/gsm/bindings/docstrings/universal_ctrl_chans_demapper_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_universal_ctrl_chans_demapper = R"doc()doc"; + + + static const char *__doc_gr_gsm_universal_ctrl_chans_demapper_universal_ctrl_chans_demapper = R"doc()doc"; + + + static const char *__doc_gr_gsm_universal_ctrl_chans_demapper_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/docstrings/uplink_downlink_splitter_pydoc_template.h b/python/gsm/bindings/docstrings/uplink_downlink_splitter_pydoc_template.h new file mode 100644 index 00000000..7e0806b5 --- /dev/null +++ b/python/gsm/bindings/docstrings/uplink_downlink_splitter_pydoc_template.h @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#include "pydoc_macros.h" +#define D(...) DOC(gr,gsm, __VA_ARGS__ ) +/* + This file contains placeholders for docstrings for the Python bindings. + Do not edit! These were automatically extracted during the binding process + and will be overwritten during the build process + */ + + + + static const char *__doc_gr_gsm_uplink_downlink_splitter = R"doc()doc"; + + + static const char *__doc_gr_gsm_uplink_downlink_splitter_uplink_downlink_splitter = R"doc()doc"; + + + static const char *__doc_gr_gsm_uplink_downlink_splitter_make = R"doc()doc"; + + diff --git a/python/gsm/bindings/dummy_burst_filter_python.cc b/python/gsm/bindings/dummy_burst_filter_python.cc new file mode 100644 index 00000000..54732276 --- /dev/null +++ b/python/gsm/bindings/dummy_burst_filter_python.cc @@ -0,0 +1,72 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/dummy_burst_filter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(039530bfc8c2ac0e4a0ddb1e66312d1a) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_dummy_burst_filter(py::module& m) +{ + + using dummy_burst_filter = ::gr::gsm::dummy_burst_filter; + + + py::class_>(m, "dummy_burst_filter", D(dummy_burst_filter)) + + .def(py::init(&dummy_burst_filter::make), + D(dummy_burst_filter,make) + ) + + + + + + + .def("get_policy",&dummy_burst_filter::get_policy, + D(dummy_burst_filter,get_policy) + ) + + + + .def("set_policy",&dummy_burst_filter::set_policy, + py::arg("policy"), + D(dummy_burst_filter,set_policy) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/extract_assignment_cmd_python.cc b/python/gsm/bindings/extract_assignment_cmd_python.cc new file mode 100644 index 00000000..c0de00e6 --- /dev/null +++ b/python/gsm/bindings/extract_assignment_cmd_python.cc @@ -0,0 +1,65 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/extract_assignment_cmd.h) */ +/* BINDTOOL_HEADER_FILE_HASH(4949d09aea1f3ed6c29e42268e57323f) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_extract_assignment_cmd(py::module& m) +{ + + using extract_assignment_cmd = ::gr::gsm::extract_assignment_cmd; + + + py::class_>(m, "extract_assignment_cmd", D(extract_assignment_cmd)) + + .def(py::init(&extract_assignment_cmd::make), + D(extract_assignment_cmd,make) + ) + + + + + + + .def("get_assignment_commands",&extract_assignment_cmd::get_assignment_commands, + D(extract_assignment_cmd,get_assignment_commands) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/extract_cmc_python.cc b/python/gsm/bindings/extract_cmc_python.cc new file mode 100644 index 00000000..afab6956 --- /dev/null +++ b/python/gsm/bindings/extract_cmc_python.cc @@ -0,0 +1,77 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/extract_cmc.h) */ +/* BINDTOOL_HEADER_FILE_HASH(73e93de535eebe422139618f75645fa0) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_extract_cmc(py::module& m) +{ + + using extract_cmc = ::gr::gsm::extract_cmc; + + + py::class_>(m, "extract_cmc", D(extract_cmc)) + + .def(py::init(&extract_cmc::make), + D(extract_cmc,make) + ) + + + + + + + .def("get_framenumbers",&extract_cmc::get_framenumbers, + D(extract_cmc,get_framenumbers) + ) + + + + .def("get_a5_versions",&extract_cmc::get_a5_versions, + D(extract_cmc,get_a5_versions) + ) + + + + .def("get_start_ciphering",&extract_cmc::get_start_ciphering, + D(extract_cmc,get_start_ciphering) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/extract_immediate_assignment_python.cc b/python/gsm/bindings/extract_immediate_assignment_python.cc new file mode 100644 index 00000000..79dd0c3f --- /dev/null +++ b/python/gsm/bindings/extract_immediate_assignment_python.cc @@ -0,0 +1,122 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/extract_immediate_assignment.h) */ +/* BINDTOOL_HEADER_FILE_HASH(6d039be3f9b96ad6c087401633d54764) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_extract_immediate_assignment(py::module& m) +{ + + using extract_immediate_assignment = ::gr::gsm::extract_immediate_assignment; + + + py::class_>(m, "extract_immediate_assignment", D(extract_immediate_assignment)) + + .def(py::init(&extract_immediate_assignment::make), + py::arg("print_immediate_assignments") = false, + py::arg("ignore_gprs") = false, + py::arg("unique_references") = false, + D(extract_immediate_assignment,make) + ) + + + + + + + .def("get_frame_numbers",&extract_immediate_assignment::get_frame_numbers, + D(extract_immediate_assignment,get_frame_numbers) + ) + + + + .def("get_channel_types",&extract_immediate_assignment::get_channel_types, + D(extract_immediate_assignment,get_channel_types) + ) + + + + .def("get_timeslots",&extract_immediate_assignment::get_timeslots, + D(extract_immediate_assignment,get_timeslots) + ) + + + + .def("get_subchannels",&extract_immediate_assignment::get_subchannels, + D(extract_immediate_assignment,get_subchannels) + ) + + + + .def("get_hopping",&extract_immediate_assignment::get_hopping, + D(extract_immediate_assignment,get_hopping) + ) + + + + .def("get_maios",&extract_immediate_assignment::get_maios, + D(extract_immediate_assignment,get_maios) + ) + + + + .def("get_hsns",&extract_immediate_assignment::get_hsns, + D(extract_immediate_assignment,get_hsns) + ) + + + + .def("get_arfcns",&extract_immediate_assignment::get_arfcns, + D(extract_immediate_assignment,get_arfcns) + ) + + + + .def("get_timing_advances",&extract_immediate_assignment::get_timing_advances, + D(extract_immediate_assignment,get_timing_advances) + ) + + + + .def("get_mobile_allocations",&extract_immediate_assignment::get_mobile_allocations, + D(extract_immediate_assignment,get_mobile_allocations) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/extract_system_info_python.cc b/python/gsm/bindings/extract_system_info_python.cc new file mode 100644 index 00000000..fcb25d3b --- /dev/null +++ b/python/gsm/bindings/extract_system_info_python.cc @@ -0,0 +1,121 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/extract_system_info.h) */ +/* BINDTOOL_HEADER_FILE_HASH(80d30ca501e0cb0a79556045dc81b5a0) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_extract_system_info(py::module& m) +{ + + using extract_system_info = ::gr::gsm::extract_system_info; + + + py::class_>(m, "extract_system_info", D(extract_system_info)) + + .def(py::init(&extract_system_info::make), + D(extract_system_info,make) + ) + + + + + + + .def("get_chans",&extract_system_info::get_chans, + D(extract_system_info,get_chans) + ) + + + + .def("get_pwrs",&extract_system_info::get_pwrs, + D(extract_system_info,get_pwrs) + ) + + + + .def("get_lac",&extract_system_info::get_lac, + D(extract_system_info,get_lac) + ) + + + + .def("get_cell_id",&extract_system_info::get_cell_id, + D(extract_system_info,get_cell_id) + ) + + + + .def("get_mcc",&extract_system_info::get_mcc, + D(extract_system_info,get_mcc) + ) + + + + .def("get_mnc",&extract_system_info::get_mnc, + D(extract_system_info,get_mnc) + ) + + + + .def("get_ccch_conf",&extract_system_info::get_ccch_conf, + D(extract_system_info,get_ccch_conf) + ) + + + + .def("get_cell_arfcns",&extract_system_info::get_cell_arfcns, + py::arg("chan_id"), + D(extract_system_info,get_cell_arfcns) + ) + + + + .def("get_neighbours",&extract_system_info::get_neighbours, + py::arg("chan_id"), + D(extract_system_info,get_neighbours) + ) + + + + .def("reset",&extract_system_info::reset, + D(extract_system_info,reset) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/failed_conversions.txt b/python/gsm/bindings/failed_conversions.txt new file mode 100644 index 00000000..2ecaa420 --- /dev/null +++ b/python/gsm/bindings/failed_conversions.txt @@ -0,0 +1,5 @@ +./include/gsm/endian.hUnable to find declaration. Matcher: [(decl type==namespace_t) and (name==gr)] +./include/gsm/gsm_constants.hUnable to find declaration. Matcher: [(decl type==namespace_t) and (name==gr)] +./include/gsm/plotting.hError occurred while running CASTXML xml file does not exist +./include/gsm/gsmtap.hUnable to find declaration. Matcher: [(decl type==namespace_t) and (name==gr)] +./include/gsm/api.hUnable to find declaration. Matcher: [(decl type==namespace_t) and (name==gr)] diff --git a/python/gsm/bindings/fn_time_python.cc b/python/gsm/bindings/fn_time_python.cc new file mode 100644 index 00000000..1b3bd575 --- /dev/null +++ b/python/gsm/bindings/fn_time_python.cc @@ -0,0 +1,56 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/fn_time.h) */ +/* BINDTOOL_HEADER_FILE_HASH(ff956c9730003ca3a43efca36f5dd5ee) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_fn_time(py::module& m) +{ + + + + + m.def("fn_time_delta_cpp",&::gr::gsm::fn_time_delta_cpp, + py::arg("fn_ref"), + py::arg("time_ref"), + py::arg("fn_x"), + py::arg("time_hint"), + py::arg("ts_num"), + py::arg("ts_ref"), + D(fn_time_delta_cpp) + ); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/gen_test_ab_python.cc b/python/gsm/bindings/gen_test_ab_python.cc new file mode 100644 index 00000000..01c0584a --- /dev/null +++ b/python/gsm/bindings/gen_test_ab_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(transmitter/gen_test_ab.h) */ +/* BINDTOOL_HEADER_FILE_HASH(82aebc8c24cd875106a35da63861202e) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_gen_test_ab(py::module& m) +{ + + using gen_test_ab = ::gr::gsm::gen_test_ab; + + + py::class_>(m, "gen_test_ab", D(gen_test_ab)) + + .def(py::init(&gen_test_ab::make), + D(gen_test_ab,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/header_utils.py b/python/gsm/bindings/header_utils.py new file mode 100644 index 00000000..7c26fe02 --- /dev/null +++ b/python/gsm/bindings/header_utils.py @@ -0,0 +1,80 @@ +# Utilities for reading values in header files + +from argparse import ArgumentParser +import re + + +class PybindHeaderParser: + def __init__(self, pathname): + with open(pathname, 'r') as f: + self.file_txt = f.read() + + def get_flag_automatic(self): + # p = re.compile(r'BINDTOOL_GEN_AUTOMATIC\(([^\s])\)') + # m = p.search(self.file_txt) + m = re.search(r'BINDTOOL_GEN_AUTOMATIC\(([^\s])\)', self.file_txt) + if (m and m.group(1) == '1'): + return True + else: + return False + + def get_flag_pygccxml(self): + # p = re.compile(r'BINDTOOL_USE_PYGCCXML\(([^\s])\)') + # m = p.search(self.file_txt) + m = re.search(r'BINDTOOL_USE_PYGCCXML\(([^\s])\)', self.file_txt) + if (m and m.group(1) == '1'): + return True + else: + return False + + def get_header_filename(self): + # p = re.compile(r'BINDTOOL_HEADER_FILE\(([^\s]*)\)') + # m = p.search(self.file_txt) + m = re.search(r'BINDTOOL_HEADER_FILE\(([^\s]*)\)', self.file_txt) + if (m): + return m.group(1) + else: + return None + + def get_header_file_hash(self): + # p = re.compile(r'BINDTOOL_HEADER_FILE_HASH\(([^\s]*)\)') + # m = p.search(self.file_txt) + m = re.search(r'BINDTOOL_HEADER_FILE_HASH\(([^\s]*)\)', self.file_txt) + if (m): + return m.group(1) + else: + return None + + def get_flags(self): + return f'{self.get_flag_automatic()};{self.get_flag_pygccxml()};{self.get_header_filename()};{self.get_header_file_hash()};' + + +def argParse(): + """Parses commandline args.""" + desc = 'Reads the parameters from the comment block in the pybind files' + parser = ArgumentParser(description=desc) + + parser.add_argument("function", help="Operation to perform on comment block of pybind file", choices=[ + "flag_auto", "flag_pygccxml", "header_filename", "header_file_hash", "all"]) + parser.add_argument( + "pathname", help="Pathname of pybind c++ file to read, e.g. blockname_python.cc") + + return parser.parse_args() + + +if __name__ == "__main__": + # Parse command line options and set up doxyxml. + args = argParse() + + pbhp = PybindHeaderParser(args.pathname) + + if args.function == "flag_auto": + print(pbhp.get_flag_automatic()) + elif args.function == "flag_pygccxml": + print(pbhp.get_flag_pygccxml()) + elif args.function == "header_filename": + print(pbhp.get_header_filename()) + elif args.function == "header_file_hash": + print(pbhp.get_header_file_hash()) + elif args.function == "all": + print(pbhp.get_flags()) diff --git a/python/gsm/bindings/message_file_sink_python.cc b/python/gsm/bindings/message_file_sink_python.cc new file mode 100644 index 00000000..8cd185cb --- /dev/null +++ b/python/gsm/bindings/message_file_sink_python.cc @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/message_file_sink.h) */ +/* BINDTOOL_HEADER_FILE_HASH(1dcfb6b10fb5cd2fbe890ffdf36a08fb) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_message_file_sink(py::module& m) +{ + + using message_file_sink = ::gr::gsm::message_file_sink; + + + py::class_>(m, "message_file_sink", D(message_file_sink)) + + .def(py::init(&message_file_sink::make), + py::arg("filename"), + D(message_file_sink,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/message_file_source_python.cc b/python/gsm/bindings/message_file_source_python.cc new file mode 100644 index 00000000..e1a7404b --- /dev/null +++ b/python/gsm/bindings/message_file_source_python.cc @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/message_file_source.h) */ +/* BINDTOOL_HEADER_FILE_HASH(dce02056ae51307222164cb2425dbca2) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_message_file_source(py::module& m) +{ + + using message_file_source = ::gr::gsm::message_file_source; + + + py::class_>(m, "message_file_source", D(message_file_source)) + + .def(py::init(&message_file_source::make), + py::arg("filename"), + D(message_file_source,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/message_printer_python.cc b/python/gsm/bindings/message_printer_python.cc new file mode 100644 index 00000000..fc63024b --- /dev/null +++ b/python/gsm/bindings/message_printer_python.cc @@ -0,0 +1,63 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/message_printer.h) */ +/* BINDTOOL_HEADER_FILE_HASH(0e75d88f5c33cd261fe1e4ab6d33fd35) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_message_printer(py::module& m) +{ + + using message_printer = ::gr::gsm::message_printer; + + + py::class_>(m, "message_printer", D(message_printer)) + + .def(py::init(&message_printer::make), + py::arg("prepend_string"), + py::arg("prepend_fnr") = false, + py::arg("prepend_frame_count") = false, + py::arg("print_gsmtap_header") = false, + D(message_printer,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/message_sink_python.cc b/python/gsm/bindings/message_sink_python.cc new file mode 100644 index 00000000..51bb6406 --- /dev/null +++ b/python/gsm/bindings/message_sink_python.cc @@ -0,0 +1,65 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(qa_utils/message_sink.h) */ +/* BINDTOOL_HEADER_FILE_HASH(d7760b11ebe16e2c8316fc185bbc89f5) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_message_sink(py::module& m) +{ + + using message_sink = ::gr::gsm::message_sink; + + + py::class_>(m, "message_sink", D(message_sink)) + + .def(py::init(&message_sink::make), + D(message_sink,make) + ) + + + + + + + .def("get_messages",&message_sink::get_messages, + D(message_sink,get_messages) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/message_source_python.cc b/python/gsm/bindings/message_source_python.cc new file mode 100644 index 00000000..1b37e7c3 --- /dev/null +++ b/python/gsm/bindings/message_source_python.cc @@ -0,0 +1,67 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(qa_utils/message_source.h) */ +/* BINDTOOL_HEADER_FILE_HASH(5c3f35ba4c0c908058f42f223eb969bf) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_message_source(py::module& m) +{ + + using message_source = ::gr::gsm::message_source; + + + py::class_>(m, "message_source", D(message_source)) + + .def(py::init(&message_source::make), + py::arg("msg_data"), + D(message_source,make) + ) + + + + + + + .def("set_msg_data",&message_source::set_msg_data, + py::arg("msg_data"), + D(message_source,set_msg_data) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/msg_to_tag_python.cc b/python/gsm/bindings/msg_to_tag_python.cc new file mode 100644 index 00000000..60920512 --- /dev/null +++ b/python/gsm/bindings/msg_to_tag_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/msg_to_tag.h) */ +/* BINDTOOL_HEADER_FILE_HASH(9d122cc61832a6430f5c602d697bd5b9) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_msg_to_tag(py::module& m) +{ + + using msg_to_tag = ::gr::gsm::msg_to_tag; + + + py::class_>(m, "msg_to_tag", D(msg_to_tag)) + + .def(py::init(&msg_to_tag::make), + D(msg_to_tag,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/preprocess_tx_burst_python.cc b/python/gsm/bindings/preprocess_tx_burst_python.cc new file mode 100644 index 00000000..52ec663e --- /dev/null +++ b/python/gsm/bindings/preprocess_tx_burst_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(transmitter/preprocess_tx_burst.h) */ +/* BINDTOOL_HEADER_FILE_HASH(d2a70edb7b7bb2eb3b53546ac0ce16d6) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_preprocess_tx_burst(py::module& m) +{ + + using preprocess_tx_burst = ::gr::gsm::preprocess_tx_burst; + + + py::class_>(m, "preprocess_tx_burst", D(preprocess_tx_burst)) + + .def(py::init(&preprocess_tx_burst::make), + D(preprocess_tx_burst,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/python_bindings.cc b/python/gsm/bindings/python_bindings.cc new file mode 100644 index 00000000..90ad4e0a --- /dev/null +++ b/python/gsm/bindings/python_bindings.cc @@ -0,0 +1,152 @@ +/* + * Copyright 2020 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include + +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION +#include + +namespace py = pybind11; + +// Headers for binding functions +/**************************************/ +// The following comment block is used for +// gr_modtool to insert function prototypes +// Please do not delete +/**************************************/ +// BINDING_FUNCTION_PROTOTYPES( +void bind_burst_downmix(py::module& m); +void bind_burst_file_source(py::module& m); +void bind_fn_time(py::module& m); +void bind_burst_file_sink(py::module& m); +void bind_msg_to_tag(py::module& m); +void bind_message_printer(py::module& m); +void bind_burst_to_fn_time(py::module& m); +void bind_tmsi_dumper(py::module& m); +void bind_message_file_source(py::module& m); +//void bind_time_spec(py::module& m); +void bind_controlled_fractional_resampler_cc(py::module& m); +void bind_extract_immediate_assignment(py::module& m); +void bind_extract_assignment_cmd(py::module& m); +void bind_bursts_printer(py::module& m); +void bind_message_file_sink(py::module& m); +//void bind_udp_socket(py::module& m); +void bind_controlled_rotator_cc(py::module& m); +void bind_collect_system_info(py::module& m); +void bind_extract_system_info(py::module& m); +void bind_extract_cmc(py::module& m); +void bind_constants(py::module& m); +void bind_burst_fnr_filter(py::module& m); +void bind_burst_sdcch_subslot_splitter(py::module& m); +void bind_burst_timeslot_filter(py::module& m); +void bind_dummy_burst_filter(py::module& m); +void bind_common(py::module& m); +void bind_burst_sdcch_subslot_filter(py::module& m); +void bind_burst_type_filter(py::module& m); +void bind_burst_timeslot_splitter(py::module& m); +void bind_uplink_downlink_splitter(py::module& m); +void bind_txtime_setter(py::module& m); +void bind_gen_test_ab(py::module& m); +void bind_preprocess_tx_burst(py::module& m); +void bind_message_source(py::module& m); +void bind_burst_sink(py::module& m); +void bind_burst_source(py::module& m); +void bind_message_sink(py::module& m); +void bind_constants(py::module& m); +void bind_tch_f_decoder(py::module& m); +void bind_tch_h_decoder(py::module& m); +void bind_control_channels_decoder(py::module& m); +void bind_universal_ctrl_chans_demapper(py::module& m); +void bind_tch_f_chans_demapper(py::module& m); +void bind_tch_h_chans_demapper(py::module& m); +void bind_receiver(py::module& m); +void bind_clock_offset_control(py::module& m); +void bind_cx_channel_hopper(py::module& m); +void bind_trx_burst_if(py::module& m); +void bind_decryption(py::module& m); +// ) END BINDING_FUNCTION_PROTOTYPES + + +// We need this hack because import_array() returns NULL +// for newer Python versions. +// This function is also necessary because it ensures access to the C API +// and removes a warning. +void* init_numpy() +{ + import_array(); + return NULL; +} + +PYBIND11_MODULE(gsm_python, m) +{ + // Initialize the numpy C API + // (otherwise we will see segmentation faults) + init_numpy(); + + // Allow access to base block methods + py::module::import("gnuradio.gr"); + py::module::import("gnuradio.gsm"); + + /**************************************/ + // The following comment block is used for + // gr_modtool to insert binding function calls + // Please do not delete + /**************************************/ + // BINDING_FUNCTION_CALLS( + bind_burst_file_source(m); + bind_fn_time(m); + bind_burst_file_sink(m); + bind_msg_to_tag(m); + bind_message_printer(m); + bind_burst_to_fn_time(m); + bind_tmsi_dumper(m); + bind_message_file_source(m); + //bind_time_spec(m); + bind_controlled_fractional_resampler_cc(m); + bind_extract_immediate_assignment(m); + bind_extract_assignment_cmd(m); + bind_bursts_printer(m); + bind_message_file_sink(m); + //bind_udp_socket(m); + bind_controlled_rotator_cc(m); + bind_collect_system_info(m); + bind_extract_system_info(m); + bind_extract_cmc(m); + bind_constants(m); + bind_burst_fnr_filter(m); + bind_burst_sdcch_subslot_splitter(m); + bind_burst_timeslot_filter(m); + bind_dummy_burst_filter(m); + bind_common(m); + bind_burst_sdcch_subslot_filter(m); + bind_burst_type_filter(m); + bind_burst_timeslot_splitter(m); + bind_uplink_downlink_splitter(m); + bind_txtime_setter(m); + bind_gen_test_ab(m); + bind_preprocess_tx_burst(m); + bind_message_source(m); + bind_burst_sink(m); + bind_burst_source(m); + bind_message_sink(m); + bind_constants(m); + bind_tch_f_decoder(m); + bind_tch_h_decoder(m); + bind_control_channels_decoder(m); + bind_tch_f_chans_demapper(m); + bind_tch_h_chans_demapper(m); + bind_receiver(m); + bind_clock_offset_control(m); + bind_cx_channel_hopper(m); + bind_trx_burst_if(m); + bind_decryption(m); + bind_universal_ctrl_chans_demapper(m); + + // ) END BINDING_FUNCTION_CALLS +} diff --git a/python/gsm/bindings/receiver_python.cc b/python/gsm/bindings/receiver_python.cc new file mode 100644 index 00000000..4e5972b7 --- /dev/null +++ b/python/gsm/bindings/receiver_python.cc @@ -0,0 +1,83 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(receiver/receiver.h) */ +/* BINDTOOL_HEADER_FILE_HASH(bca2d27955a8de4022a24e653b010e7c) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_receiver(py::module& m) +{ + + using receiver = ::gr::gsm::receiver; + + + py::class_>(m, "receiver", D(receiver)) + + .def(py::init(&receiver::make), + py::arg("osr"), + py::arg("cell_allocation"), + py::arg("seq_nums"), + py::arg("process_uplink") = false, + D(receiver,make) + ) + + + + + + + .def("set_cell_allocation",&receiver::set_cell_allocation, + py::arg("cell_allocation"), + D(receiver,set_cell_allocation) + ) + + + + .def("set_tseq_nums",&receiver::set_tseq_nums, + py::arg("tseq_nums"), + D(receiver,set_tseq_nums) + ) + + + + .def("reset",&receiver::reset, + D(receiver,reset) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/tch_f_chans_demapper_python.cc b/python/gsm/bindings/tch_f_chans_demapper_python.cc new file mode 100644 index 00000000..5972775e --- /dev/null +++ b/python/gsm/bindings/tch_f_chans_demapper_python.cc @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(demapping/tch_f_chans_demapper.h) */ +/* BINDTOOL_HEADER_FILE_HASH(d35ba78e4aa7fb7f34c0ec18a60875f0) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_tch_f_chans_demapper(py::module& m) +{ + + using tch_f_chans_demapper = ::gr::gsm::tch_f_chans_demapper; + + + py::class_>(m, "tch_f_chans_demapper", D(tch_f_chans_demapper)) + + .def(py::init(&tch_f_chans_demapper::make), + py::arg("timeslot_nr"), + D(tch_f_chans_demapper,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/tch_f_decoder_python.cc b/python/gsm/bindings/tch_f_decoder_python.cc new file mode 100644 index 00000000..78d0c46e --- /dev/null +++ b/python/gsm/bindings/tch_f_decoder_python.cc @@ -0,0 +1,77 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(decoding/tch_f_decoder.h) */ +/* BINDTOOL_HEADER_FILE_HASH(733ec8e67bddda94db77b6f1dd63342d) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_tch_f_decoder(py::module& m) +{ + + using tch_f_decoder = ::gr::gsm::tch_f_decoder; + + + py::class_>(m, "tch_f_decoder", D(tch_f_decoder)) + + .def(py::init(&tch_f_decoder::make), + py::arg("mode"), + py::arg("boundary_check") = false, + D(tch_f_decoder,make) + ) + + + + + ; + + py::enum_<::gr::gsm::tch_mode>(m,"tch_mode") + .value("TCH_AFS12_2", ::gr::gsm::tch_mode::TCH_AFS12_2) // 0 + .value("TCH_AFS10_2", ::gr::gsm::tch_mode::TCH_AFS10_2) // 1 + .value("TCH_AFS7_95", ::gr::gsm::tch_mode::TCH_AFS7_95) // 2 + .value("TCH_AFS7_4", ::gr::gsm::tch_mode::TCH_AFS7_4) // 3 + .value("TCH_AFS6_7", ::gr::gsm::tch_mode::TCH_AFS6_7) // 4 + .value("TCH_AFS5_9", ::gr::gsm::tch_mode::TCH_AFS5_9) // 5 + .value("TCH_AFS5_15", ::gr::gsm::tch_mode::TCH_AFS5_15) // 6 + .value("TCH_AFS4_75", ::gr::gsm::tch_mode::TCH_AFS4_75) // 7 + .value("TCH_FS", ::gr::gsm::tch_mode::TCH_FS) // 8 + .value("TCH_EFR", ::gr::gsm::tch_mode::TCH_EFR) // 9 + .value("TCH_HS", ::gr::gsm::tch_mode::TCH_HS) // 10 + .export_values() + ; + + py::implicitly_convertible(); + + + +} + + + + + + + + diff --git a/python/gsm/bindings/tch_h_chans_demapper_python.cc b/python/gsm/bindings/tch_h_chans_demapper_python.cc new file mode 100644 index 00000000..eeed2b4f --- /dev/null +++ b/python/gsm/bindings/tch_h_chans_demapper_python.cc @@ -0,0 +1,61 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(demapping/tch_h_chans_demapper.h) */ +/* BINDTOOL_HEADER_FILE_HASH(905dc570702137d05700a0431487075c) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_tch_h_chans_demapper(py::module& m) +{ + + using tch_h_chans_demapper = ::gr::gsm::tch_h_chans_demapper; + + + py::class_>(m, "tch_h_chans_demapper", D(tch_h_chans_demapper)) + + .def(py::init(&tch_h_chans_demapper::make), + py::arg("timeslot_nr"), + py::arg("tch_h_channel"), + D(tch_h_chans_demapper,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/tch_h_decoder_python.cc b/python/gsm/bindings/tch_h_decoder_python.cc new file mode 100644 index 00000000..990d7932 --- /dev/null +++ b/python/gsm/bindings/tch_h_decoder_python.cc @@ -0,0 +1,62 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(decoding/tch_h_decoder.h) */ +/* BINDTOOL_HEADER_FILE_HASH(22a50efdf5b9adba39548fafa9969a7a) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_tch_h_decoder(py::module& m) +{ + + using tch_h_decoder = ::gr::gsm::tch_h_decoder; + + + py::class_>(m, "tch_h_decoder", D(tch_h_decoder)) + + .def(py::init(&tch_h_decoder::make), + py::arg("sub_channel"), + py::arg("multi_rate"), + py::arg("boundary_check") = false, + D(tch_h_decoder,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/time_spec_python.cc b/python/gsm/bindings/time_spec_python.cc new file mode 100644 index 00000000..f3dccd27 --- /dev/null +++ b/python/gsm/bindings/time_spec_python.cc @@ -0,0 +1,108 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/time_spec.h) */ +/* BINDTOOL_HEADER_FILE_HASH(e62de679872f902011edd693e08dbe84) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_time_spec(py::module& m) +{ + + using time_spec_t = ::gr::gsm::time_spec_t; + + + py::class_, boost::operators_impl::operators_detail::false_t>, + std::shared_ptr>(m, "time_spec_t", D(time_spec_t)) + + .def(py::init(), py::arg("spec"), + D(time_spec_t,time_spec_t,0) + ) + .def(py::init(), py::arg("secs") = 0, + D(time_spec_t,time_spec_t,1) + ) + .def(py::init(), py::arg("full_secs"), + py::arg("frac_secs") = 0, + D(time_spec_t,time_spec_t,2) + ) + .def(py::init(), py::arg("full_secs"), + py::arg("tick_count"), + py::arg("tick_rate"), + D(time_spec_t,time_spec_t,3) + ) + + + + .def_static("from_ticks",&time_spec_t::from_ticks, + py::arg("ticks"), + py::arg("tick_rate"), + D(time_spec_t,from_ticks) + ) + + + + .def("get_tick_count",&time_spec_t::get_tick_count, + py::arg("tick_rate"), + D(time_spec_t,get_tick_count) + ) + + + + .def("to_ticks",&time_spec_t::to_ticks, + py::arg("tick_rate"), + D(time_spec_t,to_ticks) + ) + + + + .def("get_real_secs",&time_spec_t::get_real_secs, + D(time_spec_t,get_real_secs) + ) + + + + .def("get_full_secs",&time_spec_t::get_full_secs, + D(time_spec_t,get_full_secs) + ) + + + + .def("get_frac_secs",&time_spec_t::get_frac_secs, + D(time_spec_t,get_frac_secs) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/tmsi_dumper_python.cc b/python/gsm/bindings/tmsi_dumper_python.cc new file mode 100644 index 00000000..ae7db05c --- /dev/null +++ b/python/gsm/bindings/tmsi_dumper_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/tmsi_dumper.h) */ +/* BINDTOOL_HEADER_FILE_HASH(5651fa12cf89daa92ed2c8f211af2126) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_tmsi_dumper(py::module& m) +{ + + using tmsi_dumper = ::gr::gsm::tmsi_dumper; + + + py::class_>(m, "tmsi_dumper", D(tmsi_dumper)) + + .def(py::init(&tmsi_dumper::make), + D(tmsi_dumper,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/trx_burst_if_python.cc b/python/gsm/bindings/trx_burst_if_python.cc new file mode 100644 index 00000000..b3de2cf2 --- /dev/null +++ b/python/gsm/bindings/trx_burst_if_python.cc @@ -0,0 +1,62 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(trx/trx_burst_if.h) */ +/* BINDTOOL_HEADER_FILE_HASH(b7193e067e3d9cba3d3f45076f5adef8) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_trx_burst_if(py::module& m) +{ + + using trx_burst_if = ::gr::gsm::trx_burst_if; + + + py::class_>(m, "trx_burst_if", D(trx_burst_if)) + + .def(py::init(&trx_burst_if::make), + py::arg("bind_addr"), + py::arg("remote_addr"), + py::arg("base_port"), + D(trx_burst_if,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/txtime_setter_python.cc b/python/gsm/bindings/txtime_setter_python.cc new file mode 100644 index 00000000..3e420f44 --- /dev/null +++ b/python/gsm/bindings/txtime_setter_python.cc @@ -0,0 +1,98 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(transmitter/txtime_setter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(bb9e7d69e0565251e3c044257b6ea889) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_txtime_setter(py::module& m) +{ + + using txtime_setter = ::gr::gsm::txtime_setter; + + + py::class_>(m, "txtime_setter", D(txtime_setter)) + + .def(py::init(&txtime_setter::make), + py::arg("init_fn"), + py::arg("init_time_secs"), + py::arg("init_time_fracs"), + py::arg("time_hint_secs"), + py::arg("time_hint_fracs"), + py::arg("timing_advance"), + py::arg("delay_correction"), + D(txtime_setter,make) + ) + + + + + + + .def("set_fn_time_reference",&txtime_setter::set_fn_time_reference, + py::arg("fn"), + py::arg("ts"), + py::arg("time_secs"), + py::arg("time_fracs"), + D(txtime_setter,set_fn_time_reference) + ) + + + + .def("set_time_hint",&txtime_setter::set_time_hint, + py::arg("time_hint_secs"), + py::arg("time_hint_fracs"), + D(txtime_setter,set_time_hint) + ) + + + + .def("set_delay_correction",&txtime_setter::set_delay_correction, + py::arg("delay_correction"), + D(txtime_setter,set_delay_correction) + ) + + + + .def("set_timing_advance",&txtime_setter::set_timing_advance, + py::arg("timing_advance"), + D(txtime_setter,set_timing_advance) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/udp_socket_python.cc b/python/gsm/bindings/udp_socket_python.cc new file mode 100644 index 00000000..b3a2419d --- /dev/null +++ b/python/gsm/bindings/udp_socket_python.cc @@ -0,0 +1,68 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(misc_utils/udp_socket.h) */ +/* BINDTOOL_HEADER_FILE_HASH(78de1eb875aeaaf710c427cd138f3ee1) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_udp_socket(py::module& m) +{ + + using udp_socket = ::gr::gsm::udp_socket; + + + py::class_>(m, "udp_socket", D(udp_socket)) + + .def(py::init(), py::arg("bind_addr"), + py::arg("src_port"), + py::arg("remote_addr"), + py::arg("dst_port"), + py::arg("mtu"), + D(udp_socket,udp_socket) + ) + + + + .def("udp_send",&udp_socket::udp_send, + py::arg("data"), + py::arg("len"), + D(udp_socket,udp_send) + ) + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/universal_ctrl_chans_demapper_python.cc b/python/gsm/bindings/universal_ctrl_chans_demapper_python.cc new file mode 100644 index 00000000..e26cbe49 --- /dev/null +++ b/python/gsm/bindings/universal_ctrl_chans_demapper_python.cc @@ -0,0 +1,66 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(demapping/universal_ctrl_chans_demapper.h) */ +/* BINDTOOL_HEADER_FILE_HASH(234e623253c906bf7e3991295bf412e0) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_universal_ctrl_chans_demapper(py::module& m) +{ + + using universal_ctrl_chans_demapper = ::gr::gsm::universal_ctrl_chans_demapper; + + + py::class_>(m, "universal_ctrl_chans_demapper", D(universal_ctrl_chans_demapper)) + + .def(py::init(&universal_ctrl_chans_demapper::make), + py::arg("timeslot_nr"), + py::arg("downlink_starts_fn_mod51"), + py::arg("downlink_channel_types"), + py::arg("downlink_subslots"), + py::arg("uplink_starts_fn_mod51") = std::vector(), + py::arg("uplink_channel_types") = std::vector(), + py::arg("uplink_subslots") = std::vector(), + D(universal_ctrl_chans_demapper,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/gsm/bindings/uplink_downlink_splitter_python.cc b/python/gsm/bindings/uplink_downlink_splitter_python.cc new file mode 100644 index 00000000..c24a017f --- /dev/null +++ b/python/gsm/bindings/uplink_downlink_splitter_python.cc @@ -0,0 +1,59 @@ +/* + * Copyright 2022 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +/***********************************************************************************/ +/* This file is automatically generated using bindtool and can be manually edited */ +/* The following lines can be configured to regenerate this file during cmake */ +/* If manual edits are made, the following tags should be modified accordingly. */ +/* BINDTOOL_GEN_AUTOMATIC(0) */ +/* BINDTOOL_USE_PYGCCXML(0) */ +/* BINDTOOL_HEADER_FILE(flow_control/uplink_downlink_splitter.h) */ +/* BINDTOOL_HEADER_FILE_HASH(3b5118d93609f63437471b1c59878ed9) */ +/***********************************************************************************/ + +#include +#include +#include + +namespace py = pybind11; + +#include +// pydoc.h is automatically generated in the build directory +#include + +void bind_uplink_downlink_splitter(py::module& m) +{ + + using uplink_downlink_splitter = ::gr::gsm::uplink_downlink_splitter; + + + py::class_>(m, "uplink_downlink_splitter", D(uplink_downlink_splitter)) + + .def(py::init(&uplink_downlink_splitter::make), + D(uplink_downlink_splitter,make) + ) + + + + + ; + + + + +} + + + + + + + + diff --git a/python/demapping/CMakeLists.txt b/python/gsm/demapping/CMakeLists.txt similarity index 95% rename from python/demapping/CMakeLists.txt rename to python/gsm/demapping/CMakeLists.txt index 0de1d980..97c0f397 100644 --- a/python/demapping/CMakeLists.txt +++ b/python/gsm/demapping/CMakeLists.txt @@ -22,5 +22,5 @@ GR_PYTHON_INSTALL( gsm_bcch_ccch_demapper.py gsm_bcch_ccch_sdcch4_demapper.py gsm_sdcch8_demapper.py - DESTINATION ${GR_PYTHON_DIR}/grgsm + DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm ) diff --git a/python/demapping/gsm_bcch_ccch_demapper.py b/python/gsm/demapping/gsm_bcch_ccch_demapper.py similarity index 97% rename from python/demapping/gsm_bcch_ccch_demapper.py rename to python/gsm/demapping/gsm_bcch_ccch_demapper.py index 06baa629..0b5943f9 100644 --- a/python/demapping/gsm_bcch_ccch_demapper.py +++ b/python/gsm/demapping/gsm_bcch_ccch_demapper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2016 by Piotr Krysik @@ -29,7 +29,7 @@ from gnuradio import gr from gnuradio.filter import firdes -import grgsm +from gnuradio import gsm class gsm_bcch_ccch_demapper(gr.hier_block2): @@ -57,7 +57,7 @@ def __init__(self, timeslot_nr=0): # BCCH Norm D 0,2,4,6 C0 NB 51 B(2..5) # RACH U 0,2,4,6 C0 AB, Extended AB2 51 B0(0),B1(1)..B50(50) # Figure 8a: TDMA frame mapping for FCCH + SCH + BCCH + CCCH - self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper( + self.gsm_universal_ctrl_chans_demapper_0 = gsm.universal_ctrl_chans_demapper( timeslot_nr, ([ #downlink 0,0, 2,2,2,2, diff --git a/python/demapping/gsm_bcch_ccch_sdcch4_demapper.py b/python/gsm/demapping/gsm_bcch_ccch_sdcch4_demapper.py similarity index 98% rename from python/demapping/gsm_bcch_ccch_sdcch4_demapper.py rename to python/gsm/demapping/gsm_bcch_ccch_sdcch4_demapper.py index f025a708..cb67fbf8 100644 --- a/python/demapping/gsm_bcch_ccch_sdcch4_demapper.py +++ b/python/gsm/demapping/gsm_bcch_ccch_sdcch4_demapper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2016 by Piotr Krysik @@ -29,7 +29,7 @@ from gnuradio import gr from gnuradio.filter import firdes -import grgsm +from gnuradio import gsm class gsm_bcch_ccch_sdcch4_demapper(gr.hier_block2): @@ -75,7 +75,7 @@ def __init__(self, timeslot_nr=0): # # Figure 8b: TDMA frame mapping for FCCH + SCH + BCCH + CCCH + SDCCH/4(0...3) + SACCH/4(0...3) # - self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper( + self.gsm_universal_ctrl_chans_demapper_0 = gsm.universal_ctrl_chans_demapper( timeslot_nr, ([ #downlink 0,0, 2,2,2,2, diff --git a/python/demapping/gsm_sdcch8_demapper.py b/python/gsm/demapping/gsm_sdcch8_demapper.py similarity index 98% rename from python/demapping/gsm_sdcch8_demapper.py rename to python/gsm/demapping/gsm_sdcch8_demapper.py index 30450bfb..31656a3c 100644 --- a/python/demapping/gsm_sdcch8_demapper.py +++ b/python/gsm/demapping/gsm_sdcch8_demapper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2016 by Piotr Krysik @@ -29,7 +29,7 @@ from gnuradio import gr from gnuradio.filter import firdes -import grgsm +from gnuradio import gsm class gsm_sdcch8_demapper(gr.hier_block2): @@ -86,7 +86,7 @@ def __init__(self, timeslot_nr=1): # U B (4 ... 7) # 7 D B (95 ... 98) # U B (8 ... 11) - self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper( + self.gsm_universal_ctrl_chans_demapper_0 = gsm.universal_ctrl_chans_demapper( timeslot_nr, ([ #downlink 0,0,0,0, 4,4,4,4, diff --git a/python/misc_utils/CMakeLists.txt b/python/gsm/misc_utils/CMakeLists.txt similarity index 95% rename from python/misc_utils/CMakeLists.txt rename to python/gsm/misc_utils/CMakeLists.txt index 57ed2756..01d46f0f 100644 --- a/python/misc_utils/CMakeLists.txt +++ b/python/gsm/misc_utils/CMakeLists.txt @@ -23,5 +23,5 @@ GR_PYTHON_INSTALL( clock_offset_corrector_tagged.py fn_time.py device.py - DESTINATION ${GR_PYTHON_DIR}/grgsm + DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm ) diff --git a/python/misc_utils/arfcn.py b/python/gsm/misc_utils/arfcn.py similarity index 100% rename from python/misc_utils/arfcn.py rename to python/gsm/misc_utils/arfcn.py diff --git a/python/misc_utils/clock_offset_corrector_tagged.py b/python/gsm/misc_utils/clock_offset_corrector_tagged.py similarity index 92% rename from python/misc_utils/clock_offset_corrector_tagged.py rename to python/gsm/misc_utils/clock_offset_corrector_tagged.py index ea474b1e..961cb47d 100644 --- a/python/misc_utils/clock_offset_corrector_tagged.py +++ b/python/gsm/misc_utils/clock_offset_corrector_tagged.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2016 by Piotr Krysik @@ -29,7 +29,7 @@ from gnuradio import gr from gnuradio.filter import firdes -import grgsm +from gnuradio import gsm import math @@ -60,9 +60,9 @@ def __init__(self, fc=936.6e6, osr=4, ppm=0, samp_rate_in=1625000.0/6.0*4.0): ################################################## # Blocks ################################################## - self.gsm_msg_to_tag_0 = grgsm.msg_to_tag() - self.gsm_controlled_rotator_cc_0 = grgsm.controlled_rotator_cc(ppm/1.0e6*2*math.pi*fc/samp_rate_out) - self.gsm_controlled_fractional_resampler_cc_0 = grgsm.controlled_fractional_resampler_cc(0, (1-ppm/1.0e6)*(samp_rate_in/samp_rate_out)) + self.gsm_msg_to_tag_0 = gsm.msg_to_tag() + self.gsm_controlled_rotator_cc_0 = gsm.controlled_rotator_cc(ppm/1.0e6*2*math.pi*fc/samp_rate_out) + self.gsm_controlled_fractional_resampler_cc_0 = gsm.controlled_fractional_resampler_cc(0, (1-ppm/1.0e6)*(samp_rate_in/samp_rate_out)) ################################################## # Connections diff --git a/python/misc_utils/device.py b/python/gsm/misc_utils/device.py similarity index 90% rename from python/misc_utils/device.py rename to python/gsm/misc_utils/device.py index ddd9decd..73180e37 100644 --- a/python/misc_utils/device.py +++ b/python/gsm/misc_utils/device.py @@ -25,13 +25,16 @@ import os def get_devices(hint=""): - return osmosdr.device_find(osmosdr.device_t(hint)) + return osmosdr.device.find(osmosdr.device_t(hint)) def match(dev, filters): for f in filters: for k, v in f.items(): - if (k not in dev or dev[k] != v): - break + try: + if k not in dev.to_string() or dev[k] != v: + break + except: + pass else: return True return False diff --git a/python/misc_utils/fn_time.py b/python/gsm/misc_utils/fn_time.py similarity index 98% rename from python/misc_utils/fn_time.py rename to python/gsm/misc_utils/fn_time.py index 93342bda..b199d769 100644 --- a/python/misc_utils/fn_time.py +++ b/python/gsm/misc_utils/fn_time.py @@ -70,7 +70,7 @@ def fn_time_delta(fn_ref, time_ref, fn_x, time_hint=None, ts_num=0, ts_ref=0): if __name__ == "__main__": from random import uniform - from grgsm import fn_time_delta_cpp + from gsm import fn_time_delta_cpp fn1 = 10000 ts_ref = 4 diff --git a/python/qa_arfcn.py b/python/gsm/qa_arfcn.py similarity index 99% rename from python/qa_arfcn.py rename to python/gsm/qa_arfcn.py index 0a3cc4e9..d12a425e 100755 --- a/python/qa_arfcn.py +++ b/python/gsm/qa_arfcn.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm from misc_utils import arfcn import os import sys diff --git a/python/qa_burst_file_source.py b/python/gsm/qa_burst_file_source.py similarity index 96% rename from python/qa_burst_file_source.py rename to python/gsm/qa_burst_file_source.py index bfdcc732..af689ecb 100644 --- a/python/qa_burst_file_source.py +++ b/python/gsm/qa_burst_file_source.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import tempfile class qa_burst_file_sink (gr_unittest.TestCase): @@ -53,8 +53,8 @@ def test_blob_only (self): handle.flush(); handle.close(); - src = grgsm.burst_file_source(temp.name); - dst = grgsm.burst_sink(); + src = gsm.burst_file_source(temp.name); + dst = gsm.burst_sink(); self.tb.msg_connect(src, "out", dst, "in") self.tb.run () @@ -91,8 +91,8 @@ def test_fn_time (self): handle.flush(); handle.close(); - src = grgsm.burst_file_source(temp.name); - dst = grgsm.burst_sink(); + src = gsm.burst_file_source(temp.name); + dst = gsm.burst_sink(); self.tb.msg_connect(src, "out", dst, "in") self.tb.run () diff --git a/python/qa_burst_fnr_filter.py b/python/gsm/qa_burst_fnr_filter.py similarity index 97% rename from python/qa_burst_fnr_filter.py rename to python/gsm/qa_burst_fnr_filter.py index 945cd0bc..3fe52a75 100755 --- a/python/qa_burst_fnr_filter.py +++ b/python/gsm/qa_burst_fnr_filter.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_burst_fnr_filter (gr_unittest.TestCase): @@ -86,10 +86,10 @@ def test_001_less_or_equal (self): "0000100000110001000000000101000100001010100001001000000000001010000111011101001000011101001010010001101011001011101111101000010001000000000101010000" ] - fnr_filter = grgsm.burst_fnr_filter(grgsm.FILTER_LESS_OR_EQUAL, 1500123) + fnr_filter = gsm.burst_fnr_filter(gsm.FILTER_LESS_OR_EQUAL, 1500123) - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - sink = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", fnr_filter, "in") self.tb.msg_connect(fnr_filter, "out", sink, "in") @@ -150,10 +150,10 @@ def test_002_greater_or_equal (self): "0000100000110001000000000101000100001010100001001000000000001010000111011101001000011101001010010001101011001011101111101000010001000000000101010000" ] - fnr_filter = grgsm.burst_fnr_filter(grgsm.FILTER_GREATER_OR_EQUAL, 1500123) + fnr_filter = gsm.burst_fnr_filter(gsm.FILTER_GREATER_OR_EQUAL, 1500123) - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - sink = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", fnr_filter, "in") self.tb.msg_connect(fnr_filter, "out", sink, "in") diff --git a/python/qa_burst_printer.py b/python/gsm/qa_burst_printer.py similarity index 93% rename from python/qa_burst_printer.py rename to python/gsm/qa_burst_printer.py index 15a7fc89..4a2b1574 100755 --- a/python/qa_burst_printer.py +++ b/python/gsm/qa_burst_printer.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import os import pmt import sys @@ -74,8 +74,8 @@ def test_001_complete_bursts_prefix (self): "0001101010111110010001010110101100000011101100011111110100101000110101110010000011010111111000000001010010111001111111011001000000001001000011101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern(""), False, False, False, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern(""), False, False, False, False) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -101,8 +101,8 @@ def test_002_complete_bursts_prefix (self): "Test 0001101010111110010001010110101100000011101100011111110100101000110101110010000011010111111000000001010010111001111111011001000000001001000011101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern("Test "), False, False, False, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern("Test "), False, False, False, False) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -128,8 +128,8 @@ def test_003_complete_bursts_fnr (self): "2569046: 0001101010111110010001010110101100000011101100011111110100101000110101110010000011010111111000000001010010111001111111011001000000001001000011101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern(""), True, False, False, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern(""), True, False, False, False) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -155,8 +155,8 @@ def test_004_complete_bursts_fcount (self): "3967724: 0001101010111110010001010110101100000011101100011111110100101000110101110010000011010111111000000001010010111001111111011001000000001001000011101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern(""), False, True, False, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern(""), False, True, False, False) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -182,8 +182,8 @@ def test_005_complete_bursts_fnr_fcount (self): "2569046 3967724: 0001101010111110010001010110101100000011101100011111110100101000110101110010000011010111111000000001010010111001111111011001000000001001000011101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern(""), True, True, False, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern(""), True, True, False, False) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -219,8 +219,8 @@ def test_006_payload_prefix_fnr_fcount (self): "test_006: 1099605 1699245: 111110110111011000001010010011100000100100010000000111110111010010100011001100111001111010011111000100101111101010" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern("test_006: "), True, True, True, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern("test_006: "), True, True, True, False) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -252,8 +252,8 @@ def test_007_payload_prefix_fnr_fcount (self): "test_007: 2569046 3967724: 110101011111001000101011010110000001110110001111111010010111000000001010010111001111111011001000000001001000011101" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern("test_007: "), True, True, True, True) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern("test_007: "), True, True, True, True) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() @@ -285,8 +285,8 @@ def test_008_complete_prefix_fnr_fcount (self): "test_008: 2569046 3967724: 0001101010111110010001010110101100000011101100011111110100101000110101110010000011010111111000000001010010111001111111011001000000001001000011101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - printer = grgsm.bursts_printer(pmt.intern("test_008: "), True, True, False, True) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + printer = gsm.bursts_printer(pmt.intern("test_008: "), True, True, False, True) self.tb.msg_connect(src, "out", printer, "bursts") self.tb.run() diff --git a/python/qa_burst_sdcch_subslot_filter.py b/python/gsm/qa_burst_sdcch_subslot_filter.py similarity index 98% rename from python/qa_burst_sdcch_subslot_filter.py rename to python/gsm/qa_burst_sdcch_subslot_filter.py index bce74fd2..699fa373 100755 --- a/python/qa_burst_sdcch_subslot_filter.py +++ b/python/gsm/qa_burst_sdcch_subslot_filter.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm class qa_burst_sdcch_subslot_filter (gr_unittest.TestCase): # 102 random bursts as test input @@ -161,9 +161,9 @@ def test_001_sdcch8 (self): ] subslot = 2 - src = grgsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) - ss_filter = grgsm.burst_sdcch_subslot_filter(grgsm.SS_FILTER_SDCCH8, subslot) - sink = grgsm.burst_sink() + src = gsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) + ss_filter = gsm.burst_sdcch_subslot_filter(gsm.SS_FILTER_SDCCH8, subslot) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", ss_filter, "in") self.tb.msg_connect(ss_filter, "out", sink, "in") @@ -193,9 +193,9 @@ def test_002_sdcch4 (self): ] subslot = 2 - src = grgsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) - splitter = grgsm.burst_sdcch_subslot_filter(grgsm.SS_FILTER_SDCCH4, subslot) - sink = grgsm.burst_sink() + src = gsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) + splitter = gsm.burst_sdcch_subslot_filter(gsm.SS_FILTER_SDCCH4, subslot) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", splitter, "in") self.tb.msg_connect(splitter, "out", sink, "in") diff --git a/python/qa_burst_sdcch_subslot_splitter.py b/python/gsm/qa_burst_sdcch_subslot_splitter.py similarity index 98% rename from python/qa_burst_sdcch_subslot_splitter.py rename to python/gsm/qa_burst_sdcch_subslot_splitter.py index a72ec01c..bef5e474 100755 --- a/python/qa_burst_sdcch_subslot_splitter.py +++ b/python/gsm/qa_burst_sdcch_subslot_splitter.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_burst_sdcch_subslot_splitter (gr_unittest.TestCase): @@ -267,16 +267,16 @@ def test_001_sdcch8 (self): '0000110000111101100001011100100011101011011000111100001000000111011110001001011101111000111000000111100100101000000101100011011001111100110011110000', ] - src = grgsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) - splitter = grgsm.burst_sdcch_subslot_splitter(grgsm.SPLITTER_SDCCH8) - sink_0 = grgsm.burst_sink() - sink_1 = grgsm.burst_sink() - sink_2 = grgsm.burst_sink() - sink_3 = grgsm.burst_sink() - sink_4 = grgsm.burst_sink() - sink_5 = grgsm.burst_sink() - sink_6 = grgsm.burst_sink() - sink_7 = grgsm.burst_sink() + src = gsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) + splitter = gsm.burst_sdcch_subslot_splitter(gsm.SPLITTER_SDCCH8) + sink_0 = gsm.burst_sink() + sink_1 = gsm.burst_sink() + sink_2 = gsm.burst_sink() + sink_3 = gsm.burst_sink() + sink_4 = gsm.burst_sink() + sink_5 = gsm.burst_sink() + sink_6 = gsm.burst_sink() + sink_7 = gsm.burst_sink() self.tb.msg_connect(src, "out", splitter, "in") self.tb.msg_connect(splitter, "out0", sink_0, "in") @@ -371,12 +371,12 @@ def test_002_sdcch4 (self): '0000100001011010001010000101110000111100011110110010000010101000110101110010000011010111010001010101111111111101101100110101111010110100001110101000', ] - src = grgsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) - splitter = grgsm.burst_sdcch_subslot_splitter(grgsm.SPLITTER_SDCCH4) - sink_0 = grgsm.burst_sink() - sink_1 = grgsm.burst_sink() - sink_2 = grgsm.burst_sink() - sink_3 = grgsm.burst_sink() + src = gsm.burst_source(self.framenumbers_input, self.timeslots_input, self.bursts_input) + splitter = gsm.burst_sdcch_subslot_splitter(gsm.SPLITTER_SDCCH4) + sink_0 = gsm.burst_sink() + sink_1 = gsm.burst_sink() + sink_2 = gsm.burst_sink() + sink_3 = gsm.burst_sink() self.tb.msg_connect(src, "out", splitter, "in") self.tb.msg_connect(splitter, "out0", sink_0, "in") diff --git a/python/qa_burst_timeslot_filter.py b/python/gsm/qa_burst_timeslot_filter.py similarity index 96% rename from python/qa_burst_timeslot_filter.py rename to python/gsm/qa_burst_timeslot_filter.py index 041c95ab..02a06125 100755 --- a/python/qa_burst_timeslot_filter.py +++ b/python/gsm/qa_burst_timeslot_filter.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_burst_timeslot_filter (gr_unittest.TestCase): @@ -74,9 +74,9 @@ def test_001 (self): ] timeslot = 1 - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - ts_filter = grgsm.burst_timeslot_filter(timeslot) - sink = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + ts_filter = gsm.burst_timeslot_filter(timeslot) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", ts_filter, "in") self.tb.msg_connect(ts_filter, "out", sink, "in") diff --git a/python/qa_burst_timeslot_splitter.py b/python/gsm/qa_burst_timeslot_splitter.py similarity index 96% rename from python/qa_burst_timeslot_splitter.py rename to python/gsm/qa_burst_timeslot_splitter.py index e99b44d6..f2ca218b 100755 --- a/python/qa_burst_timeslot_splitter.py +++ b/python/gsm/qa_burst_timeslot_splitter.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_burst_timeslot_splitter (gr_unittest.TestCase): @@ -115,16 +115,16 @@ def test_001 (self): ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - splitter = grgsm.burst_timeslot_splitter() - sink_0 = grgsm.burst_sink() - sink_1 = grgsm.burst_sink() - sink_2 = grgsm.burst_sink() - sink_3 = grgsm.burst_sink() - sink_4 = grgsm.burst_sink() - sink_5 = grgsm.burst_sink() - sink_6 = grgsm.burst_sink() - sink_7 = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + splitter = gsm.burst_timeslot_splitter() + sink_0 = gsm.burst_sink() + sink_1 = gsm.burst_sink() + sink_2 = gsm.burst_sink() + sink_3 = gsm.burst_sink() + sink_4 = gsm.burst_sink() + sink_5 = gsm.burst_sink() + sink_6 = gsm.burst_sink() + sink_7 = gsm.burst_sink() self.tb.msg_connect(src, "out", splitter, "in") self.tb.msg_connect(splitter, "out0", sink_0, "in") diff --git a/python/qa_controlled_fractional_resampler_cc.py b/python/gsm/qa_controlled_fractional_resampler_cc.py similarity index 97% rename from python/qa_controlled_fractional_resampler_cc.py rename to python/gsm/qa_controlled_fractional_resampler_cc.py index 57939deb..1efc4287 100755 --- a/python/qa_controlled_fractional_resampler_cc.py +++ b/python/gsm/qa_controlled_fractional_resampler_cc.py @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest from gnuradio import blocks -import grgsm_swig as grgsm +from gnuradio import gsm class qa_controlled_fractional_resampler_cc (gr_unittest.TestCase): diff --git a/python/qa_decryption.py b/python/gsm/qa_decryption.py similarity index 93% rename from python/qa_decryption.py rename to python/gsm/qa_decryption.py index 995a5300..85113f5b 100755 --- a/python/qa_decryption.py +++ b/python/gsm/qa_decryption.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_decryption (gr_unittest.TestCase): @@ -56,9 +56,9 @@ def test_001_a51 (self): key = [0x32,0xE5,0x45,0x53,0x20,0x8C,0xE0,0x00] a5_version = 1 - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - decryption = grgsm.decryption((key), a5_version) - dst = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + decryption = gsm.decryption((key), a5_version) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", decryption, "bursts") self.tb.msg_connect(decryption, "bursts", dst, "in") @@ -97,9 +97,9 @@ def test_002_a51 (self): key = [0xAD,0x6A,0x3E,0xC2,0xB4,0x42,0xE4,0x00] a5_version = 1 - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - decryption = grgsm.decryption((key), a5_version) - dst = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + decryption = gsm.decryption((key), a5_version) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", decryption, "bursts") self.tb.msg_connect(decryption, "bursts", dst, "in") @@ -138,9 +138,9 @@ def test_003_a53 (self): key = [0x41,0xBC,0x19,0x30,0xB6,0x31,0x8A,0xC8] a5_version = 3 - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - decryption = grgsm.decryption((key), a5_version) - dst = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + decryption = gsm.decryption((key), a5_version) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", decryption, "bursts") self.tb.msg_connect(decryption, "bursts", dst, "in") @@ -179,9 +179,9 @@ def test_004_a53 (self): key = [0xAD,0x2C,0xB3,0x83,0x2F,0x4A,0x6C,0xF1] a5_version = 3 - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - decryption = grgsm.decryption((key), a5_version) - dst = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + decryption = gsm.decryption((key), a5_version) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", decryption, "bursts") self.tb.msg_connect(decryption, "bursts", dst, "in") diff --git a/python/qa_dummy_burst_filter.py b/python/gsm/qa_dummy_burst_filter.py similarity index 97% rename from python/qa_dummy_burst_filter.py rename to python/gsm/qa_dummy_burst_filter.py index fada415a..a39bd04f 100755 --- a/python/qa_dummy_burst_filter.py +++ b/python/gsm/qa_dummy_burst_filter.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm class qa_dummy_burst_filter (gr_unittest.TestCase): @@ -83,10 +83,10 @@ def test_001 (self): "0000100000110001000000000100000110001011100001001000000000001010000111011101001000011101001010010001010000000111010000000011000001000000000101010000" ] - dummy_burst_filter = grgsm.dummy_burst_filter() + dummy_burst_filter = gsm.dummy_burst_filter() - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - sink = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", dummy_burst_filter, "in") self.tb.msg_connect(dummy_burst_filter, "out", sink, "in") diff --git a/python/qa_gsm_bcch_ccch_demapper.py b/python/gsm/qa_gsm_bcch_ccch_demapper.py similarity index 92% rename from python/qa_gsm_bcch_ccch_demapper.py rename to python/gsm/qa_gsm_bcch_ccch_demapper.py index 14e12241..45e9b887 100644 --- a/python/qa_gsm_bcch_ccch_demapper.py +++ b/python/gsm/qa_gsm_bcch_ccch_demapper.py @@ -24,7 +24,7 @@ import unittest import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm +from gnuradio import gsm import pmt import qa_gsm_demapper_data as test_data @@ -41,10 +41,10 @@ def test_downlink (self): """ BCCH_CCCH demapper downlink test """ - src = grgsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) + src = gsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) src.set_arfcn(0); # downlink - demapper = grgsm.gsm_bcch_ccch_demapper(timeslot_nr=0) - dst = grgsm.burst_sink() + demapper = gsm.gsm_bcch_ccch_demapper(timeslot_nr=0) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "bursts", dst, "in") @@ -127,10 +127,10 @@ def test_uplink (self): """ BCCH_CCCH demapper uplink test """ - src = grgsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) + src = gsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) src.set_arfcn(0x2240); #uplink flag is 40 - demapper = grgsm.gsm_bcch_ccch_demapper(timeslot_nr=0) - dst = grgsm.burst_sink() + demapper = gsm.gsm_bcch_ccch_demapper(timeslot_nr=0) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "bursts", dst, "in") diff --git a/python/qa_gsm_bcch_ccch_sdcch4_demapper.py b/python/gsm/qa_gsm_bcch_ccch_sdcch4_demapper.py similarity index 94% rename from python/qa_gsm_bcch_ccch_sdcch4_demapper.py rename to python/gsm/qa_gsm_bcch_ccch_sdcch4_demapper.py index b57ef224..01cfbafa 100644 --- a/python/qa_gsm_bcch_ccch_sdcch4_demapper.py +++ b/python/gsm/qa_gsm_bcch_ccch_sdcch4_demapper.py @@ -24,7 +24,7 @@ import unittest import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm +from gnuradio import gsm import pmt import qa_gsm_demapper_data as test_data @@ -41,10 +41,10 @@ def test_downlink (self): """ BCCH_CCCH_SDCCH4 demapper downlink test """ - src = grgsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) + src = gsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) src.set_arfcn(0); # downlink - demapper = grgsm.gsm_bcch_ccch_sdcch4_demapper(timeslot_nr=0) - dst = grgsm.burst_sink() + demapper = gsm.gsm_bcch_ccch_sdcch4_demapper(timeslot_nr=0) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "bursts", dst, "in") @@ -127,10 +127,10 @@ def test_uplink (self): """ BCCH_CCCH_SDCCH4 demapper uplink test """ - src = grgsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) + src = gsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) src.set_arfcn(0x2240); #uplink flag is 40 - demapper = grgsm.gsm_bcch_ccch_sdcch4_demapper(timeslot_nr=0) - dst = grgsm.burst_sink() + demapper = gsm.gsm_bcch_ccch_sdcch4_demapper(timeslot_nr=0) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "bursts", dst, "in") diff --git a/python/qa_gsm_demapper_data.py b/python/gsm/qa_gsm_demapper_data.py similarity index 100% rename from python/qa_gsm_demapper_data.py rename to python/gsm/qa_gsm_demapper_data.py diff --git a/python/qa_gsm_sdcch8_demapper.py b/python/gsm/qa_gsm_sdcch8_demapper.py similarity index 95% rename from python/qa_gsm_sdcch8_demapper.py rename to python/gsm/qa_gsm_sdcch8_demapper.py index cc052674..b147b905 100644 --- a/python/qa_gsm_sdcch8_demapper.py +++ b/python/gsm/qa_gsm_sdcch8_demapper.py @@ -24,7 +24,7 @@ import unittest import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm +from gnuradio import gsm import pmt import qa_gsm_demapper_data as test_data @@ -41,10 +41,10 @@ def test_downlink (self): """ SDCCH8 demapper downlink test """ - src = grgsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) + src = gsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) src.set_arfcn(0); # downlink - demapper = grgsm.gsm_sdcch8_demapper(timeslot_nr=0) - dst = grgsm.burst_sink() + demapper = gsm.gsm_sdcch8_demapper(timeslot_nr=0) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "bursts", dst, "in") @@ -139,10 +139,10 @@ def test_uplink (self): """ BCCH_CCCH_SDCCH4 demapper uplink test """ - src = grgsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) + src = gsm.burst_source(test_data.frames, test_data.timeslots, test_data.bursts) src.set_arfcn(0x2240); #uplink flag is 40 - demapper = grgsm.gsm_sdcch8_demapper(timeslot_nr=0) - dst = grgsm.burst_sink() + demapper = gsm.gsm_sdcch8_demapper(timeslot_nr=0) + dst = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "bursts", dst, "in") diff --git a/python/qa_message_printer.py b/python/gsm/qa_message_printer.py similarity index 93% rename from python/qa_message_printer.py rename to python/gsm/qa_message_printer.py index b1bf05e0..3e1fc9e1 100755 --- a/python/qa_message_printer.py +++ b/python/gsm/qa_message_printer.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import os import pmt import sys @@ -73,8 +73,8 @@ def test_001_no_prefix_no_header (self): " 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" ] - src = grgsm.message_source(msgs_input) - printer = grgsm.message_printer(pmt.intern(""), False) + src = gsm.message_source(msgs_input) + printer = gsm.message_printer(pmt.intern(""), False) self.tb.msg_connect(src, "msgs", printer, "msgs") self.tb.run() @@ -99,8 +99,8 @@ def test_002_prefix_no_header (self): "test_002: 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" ] - src = grgsm.message_source(msgs_input) - printer = grgsm.message_printer(pmt.intern("test_002:"), False) + src = gsm.message_source(msgs_input) + printer = gsm.message_printer(pmt.intern("test_002:"), False) self.tb.msg_connect(src, "msgs", printer, "msgs") self.tb.run() @@ -126,8 +126,8 @@ def test_003_no_prefix_header (self): " 02 04 01 00 00 00 cb 00 00 1d 3d 12 02 00 00 00 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" ] - src = grgsm.message_source(msgs_input) - printer = grgsm.message_printer(pmt.intern(""), False, False, True) + src = gsm.message_source(msgs_input) + printer = gsm.message_printer(pmt.intern(""), False, False, True) self.tb.msg_connect(src, "msgs", printer, "msgs") self.tb.run() @@ -153,8 +153,8 @@ def test_004_prefix_header (self): "test_004: 02 04 01 00 00 00 cb 00 00 1d 3d 12 02 00 00 00 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" ] - src = grgsm.message_source(msgs_input) - printer = grgsm.message_printer(pmt.intern("test_004:"), False, False, True) + src = gsm.message_source(msgs_input) + printer = gsm.message_printer(pmt.intern("test_004:"), False, False, True) self.tb.msg_connect(src, "msgs", printer, "msgs") self.tb.run() diff --git a/python/qa_message_source_sink.py b/python/gsm/qa_message_source_sink.py similarity index 93% rename from python/qa_message_source_sink.py rename to python/gsm/qa_message_source_sink.py index 8c375d42..53b042c2 100755 --- a/python/qa_message_source_sink.py +++ b/python/gsm/qa_message_source_sink.py @@ -22,7 +22,7 @@ # from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import os import pmt import sys @@ -66,10 +66,10 @@ def test_001_no_prefix_no_header (self): #" 15 06 21 00 01 f0 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b" ] - src = grgsm.message_source(msgs_input) - file_sink = grgsm.message_file_sink(self.tmpfile.name) + src = gsm.message_source(msgs_input) + file_sink = gsm.message_file_sink(self.tmpfile.name) - #printer = grgsm.message_printer(pmt.intern(""), False) + #printer = gsm.message_printer(pmt.intern(""), False) #self.tb.msg_connect(src, "msgs", printer, "msgs") self.tb.run() diff --git a/python/qa_msg_to_tag.py b/python/gsm/qa_msg_to_tag.py similarity index 97% rename from python/qa_msg_to_tag.py rename to python/gsm/qa_msg_to_tag.py index b897b66d..8335d945 100755 --- a/python/qa_msg_to_tag.py +++ b/python/gsm/qa_msg_to_tag.py @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest from gnuradio import blocks -import grgsm_swig as grgsm +from gnuradio import gsm class qa_msg_to_tag (gr_unittest.TestCase): diff --git a/python/qa_tch_f_chans_demapper.py b/python/gsm/qa_tch_f_chans_demapper.py similarity index 96% rename from python/qa_tch_f_chans_demapper.py rename to python/gsm/qa_tch_f_chans_demapper.py index f101ca97..c7ba19ac 100755 --- a/python/qa_tch_f_chans_demapper.py +++ b/python/gsm/qa_tch_f_chans_demapper.py @@ -23,7 +23,7 @@ import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_tch_f_chans_demapper (gr_unittest.TestCase): @@ -91,10 +91,10 @@ def test_fr_demapper (self): b[26], b[27], b[28], b[29], b[30] ] - src = grgsm.burst_source(frames, timeslots, bursts) - demapper = grgsm.tch_f_chans_demapper(3) - tch = grgsm.burst_sink() - acch = grgsm.burst_sink() + src = gsm.burst_source(frames, timeslots, bursts) + demapper = gsm.tch_f_chans_demapper(3) + tch = gsm.burst_sink() + acch = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "tch_bursts", tch, "in") @@ -118,10 +118,10 @@ def test_fr_demapper (self): def sacch_fr_test (self, ts, frames, bursts): timeslots = [ts, ts, ts, ts, ts, ts, ts, ts] - src = grgsm.burst_source(frames, timeslots, bursts) - demapper = grgsm.tch_f_chans_demapper(ts) - tch = grgsm.burst_sink() - acch = grgsm.burst_sink() + src = gsm.burst_source(frames, timeslots, bursts) + demapper = gsm.tch_f_chans_demapper(ts) + tch = gsm.burst_sink() + acch = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "tch_bursts", tch, "in") diff --git a/python/qa_tch_f_decoder.py b/python/gsm/qa_tch_f_decoder.py similarity index 94% rename from python/qa_tch_f_decoder.py rename to python/gsm/qa_tch_f_decoder.py index 1cac84f8..a0d19b5a 100755 --- a/python/qa_tch_f_decoder.py +++ b/python/gsm/qa_tch_f_decoder.py @@ -23,7 +23,7 @@ import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_tch_f_decoder (gr_unittest.TestCase): @@ -51,8 +51,8 @@ def test_fr (self): "0000010111000101101101100001011000110010010011001110101000010111011110001001011101111000001001100011010001111110001101010100110001010001100100001000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - decoder = grgsm.tch_f_decoder(grgsm.TCH_FS, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + decoder = gsm.tch_f_decoder(gsm.TCH_FS, False) dst = blocks.message_debug() self.tb.msg_connect(src, "out", decoder, "bursts") @@ -93,8 +93,8 @@ def test_fr_parity_error (self): "0000001000010101010101111011101010100000000101011101111110101111011110001001011101111001100010000001010101011011101010001000010001011101111010101000" ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - decoder = grgsm.tch_f_decoder(grgsm.TCH_FS, False) + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + decoder = gsm.tch_f_decoder(gsm.TCH_FS, False) dst = blocks.message_debug() self.tb.msg_connect(src, "out", decoder, "bursts") diff --git a/python/qa_tch_h_chans_demapper.py b/python/gsm/qa_tch_h_chans_demapper.py similarity index 95% rename from python/qa_tch_h_chans_demapper.py rename to python/gsm/qa_tch_h_chans_demapper.py index 15e9bfc4..6c5b068e 100755 --- a/python/qa_tch_h_chans_demapper.py +++ b/python/gsm/qa_tch_h_chans_demapper.py @@ -23,7 +23,7 @@ import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_tch_h_chans_demapper (gr_unittest.TestCase): @@ -91,10 +91,10 @@ def test_hr_demapper_sub0 (self): b[26], b[27], b[28], b[29], b[30] ] - src = grgsm.burst_source(frames, timeslots, bursts) - demapper = grgsm.tch_h_chans_demapper(3, 0) - tch = grgsm.burst_sink() - acch = grgsm.burst_sink() + src = gsm.burst_source(frames, timeslots, bursts) + demapper = gsm.tch_h_chans_demapper(3, 0) + tch = gsm.burst_sink() + acch = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "tch_bursts", tch, "in") @@ -138,10 +138,10 @@ def test_hr_demapper_sub1 (self): b[21], b[22], b[23], b[24], b[25], #25 - idle b[26], b[27], b[28], b[29], b[30] ] - src = grgsm.burst_source(frames, timeslots, bursts) - demapper = grgsm.tch_h_chans_demapper(3, 1) - tch = grgsm.burst_sink() - acch = grgsm.burst_sink() + src = gsm.burst_source(frames, timeslots, bursts) + demapper = gsm.tch_h_chans_demapper(3, 1) + tch = gsm.burst_sink() + acch = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "tch_bursts", tch, "in") @@ -165,10 +165,10 @@ def test_hr_demapper_sub1 (self): def sacch_hr_test (self, ts, sub, frames, bursts): timeslots = [ts, ts, ts, ts, ts, ts, ts, ts] - src = grgsm.burst_source(frames, timeslots, bursts) - demapper = grgsm.tch_h_chans_demapper(ts, sub) - tch = grgsm.burst_sink() - acch = grgsm.burst_sink() + src = gsm.burst_source(frames, timeslots, bursts) + demapper = gsm.tch_h_chans_demapper(ts, sub) + tch = gsm.burst_sink() + acch = gsm.burst_sink() self.tb.msg_connect(src, "out", demapper, "bursts") self.tb.msg_connect(demapper, "tch_bursts", tch, "in") diff --git a/python/qa_tch_h_decoder.py b/python/gsm/qa_tch_h_decoder.py similarity index 96% rename from python/qa_tch_h_decoder.py rename to python/gsm/qa_tch_h_decoder.py index 7d64d64b..590cbb4e 100755 --- a/python/qa_tch_h_decoder.py +++ b/python/gsm/qa_tch_h_decoder.py @@ -23,7 +23,7 @@ import numpy as np from gnuradio import gr, gr_unittest, blocks -import grgsm_swig as grgsm +from gnuradio import gsm import pmt class qa_tch_h_decoder (gr_unittest.TestCase): @@ -64,8 +64,8 @@ def tchh_multirate (self, frames, timeslots, bursts, multirate, subchan): """ Common TCH/H MultiRate test code """ - src = grgsm.burst_source(frames, timeslots, bursts) - decoder = grgsm.tch_h_decoder(subchan, multirate, False); + src = gsm.burst_source(frames, timeslots, bursts) + decoder = gsm.tch_h_decoder(subchan, multirate, False); dst = blocks.message_debug() self.tb.msg_connect(src, "out", decoder, "bursts") @@ -150,10 +150,10 @@ def facch_test (self, frames, timeslots, bursts): ''' Common FACCH/TH test code ''' - src = grgsm.burst_source(frames, timeslots, bursts) - decoder = grgsm.tch_h_decoder(0, "28111a40", False); + src = gsm.burst_source(frames, timeslots, bursts) + decoder = gsm.tch_h_decoder(0, "28111a40", False); dst = blocks.message_debug() - facch = grgsm.message_sink() + facch = gsm.message_sink() self.tb.msg_connect(src, "out", decoder, "bursts") self.tb.msg_connect(decoder, "voice", dst, "store") diff --git a/python/qa_txtime_bursts_tagger.py b/python/gsm/qa_txtime_bursts_tagger.py similarity index 96% rename from python/qa_txtime_bursts_tagger.py rename to python/gsm/qa_txtime_bursts_tagger.py index 8b4c990c..9b2fb040 100755 --- a/python/qa_txtime_bursts_tagger.py +++ b/python/gsm/qa_txtime_bursts_tagger.py @@ -56,8 +56,8 @@ def test_001_t (self): "0000010010100000001001101010100001011100010001101100111111101101001111101100010100111111101101001110100010101110010110101111100010010000110010110000", ] - src = grgsm.burst_source(framenumbers_input, timeslots_input, bursts_input) - sink = grgsm.burst_sink() + src = gsm.burst_source(framenumbers_input, timeslots_input, bursts_input) + sink = gsm.burst_sink() self.tb.msg_connect(src, "out", dut, "bursts") self.tb.msg_connect(dut, "bursts", sink, "in") diff --git a/python/qa_txtime_setter.py b/python/gsm/qa_txtime_setter.py similarity index 97% rename from python/qa_txtime_setter.py rename to python/gsm/qa_txtime_setter.py index 9d9d839e..c9a0d687 100755 --- a/python/qa_txtime_setter.py +++ b/python/gsm/qa_txtime_setter.py @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest from gnuradio import blocks -import grgsm_swig as grgsm +from gnuradio import gsm class qa_txtime_setter (gr_unittest.TestCase): diff --git a/python/qa_uplink_downlink_splitter.py b/python/gsm/qa_uplink_downlink_splitter.py similarity index 97% rename from python/qa_uplink_downlink_splitter.py rename to python/gsm/qa_uplink_downlink_splitter.py index b129ae3f..4efdcb04 100755 --- a/python/qa_uplink_downlink_splitter.py +++ b/python/gsm/qa_uplink_downlink_splitter.py @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest from gnuradio import blocks -import grgsm_swig as grgsm +from gnuradio import gsm class qa_uplink_downlink_splitter (gr_unittest.TestCase): diff --git a/python/receiver/CMakeLists.txt b/python/gsm/receiver/CMakeLists.txt similarity index 95% rename from python/receiver/CMakeLists.txt rename to python/gsm/receiver/CMakeLists.txt index a7a9e3ea..58a90f1e 100644 --- a/python/receiver/CMakeLists.txt +++ b/python/gsm/receiver/CMakeLists.txt @@ -24,5 +24,5 @@ GR_PYTHON_INSTALL( sch_detector.py fcch_detector.py chirpz.py - DESTINATION ${GR_PYTHON_DIR}/grgsm + DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm ) diff --git a/python/receiver/README b/python/gsm/receiver/README similarity index 100% rename from python/receiver/README rename to python/gsm/receiver/README diff --git a/python/receiver/chirpz.py b/python/gsm/receiver/chirpz.py similarity index 100% rename from python/receiver/chirpz.py rename to python/gsm/receiver/chirpz.py diff --git a/python/receiver/fcch_burst_tagger.py b/python/gsm/receiver/fcch_burst_tagger.py similarity index 99% rename from python/receiver/fcch_burst_tagger.py rename to python/gsm/receiver/fcch_burst_tagger.py index a4607406..bb4dedda 100644 --- a/python/receiver/fcch_burst_tagger.py +++ b/python/gsm/receiver/fcch_burst_tagger.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2014 by Piotr Krysik diff --git a/python/receiver/fcch_detector.py b/python/gsm/receiver/fcch_detector.py similarity index 97% rename from python/receiver/fcch_detector.py rename to python/gsm/receiver/fcch_detector.py index 9b787c2c..f14bda64 100644 --- a/python/receiver/fcch_detector.py +++ b/python/gsm/receiver/fcch_detector.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2014 by Piotr Krysik @@ -34,7 +34,7 @@ from gnuradio import blocks from gnuradio import gr from gnuradio.filter import firdes -import grgsm +from gnuradio import gsm class fcch_detector(gr.hier_block2): @@ -59,7 +59,7 @@ def __init__(self, OSR=4): ################################################## # Blocks ################################################## - self.gsm_fcch_burst_tagger_0 = grgsm.fcch_burst_tagger(OSR) + self.gsm_fcch_burst_tagger_0 = gsm.fcch_burst_tagger(OSR) self.blocks_threshold_ff_0_0 = blocks.threshold_ff(0, 0, 0) self.blocks_threshold_ff_0 = blocks.threshold_ff(int((138)*samp_rate/f_symb), int((138)*samp_rate/f_symb), 0) self.blocks_multiply_conjugate_cc_0 = blocks.multiply_conjugate_cc(1) diff --git a/python/receiver/gsm_input.py b/python/gsm/receiver/gsm_input.py similarity index 93% rename from python/receiver/gsm_input.py rename to python/gsm/receiver/gsm_input.py index 05e323d9..6a901593 100644 --- a/python/receiver/gsm_input.py +++ b/python/gsm/receiver/gsm_input.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # @file # @author (C) 2014 by Piotr Krysik @@ -30,7 +30,8 @@ from gnuradio import filter from gnuradio import gr from gnuradio.filter import firdes -import grgsm +from gnuradio.fft import window +from gnuradio import gsm class gsm_input(gr.hier_block2): @@ -61,8 +62,8 @@ def __init__(self, fc=940e6, osr=4, ppm=0, samp_rate_in=1e6): # Blocks ################################################## self.low_pass_filter_0_0 = filter.fir_filter_ccf(1, firdes.low_pass( - 1, samp_rate_out, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) - self.gsm_clock_offset_corrector_tagged_0 = grgsm.clock_offset_corrector_tagged( + 1, samp_rate_out, 125e3, 5e3, window.WIN_HAMMING, 6.76)) + self.gsm_clock_offset_corrector_tagged_0 = gsm.clock_offset_corrector_tagged( fc=fc, samp_rate_in=samp_rate_in, ppm=ppm, @@ -118,4 +119,4 @@ def get_samp_rate_out(self): def set_samp_rate_out(self, samp_rate_out): self.samp_rate_out = samp_rate_out - self.low_pass_filter_0_0.set_taps(firdes.low_pass(1, self.samp_rate_out, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) + self.low_pass_filter_0_0.set_taps(firdes.low_pass(1, self.samp_rate_out, 125e3, 5e3, window.WIN_HAMMING, 6.76)) diff --git a/python/receiver/sch_detector.py b/python/gsm/receiver/sch_detector.py similarity index 100% rename from python/receiver/sch_detector.py rename to python/gsm/receiver/sch_detector.py diff --git a/python/transmitter/CMakeLists.txt b/python/gsm/transmitter/CMakeLists.txt similarity index 94% rename from python/transmitter/CMakeLists.txt rename to python/gsm/transmitter/CMakeLists.txt index 3a5bbe88..2d23c9d3 100644 --- a/python/transmitter/CMakeLists.txt +++ b/python/gsm/transmitter/CMakeLists.txt @@ -21,5 +21,5 @@ GR_PYTHON_INSTALL( FILES txtime_bursts_tagger.py gsm_gmsk_mod.py - DESTINATION ${GR_PYTHON_DIR}/grgsm + DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm ) diff --git a/python/transmitter/gsm_gmsk_mod.py b/python/gsm/transmitter/gsm_gmsk_mod.py similarity index 99% rename from python/transmitter/gsm_gmsk_mod.py rename to python/gsm/transmitter/gsm_gmsk_mod.py index fec936c1..f14e4194 100644 --- a/python/transmitter/gsm_gmsk_mod.py +++ b/python/gsm/transmitter/gsm_gmsk_mod.py @@ -12,7 +12,7 @@ from gnuradio import gr from gnuradio.analog import cpm from gnuradio.filter import firdes -import grgsm +from gnuradio import gsm class gsm_gmsk_mod(gr.hier_block2): diff --git a/python/transmitter/txtime_bursts_tagger.py b/python/gsm/transmitter/txtime_bursts_tagger.py similarity index 100% rename from python/transmitter/txtime_bursts_tagger.py rename to python/gsm/transmitter/txtime_bursts_tagger.py diff --git a/python/trx/CMakeLists.txt b/python/gsm/trx/CMakeLists.txt similarity index 95% rename from python/trx/CMakeLists.txt rename to python/gsm/trx/CMakeLists.txt index 1069db8e..67add55b 100644 --- a/python/trx/CMakeLists.txt +++ b/python/gsm/trx/CMakeLists.txt @@ -28,5 +28,5 @@ GR_PYTHON_INSTALL( radio_if_lms.py transceiver.py dict_toggle_sign.py - DESTINATION ${GR_PYTHON_DIR}/grgsm/trx + DESTINATION ${GR_PYTHON_DIR}/gnuradio/gsm/trx ) diff --git a/python/trx/__init__.py b/python/gsm/trx/__init__.py similarity index 100% rename from python/trx/__init__.py rename to python/gsm/trx/__init__.py diff --git a/python/trx/ctrl_if.py b/python/gsm/trx/ctrl_if.py similarity index 99% rename from python/trx/ctrl_if.py rename to python/gsm/trx/ctrl_if.py index d7e14f15..a6701a7f 100644 --- a/python/trx/ctrl_if.py +++ b/python/gsm/trx/ctrl_if.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver diff --git a/python/trx/ctrl_if_bb.py b/python/gsm/trx/ctrl_if_bb.py similarity index 99% rename from python/trx/ctrl_if_bb.py rename to python/gsm/trx/ctrl_if_bb.py index 1c21c55d..741316fe 100644 --- a/python/trx/ctrl_if_bb.py +++ b/python/gsm/trx/ctrl_if_bb.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver diff --git a/python/trx/dict_toggle_sign.py b/python/gsm/trx/dict_toggle_sign.py similarity index 100% rename from python/trx/dict_toggle_sign.py rename to python/gsm/trx/dict_toggle_sign.py diff --git a/python/trx/radio_if.py b/python/gsm/trx/radio_if.py similarity index 86% rename from python/trx/radio_if.py rename to python/gsm/trx/radio_if.py index acbc3cd1..753abc5c 100644 --- a/python/trx/radio_if.py +++ b/python/gsm/trx/radio_if.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver @@ -25,7 +25,7 @@ import pmt import time -import grgsm +from gnuradio import gsm import random from math import pi @@ -34,8 +34,9 @@ from gnuradio import digital from gnuradio import blocks from gnuradio import gr - +from gnuradio import pdu from gnuradio import filter +from gnuradio.fft import window from gnuradio.filter import firdes from .dict_toggle_sign import dict_toggle_sign @@ -88,24 +89,24 @@ def __init__(self, phy_args, phy_sample_rate, gr.top_block.__init__(self, "GR-GSM TRX") # TRX Burst Interface - self.trx_burst_if = grgsm.trx_burst_if( + self.trx_burst_if = gsm.trx_burst_if( trx_bind_addr, trx_remote_addr, str(trx_base_port)) # RX path definition self.phy_init_source() - self.msg_to_tag_src = grgsm.msg_to_tag() + self.msg_to_tag_src = gsm.msg_to_tag() - self.rotator_src = grgsm.controlled_rotator_cc(0.0) + self.rotator_src = gsm.controlled_rotator_cc(0.0) self.lpf = filter.fir_filter_ccf(1, firdes.low_pass( - 1, phy_sample_rate, 125e3, 5e3, firdes.WIN_HAMMING, 6.76)) + 1, phy_sample_rate, 125e3, 5e3, window.WIN_HAMMING, 6.76)) - self.gsm_receiver = grgsm.receiver(self.osr, ([0]), ([])) + self.gsm_receiver = gsm.receiver(self.osr, ([0]), ([])) - self.ts_filter = grgsm.burst_timeslot_filter(0) - self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) + self.ts_filter = gsm.burst_timeslot_filter(0) + self.ts_filter.set_policy(gsm.FILTER_POLICY_DROP_ALL) # Connections self.connect( @@ -136,25 +137,25 @@ def __init__(self, phy_args, phy_sample_rate, # TX Path Definition self.phy_init_sink() - self.tx_time_setter = grgsm.txtime_setter( + self.tx_time_setter = gsm.txtime_setter( 0xffffffff, 0, 0, 0, 0, 0, self.phy_proc_delay + self.GSM_UL_DL_SHIFT_uS * 1e-6) - self.tx_burst_proc = grgsm.preprocess_tx_burst() + self.tx_burst_proc = gsm.preprocess_tx_burst() - self.pdu_to_tagged_stream = blocks.pdu_to_tagged_stream( - blocks.byte_t, 'packet_len') + self.pdu_to_tagged_stream = pdu.pdu_to_tagged_stream( + gr.types.byte_t, 'packet_len') - self.gmsk_mod = grgsm.gsm_gmsk_mod( + self.gmsk_mod = gsm.gsm_gmsk_mod( BT = 0.3, pulse_duration = 4, sps = self.osr) self.burst_shaper = digital.burst_shaper_cc( - (firdes.window(firdes.WIN_HANN, 16, 0)), + (firdes.window(window.WIN_HANN, 16, 0)), 0, 20, False, "packet_len") - self.msg_to_tag_sink = grgsm.msg_to_tag() + self.msg_to_tag_sink = gsm.msg_to_tag() - self.rotator_sink = grgsm.controlled_rotator_cc(0.0) + self.rotator_sink = gsm.controlled_rotator_cc(0.0) # Connections self.msg_connect( @@ -191,8 +192,8 @@ def __init__(self, phy_args, phy_sample_rate, # RX & TX synchronization - self.bt_filter = grgsm.burst_type_filter([3]) - self.burst_to_fn_time = grgsm.burst_to_fn_time() + self.bt_filter = gsm.burst_type_filter([3]) + self.burst_to_fn_time = gsm.burst_to_fn_time() # Connections self.msg_connect( @@ -210,7 +211,7 @@ def __init__(self, phy_args, phy_sample_rate, # AFC (Automatic Frequency Correction) # NOTE: dummy frequency is used during init - self.gsm_clck_ctrl = grgsm.clock_offset_control( + self.gsm_clck_ctrl = gsm.clock_offset_control( self.DUMMY_FREQ, phy_sample_rate, osr = self.osr) self.dict_toggle_sign = dict_toggle_sign() @@ -299,12 +300,12 @@ def set_slot(self, slot, config): if config == 0: # Value 0 is used for deactivation - self.ts_filter.set_policy(grgsm.FILTER_POLICY_DROP_ALL) + self.ts_filter.set_policy(gsm.FILTER_POLICY_DROP_ALL) else: # FIXME: ideally, we should (re)configure the Receiver # block, but there is no API for that, and hard-coded # timeslot configuration is used... - self.ts_filter.set_policy(grgsm.FILTER_POLICY_DEFAULT) + self.ts_filter.set_policy(gsm.FILTER_POLICY_DEFAULT) self.ts_filter.set_tn(slot) def set_ta(self, ta): diff --git a/python/trx/radio_if_lms.py b/python/gsm/trx/radio_if_lms.py similarity index 98% rename from python/trx/radio_if_lms.py rename to python/gsm/trx/radio_if_lms.py index b9d771ab..9833842e 100644 --- a/python/trx/radio_if_lms.py +++ b/python/gsm/trx/radio_if_lms.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver diff --git a/python/trx/radio_if_uhd.py b/python/gsm/trx/radio_if_uhd.py similarity index 99% rename from python/trx/radio_if_uhd.py rename to python/gsm/trx/radio_if_uhd.py index 664a51cd..abfdfeaf 100644 --- a/python/trx/radio_if_uhd.py +++ b/python/gsm/trx/radio_if_uhd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver diff --git a/python/trx/transceiver.py b/python/gsm/trx/transceiver.py similarity index 99% rename from python/trx/transceiver.py rename to python/gsm/trx/transceiver.py index 4e706e33..708ce64b 100644 --- a/python/trx/transceiver.py +++ b/python/gsm/trx/transceiver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver diff --git a/python/trx/udp_link.py b/python/gsm/trx/udp_link.py similarity index 98% rename from python/trx/udp_link.py rename to python/gsm/trx/udp_link.py index f7267514..384a2db2 100644 --- a/python/trx/udp_link.py +++ b/python/gsm/trx/udp_link.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # GR-GSM based transceiver diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt deleted file mode 100644 index 5f1e0204..00000000 --- a/swig/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2011 Free Software Foundation, Inc. -# -# This file was generated by gr_modtool, a tool from the GNU Radio framework -# This file is a part of gr-gsm -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# Check if there is C++ code at all -######################################################################## -if(NOT grgsm_sources) - MESSAGE(STATUS "No C++ sources... skipping swig/") - return() -endif(NOT grgsm_sources) - -######################################################################## -# Include swig generation macros -######################################################################## -find_package(SWIG) -find_package(PythonLibs) -if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND) - return() -endif() -include(GrSwig) -include(GrPython) - -######################################################################## -# Setup swig generation -######################################################################## -set(GR_SWIG_INCLUDE_DIRS $) -set(GR_SWIG_TARGET_DEPS gnuradio::runtime_swig) - -set(GR_SWIG_LIBRARIES grgsm) - -set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) - -GR_SWIG_MAKE(grgsm_swig grgsm_swig.i) - -######################################################################## -# Install the build swig module -######################################################################## -GR_SWIG_INSTALL(TARGETS grgsm_swig DESTINATION ${GR_PYTHON_DIR}/grgsm) - -######################################################################## -# Install swig .i files for development -######################################################################## -install( - FILES - grgsm_swig.i - ${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i - DESTINATION ${GR_INCLUDE_DIR}/grgsm/swig -) diff --git a/swig/constants.i b/swig/constants.i deleted file mode 100644 index 091bd9af..00000000 --- a/swig/constants.i +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2006,2009,2013 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - - -namespace gr { - namespace gsm{ - %rename(build_date) build_date; - %rename(version) version; - %rename(version_info) version_info; - - const std::string build_date(); - const std::string version(); - const std::string major_version(); - const std::string api_version(); - const std::string minor_version(); - const std::string maint_version(); - } /* namespace gsm */ -} /* namespace gr */ diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i deleted file mode 100644 index ec1eea7c..00000000 --- a/swig/grgsm_swig.i +++ /dev/null @@ -1,178 +0,0 @@ -/* -*- c++ -*- */ -/* - * @file - * @author (C) 2014-2017 by Piotr Krysik - * @section LICENSE - * - * Gr-gsm is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * Gr-gsm is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with gr-gsm; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - - -#define GRGSM_API - -%include -%template(pairud) std::pair; - -%include "gnuradio.i" // the common stuff - -//load generated python docstrings -%include "grgsm_swig_doc.i" - -%{ -#include "grgsm/constants.h" -#include "grgsm/receiver/receiver.h" -#include "grgsm/receiver/clock_offset_control.h" -#include "grgsm/receiver/cx_channel_hopper.h" -#include "grgsm/decoding/control_channels_decoder.h" -#include "grgsm/decoding/tch_f_decoder.h" -#include "grgsm/decoding/tch_h_decoder.h" -#include "grgsm/decryption/decryption.h" -#include "grgsm/demapping/universal_ctrl_chans_demapper.h" -#include "grgsm/demapping/tch_f_chans_demapper.h" -#include "grgsm/demapping/tch_h_chans_demapper.h" -#include "grgsm/flow_control/common.h" -#include "grgsm/flow_control/burst_timeslot_splitter.h" -#include "grgsm/flow_control/burst_sdcch_subslot_splitter.h" -#include "grgsm/flow_control/burst_timeslot_filter.h" -#include "grgsm/flow_control/burst_sdcch_subslot_filter.h" -#include "grgsm/flow_control/burst_fnr_filter.h" -#include "grgsm/flow_control/burst_type_filter.h" -#include "grgsm/flow_control/dummy_burst_filter.h" -#include "grgsm/flow_control/uplink_downlink_splitter.h" -#include "grgsm/misc_utils/bursts_printer.h" -#include "grgsm/misc_utils/controlled_rotator_cc.h" -#include "grgsm/misc_utils/extract_system_info.h" -#include "grgsm/misc_utils/extract_immediate_assignment.h" -#include "grgsm/misc_utils/message_printer.h" -#include "grgsm/misc_utils/tmsi_dumper.h" -#include "grgsm/misc_utils/burst_file_sink.h" -#include "grgsm/misc_utils/burst_file_source.h" -#include "grgsm/misc_utils/collect_system_info.h" -#include "grgsm/misc_utils/extract_cmc.h" -#include "grgsm/misc_utils/extract_assignment_cmd.h" -#include "grgsm/qa_utils/burst_sink.h" -#include "grgsm/qa_utils/burst_source.h" -#include "grgsm/qa_utils/message_source.h" -#include "grgsm/qa_utils/message_sink.h" -#include "grgsm/misc_utils/message_file_sink.h" -#include "grgsm/misc_utils/message_file_source.h" -#include "grgsm/misc_utils/msg_to_tag.h" -#include "grgsm/misc_utils/controlled_fractional_resampler_cc.h" -#include "grgsm/misc_utils/burst_to_fn_time.h" -#include "grgsm/misc_utils/fn_time.h" -#include "grgsm/transmitter/txtime_setter.h" -#include "grgsm/transmitter/preprocess_tx_burst.h" -#include "grgsm/transmitter/gen_test_ab.h" -#include "grgsm/trx/trx_burst_if.h" -%} - -%include "constants.i" - -%include "grgsm/receiver/receiver.h" -GR_SWIG_BLOCK_MAGIC2(gsm, receiver); -%include "grgsm/receiver/clock_offset_control.h" -GR_SWIG_BLOCK_MAGIC2(gsm, clock_offset_control); -%include "grgsm/receiver/cx_channel_hopper.h" -GR_SWIG_BLOCK_MAGIC2(gsm, cx_channel_hopper); - -%include "grgsm/decoding/control_channels_decoder.h" -GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder); -%include "grgsm/decoding/tch_f_decoder.h" -GR_SWIG_BLOCK_MAGIC2(gsm, tch_f_decoder); -%include "grgsm/decoding/tch_h_decoder.h" -GR_SWIG_BLOCK_MAGIC2(gsm, tch_h_decoder); - -%include "grgsm/decryption/decryption.h" -GR_SWIG_BLOCK_MAGIC2(gsm, decryption); - -%include "grgsm/demapping/universal_ctrl_chans_demapper.h" -GR_SWIG_BLOCK_MAGIC2(gsm, universal_ctrl_chans_demapper); -%include "grgsm/demapping/tch_f_chans_demapper.h" -GR_SWIG_BLOCK_MAGIC2(gsm, tch_f_chans_demapper); -%include "grgsm/demapping/tch_h_chans_demapper.h" -GR_SWIG_BLOCK_MAGIC2(gsm, tch_h_chans_demapper); - -%include "grgsm/flow_control/common.h" -%include "grgsm/flow_control/burst_timeslot_splitter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_timeslot_splitter); -%include "grgsm/flow_control/burst_sdcch_subslot_splitter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_sdcch_subslot_splitter); -%include "grgsm/flow_control/burst_timeslot_filter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_timeslot_filter); -%include "grgsm/flow_control/burst_sdcch_subslot_filter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_sdcch_subslot_filter); -%include "grgsm/flow_control/burst_fnr_filter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_fnr_filter); -%include "grgsm/flow_control/burst_type_filter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_type_filter); -%include "grgsm/flow_control/dummy_burst_filter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, dummy_burst_filter); -%include "grgsm/flow_control/uplink_downlink_splitter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, uplink_downlink_splitter); - - -%include "grgsm/misc_utils/bursts_printer.h" -GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer); -%include "grgsm/misc_utils/burst_file_sink.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_file_sink); -%include "grgsm/misc_utils/burst_file_source.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_file_source); -%include "grgsm/misc_utils/collect_system_info.h" -GR_SWIG_BLOCK_MAGIC2(gsm, collect_system_info); -%include "grgsm/misc_utils/extract_system_info.h" -GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info); -%include "grgsm/misc_utils/extract_immediate_assignment.h" -GR_SWIG_BLOCK_MAGIC2(gsm, extract_immediate_assignment); -%include "grgsm/misc_utils/controlled_rotator_cc.h" -GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc); -%include "grgsm/misc_utils/message_printer.h" -GR_SWIG_BLOCK_MAGIC2(gsm, message_printer); -%include "grgsm/misc_utils/tmsi_dumper.h" -GR_SWIG_BLOCK_MAGIC2(gsm, tmsi_dumper); -%include "grgsm/misc_utils/message_file_sink.h" -GR_SWIG_BLOCK_MAGIC2(gsm, message_file_sink); -%include "grgsm/misc_utils/message_file_source.h" -GR_SWIG_BLOCK_MAGIC2(gsm, message_file_source); -%include "grgsm/misc_utils/msg_to_tag.h" -GR_SWIG_BLOCK_MAGIC2(gsm, msg_to_tag); -%include "grgsm/misc_utils/controlled_fractional_resampler_cc.h" -GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc); -%include "grgsm/misc_utils/extract_cmc.h" -GR_SWIG_BLOCK_MAGIC2(gsm, extract_cmc); -%include "grgsm/misc_utils/extract_assignment_cmd.h" -GR_SWIG_BLOCK_MAGIC2(gsm, extract_assignment_cmd); -%include "grgsm/trx/trx_burst_if.h" -GR_SWIG_BLOCK_MAGIC2(gsm, trx_burst_if); -%include "grgsm/misc_utils/burst_to_fn_time.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_to_fn_time); - -%include "grgsm/qa_utils/burst_sink.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink); -%include "grgsm/qa_utils/burst_source.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_source); -%include "grgsm/qa_utils/message_source.h" -GR_SWIG_BLOCK_MAGIC2(gsm, message_source); -%include "grgsm/qa_utils/message_sink.h" -GR_SWIG_BLOCK_MAGIC2(gsm, message_sink); - -%include "grgsm/misc_utils/fn_time.h" - -%include "grgsm/transmitter/txtime_setter.h" -GR_SWIG_BLOCK_MAGIC2(gsm, txtime_setter); -%include "grgsm/transmitter/preprocess_tx_burst.h" -GR_SWIG_BLOCK_MAGIC2(gsm, preprocess_tx_burst); -%include "grgsm/transmitter/gen_test_ab.h" -GR_SWIG_BLOCK_MAGIC2(gsm, gen_test_ab); diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker index 8a9f84be..b4479d20 100644 --- a/tests/dockerfiles/Debian_testing.docker +++ b/tests/dockerfiles/Debian_testing.docker @@ -1,5 +1,5 @@ -FROM debian:testing -MAINTAINER Piotr Krysik +FROM fedora:36 +MAINTAINER Vasil Velichkov RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ cmake \ diff --git a/tests/dockerfiles/Fedora_36.Dockerfile b/tests/dockerfiles/Fedora_36.Dockerfile new file mode 100644 index 00000000..1923db19 --- /dev/null +++ b/tests/dockerfiles/Fedora_36.Dockerfile @@ -0,0 +1,48 @@ +FROM fedora:36 + +RUN dnf install -y \ + gcc-c++ \ + make \ + cmake \ + pkgconfig \ + boost-devel \ + spdlog-devel \ + gmp-devel \ + pybind11-devel \ + gnuradio-devel \ + libosmocore-devel \ + gr-osmosdr \ + swig \ + doxygen \ + python3-docutils \ + cppunit-devel \ +#deps of libosmocore \ + autoconf \ + automake \ + libtool \ + gnutls-devel \ + libusb-devel \ + libmnl-devel \ + lksctp-tools-devel + +ADD https://gitea.osmocom.org/osmocom/libosmocore/archive/1.7.0.tar.gz /src/libosmocore.tar.gz +RUN cd /src/ && \ + tar -xzvf libosmocore.tar.gz && \ + cd libosmocore && \ + autoreconf -if && \ + ./configure --disable-pcsc && \ + make && \ + make install + +COPY ./ /src/gr-gsm +WORKDIR /src/gr-gsm/build + +RUN cmake .. && \ + # The parallel build sometimes fails when the .grc_gnuradio + # and .gnuradio directories do not exist + mkdir $HOME/.grc_gnuradio/ $HOME/.gnuradio/ && \ + make && \ + make -j $(nproc) && \ + make install && \ + ldconfig && \ + make CTEST_OUTPUT_ON_FAILURE=1 test diff --git a/tests/dockerfiles/Ubuntu_20_04.docker b/tests/dockerfiles/Ubuntu_22_04.docker similarity index 97% rename from tests/dockerfiles/Ubuntu_20_04.docker rename to tests/dockerfiles/Ubuntu_22_04.docker index f972d9ee..9e1e7f46 100644 --- a/tests/dockerfiles/Ubuntu_20_04.docker +++ b/tests/dockerfiles/Ubuntu_22_04.docker @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 MAINTAINER Piotr Krysik RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ diff --git a/tests/scripts/decode.sh b/tests/scripts/decode.sh index 402e8181..9211ebc4 100755 --- a/tests/scripts/decode.sh +++ b/tests/scripts/decode.sh @@ -7,14 +7,14 @@ TEST_DIR=$(dirname "$0") # /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling # https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8 # -export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH +export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/gnuradio/gsm/:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH export AP_DECODE="grgsm_decode" export CAPFILE="../../test_data/vf_call6_a725_d174_g5_Kc1EF00BAB3BAC7002.cfile" export SHORTENED_CAPFILE="tmp.cfile" -export RESULT_EXPECTED="../fixtures/grgsm_decode_test1_expected" -export RESULT_OBTAINED="grgsm_decode_test1_result" +export RESULT_EXPECTED="../fixtures/gsm_decode_test1_expected" +export RESULT_OBTAINED="gsm_decode_test1_result" export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((100000000/174)) -m BCCH -t 0 -v --ppm -10" echo "Testing with:" echo " $RUNLINE" diff --git a/tests/scripts/decrypt.sh b/tests/scripts/decrypt.sh index 335528a7..735193dd 100755 --- a/tests/scripts/decrypt.sh +++ b/tests/scripts/decrypt.sh @@ -7,14 +7,14 @@ TEST_DIR=$(dirname "$0") # /usr/local/lib/python3/dist-packages/ is currently needed on Debian Testing and Kali Rolling # https://salsa.debian.org/bottoms/pkg-gnuradio/blob/unstable/debian/patches/debian-python-install#L8 # -export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/grgsm/:$PYTHONPATH +export PYTHONPATH=/usr/local/lib/python3/dist-packages/:/usr/local/lib64/python2.7/site-packages/:/usr/local/lib64/python2.7/site-packages/gnuradio/gsm/:$PYTHONPATH export LD_LIBRARY_PATH=/usr/local/lib64/:$LD_LIBRARY_PATH export AP_DECODE="grgsm_decode" export CAPFILE="../../test_data/vf_call6_a725_d174_g5_Kc1EF00BAB3BAC7002.cfile" export SHORTENED_CAPFILE="tmp.cfile" -export RESULT_EXPECTED="../fixtures/grgsm_decode_decrypt1_expected" -export RESULT_OBTAINED="grgsm_decode_test1_result" +export RESULT_EXPECTED="../fixtures/gsm_decode_decrypt1_expected" +export RESULT_OBTAINED="gsm_decode_test1_result" export RUNLINE="$AP_DECODE -c $SHORTENED_CAPFILE -s $((100000000/174)) -m SDCCH8 -t 1 -k 0x1E,0xF0,0x0B,0xAB,0x3B,0xAC,0x70,0x02 -v --ppm -10" echo "Testing with:" echo " $RUNLINE"