Merge branch 'FreeCAD:main' into libe57UPD

data/examples/CMakeLists.txt

@@ -7,6 +7,7 @@ SET(Examples_Files
     BIMExample.FCStd
     FEMExample.FCStd
     AssemblyExample.FCStd
+    ArchDetail.FCStd
 )
 
 ADD_CUSTOM_TARGET(Example_data ALL

src/App/Color.cpp

@@ -67,6 +67,16 @@ void Color::set(float red, float green, float blue, float alpha)
     a = alpha;
 }
 
+float Color::transparency() const
+{
+    return 1.0F - a;
+}
+
+void Color::setTransparency(float value)
+{
+    a = 1.0F - value;
+}
+
 // NOLINTBEGIN(cppcoreguidelines-avoid-magic-numbers,readability-magic-numbers)
 Color& Color::setPackedValue(uint32_t rgba)
 {

src/App/Color.h

@@ -25,7 +25,7 @@
 #define APP_COLOR_H
 
 #ifdef __GNUC__
-# include <cstdint>
+#include <cstdint>
 #endif
 #include <cmath>
 #include <string>
@@ -35,16 +35,60 @@
 namespace App
 {
 
+template<class color_type>
+struct color_traits
+{
+    color_traits() = default;
+    explicit color_traits(const color_type& ct)
+        : ct(ct)
+    {}
+    float redF() const
+    {
+        return static_cast<float>(ct.redF());
+    }
+    float greenF() const
+    {
+        return static_cast<float>(ct.greenF());
+    }
+    float blueF() const
+    {
+        return static_cast<float>(ct.blueF());
+    }
+    int red() const
+    {
+        return ct.red();
+    }
+    int green() const
+    {
+        return ct.green();
+    }
+    int blue() const
+    {
+        return ct.blue();
+    }
+    int alpha() const
+    {
+        return ct.alpha();
+    }
+    static color_type makeColor(int red, int green, int blue, int alpha = 255)
+    {
+        return color_type{red, green, blue, alpha};
+    }
+
+private:
+    color_type ct;
+};
+
 /** Color class
  */
 class AppExport Color
 {
 public:
     /**
      * Defines the color as (R,G,B,A) whereas all values are in the range [0,1].
-     * \a A defines the transparency.
+     * \a A defines the alpha value.
      */
-    explicit Color(float R=0.0,float G=0.0, float B=0.0, float A=0.0);
+    explicit Color(float R = 0.0, float G = 0.0, float B = 0.0, float A = 1.0);
 
     /**
      * Does basically the same as the constructor above unless that (R,G,B,A) is
@@ -61,9 +105,11 @@ class AppExport Color
     bool operator!=(const Color& c) const;
     /**
      * Defines the color as (R,G,B,A) whereas all values are in the range [0,1].
-     * \a A defines the transparency, 0 means complete opaque and 1 invisible.
+     * \a A defines the alpha value, 1 means fully opaque and 0 transparent.
      */
-    void set(float R,float G, float B, float A=0.0);
+    void set(float R, float G, float B, float A = 1.0);
+    float transparency() const;
+    void setTransparency(float value);
     Color& operator=(const Color& c) = default;
     Color& operator=(Color&& c) = default;
     /**
@@ -97,43 +143,56 @@ class AppExport Color
      */
     void setPackedARGB(uint32_t);
 
-    template <typename T>
-    static uint32_t asPackedRGBA(const T& color) {
-        return (color.red() << 24) | (color.green() << 16) | (color.blue() << 8) | color.alpha();
+    template<typename T>
+    static uint32_t asPackedRGBA(const T& color)
+    {
+        color_traits<T> ct{color};
+        return (ct.red() << 24) | (ct.green() << 16) | (ct.blue() << 8) | ct.alpha();
     }
 
-    template <typename T>
-    static T fromPackedRGBA(uint32_t color) {
-        return T((color >> 24) & 0xff, (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
+    template<typename T>
+    static T fromPackedRGBA(uint32_t color)
+    {
+        return color_traits<T>::makeColor((color >> 24) & 0xff,
+                                          (color >> 16) & 0xff,
+                                          (color >> 8) & 0xff,
+                                          (color & 0xff));
     }
 
-    template <typename T>
-    static uint32_t asPackedRGB(const T& color) {
-        return (color.red() << 24) | (color.green() << 16) | (color.blue() << 8);
+    template<typename T>
+    static uint32_t asPackedRGB(const T& color)
+    {
+        color_traits<T> ct{color};
+        return (ct.red() << 24) | (ct.green() << 16) | (ct.blue() << 8);
     }
 
-    template <typename T>
-    static T fromPackedRGB(uint32_t color) {
-        return T((color >> 24) & 0xff, (color >> 16) & 0xff, (color >> 8) & 0xff);
+    template<typename T>
+    static T fromPackedRGB(uint32_t color)
+    {
+        return color_traits<T>::makeColor((color >> 24) & 0xff,
+                                          (color >> 16) & 0xff,
+                                          (color >> 8) & 0xff);
     }
     /**
      * creates FC Color from template type, e.g. Qt QColor
      */
-    template <typename T>
-    void setValue(const T& q) {
-        set(q.redF(),q.greenF(),q.blueF());
+    template<typename T>
+    void setValue(const T& q)
+    {
+        color_traits<T> ct{q};
+        set(ct.redF(), ct.greenF(), ct.blueF());
     }
     /**
      * returns a template type e.g. Qt color equivalent to FC color
      *
      */
-    template <typename T>
+    template<typename T>
     inline T asValue() const
     {
         // clang-format off
-        return(T(int(std::lround(r * 255.0F)),
-                 int(std::lround(g * 255.0F)),
-                 int(std::lround(b * 255.0F))));
+        return color_traits<T>::makeColor(int(std::lround(r * 255.0F)),
+                                          int(std::lround(g * 255.0F)),
+                                          int(std::lround(b * 255.0F)));
         // clang-format on
     }
     /**
@@ -149,9 +208,9 @@ class AppExport Color
     bool fromHexString(const std::string& hex);
 
     /// color values, public accessible
-    float r,g,b,a;
+    float r {}, g {}, b {}, a {};
 };
 
-} //namespace App
+}  // namespace App
 
-#endif // APP_COLOR_H
+#endif  // APP_COLOR_H

src/App/ColorModel.h

@@ -540,8 +540,9 @@ inline Color ColorGradient::getColor (float fVal) const
 {
     Color color = _getColor(fVal);
     if (isOutsideInvisible()) {
-        if (isOutOfRange(fVal))
-            color.a = 0.8f;
+        if (isOutOfRange(fVal)) {
+            color.a = 0.2F;
+        }
     }
 
     return color;

src/App/Part.cpp

@@ -55,7 +55,7 @@ Part::Part()
     ADD_PROPERTY_TYPE(License, (""), 0, App::Prop_None, "License string of the Item");
     ADD_PROPERTY_TYPE(LicenseURL, (""), 0, App::Prop_None, "URL to the license text/contract");
     // color and appearance
-    ADD_PROPERTY(Color, (1.0, 1.0, 1.0, 1.0)); // set transparent -> not used
+    ADD_PROPERTY(Color, (1.0, 1.0, 1.0, 0.0));  // set transparent -> not used
 
     GroupExtension::initExtension(this);
 }

src/App/PropertyStandard.h

@@ -1038,19 +1038,19 @@ class AppExport PropertyMaterial: public Property
      */
     void setValue(const Material& mat);
     void setValue(const Color& col);
-    void setValue(float r, float g, float b, float a = 0.0F);
+    void setValue(float r, float g, float b, float a = 1.0F);
     void setValue(uint32_t rgba);
     void setAmbientColor(const Color& col);
-    void setAmbientColor(float r, float g, float b, float a = 0.0F);
+    void setAmbientColor(float r, float g, float b, float a = 1.0F);
     void setAmbientColor(uint32_t rgba);
     void setDiffuseColor(const Color& col);
-    void setDiffuseColor(float r, float g, float b, float a = 0.0F);
+    void setDiffuseColor(float r, float g, float b, float a = 1.0F);
     void setDiffuseColor(uint32_t rgba);
     void setSpecularColor(const Color& col);
-    void setSpecularColor(float r, float g, float b, float a = 0.0F);
+    void setSpecularColor(float r, float g, float b, float a = 1.0F);
     void setSpecularColor(uint32_t rgba);
     void setEmissiveColor(const Color& col);
-    void setEmissiveColor(float r, float g, float b, float a = 0.0F);
+    void setEmissiveColor(float r, float g, float b, float a = 1.0F);
     void setEmissiveColor(uint32_t rgba);
     void setShininess(float);
     void setTransparency(float);
@@ -1123,32 +1123,32 @@ class AppExport PropertyMaterialList: public PropertyListsT<Material>
     void setValue(int index, const Material& mat);
 
     void setAmbientColor(const Color& col);
-    void setAmbientColor(float r, float g, float b, float a = 0.0F);
+    void setAmbientColor(float r, float g, float b, float a = 1.0F);
     void setAmbientColor(uint32_t rgba);
     void setAmbientColor(int index, const Color& col);
-    void setAmbientColor(int index, float r, float g, float b, float a = 0.0F);
+    void setAmbientColor(int index, float r, float g, float b, float a = 1.0F);
     void setAmbientColor(int index, uint32_t rgba);
 
     void setDiffuseColor(const Color& col);
-    void setDiffuseColor(float r, float g, float b, float a = 0.0F);
+    void setDiffuseColor(float r, float g, float b, float a = 1.0F);
     void setDiffuseColor(uint32_t rgba);
     void setDiffuseColor(int index, const Color& col);
-    void setDiffuseColor(int index, float r, float g, float b, float a = 0.0F);
+    void setDiffuseColor(int index, float r, float g, float b, float a = 1.0F);
     void setDiffuseColor(int index, uint32_t rgba);
     void setDiffuseColors(const std::vector<App::Color>& colors);
 
     void setSpecularColor(const Color& col);
-    void setSpecularColor(float r, float g, float b, float a = 0.0F);
+    void setSpecularColor(float r, float g, float b, float a = 1.0F);
     void setSpecularColor(uint32_t rgba);
     void setSpecularColor(int index, const Color& col);
-    void setSpecularColor(int index, float r, float g, float b, float a = 0.0F);
+    void setSpecularColor(int index, float r, float g, float b, float a = 1.0F);
     void setSpecularColor(int index, uint32_t rgba);
 
     void setEmissiveColor(const Color& col);
-    void setEmissiveColor(float r, float g, float b, float a = 0.0F);
+    void setEmissiveColor(float r, float g, float b, float a = 1.0F);
     void setEmissiveColor(uint32_t rgba);
     void setEmissiveColor(int index, const Color& col);
-    void setEmissiveColor(int index, float r, float g, float b, float a = 0.0F);
+    void setEmissiveColor(int index, float r, float g, float b, float a = 1.0F);
     void setEmissiveColor(int index, uint32_t rgba);
 
     void setShininess(float);

src/App/Resources/translations/App.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../Application.cpp" line="463"/>
+        <location filename="../../Application.cpp" line="468"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>

src/App/Resources/translations/App_be.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Без назвы</translation>
     </message>

src/App/Resources/translations/App_ca.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sense nom</translation>
     </message>

src/App/Resources/translations/App_cs.ts

@@ -14,7 +14,7 @@ které odkazují na stejný konfigurovatelný objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nepojmenovaný</translation>
     </message>

src/App/Resources/translations/App_da.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Unavngivet</translation>
     </message>

src/App/Resources/translations/App_de.ts

@@ -14,7 +14,7 @@ angewendet werden soll, die das gleiche konfigurierbare Objekt referenzieren</tr
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Unbenannt</translation>
     </message>

src/App/Resources/translations/App_el.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Ανώνυμο</translation>
     </message>

src/App/Resources/translations/App_es-AR.ts

@@ -14,7 +14,7 @@ que hacen referencia al mismo objeto configurable</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

src/App/Resources/translations/App_es-ES.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

src/App/Resources/translations/App_eu.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Izenik gabea</translation>
     </message>

src/App/Resources/translations/App_fi.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nimetön</translation>
     </message>

src/App/Resources/translations/App_fr.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="463"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nouveau</translation>
     </message>