Merge pull request makehumancommunity#181 from makehumancommunity/bod…

…yshapes Bodyshapes
Deiolly · Nov 4, 2021 · 0ab1e54 · 0ab1e54
2 parents 2ff235b + c65fa05
commit 0ab1e54
Show file tree

Hide file tree

Showing 57 changed files with 145,106 additions and 45 deletions.
diff --git a/makehuman/apps/gui/guimodifier.py b/makehuman/apps/gui/guimodifier.py
@@ -91,6 +91,8 @@ def addSlider(self, sliderCategory, slider, enabledCondition=None):
 
         # Add slider to groupbox
         self.modifiers[slider.modifier.fullName] = slider.modifier
+        if slider.modifier.description is not None and slider.modifier.description != "":
+            slider.setToolTip(slider.modifier.description)
         box.addWidget(slider)
         slider.enabledCondition = enabledCondition
         self.sliders.append(slider)
@@ -236,7 +238,10 @@ def loadModifierTaskViews(filename, human, category, taskviewClass=None):
                 modifier = human.getModifier(modifierName)
                 label = sDef.get('label', None)
                 camFunc = _getCamFunc( sDef.get('cam', None) )
-                slider = modifierslider.ModifierSlider(modifier, label=label, cameraView=camFunc)
+                tooltip = None
+                if len(modifier.description) > 0:
+                    tooltip=modifier.description
+                slider = modifierslider.ModifierSlider(modifier, label=label, cameraView=camFunc, tooltip=tooltip)
                 enabledCondition = sDef.get("enabledCondition", None)
                 taskView.addSlider(sliderCategory, slider, enabledCondition)
 

diff --git a/makehuman/data/modifiers/bodyshapes_modifiers.json b/makehuman/data/modifiers/bodyshapes_modifiers.json
@@ -0,0 +1,33 @@
+[
+  { "group": "bodyshapes",
+    "modifiers": [
+      {"target": "bodyshapes-elvs-fem-apple"},
+      {"target": "bodyshapes-elvs-fem-diamond"},
+      {"target": "bodyshapes-elvs-fem-full-hourglass"},
+      {"target": "bodyshapes-elvs-fem-neat-hourglass"},
+      {"target": "bodyshapes-elvs-fem-invert-triangle"},
+      {"target": "bodyshapes-elvs-fem-lean-column"},
+      {"target": "bodyshapes-elvs-fem-rectangle"},
+      {"target": "bodyshapes-elvs-fem-triangle"},
+
+      {"target": "bodyshapes-elvs-fem-adrenal"},
+      {"target": "bodyshapes-elvs-fem-liver"},
+      {"target": "bodyshapes-elvs-fem-ovary"},
+      {"target": "bodyshapes-elvs-fem-thyroid"},
+
+      {"target": "bodyshapes-elvs-man-apple"},
+      {"target": "bodyshapes-elvs-man-rectangle"},
+      {"target": "bodyshapes-elvs-man-lean-column"},
+      {"target": "bodyshapes-elvs-man-triangle"},
+      {"target": "bodyshapes-elvs-man-invert-triangle"},
+      {"target": "bodyshapes-elvs-man-trapezoid"},
+
+      {"target": "bodyshapes-elvs-man-adrenal"},
+      {"target": "bodyshapes-elvs-man-liver"},
+      {"target": "bodyshapes-elvs-man-gonadal"},
+      {"target": "bodyshapes-elvs-man-thyroid"}
+    ]
+  }
+]
+
+
diff --git a/makehuman/data/modifiers/bodyshapes_modifiers_desc.json b/makehuman/data/modifiers/bodyshapes_modifiers_desc.json
@@ -0,0 +1,25 @@
+{
+    "bodyshapes/bodyshapes-elvs-fem-apple": "Undefined waist, chest and abdomen form a round silhouette.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-diamond": "Broader hips than shoulders, undefined waist and relatively small bust.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-full-hourglass": "Most feminine body type: hips and bust are nearly equal in size, well-defined narrower waistline. Bottom and hips are rounded.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-neat-hourglass": "Lean body, hips and bust are nearly equal in size, well-defined narrower waistline.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-invert-triangle": "Broad shoulders and chest, narrow hips and bottom, less waist definition.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-lean-column": "Straight skinny shape with chest, hips and waist are about the same width.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-rectangle": "Straight shape with chest, hips and waist are about the same width.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-triangle": "Wide hips, narrow shoulders and a small waistline.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-adrenal": "The adrenal glands are producing cortisol (a stress hormone). If too much is produced, protein needed for muscles is turned into sugar, which then is converted into belly fat.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-liver": "If the liver is damaged, it could result in fluid belly.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-ovary": "A surplus of estrogen will gain fat in the areas it is produced and the surrounding areas, lower belly, hips, and thighs.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-fem-thyroid": "Thyroid hypofunction is slowing down metabolism which usually results in obesity.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-apple": "Oval shape with rounded stomach.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-lean-column": "Straight skinny shape with chest, hips and waist are about the same width.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-rectangle": "Straight shape with chest, hips and waist are about the same width.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-triangle": "Narrow chest and combined with heavier lower body.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-invert-triangle": "Muscular body, wide shoulders and narrow hips.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-trapezoid": "Athletic shape, upper torso is bigger than the lower torso.<p>Target by Elvaerwyn",
+
+    "bodyshapes/bodyshapes-elvs-man-adrenal": "The adrenal glands are producing cortisol (a stress hormone). If too much is produced, protein needed for muscles is turned into sugar, which then is converted into belly fat.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-liver": "If the liver is damaged, it could result in fluid belly.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-gonadal": "High insulin resistance, low testosterone and high estrogen which cannot be cleared from the liver change the body.<p>Target by Elvaerwyn",
+    "bodyshapes/bodyshapes-elvs-man-thyroid": "Thyroid hypofunction is slowing down metabolism which usually results in obesity.<p>Target by Elvaerwyn"
+}
diff --git a/makehuman/data/modifiers/bodyshapes_sliders.json b/makehuman/data/modifiers/bodyshapes_sliders.json
@@ -0,0 +1,37 @@
+{
+  "Body shapes": {
+    "sortOrder": 0,
+    "modifiers": {
+      "Female body shapes": [
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-apple", "label": "Elvs Female Apple", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-diamond", "label": "Elvs Female Diamond", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-full-hourglass", "label": "Elvs Female Full Hourglass", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-neat-hourglass", "label": "Elvs Female Neat Hourglass", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-invert-triangle", "label": "Elvs Female Inverted Triangle", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-lean-column", "label": "Elvs Female Lean Column", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-rectangle", "label": "Elvs Female Rectangle", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-triangle", "label": "Elvs Female Triangle", "cam": "frontView"}
+        ],
+     "Female hormonal components": [
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-adrenal", "label": "Elvs Female Adrenal", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-liver", "label": "Elvs Female Liver", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-ovary", "label": "Elvs Female Ovary", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-fem-thyroid", "label": "Elvs Female Thyroid", "cam": "frontView"}
+	],
+     "Male body shapes": [
+          {"mod": "bodyshapes/bodyshapes-elvs-man-apple", "label": "Elvs Male Apple", "cam": "frontView"},
+	  {"mod": "bodyshapes/bodyshapes-elvs-man-rectangle", "label": "Elvs Male Rectangle", "cam": "frontView"},
+	  {"mod": "bodyshapes/bodyshapes-elvs-man-lean-column", "label": "Elvs Male Lean Column", "cam": "frontView"},
+	  {"mod": "bodyshapes/bodyshapes-elvs-man-triangle", "label": "Elvs Male Triangle", "cam": "frontView"},
+	  {"mod": "bodyshapes/bodyshapes-elvs-man-invert-triangle", "label": "Elvs Male Inverted Triangle", "cam": "frontView"},
+	  {"mod": "bodyshapes/bodyshapes-elvs-man-trapezoid", "label": "Elvs Male Trapezoid", "cam": "frontView"}
+	],
+     "Male hormonal components": [
+          {"mod": "bodyshapes/bodyshapes-elvs-man-adrenal", "label": "Elvs Male Adrenal", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-man-liver", "label": "Elvs Male Liver", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-man-gonadal", "label": "Elvs Male Gonadal", "cam": "frontView"},
+          {"mod": "bodyshapes/bodyshapes-elvs-man-thyroid", "label": "Elvs Male Thyroid", "cam": "frontView"}
+	]
+    }
+  }
+}
diff --git a/makehuman/data/modifiers/modeling_modifiers_desc.json b/makehuman/data/modifiers/modeling_modifiers_desc.json
@@ -10,7 +10,7 @@
 
     "macrodetails-height/Height": "The height/length of the human.",
 
-    "macrodetails-proportions/BodyProportions": "Proportions of the human features, often subjectively referred to as qualities of beauty (min is unusual, center position is average and max is idealistic proportions).",
+    "macrodetails-proportions/BodyProportions": "Proportions of the human features, often subjectively referred to as qualities of beauty<br>(min is unusual, center position is average and max is idealistic proportions).",
 
     "armslegs/l-foot-scale-decr|incr": "",
     "armslegs/l-foot-trans-backward|forward": "",