[Bf-extensions-cvs] [b224597b] master: stored views: disable logging, remove excessive prints to console
meta-androcto
noreply at git.blender.org
Thu Apr 13 02:08:57 CEST 2017
Commit: b224597b1edd4b359b0f0004b617c55f2e85ad5d
Author: meta-androcto
Date: Thu Apr 13 10:08:36 2017 +1000
Branches: master
https://developer.blender.org/rBACb224597b1edd4b359b0f0004b617c55f2e85ad5d
stored views: disable logging, remove excessive prints to console
===================================================================
M stored_views/__init__.py
M stored_views/core.py
M stored_views/ui.py
===================================================================
diff --git a/stored_views/__init__.py b/stored_views/__init__.py
index b4184e7b..67798bbe 100644
--- a/stored_views/__init__.py
+++ b/stored_views/__init__.py
@@ -39,6 +39,7 @@ bl_info = {
# TODO: list reordering
# logging setup
+'''
import logging
logger = logging.getLogger(__name__)
@@ -47,7 +48,7 @@ hdlr = logging.StreamHandler()
fmtr = logging.Formatter('%(asctime)s %(levelname)s %(name)s : %(funcName)s - %(message)s')
hdlr.setFormatter(fmtr)
logger.addHandler(hdlr)
-
+'''
if "bpy" in locals():
import imp
diff --git a/stored_views/core.py b/stored_views/core.py
index 83c1fb90..21e49b31 100644
--- a/stored_views/core.py
+++ b/stored_views/core.py
@@ -1,6 +1,7 @@
+'''
import logging
module_logger = logging.getLogger(__name__)
-
+'''
import hashlib
import bpy
@@ -8,7 +9,7 @@ import bpy
class StoredView():
def __init__(self, mode, index=None):
- self.logger = logging.getLogger('%s.StoredView' % __name__)
+# self.logger = logging.getLogger('%s.StoredView' % __name__)
self.scene = bpy.context.scene
self.view3d = bpy.context.space_data
self.index = index
@@ -20,12 +21,12 @@ class StoredView():
else:
stored_view = self.data_store.get(self.index)
self.from_v3d(stored_view)
- self.logger.debug('index: %s name: %s' % (self.data_store.current_index, stored_view.name))
+# self.logger.debug('index: %s name: %s' % (self.data_store.current_index, stored_view.name))
def set(self):
stored_view = self.data_store.get(self.index)
self.update_v3d(stored_view)
- self.logger.debug('index: %s name: %s' % (self.data_store.current_index, stored_view.name))
+# self.logger.debug('index: %s name: %s' % (self.data_store.current_index, stored_view.name))
def from_v3d(self, stored_view):
raise NotImplementedError("Subclass must implement abstract method")
@@ -41,7 +42,7 @@ class StoredView():
class POV(StoredView):
def __init__(self, index=None):
super().__init__(mode='POV', index=index)
- self.logger = logging.getLogger('%s.POV' % __name__)
+# self.logger = logging.getLogger('%s.POV' % __name__)
def from_v3d(self, stored_view):
view3d = self.view3d
@@ -120,17 +121,17 @@ class POV(StoredView):
@staticmethod
def is_modified(context, stored_view):
# TODO: check for others param, currently only perspectiveand perspective_matrix are checked
- logger = logging.getLogger('%s.POV' % __name__)
+# logger = logging.getLogger('%s.POV' % __name__)
view3d = context.space_data
region3d = view3d.region_3d
if region3d.view_perspective != stored_view.perspective:
- logger.debug('view_perspective')
+# logger.debug('view_perspective')
return True
md5 = POV._get_perspective_matrix_md5(region3d)
if (md5 != stored_view.perspective_matrix_md5 and
region3d.view_perspective != "CAMERA"):
- logger.debug('perspective_matrix')
+# logger.debug('perspective_matrix')
return True
return False
@@ -144,7 +145,7 @@ class POV(StoredView):
class Layers(StoredView):
def __init__(self, index=None):
super().__init__(mode='LAYERS', index=index)
- self.logger = logging.getLogger('%s.Layers' % __name__)
+# self.logger = logging.getLogger('%s.Layers' % __name__)
def from_v3d(self, stored_view):
view3d = self.view3d
@@ -162,19 +163,19 @@ class Layers(StoredView):
@staticmethod
def is_modified(context, stored_view):
- logger = logging.getLogger('%s.Layers' % __name__)
+# logger = logging.getLogger('%s.Layers' % __name__)
if stored_view.lock_camera_and_layers != context.space_data.lock_camera_and_layers:
- logger.debug('lock_camera_and_layers')
+# logger.debug('lock_camera_and_layers')
return True
if stored_view.lock_camera_and_layers == True:
for i in range(20):
if stored_view.scene_layers[i] != context.scene.layers[i]:
- logger.debug('scene_layers[%s]' % (i, ))
+# logger.debug('scene_layers[%s]' % (i, ))
return True
else:
for i in range(20):
if stored_view.view_layers[i] != context.space_data.view3d.layers[i]:
- logger.debug('view_layers[%s]' % (i ,))
+# logger.debug('view_layers[%s]' % (i ,))
return True
return False
@@ -182,7 +183,7 @@ class Layers(StoredView):
class Display(StoredView):
def __init__(self, index=None):
super().__init__(mode='DISPLAY', index=index)
- self.logger = logging.getLogger('%s.Display' % __name__)
+# self.logger = logging.getLogger('%s.Display' % __name__)
def from_v3d(self, stored_view):
view3d = self.view3d
@@ -220,24 +221,24 @@ class Display(StoredView):
@staticmethod
def is_modified(context, stored_view):
- logger = logging.getLogger('%s.Display' % __name__)
+ # logger = logging.getLogger('%s.Display' % __name__)
view3d = context.space_data
excludes = ["material_mode", "quad_view", "lock_rotation", "show_sync_view", "use_box_clip", "name"]
for k, v in stored_view.items():
if k not in excludes:
if getattr(view3d, k) != getattr(stored_view, k):
- logger.debug('%s' % (k ,))
+# logger.debug('%s' % (k ,))
return True
if stored_view.material_mode != context.scene.game_settings.material_mode:
- logger.debug('material_mode')
+# logger.debug('material_mode')
return True
class View(StoredView):
def __init__(self, index=None):
super().__init__(mode='VIEW', index=index)
- self.logger = logging.getLogger('%s.View' % __name__)
+# self.logger = logging.getLogger('%s.View' % __name__)
self.pov = POV()
self.layers = Layers()
self.display = Display()
diff --git a/stored_views/ui.py b/stored_views/ui.py
index d31e34cf..769a955e 100644
--- a/stored_views/ui.py
+++ b/stored_views/ui.py
@@ -1,6 +1,7 @@
+'''
import logging
module_logger = logging.getLogger(__name__)
-
+'''
import bpy
import blf
@@ -29,11 +30,6 @@ def init_draw(context=None):
def _draw_callback_px(self, context):
- try:
- print("SELF", self)
- except:
- print("red err?")
-
r_width = context.region.width
r_height = context.region.height
font_id = 0 # TODO: need to find out how best to get font_id
@@ -104,13 +100,13 @@ class VIEW3D_stored_views_draw(bpy.types.Operator):
elif data.mode == 'DISPLAY':
is_modified = core.Display.is_modified(context, sv)
if is_modified:
- module_logger.debug('view modified - index: %s name: %s' % (data.current_index, sv.name))
+# module_logger.debug('view modified - index: %s name: %s' % (data.current_index, sv.name))
self.view_name = ""
stored_views.view_modified = is_modified
return {"PASS_THROUGH"}
else:
- module_logger.debug('exit')
+# module_logger.debug('exit')
context.window_manager["stored_views_osd"] = False
VIEW3D_stored_views_draw.handle_remove(context)
return {'FINISHED'}
@@ -133,7 +129,7 @@ class VIEW3D_PT_properties_stored_views(bpy.types.Panel):
bl_region_type = "UI"
def draw(self, context):
- logger = logging.getLogger('%s Properties panel' % __name__)
+# logger = logging.getLogger('%s Properties panel' % __name__)
layout = self.layout
if bpy.ops.view3d.stored_views_initialize.poll():
More information about the Bf-extensions-cvs
mailing list