kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Show: py2 support

Browse Source 
mostly changes to the way things are imported
+small misc fixes
This commit is contained in:
DeepSOIC
2019-09-12 02:34:26 +03:00
committed by wmayer
parent 20f68358a7
commit 1593efecc7
6 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Show/SceneDetails/ObjectClipPlane.py
View File

@@ -101,7 +101,7 @@ def placement2plane(placement, offset):
def clipPlane(obj, enable, placement = None, offset = 0, tv = None):
if tv is None:
from Show.TempoVis import TempoVis
from Show import TempoVis
tv = TempoVis(obj.Document)
tv.modify(ClipPlane(obj, enable, placement, offset))
return tv

2
src/Mod/Show/ShowUtils.py
View File

@@ -33,5 +33,5 @@ def is3DObject(obj):
return obj.ViewObject.SwitchNode.getNumChildren()>0
except Exception as err:
import FreeCAD as App
App.Console.PrintWarning(u"Show.TempoVis.is3DObject error: {err}\n".format(err= str(err)))
App.Console.PrintWarning(u"Show.ShowUtils.is3DObject error: {err}\n".format(err= str(err)))
return True #assume.

3
src/Mod/Show/TVObserver.py
View File

@@ -21,7 +21,6 @@
# * *
# ***************************************************************************/
from . import TVStack
import FreeCAD
class TVObserver(object):
@@ -32,9 +31,11 @@ class TVObserver(object):
FreeCAD.removeDocumentObserver(self)
def slotStartSaveDocument(self, doc, filepath):
from . import TVStack
TVStack._slotStartSaveDocument(doc)
def slotFinishSaveDocument(self, doc, filepath):
from . import TVStack
TVStack._slotFinishSaveDocument(doc)
def slotDeletedDocument(self, doc):

11
src/Mod/Show/TVStack.py
View File

@@ -21,9 +21,6 @@
# * *
# ***************************************************************************/
from . import TempoVis
from . import TVObserver #import to start the observer
import weakref
global_stacks = {} # dict of TVStacks. key = document name.
@@ -39,6 +36,7 @@ class TVStack(object):
self.document = None
self.index_LUT = {}
self.stack = []
from . import TVObserver #to start the observer
def insert(self, tv, index = None):
if index is None:
@@ -83,11 +81,12 @@ class TVStack(object):
tv can be None, then, the function returns the original value of the detail, or
None, if the current value matches the original."""
from . import mTempoVis
index = self.index_LUT[id(tv)] if tv is not None else -1
for tvref in self.stack[index + 1 : ]:
tv = tvref()
if tv.state == TempoVis.S_ACTIVE:
if tv.state == mTempoVis.S_ACTIVE:
if tv.has(detail):
return (tv, tv.data[detail.full_key])
return None
@@ -117,6 +116,8 @@ class TVStack(object):
ref().forget()
def unwindForSaving(self):
from . import mTempoVis
self.rewindAfterSaving() #just in case there was a failed save before.
details = {} #dict of detail original values. Key = detail key; value = detail instance with data representing the original value
@@ -127,7 +128,7 @@ class TVStack(object):
if detail.affects_persistence:
details[detail.full_key] = detail
self._rewind_tv = TempoVis.TempoVis(self.document, None)
self._rewind_tv = mTempoVis.TempoVis(self.document, None)
for key, detail in details.items():
self._rewind_tv.modify(detail)

2
src/Mod/Show/__init__.py
View File

@@ -1,4 +1,4 @@
__doc__ = "Show module: helper code for visibility automation."
from .TempoVis import TempoVis
from .mTempoVis import TempoVis
from . import DepGraphTools

32
src/Mod/Show/mTempoVis.py
View File

@@ -21,12 +21,9 @@
# * *
# ***************************************************************************/
from .DepGraphTools import getAllDependencies, getAllDependent
from .ShowUtils import is3DObject
# module is named mTempoVis, because Show.TimpoVis exposes the class as its member, and hides the module TempoVis.py.
from . import Containers
Container = Containers.Container
from . import TVStack
@@ -237,7 +234,7 @@ class TempoVis(object):
mild_restore: test if user changed the value manually when restoring the TV.'''
if self.state == S_RESTORED:
warn("Attempting to use a TV that has been restored. There must be a problem with code.")
Wrn("Attempting to use a TV that has been restored. There must be a problem with code.")
return
if not hasattr(doc_obj_or_list, '__iter__'):
@@ -247,7 +244,7 @@ class TempoVis(object):
for doc_obj in doc_obj_or_list:
for prop_name in prop_names:
if not hasattr(doc_obj.ViewObject, prop_name):
warn("TempoVis: object {obj} has no attribute {attr}. Skipped."
Wrn("TempoVis: object {obj} has no attribute {attr}. Skipped."
.format(obj= doc_obj.Name, attr= prop_name))
continue
@@ -319,7 +316,9 @@ class TempoVis(object):
def get_all_dependent(self, doc_obj, subname = None):
'''get_all_dependent(doc_obj, subname = None): gets all objects that depend on doc_obj. Containers and Links (if subname) required for visibility of the object are excluded from the list.'''
from Containers import isAContainer
from . import Containers
from .Containers import isAContainer
from .DepGraphTools import getAllDependencies, getAllDependent
if subname:
# a link-path was provided. doc_obj has nothing to do with the object we want
# to collect dependencies from. So, replace it with the one pointed by link-path.
@@ -343,18 +342,22 @@ class TempoVis(object):
def show_all_dependent(self, doc_obj):
'''show_all_dependent(doc_obj): shows all objects that depend on doc_obj. This method is probably useless.'''
from .DepGraphTools import getAllDependencies, getAllDependent
self.show(self._3D_objects(getAllDependent(doc_obj)))
def restore_all_dependent(self, doc_obj):
'''show_all_dependent(doc_obj): restores original visibilities of all dependent objects.'''
from .DepGraphTools import getAllDependencies, getAllDependent
self.restoreVPProperty( getAllDependent(doc_obj), ('Visibility', 'LinkVisibility') )
def hide_all_dependencies(self, doc_obj):
'''hide_all_dependencies(doc_obj): hides all objects that doc_obj depends on (directly and indirectly).'''
from .DepGraphTools import getAllDependencies, getAllDependent
self.hide(self._3D_objects(getAllDependencies(doc_obj)))
def show_all_dependencies(self, doc_obj):
'''show_all_dependencies(doc_obj): shows all objects that doc_obj depends on (directly and indirectly). This method is probably useless.'''
from .DepGraphTools import getAllDependencies, getAllDependent
self.show(self._3D_objects(getAllDependencies(doc_obj)))
def saveCamera(self, vw = None):
@@ -379,6 +382,7 @@ class TempoVis(object):
tempovis. '''
from .SceneDetails.Pickability import Pickability
from .ShowUtils import is3DObject
if not hasattr(doc_obj_or_list, '__iter__'):
doc_obj_or_list = [doc_obj_or_list]
@@ -400,6 +404,7 @@ class TempoVis(object):
inserted as the very first node. The node is left, but disabled when tempovis is restoring.'''
from .SceneDetails.ObjectClipPlane import ObjectClipPlane
from .ShowUtils import is3DObject
if not hasattr(doc_obj_or_list, '__iter__'):
doc_obj_or_list = [doc_obj_or_list]
@@ -413,13 +418,15 @@ class TempoVis(object):
def allVisibleObjects(aroundObject):
'''allVisibleObjects(aroundObject): returns list of objects that have to be toggled invisible for only aroundObject to remain.
If a whole container can be made invisible, it is returned, instead of its child objects.'''
from .ShowUtils import is3DObject
from . import Containers
chain = Containers.VisGroupChain(aroundObject)
result = []
for i in range(len(chain)):
cnt = chain[i]
cnt_next = chain[i+1] if i+1 < len(chain) else aroundObject
container = Container(cnt)
container = Containers.Container(cnt)
for obj in container.getVisGroupChildren():
if not is3DObject(obj):
continue
@@ -447,12 +454,7 @@ class TempoVis(object):
def activateWorkbench(self, wb_name):
from .SceneDetails.Workbench import Workbench
wb = Workbench(wb_name)
if wb.scene_value() == 'StartWorkbench':
#exclusion - don't switch back to Start, as it causes Start page to appear
wb.apply_data(wb_name)
return
self.modify(wb)
self.modify(Workbench(wb_name))
#</convenience functions>
@@ -518,6 +520,8 @@ class TempoVis(object):
def _3D_objects(self, doc_obj_or_list):
"""_3D_objects(doc_obj_or_list): returns list of objects that are in 3d view."""
from .ShowUtils import is3DObject
if not hasattr(doc_obj_or_list, '__iter__'):
doc_obj_or_list = [doc_obj_or_list]