From 3991385132d72ea440fc70ef37a674930800be40 Mon Sep 17 00:00:00 2001 From: wehrle Date: Fri, 31 Dec 2021 17:44:17 +0100 Subject: [PATCH 1/6] update smoothing script format --- meshlabxml/smooth.py | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/meshlabxml/smooth.py b/meshlabxml/smooth.py index ba6f9c5..9f22103 100644 --- a/meshlabxml/smooth.py +++ b/meshlabxml/smooth.py @@ -31,23 +31,23 @@ def laplacian(script, iterations=1, boundary=True, cotangent_weight=True, """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', @@ -101,23 +101,23 @@ def taubin(script, iterations=10, t_lambda=0.5, t_mu=-0.53, selected=False): """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', @@ -164,28 +164,28 @@ def twostep(script, iterations=3, angle_threshold=60, normal_steps=20, fit_steps """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', @@ -217,20 +217,20 @@ def depth(script, iterations=3, viewpoint=(0, 0, 0), selected=False): """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', From 4c67583501eb89a6e0bac36326af6e16a9f5fc14 Mon Sep 17 00:00:00 2001 From: wehrle Date: Fri, 31 Dec 2021 17:54:35 +0100 Subject: [PATCH 2/6] reorder params --- meshlabxml/smooth.py | 88 ++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/meshlabxml/smooth.py b/meshlabxml/smooth.py index 9f22103..8273ef6 100644 --- a/meshlabxml/smooth.py +++ b/meshlabxml/smooth.py @@ -31,25 +31,25 @@ def laplacian(script, iterations=1, boundary=True, cotangent_weight=True, """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', ' \n']) util.write_filter(script, filter_xml) @@ -101,25 +101,25 @@ def taubin(script, iterations=10, t_lambda=0.5, t_mu=-0.53, selected=False): """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', ' \n']) util.write_filter(script, filter_xml) @@ -164,30 +164,30 @@ def twostep(script, iterations=3, angle_threshold=60, normal_steps=20, fit_steps """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', ' \n']) util.write_filter(script, filter_xml) @@ -217,10 +217,10 @@ def depth(script, iterations=3, viewpoint=(0, 0, 0), selected=False): """ filter_xml = ''.join([ ' \n', - ' \n', ' \n', - ' \n', ' \n']) util.write_filter(script, filter_xml) From 6b696d0c2e449acb03abe141c0560fadab0b8136 Mon Sep 17 00:00:00 2001 From: wehrle Date: Fri, 31 Dec 2021 18:05:18 +0100 Subject: [PATCH 3/6] script format in layers --- meshlabxml/layers.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/meshlabxml/layers.py b/meshlabxml/layers.py index 1c02b72..19f6319 100644 --- a/meshlabxml/layers.py +++ b/meshlabxml/layers.py @@ -43,23 +43,23 @@ def join(script, merge_visible=True, merge_vert=False, delete_layer=True, """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', @@ -134,8 +134,8 @@ def rename(script, label='blank', layer_num=None): """ filter_xml = ''.join([ ' \n', - ' \n', @@ -180,8 +180,8 @@ def change(script, layer_num=None): if script.ml_version == '1.3.4BETA' or script.ml_version == '2016.12': filter_xml = ''.join([ ' \n', - ' \n', @@ -189,8 +189,8 @@ def change(script, layer_num=None): else: filter_xml = ''.join([ ' \n', - ' \n', From 159eae0a40d1529dfebd7af515b0ed8bfbb58b80 Mon Sep 17 00:00:00 2001 From: wehrle Date: Fri, 31 Dec 2021 18:16:38 +0100 Subject: [PATCH 4/6] script format in clean --- meshlabxml/clean.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/meshlabxml/clean.py b/meshlabxml/clean.py index a0da8ad..db562dd 100644 --- a/meshlabxml/clean.py +++ b/meshlabxml/clean.py @@ -25,8 +25,8 @@ def merge_vert(script, threshold=0.0): """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', @@ -113,8 +113,8 @@ def split_vert_on_nonmanifold_face(script, vert_displacement_ratio=0.0): filter_name = 'Repair non Manifold Vertices by splitting' filter_xml = ''.join([ ' \n'.format(filter_name), - ' \n', @@ -175,13 +175,13 @@ def snap_mismatched_borders(script, edge_dist_ratio=0.01, unify_vert=True): """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', From 450bff4ec888a690418e0e4b6dd1f6cb4615a80f Mon Sep 17 00:00:00 2001 From: wehrle Date: Fri, 31 Dec 2021 18:28:43 +0100 Subject: [PATCH 5/6] format --- meshlabxml/clean.py | 21 ++++++++++++++------- meshlabxml/layers.py | 21 ++++++++++++++------- meshlabxml/smooth.py | 45 +++++++++++++++++++++++++++++--------------- 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/meshlabxml/clean.py b/meshlabxml/clean.py index db562dd..8c6ffcd 100644 --- a/meshlabxml/clean.py +++ b/meshlabxml/clean.py @@ -25,7 +25,8 @@ def merge_vert(script, threshold=0.0): """ filter_xml = ''.join([ ' \n', - ' \n', - ' \n', - ' \n', - ' \n'.format(filter_name), - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' \n', - ' Date: Fri, 31 Dec 2021 18:41:16 +0100 Subject: [PATCH 6/6] layer as float --- meshlabxml/layers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meshlabxml/layers.py b/meshlabxml/layers.py index 927f116..952bf01 100644 --- a/meshlabxml/layers.py +++ b/meshlabxml/layers.py @@ -186,7 +186,7 @@ def change(script, layer_num=None): filter_xml = ''.join([ ' \n', ' \n', '