ticket:4196 Convert the drawing unit to pixels.

Author: adeas31

OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp

@@ -473,30 +473,37 @@ QRectF ShapeAnnotation::getBoundingRect() const
 }
 
 /*!
-  Applies the shape line pattern.
-  \param painter - pointer to QPainter
-  */
+ * \brief ShapeAnnotation::applyLinePattern
+ * Applies the shape line pattern.
+ * \param painter - pointer to QPainter
+ */
 void ShapeAnnotation::applyLinePattern(QPainter *painter)
 {
-  qreal thicknessFactor = mLineThickness / 0.5;
-  qreal thickness = thicknessFactor < 1 ? 1.0 : thicknessFactor;
+  qreal thickness = Utilities::convertMMToPixel(mLineThickness);
   QPen pen(mLineColor, thickness, StringHandler::getLinePatternType(mLinePattern), Qt::SquareCap, Qt::MiterJoin);
+  /* The specification doesn't say anything about it.
+   * But just to keep this consist with Dymola we use Qt::BevelJoin for Line shapes.
+   * All other shapes use Qt::MiterJoin
+   */
+  if (dynamic_cast<LineAnnotation*>(this)) {
+    pen.setJoinStyle(Qt::BevelJoin);
+  }
   /* Ticket #3222
    * Make all the shapes use cosmetic pens so that they perserve their pen widht when scaled i.e zoomed in/out.
    * Only shapes with border patterns raised & sunken don't use cosmetic pens. We need better handling of border patterns.
    */
   if (mBorderPattern != StringHandler::BorderRaised && mBorderPattern != StringHandler::BorderSunken) {
     pen.setCosmetic(true);
   }
-  if (mpGraphicsView && mpGraphicsView->isRenderingLibraryPixmap()) {
-    /* Ticket #2272, Ticket #2268.
-     * If thickness is greater than 2 then don't make the pen cosmetic since cosmetic pens don't change the width with respect to zoom.
-     */
-    if (thickness <= 2) {
-      pen.setCosmetic(true);
-    } else {
-      pen.setCosmetic(false);
-    }
+  /* Ticket #2272, Ticket #2268.
+   * If thickness is greater than 2 then don't make the pen cosmetic since cosmetic pens don't change the width with respect to zoom.
+   */
+  if (mpGraphicsView && mpGraphicsView->isRenderingLibraryPixmap() && thickness > 2) {
+    pen.setCosmetic(false);
+  }
+  // if thickness is greater than 1 pixel then use antialiasing.
+  if (thickness > 1) {
+    painter->setRenderHint(QPainter::Antialiasing);
   }
   painter->setPen(pen);
 }

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -1209,6 +1209,17 @@ void GraphicsView::addConnection(Component *pComponent)
     mpConnectionLineAnnotation->addPoint(startPos);
     mpConnectionLineAnnotation->addPoint(startPos);
     mpConnectionLineAnnotation->addPoint(startPos);
+    /* Ticket:4196
+     * If we are starting connection from expandable connector or array connector
+     * then set the line thickness to 0.5
+     */
+    if ((pComponent->getLibraryTreeItem() && pComponent->getLibraryTreeItem()->getRestriction() == StringHandler::ExpandableConnector) ||
+        (pComponent->getParentComponent() && pComponent->getRootParentComponent()->getComponentInfo()->isArray()) ||
+        (!pComponent->getParentComponent() && pComponent->getRootParentComponent()->getLibraryTreeItem() && pComponent->getRootParentComponent()->getLibraryTreeItem()->getRestriction() == StringHandler::ExpandableConnector) ||
+        (pComponent->getParentComponent() && pComponent->getLibraryTreeItem() && pComponent->getLibraryTreeItem()->getRestriction() == StringHandler::ExpandableConnector) ||
+        (pComponent->getComponentInfo() && pComponent->getComponentInfo()->isArray())) {
+      mpConnectionLineAnnotation->setLineThickness(0.5);
+    }
   } else if (isCreatingConnection()) { // When clicking the end component
     mpConnectionLineAnnotation->setEndComponent(pComponent);
     // update the last point to the center of component

OMEdit/OMEditGUI/Util/Utilities.cpp

@@ -38,6 +38,7 @@
 #include "Modeling/LibraryTreeWidget.h"
 
 #include <QApplication>
+#include <QDesktopWidget>
 #include <QGridLayout>
 #include <QStylePainter>
 #include <QPainter>
@@ -886,3 +887,16 @@ bool Utilities::containsWord(QString text, int index, QString keyword, bool chec
   }
   return false;
 }
+
+/*!
+ * \brief Utilities::convertMMToPixel
+ * Converts the value from mm to pixels
+ * pixel = (dpi * mm / 1 inch)
+ * 1 inch is 25.4
+ * \param value
+ * \return
+ */
+qreal Utilities::convertMMToPixel(qreal value)
+{
+  return (QApplication::desktop()->screen()->logicalDpiX() * value) / 25.4;
+}

OMEdit/OMEditGUI/Util/Utilities.h

@@ -470,6 +470,7 @@ namespace Utilities {
   } // namespace FileIconProvider
 
   bool containsWord(QString text, int index, QString keyword, bool checkParenthesis = false);
+  qreal convertMMToPixel(qreal value);
 
 } // namespace Utilities