+ Add instance names (if exit) in cutlist part rows

lairdubois · Mar 16, 2018 · 3f01819 · 3f01819
1 parent 68cc303
commit 3f01819
Show file tree

Hide file tree

Showing 10 changed files with 310 additions and 242 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,10 @@ CHANGELOG
 This changelog references the relevant changes (bug and security fixes) done
 in 1.x and 0.x versions.
 
-* 1.3.0 (2018-03-14)
+* 1.3.0 (2018-03-16)
 
  * Add dynamic components support !
+ * Add instance names (if exit) in cutlist part rows
  * Fix part size calculation when a component contains multiples child groups
  * Exclude always_face_camera component from cutlist
  * Treat cuts_opening components has groups

diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
  "name": "lairdubois-toolbox-sketchup-plugin",
- "version": "1.3.0",
+ "version": "1.3.0-alpha",
  "description": "L'Air du Bois : Woodworking Toolbox ================================",
  "main": "index.js",
  "directories": {

diff --git a/dist/VERSION b/dist/VERSION
@@ -1 +1 @@
-1.3.0
+1.3.0-alpha
diff --git a/dist/ladb_toolbox.rbz b/dist/ladb_toolbox.rbz
diff --git a/src/ladb_toolbox/js/plugins/jquery.ladb.tab-cutlist.js b/src/ladb_toolbox/js/plugins/jquery.ladb.tab-cutlist.js
@@ -331,6 +331,14 @@
  materialUsages: that.materialUsages
  });
 
+ var isOwnedMaterial = true;
+ for (var i = 0; i < part.material_origins.length; i++) {
+ if (part.material_origins[i] != 1) { // 1 = MATERIAL_ORIGIN_OWNED
+ isOwnedMaterial = false;
+ break;
+ }
+ }
+
  // Fetch UI elements
  var $inputName = $('#ladb_cutlist_part_input_name', $modal);
  var $selectMaterialName = $('#ladb_cutlist_part_select_material_name', $modal);
@@ -339,7 +347,9 @@
  var $btnUpdate = $('#ladb_cutlist_part_update', $modal);
 
  // Bind select
- $selectMaterialName.val(part.material_name);
+ if (isOwnedMaterial) {
+ $selectMaterialName.val(part.material_name);
+ }
  $selectMaterialName.selectpicker(SELECT_PICKER_OPTIONS);
  $selectCumulable.val(part.cumulable);
  $selectCumulable.selectpicker(SELECT_PICKER_OPTIONS);

diff --git a/src/ladb_toolbox/less/tabs/cutlist.less b/src/ladb_toolbox/less/tabs/cutlist.less
@@ -21,6 +21,10 @@
  thead tr {
  background-color: #eee;
 
+ td {
+ border-bottom: 0;
+ }
+
  .ladb-heading {
  line-height: 30px;
  font-size: 130%;
@@ -30,6 +34,11 @@
 
  tbody tr.ladb-cutlist-row {
  font-size: 120%;
+
+ .ladb-part-entity-names {
+ font-size: 70%;
+ }
+
  }
 
  .ladb-btn-toggle-no-print {