updates to remove restriction for emane in general and emane 1.2.1, should support at leat 1.0.1 possibly further back and can run without emane again, updated gui to ask users to install emane when not preset on the emane models panel
This commit is contained in:
parent
8ed7f7c0ef
commit
ac2b64aaaf
5 changed files with 49 additions and 26 deletions
|
@ -1,10 +1,14 @@
|
|||
from core import logger
|
||||
from core.enumerations import ConfigDataTypes
|
||||
|
||||
manifest = None
|
||||
try:
|
||||
from emane.shell import manifest
|
||||
except ImportError:
|
||||
logger.info("emane 1.2.1 not found")
|
||||
try:
|
||||
from emanesh import manifest
|
||||
except ImportError:
|
||||
logger.warn("compatible emane python bindings not installed")
|
||||
|
||||
|
||||
def _type_value(config_type):
|
||||
|
@ -77,6 +81,10 @@ def parse(manifest_path, defaults):
|
|||
:rtype: list
|
||||
"""
|
||||
|
||||
# no results when emane bindings are not present
|
||||
if not manifest:
|
||||
return []
|
||||
|
||||
# load configuration file
|
||||
manifest_file = manifest.Manifest(manifest_path)
|
||||
manifest_configurations = manifest_file.getAllConfiguration()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue