Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Components.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
import wx
from pubsub import pub as Publisher
import Editor
from SimpleFrameEditor import FrameEditor

import ZipManager

from Utilities import replaceAll, GetActiveWindow, printOnStatusBar
from NetManager import Net
from SimpleFrameEditor import FrameEditor
from which import which

###########################################################
Expand Down
1 change: 1 addition & 0 deletions Container.py
Original file line number Diff line number Diff line change
Expand Up @@ -3952,6 +3952,7 @@ def __setstate__(self, state):

### try to find it in exportedPathList (after Domain check)
if not os.path.exists(path):
import wx
mainW = wx.GetApp().GetTopWindow()
for p in mainW.exportPathsList:
lib_name = os.path.basename(p)
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ The use of DEVSimPy requires:

Users which don't want to install python with all dependencies can use [Portable Python](http://portablepython.com) (version 2.x). Then, just extract DEVSimPy archive and edit the devsimpy.py file with [PyScripter](https://sourceforge.net/projects/pyscripter/) to execute it. Users can also execute DEVSimPy through the conda env file loaded using the [conda_devsimpy_env.yml](https://github.com/capocchi/DEVSimPy-site/raw/gh-pages/conda_devsimpy_env.yml) file (available from the [DEVSimPy-site](https://github.com/capocchi/DEVSimPy-site) repository).

An XUbuntu 19.10 virtual machine including DEVSimPy can be donwloaded from [DEVSimPy-on-XUbuntu19.10.ova](https://mycore.core-cloud.net/index.php/s/o8T8mAzmuuHDokh). The login and password of the distribution (root) are: devsimpy-user/devsimpy. If you want to have the latest version of DEVSimPy, please execute 'git pull' in the DEVSimPy directory before starting or start DEVSimPy by double clicking on the desktop icon and go to Help->Update->From Git Repository (pull).

An archive of a conda environment which includes all the binaries of the packages needed for the DEVSimPy environment is available here: [py38.tar.gz](https://mycore.core-cloud.net/index.php/s/5nNgyvwps6O2kUy). This is useful when you want to reproduce a compatible environment for DEVSimPy and avoid all installation and dependencies requirement.

# Features
With DEVSimPy you can:

Expand All @@ -47,9 +51,6 @@ All dependencies can be installed using pip with the requirements.txt file:
```sh
$ pip install -r requirements.txt
```

An XUbuntu 19.10 virtual machine including DEVSimPy can be donwloaded from [DEVSimPy-on-XUbuntu19.10.ova](https://mycore.core-cloud.net/index.php/s/o8T8mAzmuuHDokh). The login and password of the distribution (root) are: devsimpy-user/devsimpy. If you want to have the latest version of DEVSimPy, please execute 'git pull' in the DEVSimPy directory before starting or start DEVSimPy by double clicking on the desktop icon and go to Help->Update->From Git Repository (pull).

# Usage
To execute DEVSimPy:
```sh
Expand Down
3 changes: 2 additions & 1 deletion SimulationGUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@

import Container

_ = wx.GetTranslation
import gettext
_ = gettext.gettext

import time

Expand Down
3 changes: 2 additions & 1 deletion SimulationNoGUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ def Run(self):
################################################################################################################
################################################################################################################
if self.master:
from SimulationGUI import simulator_factory
#from SimulationGUI import simulator_factory
from Patterns.Factory import simulator_factory
if not self.ntl:
self.master.FINAL_TIME = float(self.time)

Expand Down
2 changes: 1 addition & 1 deletion XMLModule.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import re
import copy
import tempfile
import wx
# import wx

import gettext
_ = gettext.gettext
Expand Down