Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

Fixes introduced to the software components:

1. wflow_bin

a. pcrut.py

...

1. line 10 - 17

...

try:

    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import *
except ImportError:
    from pcraster import *
    from pcraster.framework import *

b. wf_DynamicFramework.py

...

1. line 33 - 41
try:
    import PCRaster
    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import *
except ImportError:
    import pcraster as PCRaster
    from pcraster import *
    from pcraster.framework import *
    #from pcraster.numpy import *

...

4. line 921 -922
  def setQuiet(self,quiet=True):
    self.showWarning("I'm not going to be quiet!!!!")

...

c. wf_Timeoutput.py

...

1. line 7 - 10

try:
    import PCRaster
except ImportError:
    import pcraster as PCRaster

2. line 43:

  if isinstance(idMap, str) or isinstance(idMap, PCRaster._pcraster.Field):

...

d. wflow_funcs.py

...

1. line 30 - 37

try:
    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import * 
except ImportError:
    from pcraster import *
    from pcraster.framework import *
    #from pcraster.numpy import *

...

e. wflow_lib.py

...

1. line 42 - 49

try:
    from PCRaster import *
    from PCRaster.Framework import *
    from PCRaster.NumPy import * 
except ImportError:
    from pcraster import *
    from pcraster.framework import *
    #from pcraster.numpy import *